From ea15b859b7460789138b25f4f42f97346a900375 Mon Sep 17 00:00:00 2001
From: Dmytro Kryvoshei <dmytrobr@gmail.com>
Date: Sat, 14 May 2016 06:38:38 -0400
Subject: [PATCH 001/139] use Title attribute as model name

this allows to use names defined by user in Response model instead of
"inline_response". Also user could use title to have specific name for
request model instead of parameter name
---
 modules/swagger-codegen/.gitignore            |   1 +
 .../swagger/codegen/InlineModelResolver.java  |  57 ++++++----
 .../codegen/InlineModelResolverTest.java      | 107 ++++++++++++++++++
 3 files changed, 141 insertions(+), 24 deletions(-)

diff --git a/modules/swagger-codegen/.gitignore b/modules/swagger-codegen/.gitignore
index d027396de4e4..f4ccae271fac 100644
--- a/modules/swagger-codegen/.gitignore
+++ b/modules/swagger-codegen/.gitignore
@@ -1 +1,2 @@
 /.settings/
+/test-output/
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java
index 2f8dc6e3575d..e82f92b50241 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java
@@ -50,7 +50,7 @@ public class InlineModelResolver {
                                         if (obj.getType() == null || "object".equals(obj.getType())) {
                                             if (obj.getProperties() != null && obj.getProperties().size() > 0) {
                                                 flattenProperties(obj.getProperties(), pathname);
-                                                String modelName = uniqueName(bp.getName());
+                                                String modelName = resolveModelName( obj.getTitle(), bp.getName());
                                                 bp.setSchema(new RefModel(modelName));
                                                 addGenerated(modelName, model);
                                                 swagger.addDefinition(modelName, model);
@@ -65,7 +65,7 @@ public class InlineModelResolver {
                                             ObjectProperty op = (ObjectProperty) inner;
                                             if (op.getProperties() != null && op.getProperties().size() > 0) {
                                                 flattenProperties(op.getProperties(), pathname);
-                                                String modelName = uniqueName(bp.getName());
+                                                String modelName = resolveModelName( op.getTitle(), bp.getName());
                                                 Model innerModel = modelFromProperty(op, modelName);
                                                 String existing = matchGenerated(innerModel);
                                                 if (existing != null) {
@@ -91,7 +91,7 @@ public class InlineModelResolver {
                                 if (property instanceof ObjectProperty) {
                                     ObjectProperty op = (ObjectProperty) property;
                                     if (op.getProperties() != null && op.getProperties().size() > 0) {
-                                        String modelName = uniqueName("inline_response_" + key);
+					String modelName = resolveModelName( op.getTitle(),"inline_response_" + key);
                                         Model model = modelFromProperty(op, modelName);
                                         String existing = matchGenerated(model);
                                         if (existing != null) {
@@ -108,18 +108,18 @@ public class InlineModelResolver {
 
                                     if(inner instanceof ObjectProperty) {
                                         ObjectProperty op = (ObjectProperty) inner;
-                                        if (op.getProperties() != null && op.getProperties().size() > 0) {
-                                            flattenProperties(op.getProperties(), pathname);
-                                            String modelName = uniqueName("inline_response_" + key);
-                                            Model innerModel = modelFromProperty(op, modelName);
-                                            String existing = matchGenerated(innerModel);
-                                            if (existing != null) {
-                                                ap.setItems(new RefProperty(existing));
-                                            } else {
+					if (op.getProperties() != null && op.getProperties().size() > 0) {
+					flattenProperties(op.getProperties(), pathname);
+					String modelName = resolveModelName( op.getTitle(),"inline_response_" + key);
+					Model innerModel = modelFromProperty(op, modelName);
+					String existing = matchGenerated(innerModel);
+                                        if (existing != null) {
+                                            	ap.setItems(new RefProperty(existing));
+                                        } else {
                                                 ap.setItems(new RefProperty(modelName));
                                                 addGenerated(modelName, innerModel);
                                                 swagger.addDefinition(modelName, innerModel);
-                                            }
+                                        	}
                                         }
                                     }
                                 } else if (property instanceof MapProperty) {
@@ -129,18 +129,18 @@ public class InlineModelResolver {
                                     if(innerProperty instanceof ObjectProperty) {
                                         ObjectProperty op = (ObjectProperty) innerProperty;
                                         if (op.getProperties() != null && op.getProperties().size() > 0) {
-                                            flattenProperties(op.getProperties(), pathname);
-                                            String modelName = uniqueName("inline_response_" + key);
-                                            Model innerModel = modelFromProperty(op, modelName);
-                                            String existing = matchGenerated(innerModel);
-                                            if (existing != null) {
-                                                mp.setAdditionalProperties(new RefProperty(existing));
-                                            } else {
-                                                mp.setAdditionalProperties(new RefProperty(modelName));
-                                                addGenerated(modelName, innerModel);
-                                                swagger.addDefinition(modelName, innerModel);
-                                            }
-                                        }
+					flattenProperties(op.getProperties(), pathname);
+					String modelName = resolveModelName( op.getTitle(),"inline_response_" + key);
+					Model innerModel = modelFromProperty(op, modelName);
+					String existing = matchGenerated(innerModel);
+	                                if (existing != null) {
+	                                    mp.setAdditionalProperties(new RefProperty(existing));
+	                                } else {
+	                                    mp.setAdditionalProperties(new RefProperty(modelName));
+	                                    addGenerated(modelName, innerModel);
+	                                    swagger.addDefinition(modelName, innerModel);
+	                                  }
+					}
                                     }
                                 }
                             }
@@ -184,6 +184,15 @@ public class InlineModelResolver {
         }
     }
 
+    private String resolveModelName(String title, String key ) {
+	if (title == null) {
+	    return uniqueName(key);
+	}
+	else {
+	    return uniqueName(title);
+	}
+    }
+
     public String matchGenerated(Model model) {
         if (this.skipMatches) {
             return null;
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/InlineModelResolverTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/InlineModelResolverTest.java
index f82e40bb41cc..dfa4337e081a 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/InlineModelResolverTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/InlineModelResolverTest.java
@@ -77,6 +77,40 @@ public class InlineModelResolverTest {
         assertTrue(model.getProperties().get("name") instanceof StringProperty);
     }
 
+    
+    @Test
+    public void testInlineResponseModelWithTitle() throws Exception {
+        Swagger swagger = new Swagger();
+
+        String responseTitle = "GetBarResponse";
+	swagger.path("/foo/bar", new Path()
+            .get(new Operation()
+                    .response(200, new Response()
+                            .description("it works!")
+                            .schema(new ObjectProperty().title(responseTitle)
+                                    .property("name", new StringProperty())))))
+        .path("/foo/baz", new Path()
+                .get(new Operation()
+                        .response(200, new Response()
+                                .vendorExtension("x-foo", "bar")
+                                .description("it works!")
+                                .schema(new ObjectProperty()
+                                        .property("name", new StringProperty())))));
+        new InlineModelResolver().flatten(swagger);
+
+        Map<String, Response> responses = swagger.getPaths().get("/foo/bar").getGet().getResponses();
+
+        Response response = responses.get("200");
+        assertNotNull(response);
+        assertTrue(response.getSchema() instanceof RefProperty);
+
+        ModelImpl model = (ModelImpl)swagger.getDefinitions().get(responseTitle);
+        assertTrue(model.getProperties().size() == 1);
+        assertNotNull(model.getProperties().get("name"));
+        assertTrue(model.getProperties().get("name") instanceof StringProperty);
+    }
+    
+    
     @Test
     public void resolveInlineArrayModel() throws Exception {
         Swagger swagger = new Swagger();
@@ -128,6 +162,35 @@ public class InlineModelResolverTest {
         ModelImpl impl = (ModelImpl) body;
         assertNotNull(impl.getProperties().get("address"));
     }
+    
+    @Test
+    public void resolveInlineBodyParameterWithTitle() throws Exception {
+        Swagger swagger = new Swagger();
+
+        ModelImpl addressModelItem = new ModelImpl();
+        String addressModelName = "DetailedAddress";
+	addressModelItem.setTitle(addressModelName);
+	swagger.path("/hello", new Path()
+                .get(new Operation()
+                        .parameter(new BodyParameter()
+                                .name("body")
+                                .schema(addressModelItem
+                                        .property("address", new ObjectProperty()
+                                            .property("street", new StringProperty()))
+                                        .property("name", new StringProperty())))));
+
+        new InlineModelResolver().flatten(swagger);
+
+        Operation operation = swagger.getPaths().get("/hello").getGet();
+        BodyParameter bp = (BodyParameter)operation.getParameters().get(0);
+        assertTrue(bp.getSchema() instanceof RefModel);
+
+        Model body = swagger.getDefinitions().get(addressModelName);
+        assertTrue(body instanceof ModelImpl);
+
+        ModelImpl impl = (ModelImpl) body;
+        assertNotNull(impl.getProperties().get("address"));
+    }    
 
     @Test
     public void notResolveNonModelBodyParameter() throws Exception {
@@ -245,6 +308,50 @@ public class InlineModelResolverTest {
         assertTrue(impl.getProperties().get("name") instanceof StringProperty);
     }
 
+    @Test
+    public void resolveInlineArrayResponseWithTitle() throws Exception {
+        Swagger swagger = new Swagger();
+
+        swagger.path("/foo/baz", new Path()
+                .get(new Operation()
+                        .response(200, new Response()
+                                .vendorExtension("x-foo", "bar")
+                                .description("it works!")
+                                .schema(new ArrayProperty()
+                                        .items(
+                                                new ObjectProperty()
+                                                	.title("FooBar")
+                                                        .property("name", new StringProperty()))))));
+
+        new InlineModelResolver().flatten(swagger);
+
+        Response response = swagger.getPaths().get("/foo/baz").getGet().getResponses().get("200");
+        assertNotNull(response);
+
+        assertNotNull(response.getSchema());
+        Property responseProperty = response.getSchema();
+
+        // no need to flatten more
+        assertTrue(responseProperty instanceof ArrayProperty);
+
+        ArrayProperty ap = (ArrayProperty) responseProperty;
+        Property p = ap.getItems();
+
+        assertNotNull(p);
+
+        RefProperty rp = (RefProperty) p;
+        assertEquals(rp.getType(), "ref");
+        assertEquals(rp.get$ref(), "#/definitions/"+ "FooBar");
+        assertEquals(rp.getSimpleRef(), "FooBar");
+
+        Model inline = swagger.getDefinitions().get("FooBar");
+        assertNotNull(inline);
+        assertTrue(inline instanceof ModelImpl);
+        ModelImpl impl = (ModelImpl) inline;
+        assertNotNull(impl.getProperties().get("name"));
+        assertTrue(impl.getProperties().get("name") instanceof StringProperty);
+    }
+    
     @Test
     public void testInlineMapResponse() throws Exception {
         Swagger swagger = new Swagger();

From 942b015c8fa744469144ce2f49c9f1a2178c20d0 Mon Sep 17 00:00:00 2001
From: Newell Zhu <zlx.star@gmail.com>
Date: Mon, 23 May 2016 20:46:32 +0800
Subject: [PATCH 002/139] Add normal class enum support

---
 .../ruby/partial_model_generic.mustache       | 74 +++++++++----------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/ruby/partial_model_generic.mustache b/modules/swagger-codegen/src/main/resources/ruby/partial_model_generic.mustache
index 25a716101681..0335500863f1 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/partial_model_generic.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/partial_model_generic.mustache
@@ -4,6 +4,30 @@
     attr_accessor :{{{name}}}
   {{/vars}}
 
+{{#hasEnums}}
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
+{{/hasEnums}}
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -53,13 +77,6 @@
     # @return Array for valid properies with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      {{#isEnum}}
-      allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
-      if @{{{name}}} && !allowed_values.include?({{{name}}})
-        invalid_properties.push("invalid value for '{{{name}}}', must be one of #{allowed_values}.")
-      end
-
-      {{/isEnum}}
       {{#hasValidation}}
       if @{{{name}}}.nil?
         fail ArgumentError, "{{{name}}} cannot be nil"
@@ -104,50 +121,31 @@
     def valid?
       {{#vars}}
       {{#required}}
-      if @{{{name}}}.nil?
-        return false
-      end
-
+      return false if @{{{name}}}.nil?
       {{/required}}
       {{#isEnum}}
-      allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
-      if @{{{name}}} && !allowed_values.include?(@{{{name}}})
-        return false
-      end
+      {{{name}}}_validator = EnumAttributeValidator.new('{{{datatype}}}', [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
+      return false unless {{{name}}}_validator.valid?(@{{{name}}})
       {{/isEnum}}
       {{#hasValidation}}
       {{#minLength}}
-      if @{{{name}}}.to_s.length > {{{maxLength}}}
-        return false
-      end
-
+      return false if @{{{name}}}.to_s.length > {{{maxLength}}}
       {{/minLength}}
       {{#maxLength}}
-      if @{{{name}}}.to_s.length < {{{minLength}}}
-        return false
-      end
-
+      return false if @{{{name}}}.to_s.length < {{{minLength}}}
       {{/maxLength}}
       {{#maximum}}
-      if @{{{name}}} > {{{maximum}}}
-        return false
-      end
-
+      return false if @{{{name}}} > {{{maximum}}}
       {{/maximum}}
       {{#minimum}}
-      if @{{{name}}} < {{{minimum}}}
-        return false
-      end
-
+      return false if @{{{name}}} < {{{minimum}}}
       {{/minimum}}
       {{#pattern}}
-      if @{{{name}}} !~ Regexp.new({{{pattern}}})
-        return false
-      end
-
+      return false if @{{{name}}} !~ Regexp.new({{{pattern}}})
       {{/pattern}}
       {{/hasValidation}}
       {{/vars}}
+      return true
     end
 
     {{#vars}}
@@ -155,9 +153,9 @@
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] {{{name}}} Object to be assigned
     def {{{name}}}=({{{name}}})
-      allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
-      if {{{name}}} && !allowed_values.include?({{{name}}})
-        fail ArgumentError, "invalid value for '{{{name}}}', must be one of #{allowed_values}."
+      validator = EnumAttributeValidator.new('{{{datatype}}}', [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
+      unless validator.valid?({{{name}}})
+        fail ArgumentError, "invalid value for '{{{name}}}', must be one of #{validator.allowable_values}."
       end
       @{{{name}}} = {{{name}}}
     end

From a9b81504428ce41839da524ea802c1bbea340b71 Mon Sep 17 00:00:00 2001
From: Newell Zhu <zlx.star@gmail.com>
Date: Mon, 23 May 2016 20:54:45 +0800
Subject: [PATCH 003/139] regenerate ruby client sample

---
 .../petstore/ruby/.swagger-codegen-ignore     |  23 ++
 samples/client/petstore/ruby/README.md        |   5 +-
 .../ruby/docs/AdditionalPropertiesClass.md    |   7 +
 samples/client/petstore/ruby/docs/FakeApi.md  |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   9 +
 .../petstore/ruby/docs/ReadOnlyFirst.md       |   9 +
 samples/client/petstore/ruby/lib/petstore.rb  |   3 +
 .../ruby/lib/petstore/api/fake_api.rb         |   4 +-
 .../models/additional_properties_class.rb     | 183 ++++++++++++++++
 .../ruby/lib/petstore/models/animal.rb        |   9 +-
 .../ruby/lib/petstore/models/animal_farm.rb   |   4 +
 .../ruby/lib/petstore/models/api_response.rb  |   4 +
 .../petstore/ruby/lib/petstore/models/cat.rb  |   9 +-
 .../ruby/lib/petstore/models/category.rb      |   4 +
 .../petstore/ruby/lib/petstore/models/dog.rb  |   9 +-
 .../ruby/lib/petstore/models/enum_class.rb    |   9 +-
 .../ruby/lib/petstore/models/enum_test.rb     |  61 ++++--
 .../ruby/lib/petstore/models/format_test.rb   |  89 ++------
 ...perties_and_additional_properties_class.rb | 201 ++++++++++++++++++
 .../lib/petstore/models/model_200_response.rb |   3 +
 .../ruby/lib/petstore/models/model_return.rb  |   3 +
 .../petstore/ruby/lib/petstore/models/name.rb |   8 +-
 .../ruby/lib/petstore/models/order.rb         |  37 +++-
 .../petstore/ruby/lib/petstore/models/pet.rb  |  47 ++--
 .../lib/petstore/models/read_only_first.rb    | 201 ++++++++++++++++++
 .../lib/petstore/models/special_model_name.rb |   4 +
 .../petstore/ruby/lib/petstore/models/tag.rb  |   4 +
 .../petstore/ruby/lib/petstore/models/user.rb |   4 +
 .../additional_properties_class_spec.rb       |  40 ++++
 ...es_and_additional_properties_class_spec.rb |  52 +++++
 .../ruby/spec/models/read_only_first_spec.rb  |  52 +++++
 31 files changed, 965 insertions(+), 136 deletions(-)
 create mode 100644 samples/client/petstore/ruby/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/ruby/docs/AdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/ruby/docs/MixedPropertiesAndAdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/ruby/docs/ReadOnlyFirst.md
 create mode 100644 samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
 create mode 100644 samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
 create mode 100644 samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
 create mode 100644 samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
 create mode 100644 samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
 create mode 100644 samples/client/petstore/ruby/spec/models/read_only_first_spec.rb

diff --git a/samples/client/petstore/ruby/.swagger-codegen-ignore b/samples/client/petstore/ruby/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/ruby/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/ruby/README.md b/samples/client/petstore/ruby/README.md
index 1ff27c5eb29d..8767f8164822 100644
--- a/samples/client/petstore/ruby/README.md
+++ b/samples/client/petstore/ruby/README.md
@@ -8,7 +8,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-05-11T16:13:11.464+08:00
+- Build date: 2016-05-23T20:51:09.022+08:00
 - Build package: class io.swagger.codegen.languages.RubyClientCodegen
 
 ## Installation
@@ -116,6 +116,7 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [Petstore::AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
  - [Petstore::Animal](docs/Animal.md)
  - [Petstore::AnimalFarm](docs/AnimalFarm.md)
  - [Petstore::ApiResponse](docs/ApiResponse.md)
@@ -125,11 +126,13 @@ Class | Method | HTTP request | Description
  - [Petstore::EnumClass](docs/EnumClass.md)
  - [Petstore::EnumTest](docs/EnumTest.md)
  - [Petstore::FormatTest](docs/FormatTest.md)
+ - [Petstore::MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [Petstore::Model200Response](docs/Model200Response.md)
  - [Petstore::ModelReturn](docs/ModelReturn.md)
  - [Petstore::Name](docs/Name.md)
  - [Petstore::Order](docs/Order.md)
  - [Petstore::Pet](docs/Pet.md)
+ - [Petstore::ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [Petstore::SpecialModelName](docs/SpecialModelName.md)
  - [Petstore::Tag](docs/Tag.md)
  - [Petstore::User](docs/User.md)
diff --git a/samples/client/petstore/ruby/docs/AdditionalPropertiesClass.md b/samples/client/petstore/ruby/docs/AdditionalPropertiesClass.md
new file mode 100644
index 000000000000..8c9c63a74a32
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/AdditionalPropertiesClass.md
@@ -0,0 +1,7 @@
+# Petstore::AdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
diff --git a/samples/client/petstore/ruby/docs/FakeApi.md b/samples/client/petstore/ruby/docs/FakeApi.md
index c0312e00f515..7b687dc67b94 100644
--- a/samples/client/petstore/ruby/docs/FakeApi.md
+++ b/samples/client/petstore/ruby/docs/FakeApi.md
@@ -75,8 +75,8 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
+ - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
 
 
 
diff --git a/samples/client/petstore/ruby/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/ruby/docs/MixedPropertiesAndAdditionalPropertiesClass.md
new file mode 100644
index 000000000000..973c03c83966
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -0,0 +1,9 @@
+# Petstore::MixedPropertiesAndAdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**uuid** | **String** |  | [optional] 
+**date_time** | **DateTime** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/docs/ReadOnlyFirst.md b/samples/client/petstore/ruby/docs/ReadOnlyFirst.md
new file mode 100644
index 000000000000..e49b51194785
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/ReadOnlyFirst.md
@@ -0,0 +1,9 @@
+# Petstore::ReadOnlyFirst
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**bar** | **String** |  | [optional] 
+**baz** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
index ce77b3d21b6e..403cf32b4480 100644
--- a/samples/client/petstore/ruby/lib/petstore.rb
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -21,6 +21,7 @@ require 'petstore/version'
 require 'petstore/configuration'
 
 # Models
+require 'petstore/models/additional_properties_class'
 require 'petstore/models/animal'
 require 'petstore/models/animal_farm'
 require 'petstore/models/api_response'
@@ -30,11 +31,13 @@ require 'petstore/models/dog'
 require 'petstore/models/enum_class'
 require 'petstore/models/enum_test'
 require 'petstore/models/format_test'
+require 'petstore/models/mixed_properties_and_additional_properties_class'
 require 'petstore/models/model_200_response'
 require 'petstore/models/model_return'
 require 'petstore/models/name'
 require 'petstore/models/order'
 require 'petstore/models/pet'
+require 'petstore/models/read_only_first'
 require 'petstore/models/special_model_name'
 require 'petstore/models/tag'
 require 'petstore/models/user'
diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
index e7e6e45c2622..e308b35153ac 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
@@ -131,11 +131,11 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/xml', 'application/json']
+      local_header_accept = ['application/xml; charset=utf-8', 'application/json; charset=utf-8']
       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 = []
+      local_header_content_type = ['application/xml; charset=utf-8', 'application/json; charset=utf-8']
       header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
 
       # form parameters
diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
new file mode 100644
index 000000000000..c2baf6ab38e0
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
@@ -0,0 +1,183 @@
+=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. Special characters: \" \\ 
+
+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 AdditionalPropertiesClass
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+      }
+    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}
+
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properies with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      return invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      return true
+    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
+    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
+      [].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/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
index 60edb0004a7c..67c7a49d30fb 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
@@ -17,11 +17,13 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class Animal
     attr_accessor :class_name
 
     attr_accessor :color
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -68,10 +70,8 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      if @class_name.nil?
-        return false
-      end
-
+      return false if @class_name.nil?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -200,4 +200,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb b/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb
index 3328854e56b9..bcf857a5d03b 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb
@@ -17,7 +17,9 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class AnimalFarm
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -50,6 +52,7 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -176,4 +179,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
index 9bc6c7b7ae7d..15307a0343e2 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
@@ -17,6 +17,7 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class ApiResponse
     attr_accessor :code
 
@@ -24,6 +25,7 @@ module Petstore
 
     attr_accessor :message
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -74,6 +76,7 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -203,4 +206,5 @@ module Petstore
     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 58f9bca969e6..f646c9fc7dab 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb
@@ -17,6 +17,7 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class Cat
     attr_accessor :class_name
 
@@ -24,6 +25,7 @@ module Petstore
 
     attr_accessor :declawed
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -76,10 +78,8 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      if @class_name.nil?
-        return false
-      end
-
+      return false if @class_name.nil?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -209,4 +209,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb
index 0a0679c8e0a7..56f109352701 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/category.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb
@@ -17,11 +17,13 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class Category
     attr_accessor :id
 
     attr_accessor :name
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -66,6 +68,7 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -194,4 +197,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
index 78738dfb3236..d8de4d6b812f 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
@@ -17,6 +17,7 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class Dog
     attr_accessor :class_name
 
@@ -24,6 +25,7 @@ module Petstore
 
     attr_accessor :breed
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -76,10 +78,8 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      if @class_name.nil?
-        return false
-      end
-
+      return false if @class_name.nil?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -209,4 +209,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
index 8f9781813e97..700ef381d8b8 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
@@ -1,7 +1,7 @@
 =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. Special characters: \" \\
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -18,9 +18,10 @@ require 'date'
 
 module Petstore
   class EnumClass
-
-    ABC = "_ab\"c".freeze
+    
+    ABC = "_abc".freeze
     EFG = "-efg".freeze
-    XYZ = "(xy'z)".freeze
+    XYZ = "(xyz)".freeze
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
index 31a75aebb8b8..1c9c255cfff5 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
@@ -17,6 +17,7 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class EnumTest
     attr_accessor :enum_string
 
@@ -24,6 +25,28 @@ module Petstore
 
     attr_accessor :enum_number
 
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -74,26 +97,21 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      allowed_values = ["UPPER", "lower"]
-      if @enum_string && !allowed_values.include?(@enum_string)
-        return false
-      end
-      allowed_values = ["1", "-1"]
-      if @enum_integer && !allowed_values.include?(@enum_integer)
-        return false
-      end
-      allowed_values = ["1.1", "-1.2"]
-      if @enum_number && !allowed_values.include?(@enum_number)
-        return false
-      end
+      enum_string_validator = EnumAttributeValidator.new('String', ["UPPER", "lower"])
+      return false unless enum_string_validator.valid?(@enum_string)
+      enum_integer_validator = EnumAttributeValidator.new('Integer', ["1", "-1"])
+      return false unless enum_integer_validator.valid?(@enum_integer)
+      enum_number_validator = EnumAttributeValidator.new('Float', ["1.1", "-1.2"])
+      return false unless enum_number_validator.valid?(@enum_number)
+      return true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] enum_string Object to be assigned
     def enum_string=(enum_string)
-      allowed_values = ["UPPER", "lower"]
-      if enum_string && !allowed_values.include?(enum_string)
-        fail ArgumentError, "invalid value for 'enum_string', must be one of #{allowed_values}."
+      validator = EnumAttributeValidator.new('String', ["UPPER", "lower"])
+      unless validator.valid?(enum_string)
+        fail ArgumentError, "invalid value for 'enum_string', must be one of #{validator.allowable_values}."
       end
       @enum_string = enum_string
     end
@@ -101,9 +119,9 @@ module Petstore
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] enum_integer Object to be assigned
     def enum_integer=(enum_integer)
-      allowed_values = ["1", "-1"]
-      if enum_integer && !allowed_values.include?(enum_integer)
-        fail ArgumentError, "invalid value for 'enum_integer', must be one of #{allowed_values}."
+      validator = EnumAttributeValidator.new('Integer', ["1", "-1"])
+      unless validator.valid?(enum_integer)
+        fail ArgumentError, "invalid value for 'enum_integer', must be one of #{validator.allowable_values}."
       end
       @enum_integer = enum_integer
     end
@@ -111,9 +129,9 @@ module Petstore
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] enum_number Object to be assigned
     def enum_number=(enum_number)
-      allowed_values = ["1.1", "-1.2"]
-      if enum_number && !allowed_values.include?(enum_number)
-        fail ArgumentError, "invalid value for 'enum_number', must be one of #{allowed_values}."
+      validator = EnumAttributeValidator.new('Float', ["1.1", "-1.2"])
+      unless validator.valid?(enum_number)
+        fail ArgumentError, "invalid value for 'enum_number', must be one of #{validator.allowable_values}."
       end
       @enum_number = enum_number
     end
@@ -245,4 +263,5 @@ module Petstore
     end
 
   end
+
 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
index bd6a02d4a73d..c517d909b724 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
@@ -17,6 +17,7 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class FormatTest
     attr_accessor :integer
 
@@ -44,6 +45,7 @@ module Petstore
 
     attr_accessor :password
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -154,74 +156,24 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      if @integer > 100.0
-        return false
-      end
-
-      if @integer < 10.0
-        return false
-      end
-
-      if @int32 > 200.0
-        return false
-      end
-
-      if @int32 < 20.0
-        return false
-      end
-
-      if @number.nil?
-        return false
-      end
-
-      if @number > 543.2
-        return false
-      end
-
-      if @number < 32.1
-        return false
-      end
-
-      if @float > 987.6
-        return false
-      end
-
-      if @float < 54.3
-        return false
-      end
-
-      if @double > 123.4
-        return false
-      end
-
-      if @double < 67.8
-        return false
-      end
-
-      if @string !~ Regexp.new(/[a-z]/i)
-        return false
-      end
-
-      if @byte.nil?
-        return false
-      end
-
-      if @date.nil?
-        return false
-      end
-
-      if @password.nil?
-        return false
-      end
-
-      if @password.to_s.length > 64
-        return false
-      end
-
-      if @password.to_s.length < 10
-        return false
-      end
-
+      return false if @integer > 100.0
+      return false if @integer < 10.0
+      return false if @int32 > 200.0
+      return false if @int32 < 20.0
+      return false if @number.nil?
+      return false if @number > 543.2
+      return false if @number < 32.1
+      return false if @float > 987.6
+      return false if @float < 54.3
+      return false if @double > 123.4
+      return false if @double < 67.8
+      return false if @string !~ Regexp.new(/[a-z]/i)
+      return false if @byte.nil?
+      return false if @date.nil?
+      return false if @password.nil?
+      return false if @password.to_s.length > 64
+      return false if @password.to_s.length < 10
+      return true
     end
 
     # Custom attribute writer method with validation
@@ -483,4 +435,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
new file mode 100644
index 000000000000..6b2c9b8cecf2
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
@@ -0,0 +1,201 @@
+=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. Special characters: \" \\ 
+
+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 MixedPropertiesAndAdditionalPropertiesClass
+    attr_accessor :uuid
+
+    attr_accessor :date_time
+
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'uuid' => :'uuid',
+        :'date_time' => :'dateTime'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'uuid' => :'String',
+        :'date_time' => :'DateTime'
+      }
+    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.has_key?(:'uuid')
+        self.uuid = attributes[:'uuid']
+      end
+
+      if attributes.has_key?(:'dateTime')
+        self.date_time = attributes[:'dateTime']
+      end
+
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properies with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      return invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      return true
+    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 &&
+          uuid == o.uuid &&
+          date_time == o.date_time
+    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
+      [uuid, date_time].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/model_200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb
index 15675e5dd22e..ad6926b260f4 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
@@ -21,6 +21,7 @@ module Petstore
   class Model200Response
     attr_accessor :name
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -59,6 +60,7 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -186,4 +188,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
index 06150419de32..d2a24d316c24 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
@@ -21,6 +21,7 @@ module Petstore
   class ModelReturn
     attr_accessor :_return
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -59,6 +60,7 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -186,4 +188,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb
index 01d3910b9485..c029d5c60101 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/name.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb
@@ -27,6 +27,7 @@ module Petstore
 
     attr_accessor :_123_number
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -83,10 +84,8 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      if @name.nil?
-        return false
-      end
-
+      return false if @name.nil?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -217,4 +216,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb
index 4aefb422eb65..8c510a97927b 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb
@@ -17,6 +17,7 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class Order
     attr_accessor :id
 
@@ -31,6 +32,28 @@ module Petstore
 
     attr_accessor :complete
 
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -101,18 +124,17 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      allowed_values = ["placed", "approved", "delivered"]
-      if @status && !allowed_values.include?(@status)
-        return false
-      end
+      status_validator = EnumAttributeValidator.new('String', ["placed", "approved", "delivered"])
+      return false unless status_validator.valid?(@status)
+      return true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] status Object to be assigned
     def status=(status)
-      allowed_values = ["placed", "approved", "delivered"]
-      if status && !allowed_values.include?(status)
-        fail ArgumentError, "invalid value for 'status', must be one of #{allowed_values}."
+      validator = EnumAttributeValidator.new('String', ["placed", "approved", "delivered"])
+      unless validator.valid?(status)
+        fail ArgumentError, "invalid value for 'status', must be one of #{validator.allowable_values}."
       end
       @status = status
     end
@@ -247,4 +269,5 @@ module Petstore
     end
 
   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 b2432b09e5e1..3b47127903b4 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
@@ -17,6 +17,7 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class Pet
     attr_accessor :id
 
@@ -31,6 +32,28 @@ module Petstore
     # pet status in the store
     attr_accessor :status
 
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -103,26 +126,19 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      if @name.nil?
-        return false
-      end
-
-      if @photo_urls.nil?
-        return false
-      end
-
-      allowed_values = ["available", "pending", "sold"]
-      if @status && !allowed_values.include?(@status)
-        return false
-      end
+      return false if @name.nil?
+      return false if @photo_urls.nil?
+      status_validator = EnumAttributeValidator.new('String', ["available", "pending", "sold"])
+      return false unless status_validator.valid?(@status)
+      return true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] status Object to be assigned
     def status=(status)
-      allowed_values = ["available", "pending", "sold"]
-      if status && !allowed_values.include?(status)
-        fail ArgumentError, "invalid value for 'status', must be one of #{allowed_values}."
+      validator = EnumAttributeValidator.new('String', ["available", "pending", "sold"])
+      unless validator.valid?(status)
+        fail ArgumentError, "invalid value for 'status', must be one of #{validator.allowable_values}."
       end
       @status = status
     end
@@ -257,4 +273,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
new file mode 100644
index 000000000000..80d14387f620
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
@@ -0,0 +1,201 @@
+=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. Special characters: \" \\ 
+
+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 ReadOnlyFirst
+    attr_accessor :bar
+
+    attr_accessor :baz
+
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'bar' => :'bar',
+        :'baz' => :'baz'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'bar' => :'String',
+        :'baz' => :'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.has_key?(:'bar')
+        self.bar = attributes[:'bar']
+      end
+
+      if attributes.has_key?(:'baz')
+        self.baz = attributes[:'baz']
+      end
+
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properies with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      return invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      return true
+    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 &&
+          bar == o.bar &&
+          baz == o.baz
+    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
+      [bar, baz].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/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
index caf84588f222..9423b2d34437 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
@@ -17,9 +17,11 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class SpecialModelName
     attr_accessor :special_property_name
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -58,6 +60,7 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -185,4 +188,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
index b47fc2f86e99..86cc8b9dce46 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
@@ -17,11 +17,13 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class Tag
     attr_accessor :id
 
     attr_accessor :name
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -66,6 +68,7 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -194,4 +197,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb
index da720b1f5595..5681a1f6928c 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/user.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb
@@ -17,6 +17,7 @@ Terms of Service: http://swagger.io/terms/
 require 'date'
 
 module Petstore
+
   class User
     attr_accessor :id
 
@@ -35,6 +36,7 @@ module Petstore
     # User Status
     attr_accessor :user_status
 
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -115,6 +117,7 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return true
     end
 
     # Checks equality by comparing each attribute.
@@ -249,4 +252,5 @@ module Petstore
     end
 
   end
+
 end
diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
new file mode 100644
index 000000000000..edf0371b1276
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
@@ -0,0 +1,40 @@
+=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. Special characters: \" \\ 
+
+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::AdditionalPropertiesClass
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'AdditionalPropertiesClass' do
+  before do
+    # run before each test
+    @instance = Petstore::AdditionalPropertiesClass.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of AdditionalPropertiesClass' do
+    it 'should create an instact of AdditionalPropertiesClass' do
+      expect(@instance).to be_instance_of(Petstore::AdditionalPropertiesClass)
+    end
+  end
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
new file mode 100644
index 000000000000..f1f9c33d78fe
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb
@@ -0,0 +1,52 @@
+=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. Special characters: \" \\ 
+
+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::MixedPropertiesAndAdditionalPropertiesClass
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'MixedPropertiesAndAdditionalPropertiesClass' do
+  before do
+    # run before each test
+    @instance = Petstore::MixedPropertiesAndAdditionalPropertiesClass.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of MixedPropertiesAndAdditionalPropertiesClass' do
+    it 'should create an instact of MixedPropertiesAndAdditionalPropertiesClass' do
+      expect(@instance).to be_instance_of(Petstore::MixedPropertiesAndAdditionalPropertiesClass)
+    end
+  end
+  describe 'test attribute "uuid"' do
+    it 'should work' do
+       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  describe 'test attribute "date_time"' do
+    it 'should work' do
+       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+end
+
diff --git a/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb b/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb
new file mode 100644
index 000000000000..ab6317293105
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb
@@ -0,0 +1,52 @@
+=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. Special characters: \" \\ 
+
+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::ReadOnlyFirst
+# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
+# Please update as you see appropriate
+describe 'ReadOnlyFirst' do
+  before do
+    # run before each test
+    @instance = Petstore::ReadOnlyFirst.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of ReadOnlyFirst' do
+    it 'should create an instact of ReadOnlyFirst' do
+      expect(@instance).to be_instance_of(Petstore::ReadOnlyFirst)
+    end
+  end
+  describe 'test attribute "bar"' do
+    it 'should work' do
+       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  describe 'test attribute "baz"' do
+    it 'should work' do
+       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+end
+

From 24a0ced972fd41d1f136932d6937b6319f1e521c Mon Sep 17 00:00:00 2001
From: Newell Zhu <zlx.star@gmail.com>
Date: Mon, 23 May 2016 21:30:05 +0800
Subject: [PATCH 004/139] regenerate ruby spec file

---
 .../src/main/resources/ruby/model_test.mustache |  8 ++++++++
 samples/client/petstore/ruby/README.md          |  2 +-
 .../ruby/spec/models/animal_farm_spec.rb        |  2 +-
 .../petstore/ruby/spec/models/animal_spec.rb    |  8 +++++++-
 .../ruby/spec/models/api_response_spec.rb       |  2 +-
 .../petstore/ruby/spec/models/cat_spec.rb       |  8 +++++++-
 .../petstore/ruby/spec/models/category_spec.rb  |  2 +-
 .../petstore/ruby/spec/models/dog_spec.rb       |  8 +++++++-
 .../ruby/spec/models/enum_class_spec.rb         |  2 +-
 .../petstore/ruby/spec/models/enum_test_spec.rb | 17 +++++++++++++----
 .../ruby/spec/models/format_test_spec.rb        |  2 +-
 .../ruby/spec/models/model_200_response_spec.rb |  2 +-
 .../ruby/spec/models/model_return_spec.rb       |  2 +-
 .../petstore/ruby/spec/models/name_spec.rb      |  8 +++++++-
 .../petstore/ruby/spec/models/order_spec.rb     |  7 +++++--
 .../petstore/ruby/spec/models/pet_spec.rb       |  7 +++++--
 .../ruby/spec/models/special_model_name_spec.rb |  2 +-
 .../petstore/ruby/spec/models/tag_spec.rb       |  2 +-
 .../petstore/ruby/spec/models/user_spec.rb      |  2 +-
 19 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/ruby/model_test.mustache b/modules/swagger-codegen/src/main/resources/ruby/model_test.mustache
index 305a10d6467b..9425585780f8 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/model_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/model_test.mustache
@@ -27,7 +27,15 @@ require 'date'
 {{#vars}}
   describe 'test attribute "{{{name}}}"' do
     it 'should work' do
+       {{#isEnum}}
+       validator = Petstore::EnumTest::EnumAttributeValidator.new('{{{datatype}}}', [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
+       validator.allowable_values.each do |value|
+         expect { @instance.{{name}} = value }.not_to raise_error
+       end
+       {{/isEnum}}
+       {{^isEnum}}
        # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+       {{/isEnum}}
     end
   end
 
diff --git a/samples/client/petstore/ruby/README.md b/samples/client/petstore/ruby/README.md
index 8767f8164822..03e5ef14f4fa 100644
--- a/samples/client/petstore/ruby/README.md
+++ b/samples/client/petstore/ruby/README.md
@@ -8,7 +8,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-05-23T20:51:09.022+08:00
+- Build date: 2016-05-23T21:28:35.293+08:00
 - Build package: class io.swagger.codegen.languages.RubyClientCodegen
 
 ## Installation
diff --git a/samples/client/petstore/ruby/spec/models/animal_farm_spec.rb b/samples/client/petstore/ruby/spec/models/animal_farm_spec.rb
index 016b86fd8af0..1535c7cb4ec8 100644
--- a/samples/client/petstore/ruby/spec/models/animal_farm_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/animal_farm_spec.rb
@@ -1,7 +1,7 @@
 =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.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/animal_spec.rb b/samples/client/petstore/ruby/spec/models/animal_spec.rb
index 3f98b0f7b846..5c4f8dc0e69b 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -42,5 +42,11 @@ describe 'Animal' do
     end
   end
 
+  describe 'test attribute "color"' do
+    it 'should work' do
+       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
 end
 
diff --git a/samples/client/petstore/ruby/spec/models/api_response_spec.rb b/samples/client/petstore/ruby/spec/models/api_response_spec.rb
index 67b0cbe1a03d..18ab87bf551e 100644
--- a/samples/client/petstore/ruby/spec/models/api_response_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/api_response_spec.rb
@@ -1,7 +1,7 @@
 =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.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/cat_spec.rb b/samples/client/petstore/ruby/spec/models/cat_spec.rb
index 97ae668ea3b1..86d600213b3d 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -42,6 +42,12 @@ describe 'Cat' do
     end
   end
 
+  describe 'test attribute "color"' do
+    it 'should work' do
+       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
   describe 'test attribute "declawed"' do
     it 'should work' do
        # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
diff --git a/samples/client/petstore/ruby/spec/models/category_spec.rb b/samples/client/petstore/ruby/spec/models/category_spec.rb
index 1481358afdc8..021de250efc4 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 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 e3eb4be12fcc..10a5b831f25d 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -42,6 +42,12 @@ describe 'Dog' do
     end
   end
 
+  describe 'test attribute "color"' do
+    it 'should work' do
+       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
   describe 'test attribute "breed"' do
     it 'should work' do
        # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
diff --git a/samples/client/petstore/ruby/spec/models/enum_class_spec.rb b/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
index b8610d74a1b2..02fe0a113fea 100644
--- a/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
@@ -1,7 +1,7 @@
 =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.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
diff --git a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb b/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
index 91941d8a50d0..f85c15564f18 100644
--- a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
@@ -1,7 +1,7 @@
 =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.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -38,19 +38,28 @@ describe 'EnumTest' do
   end
   describe 'test attribute "enum_string"' do
     it 'should work' do
-       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+       validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["UPPER", "lower"])
+       validator.allowable_values.each do |value|
+         expect { @instance.enum_string = value }.not_to raise_error
+       end
     end
   end
 
   describe 'test attribute "enum_integer"' do
     it 'should work' do
-       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+       validator = Petstore::EnumTest::EnumAttributeValidator.new('Integer', ["1", "-1"])
+       validator.allowable_values.each do |value|
+         expect { @instance.enum_integer = value }.not_to raise_error
+       end
     end
   end
 
   describe 'test attribute "enum_number"' do
     it 'should work' do
-       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+       validator = Petstore::EnumTest::EnumAttributeValidator.new('Float', ["1.1", "-1.2"])
+       validator.allowable_values.each do |value|
+         expect { @instance.enum_number = value }.not_to raise_error
+       end
     end
   end
 
diff --git a/samples/client/petstore/ruby/spec/models/format_test_spec.rb b/samples/client/petstore/ruby/spec/models/format_test_spec.rb
index e7a81fe537cd..fd6cf6c03811 100644
--- a/samples/client/petstore/ruby/spec/models/format_test_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/format_test_spec.rb
@@ -1,7 +1,7 @@
 =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.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
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 8b8879105d00..b986604e1ef1 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 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 5a80c97542b2..d21f4f1ed3e6 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 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 03a9c69ece11..5ad2a851827e 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -54,5 +54,11 @@ describe 'Name' do
     end
   end
 
+  describe 'test attribute "_123_number"' do
+    it 'should work' do
+       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
 end
 
diff --git a/samples/client/petstore/ruby/spec/models/order_spec.rb b/samples/client/petstore/ruby/spec/models/order_spec.rb
index 73bd5c082fda..008d226ce6ea 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -62,7 +62,10 @@ describe 'Order' do
 
   describe 'test attribute "status"' do
     it 'should work' do
-       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+       validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["placed", "approved", "delivered"])
+       validator.allowable_values.each do |value|
+         expect { @instance.status = value }.not_to raise_error
+       end
     end
   end
 
diff --git a/samples/client/petstore/ruby/spec/models/pet_spec.rb b/samples/client/petstore/ruby/spec/models/pet_spec.rb
index 9911ced1366d..72780cf80c99 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io
@@ -68,7 +68,10 @@ describe 'Pet' do
 
   describe 'test attribute "status"' do
     it 'should work' do
-       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+       validator = Petstore::EnumTest::EnumAttributeValidator.new('String', ["available", "pending", "sold"])
+       validator.allowable_values.each do |value|
+         expect { @instance.status = value }.not_to raise_error
+       end
     end
   end
 
diff --git a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb
index cd93568e8f98..5b10f4c8f9f1 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 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 68b77e026b1f..c6a5a954b7ec 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 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 fc510605b5c0..ae780d5d656d 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 OpenAPI spec version: 1.0.0
 Contact: apiteam@swagger.io

From 00c4877baf480a6bb4a4c3feb94b88535c8c03e4 Mon Sep 17 00:00:00 2001
From: Joseph Zuromski <jaz@activehours.com>
Date: Mon, 23 May 2016 20:08:00 -0700
Subject: [PATCH 005/139] move swift samples into swift/default and
 swift/promisekit directories

---
 bin/swift-petstore-promisekit.sh              |  2 +-
 bin/swift-petstore.sh                         |  2 +-
 .../petstore/swift-promisekit/.gitignore      | 63 -------------------
 .../petstore/swift/{ => default}/Cartfile     |  0
 .../{ => default}/PetstoreClient.podspec      |  0
 .../Classes/Swaggers/APIHelper.swift          |  0
 .../Classes/Swaggers/APIs.swift               |  0
 .../Classes/Swaggers/APIs/PetAPI.swift        |  0
 .../Classes/Swaggers/APIs/StoreAPI.swift      |  0
 .../Classes/Swaggers/APIs/UserAPI.swift       |  0
 .../Swaggers/AlamofireImplementations.swift   |  0
 .../Classes/Swaggers/Extensions.swift         |  0
 .../Classes/Swaggers/Models.swift             |  0
 .../Classes/Swaggers/Models/Category.swift    |  0
 .../Classes/Swaggers/Models/Order.swift       |  0
 .../Classes/Swaggers/Models/Pet.swift         |  0
 .../Classes/Swaggers/Models/Tag.swift         |  0
 .../Classes/Swaggers/Models/User.swift        |  0
 .../default}/SwaggerClientTests/Podfile       |  0
 .../SwaggerClientTests/Podfile.lock           |  0
 .../SwaggerClientTests/Pods/Alamofire/LICENSE |  0
 .../Pods/Alamofire/README.md                  |  0
 .../Pods/Alamofire/Source/Alamofire.swift     |  0
 .../Pods/Alamofire/Source/Download.swift      |  0
 .../Pods/Alamofire/Source/Error.swift         |  0
 .../Pods/Alamofire/Source/Manager.swift       |  0
 .../Alamofire/Source/MultipartFormData.swift  |  0
 .../Alamofire/Source/ParameterEncoding.swift  |  0
 .../Pods/Alamofire/Source/Request.swift       |  0
 .../Pods/Alamofire/Source/Response.swift      |  0
 .../Source/ResponseSerialization.swift        |  0
 .../Pods/Alamofire/Source/Result.swift        |  0
 .../Alamofire/Source/ServerTrustPolicy.swift  |  0
 .../Pods/Alamofire/Source/Stream.swift        |  0
 .../Pods/Alamofire/Source/Upload.swift        |  0
 .../Pods/Alamofire/Source/Validation.swift    |  0
 .../PetstoreClient.podspec.json               |  0
 .../SwaggerClientTests/Pods/Manifest.lock     |  0
 .../Pods/Pods.xcodeproj/project.pbxproj       |  0
 .../Alamofire/Alamofire-dummy.m               |  0
 .../Alamofire/Alamofire-prefix.pch            |  0
 .../Alamofire/Alamofire-umbrella.h            |  0
 .../Alamofire/Alamofire.modulemap             |  0
 .../Alamofire/Alamofire.xcconfig              |  0
 .../Target Support Files/Alamofire/Info.plist |  0
 .../PetstoreClient/Info.plist                 |  0
 .../PetstoreClient/PetstoreClient-dummy.m     |  0
 .../PetstoreClient/PetstoreClient-prefix.pch  |  0
 .../PetstoreClient/PetstoreClient-umbrella.h  |  0
 .../PetstoreClient/PetstoreClient.modulemap   |  0
 .../PetstoreClient/PetstoreClient.xcconfig    |  0
 .../Pods-SwaggerClient/Info.plist             |  0
 ...ds-SwaggerClient-acknowledgements.markdown |  0
 .../Pods-SwaggerClient-acknowledgements.plist |  0
 .../Pods-SwaggerClient-dummy.m                |  0
 .../Pods-SwaggerClient-frameworks.sh          |  0
 .../Pods-SwaggerClient-resources.sh           |  0
 .../Pods-SwaggerClient-umbrella.h             |  0
 .../Pods-SwaggerClient.debug.xcconfig         |  0
 .../Pods-SwaggerClient.modulemap              |  0
 .../Pods-SwaggerClient.release.xcconfig       |  0
 .../Pods-SwaggerClientTests/Info.plist        |  0
 ...aggerClientTests-acknowledgements.markdown |  0
 ...-SwaggerClientTests-acknowledgements.plist |  0
 .../Pods-SwaggerClientTests-dummy.m           |  0
 .../Pods-SwaggerClientTests-frameworks.sh     |  0
 .../Pods-SwaggerClientTests-resources.sh      |  0
 .../Pods-SwaggerClientTests-umbrella.h        |  0
 .../Pods-SwaggerClientTests.debug.xcconfig    |  0
 .../Pods-SwaggerClientTests.modulemap         |  0
 .../Pods-SwaggerClientTests.release.xcconfig  |  0
 .../SwaggerClient.xcodeproj/project.pbxproj   |  0
 .../xcschemes/SwaggerClient.xcscheme          |  0
 .../contents.xcworkspacedata                  |  0
 .../SwaggerClient/AppDelegate.swift           |  0
 .../AppIcon.appiconset/Contents.json          |  0
 .../Base.lproj/LaunchScreen.storyboard        |  0
 .../SwaggerClient/Base.lproj/Main.storyboard  |  0
 .../SwaggerClient/Info.plist                  |  0
 .../SwaggerClient/ViewController.swift        |  0
 .../SwaggerClientTests/Info.plist             |  0
 .../SwaggerClientTests/PetAPITests.swift      |  0
 .../SwaggerClientTests/StoreAPITests.swift    |  0
 .../SwaggerClientTests/UserAPITests.swift     |  0
 .../{ => default}/SwaggerClientTests/pom.xml  |  0
 .../default}/git_push.sh                      |  0
 .../promisekit}/Cartfile                      |  0
 .../promisekit}/PetstoreClient.podspec        |  0
 .../Classes/Swaggers/APIHelper.swift          |  0
 .../Classes/Swaggers/APIs.swift               |  0
 .../Classes/Swaggers/APIs/PetAPI.swift        |  0
 .../Classes/Swaggers/APIs/StoreAPI.swift      |  0
 .../Classes/Swaggers/APIs/UserAPI.swift       |  0
 .../Swaggers/AlamofireImplementations.swift   |  0
 .../Classes/Swaggers/Extensions.swift         |  0
 .../Classes/Swaggers/Models.swift             |  0
 .../Classes/Swaggers/Models/Category.swift    |  0
 .../Classes/Swaggers/Models/Order.swift       |  0
 .../Classes/Swaggers/Models/Pet.swift         |  0
 .../Classes/Swaggers/Models/Tag.swift         |  0
 .../Classes/Swaggers/Models/User.swift        |  0
 .../SwaggerClientTests/Podfile                |  0
 .../SwaggerClientTests/Podfile.lock           |  0
 .../SwaggerClientTests/Pods/Alamofire/LICENSE |  0
 .../Pods/Alamofire/README.md                  |  0
 .../Pods/Alamofire/Source/Alamofire.swift     |  0
 .../Pods/Alamofire/Source/Download.swift      |  0
 .../Pods/Alamofire/Source/Error.swift         |  0
 .../Pods/Alamofire/Source/Manager.swift       |  0
 .../Alamofire/Source/MultipartFormData.swift  |  0
 .../Alamofire/Source/ParameterEncoding.swift  |  0
 .../Pods/Alamofire/Source/Request.swift       |  0
 .../Pods/Alamofire/Source/Response.swift      |  0
 .../Source/ResponseSerialization.swift        |  0
 .../Pods/Alamofire/Source/Result.swift        |  0
 .../Alamofire/Source/ServerTrustPolicy.swift  |  0
 .../Pods/Alamofire/Source/Stream.swift        |  0
 .../Pods/Alamofire/Source/Upload.swift        |  0
 .../Pods/Alamofire/Source/Validation.swift    |  0
 .../PetstoreClient.podspec.json               |  0
 .../SwaggerClientTests/Pods/Manifest.lock     |  0
 .../Pods/OMGHTTPURLRQ/README.markdown         |  0
 .../OMGHTTPURLRQ/Sources/OMGFormURLEncode.h   |  0
 .../OMGHTTPURLRQ/Sources/OMGFormURLEncode.m   |  0
 .../Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.h  |  0
 .../Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m  |  0
 .../Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.h  |  0
 .../Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.m  |  0
 .../Pods/Pods.xcodeproj/project.pbxproj       |  0
 .../NSNotificationCenter+AnyPromise.h         |  0
 .../NSNotificationCenter+AnyPromise.m         |  0
 .../NSNotificationCenter+Promise.swift        |  0
 .../Foundation/NSObject+Promise.swift         |  0
 .../Foundation/NSURLConnection+AnyPromise.h   |  0
 .../Foundation/NSURLConnection+AnyPromise.m   |  0
 .../Foundation/NSURLConnection+Promise.swift  |  0
 .../Foundation/NSURLSession+Promise.swift     |  0
 .../Categories/Foundation/afterlife.swift     |  0
 .../QuartzCore/CALayer+AnyPromise.h           |  0
 .../QuartzCore/CALayer+AnyPromise.m           |  0
 .../Categories/UIKit/PMKAlertController.swift |  0
 .../UIKit/UIActionSheet+AnyPromise.h          |  0
 .../UIKit/UIActionSheet+AnyPromise.m          |  0
 .../UIKit/UIActionSheet+Promise.swift         |  0
 .../Categories/UIKit/UIAlertView+AnyPromise.h |  0
 .../Categories/UIKit/UIAlertView+AnyPromise.m |  0
 .../UIKit/UIAlertView+Promise.swift           |  0
 .../Categories/UIKit/UIView+AnyPromise.h      |  0
 .../Categories/UIKit/UIView+AnyPromise.m      |  0
 .../Categories/UIKit/UIView+Promise.swift     |  0
 .../UIKit/UIViewController+AnyPromise.h       |  0
 .../UIKit/UIViewController+AnyPromise.m       |  0
 .../UIKit/UIViewController+Promise.swift      |  0
 .../Pods/PromiseKit/README.markdown           |  0
 .../PromiseKit/Sources/AnyPromise+Private.h   |  0
 .../Pods/PromiseKit/Sources/AnyPromise.h      |  0
 .../Pods/PromiseKit/Sources/AnyPromise.m      |  0
 .../Pods/PromiseKit/Sources/AnyPromise.swift  |  0
 .../Pods/PromiseKit/Sources/Error.swift       |  0
 .../PromiseKit/Sources/NSError+Cancellation.h |  0
 .../Sources/NSMethodSignatureForBlock.m       |  0
 .../Pods/PromiseKit/Sources/PMK.modulemap     |  0
 .../PromiseKit/Sources/PMKCallVariadicBlock.m |  0
 .../Sources/Promise+Properties.swift          |  0
 .../Pods/PromiseKit/Sources/Promise.swift     |  0
 .../Pods/PromiseKit/Sources/PromiseKit.h      |  0
 .../Pods/PromiseKit/Sources/State.swift       |  0
 .../PromiseKit/Sources/URLDataPromise.swift   |  0
 .../Pods/PromiseKit/Sources/Umbrella.h        |  0
 .../Pods/PromiseKit/Sources/after.m           |  0
 .../Pods/PromiseKit/Sources/after.swift       |  0
 .../PromiseKit/Sources/dispatch_promise.m     |  0
 .../PromiseKit/Sources/dispatch_promise.swift |  0
 .../Pods/PromiseKit/Sources/hang.m            |  0
 .../Pods/PromiseKit/Sources/join.m            |  0
 .../Pods/PromiseKit/Sources/join.swift        |  0
 .../Pods/PromiseKit/Sources/race.swift        |  0
 .../Pods/PromiseKit/Sources/when.m            |  0
 .../Pods/PromiseKit/Sources/when.swift        |  0
 .../Alamofire/Alamofire-dummy.m               |  0
 .../Alamofire/Alamofire-prefix.pch            |  0
 .../Alamofire/Alamofire-umbrella.h            |  0
 .../Alamofire/Alamofire.modulemap             |  0
 .../Alamofire/Alamofire.xcconfig              |  0
 .../Target Support Files/Alamofire/Info.plist |  0
 .../OMGHTTPURLRQ/Info.plist                   |  0
 .../OMGHTTPURLRQ/OMGHTTPURLRQ-dummy.m         |  0
 .../OMGHTTPURLRQ/OMGHTTPURLRQ-prefix.pch      |  0
 .../OMGHTTPURLRQ/OMGHTTPURLRQ-umbrella.h      |  0
 .../OMGHTTPURLRQ/OMGHTTPURLRQ.modulemap       |  0
 .../OMGHTTPURLRQ/OMGHTTPURLRQ.xcconfig        |  0
 .../PetstoreClient/Info.plist                 |  0
 .../PetstoreClient/PetstoreClient-dummy.m     |  0
 .../PetstoreClient/PetstoreClient-prefix.pch  |  0
 .../PetstoreClient/PetstoreClient-umbrella.h  |  0
 .../PetstoreClient/PetstoreClient.modulemap   |  0
 .../PetstoreClient/PetstoreClient.xcconfig    |  0
 .../Pods-SwaggerClient/Info.plist             |  0
 ...ds-SwaggerClient-acknowledgements.markdown |  0
 .../Pods-SwaggerClient-acknowledgements.plist |  0
 .../Pods-SwaggerClient-dummy.m                |  0
 .../Pods-SwaggerClient-frameworks.sh          |  0
 .../Pods-SwaggerClient-resources.sh           |  0
 .../Pods-SwaggerClient-umbrella.h             |  0
 .../Pods-SwaggerClient.debug.xcconfig         |  0
 .../Pods-SwaggerClient.modulemap              |  0
 .../Pods-SwaggerClient.release.xcconfig       |  0
 .../Pods-SwaggerClientTests/Info.plist        |  0
 ...aggerClientTests-acknowledgements.markdown |  0
 ...-SwaggerClientTests-acknowledgements.plist |  0
 .../Pods-SwaggerClientTests-dummy.m           |  0
 .../Pods-SwaggerClientTests-frameworks.sh     |  0
 .../Pods-SwaggerClientTests-resources.sh      |  0
 .../Pods-SwaggerClientTests-umbrella.h        |  0
 .../Pods-SwaggerClientTests.debug.xcconfig    |  0
 .../Pods-SwaggerClientTests.modulemap         |  0
 .../Pods-SwaggerClientTests.release.xcconfig  |  0
 .../PromiseKit/Info.plist                     |  0
 .../PromiseKit/PromiseKit-dummy.m             |  0
 .../PromiseKit/PromiseKit-prefix.pch          |  0
 .../PromiseKit/PromiseKit.modulemap           |  0
 .../PromiseKit/PromiseKit.xcconfig            |  0
 .../SwaggerClient.xcodeproj/project.pbxproj   |  0
 .../xcschemes/SwaggerClient.xcscheme          |  0
 .../contents.xcworkspacedata                  |  0
 .../SwaggerClient/AppDelegate.swift           |  0
 .../AppIcon.appiconset/Contents.json          |  0
 .../Base.lproj/LaunchScreen.storyboard        |  0
 .../SwaggerClient/Base.lproj/Main.storyboard  |  0
 .../SwaggerClient/Info.plist                  |  0
 .../SwaggerClient/ViewController.swift        |  0
 .../SwaggerClientTests/Info.plist             |  0
 .../SwaggerClientTests/PetAPITests.swift      |  0
 .../SwaggerClientTests/StoreAPITests.swift    |  0
 .../SwaggerClientTests/UserAPITests.swift     |  0
 .../promisekit}/SwaggerClientTests/pom.xml    |  0
 .../swift/{ => promisekit}/git_push.sh        |  0
 237 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 samples/client/petstore/swift-promisekit/.gitignore
 rename samples/client/petstore/swift/{ => default}/Cartfile (100%)
 rename samples/client/petstore/swift/{ => default}/PetstoreClient.podspec (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/PetstoreClient/Classes/Swaggers/APIHelper.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/PetstoreClient/Classes/Swaggers/APIs.swift (100%)
 rename samples/client/petstore/swift/{ => default}/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift (100%)
 rename samples/client/petstore/swift/{ => default}/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift (100%)
 rename samples/client/petstore/swift/{ => default}/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift (100%)
 rename samples/client/petstore/swift/{ => default}/PetstoreClient/Classes/Swaggers/Extensions.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/PetstoreClient/Classes/Swaggers/Models.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/PetstoreClient/Classes/Swaggers/Models/Category.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/PetstoreClient/Classes/Swaggers/Models/Order.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/PetstoreClient/Classes/Swaggers/Models/Pet.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/PetstoreClient/Classes/Swaggers/Models/Tag.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/PetstoreClient/Classes/Swaggers/Models/User.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Podfile (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Podfile.lock (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/LICENSE (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/README.md (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/Download.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/Error.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/Request.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/Response.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/Result.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Pods/Manifest.lock (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.markdown (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.plist (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-umbrella.h (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Info.plist (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.markdown (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.plist (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-dummy.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-umbrella.h (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/SwaggerClient/AppDelegate.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/SwaggerClient/Info.plist (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/SwaggerClient/ViewController.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/SwaggerClientTests/SwaggerClientTests/Info.plist (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift (100%)
 rename samples/client/petstore/swift/{ => default}/SwaggerClientTests/pom.xml (100%)
 rename samples/client/petstore/{swift-promisekit => swift/default}/git_push.sh (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/Cartfile (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/PetstoreClient.podspec (100%)
 rename samples/client/petstore/swift/{ => promisekit}/PetstoreClient/Classes/Swaggers/APIHelper.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/PetstoreClient/Classes/Swaggers/APIs.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/PetstoreClient/Classes/Swaggers/Extensions.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/PetstoreClient/Classes/Swaggers/Models.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/PetstoreClient/Classes/Swaggers/Models/Category.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/PetstoreClient/Classes/Swaggers/Models/Order.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/PetstoreClient/Classes/Swaggers/Models/Pet.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/PetstoreClient/Classes/Swaggers/Models/Tag.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/PetstoreClient/Classes/Swaggers/Models/User.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Podfile (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Podfile.lock (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/LICENSE (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/README.md (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/Download.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/Error.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/Request.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/Response.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/Result.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Manifest.lock (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+Promise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSObject+Promise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+Promise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLSession+Promise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/afterlife.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/PMKAlertController.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+Promise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+Promise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+Promise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+Promise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/README.markdown (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise+Private.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/NSError+Cancellation.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/NSMethodSignatureForBlock.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/PMK.modulemap (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/PMKCallVariadicBlock.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/Promise+Properties.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/PromiseKit.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/URLDataPromise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/Umbrella.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/after.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/after.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/hang.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/join.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/race.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/when.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-dummy.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-prefix.pch (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-umbrella.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.modulemap (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.xcconfig (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.markdown (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.plist (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-umbrella.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Info.plist (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.markdown (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.plist (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-dummy.m (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-umbrella.h (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/PromiseKit/Info.plist (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-dummy.m (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-prefix.pch (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.modulemap (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/SwaggerClient/AppDelegate.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/SwaggerClient/Info.plist (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/SwaggerClient/ViewController.swift (100%)
 rename samples/client/petstore/swift/{ => promisekit}/SwaggerClientTests/SwaggerClientTests/Info.plist (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift (100%)
 rename samples/client/petstore/{swift-promisekit => swift/promisekit}/SwaggerClientTests/pom.xml (100%)
 rename samples/client/petstore/swift/{ => promisekit}/git_push.sh (100%)

diff --git a/bin/swift-petstore-promisekit.sh b/bin/swift-petstore-promisekit.sh
index 0fe36cbf4a85..d2787a876a05 100755
--- a/bin/swift-petstore-promisekit.sh
+++ b/bin/swift-petstore-promisekit.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -c ./bin/swift-petstore-promisekit.json -o samples/client/petstore/swift-promisekit"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -c ./bin/swift-petstore-promisekit.json -o samples/client/petstore/swift/promisekit"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/swift-petstore.sh b/bin/swift-petstore.sh
index 96433e5b72d0..3747b3adca40 100644
--- a/bin/swift-petstore.sh
+++ b/bin/swift-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -c ./bin/swift-petstore.json -o samples/client/petstore/swift"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -c ./bin/swift-petstore.json -o samples/client/petstore/swift/default"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/samples/client/petstore/swift-promisekit/.gitignore b/samples/client/petstore/swift-promisekit/.gitignore
deleted file mode 100644
index 5e5d5cebcf47..000000000000
--- a/samples/client/petstore/swift-promisekit/.gitignore
+++ /dev/null
@@ -1,63 +0,0 @@
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-## Build generated
-build/
-DerivedData
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-
-## Other
-*.xccheckout
-*.moved-aside
-*.xcuserstate
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
-
-## Playgrounds
-timeline.xctimeline
-playground.xcworkspace
-
-# Swift Package Manager
-#
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-.build/
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
-
-fastlane/report.xml
-fastlane/screenshots
diff --git a/samples/client/petstore/swift/Cartfile b/samples/client/petstore/swift/default/Cartfile
similarity index 100%
rename from samples/client/petstore/swift/Cartfile
rename to samples/client/petstore/swift/default/Cartfile
diff --git a/samples/client/petstore/swift/PetstoreClient.podspec b/samples/client/petstore/swift/default/PetstoreClient.podspec
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient.podspec
rename to samples/client/petstore/swift/default/PetstoreClient.podspec
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/APIHelper.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/APIHelper.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/APIHelper.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/APIHelper.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/APIs.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/APIs.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/APIs.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/APIs.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Extensions.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Extensions.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Extensions.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Extensions.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models/Category.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models/Category.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models/Order.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models/Order.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models/Pet.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models/Pet.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models/Tag.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models/Tag.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift b/samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models/User.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift
rename to samples/client/petstore/swift/default/PetstoreClient/Classes/Swaggers/Models/User.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Podfile b/samples/client/petstore/swift/default/SwaggerClientTests/Podfile
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Podfile
rename to samples/client/petstore/swift/default/SwaggerClientTests/Podfile
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Podfile.lock b/samples/client/petstore/swift/default/SwaggerClientTests/Podfile.lock
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Podfile.lock
rename to samples/client/petstore/swift/default/SwaggerClientTests/Podfile.lock
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/LICENSE b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/LICENSE
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/LICENSE
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/LICENSE
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/README.md b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/README.md
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/README.md
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/README.md
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Download.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Download.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Download.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Download.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Error.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Error.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Error.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Error.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Request.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Response.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Result.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Result.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Result.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Result.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Manifest.lock b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Manifest.lock
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Manifest.lock
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Manifest.lock
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.markdown b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.markdown
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.markdown
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.markdown
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.plist b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.plist
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.plist
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.plist
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-umbrella.h b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-umbrella.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-umbrella.h
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-umbrella.h
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Info.plist b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Info.plist
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Info.plist
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Info.plist
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.markdown b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.markdown
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.markdown
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.markdown
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.plist b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.plist
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.plist
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.plist
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-dummy.m b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-dummy.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-dummy.m
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-dummy.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-umbrella.h b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-umbrella.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-umbrella.h
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-umbrella.h
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig b/samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig
rename to samples/client/petstore/swift/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/AppDelegate.swift b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/AppDelegate.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/AppDelegate.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/AppDelegate.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/Info.plist b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/Info.plist
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/Info.plist
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/Info.plist
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/ViewController.swift b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/ViewController.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClient/ViewController.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient/ViewController.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClientTests/Info.plist b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClientTests/Info.plist
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClientTests/Info.plist
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClientTests/Info.plist
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift b/samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
rename to samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/pom.xml b/samples/client/petstore/swift/default/SwaggerClientTests/pom.xml
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/pom.xml
rename to samples/client/petstore/swift/default/SwaggerClientTests/pom.xml
diff --git a/samples/client/petstore/swift-promisekit/git_push.sh b/samples/client/petstore/swift/default/git_push.sh
similarity index 100%
rename from samples/client/petstore/swift-promisekit/git_push.sh
rename to samples/client/petstore/swift/default/git_push.sh
diff --git a/samples/client/petstore/swift-promisekit/Cartfile b/samples/client/petstore/swift/promisekit/Cartfile
similarity index 100%
rename from samples/client/petstore/swift-promisekit/Cartfile
rename to samples/client/petstore/swift/promisekit/Cartfile
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient.podspec b/samples/client/petstore/swift/promisekit/PetstoreClient.podspec
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient.podspec
rename to samples/client/petstore/swift/promisekit/PetstoreClient.podspec
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIHelper.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIHelper.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIHelper.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIHelper.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/APIs.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Extensions.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Extensions.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Extensions.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Extensions.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Category.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Order.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Pet.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Tag.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/Tag.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/User.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift
similarity index 100%
rename from samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models/User.swift
rename to samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Podfile b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Podfile
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Podfile
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Podfile
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Podfile.lock b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Podfile.lock
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Podfile.lock
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Podfile.lock
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/LICENSE b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/LICENSE
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/LICENSE
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/LICENSE
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/README.md b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/README.md
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/README.md
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/README.md
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Download.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Download.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Download.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Download.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Error.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Error.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Error.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Error.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Manager.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Request.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Response.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Result.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Result.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Result.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Result.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Stream.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Upload.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Manifest.lock b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Manifest.lock
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Manifest.lock
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Manifest.lock
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGFormURLEncode.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGUserAgent.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+AnyPromise.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+Promise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+Promise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+Promise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSNotificationCenter+Promise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSObject+Promise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSObject+Promise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSObject+Promise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSObject+Promise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+Promise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+Promise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+Promise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLConnection+Promise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLSession+Promise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLSession+Promise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLSession+Promise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/NSURLSession+Promise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/afterlife.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/afterlife.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/afterlife.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/Foundation/afterlife.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/QuartzCore/CALayer+AnyPromise.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/PMKAlertController.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/PMKAlertController.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/PMKAlertController.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/PMKAlertController.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+AnyPromise.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+Promise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+Promise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+Promise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIActionSheet+Promise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+AnyPromise.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+Promise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+Promise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+Promise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIAlertView+Promise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+AnyPromise.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+Promise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+Promise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+Promise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIView+Promise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+Promise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+Promise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+Promise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Categories/UIKit/UIViewController+Promise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/README.markdown b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/README.markdown
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/README.markdown
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/README.markdown
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise+Private.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise+Private.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise+Private.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise+Private.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/NSError+Cancellation.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/NSError+Cancellation.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/NSError+Cancellation.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/NSError+Cancellation.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/NSMethodSignatureForBlock.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/NSMethodSignatureForBlock.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/NSMethodSignatureForBlock.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/NSMethodSignatureForBlock.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PMK.modulemap b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PMK.modulemap
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PMK.modulemap
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PMK.modulemap
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PMKCallVariadicBlock.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PMKCallVariadicBlock.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PMKCallVariadicBlock.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PMKCallVariadicBlock.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise+Properties.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise+Properties.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise+Properties.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise+Properties.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PromiseKit.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PromiseKit.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PromiseKit.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/PromiseKit.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/URLDataPromise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/URLDataPromise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/URLDataPromise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/URLDataPromise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Umbrella.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Umbrella.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Umbrella.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Umbrella.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/after.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/after.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/after.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/after.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/after.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/after.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/after.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/after.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/dispatch_promise.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/hang.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/hang.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/hang.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/hang.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/race.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/race.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/race.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/race.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-dummy.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-dummy.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-dummy.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-dummy.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-prefix.pch b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-prefix.pch
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-prefix.pch
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-prefix.pch
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-umbrella.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-umbrella.h
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-umbrella.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ-umbrella.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.modulemap b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.modulemap
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.modulemap
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.modulemap
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.xcconfig b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.xcconfig
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.xcconfig
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/OMGHTTPURLRQ.xcconfig
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.markdown b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.markdown
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.markdown
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.markdown
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.plist b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.plist
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.plist
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-acknowledgements.plist
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-umbrella.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-umbrella.h
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-umbrella.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-umbrella.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Info.plist b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Info.plist
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Info.plist
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Info.plist
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.markdown b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.markdown
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.markdown
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.markdown
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.plist b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.plist
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.plist
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-acknowledgements.plist
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-dummy.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-dummy.m
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-dummy.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-dummy.m
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-umbrella.h b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-umbrella.h
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-umbrella.h
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-umbrella.h
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig
diff --git a/samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/Info.plist b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/Info.plist
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/Info.plist
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/Info.plist
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-dummy.m b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-dummy.m
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-dummy.m
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-dummy.m
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-prefix.pch b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-prefix.pch
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-prefix.pch
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit-prefix.pch
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.modulemap b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.modulemap
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.modulemap
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.modulemap
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig b/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient.xcworkspace/contents.xcworkspacedata
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/AppDelegate.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/AppDelegate.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/AppDelegate.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/AppDelegate.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/Base.lproj/LaunchScreen.storyboard
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/Base.lproj/Main.storyboard
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Info.plist b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/Info.plist
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/Info.plist
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/Info.plist
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/ViewController.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/ViewController.swift
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClient/ViewController.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClient/ViewController.swift
diff --git a/samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/Info.plist b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClientTests/Info.plist
similarity index 100%
rename from samples/client/petstore/swift/SwaggerClientTests/SwaggerClientTests/Info.plist
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClientTests/Info.plist
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift b/samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/pom.xml b/samples/client/petstore/swift/promisekit/SwaggerClientTests/pom.xml
similarity index 100%
rename from samples/client/petstore/swift-promisekit/SwaggerClientTests/pom.xml
rename to samples/client/petstore/swift/promisekit/SwaggerClientTests/pom.xml
diff --git a/samples/client/petstore/swift/git_push.sh b/samples/client/petstore/swift/promisekit/git_push.sh
similarity index 100%
rename from samples/client/petstore/swift/git_push.sh
rename to samples/client/petstore/swift/promisekit/git_push.sh

From 673784491eee8969d03870be9523121b69f797ae Mon Sep 17 00:00:00 2001
From: Joseph Zuromski <jaz@activehours.com>
Date: Mon, 23 May 2016 20:09:06 -0700
Subject: [PATCH 006/139] couple new files

---
 .../petstore/swift/promisekit/.gitignore      | 63 +++++++++++++++++++
 .../swift/promisekit/.swagger-codegen-ignore  | 23 +++++++
 2 files changed, 86 insertions(+)
 create mode 100644 samples/client/petstore/swift/promisekit/.gitignore
 create mode 100644 samples/client/petstore/swift/promisekit/.swagger-codegen-ignore

diff --git a/samples/client/petstore/swift/promisekit/.gitignore b/samples/client/petstore/swift/promisekit/.gitignore
new file mode 100644
index 000000000000..5e5d5cebcf47
--- /dev/null
+++ b/samples/client/petstore/swift/promisekit/.gitignore
@@ -0,0 +1,63 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/screenshots
diff --git a/samples/client/petstore/swift/promisekit/.swagger-codegen-ignore b/samples/client/petstore/swift/promisekit/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/swift/promisekit/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

From cce21abaec22d24d0355c0e97e2e351546570839 Mon Sep 17 00:00:00 2001
From: Mikolaj Przybysz <mikolaj.przybysz@home24.de>
Date: Tue, 24 May 2016 12:17:57 +0200
Subject: [PATCH 007/139] Removed printing artifactVersion if it is not set

---
 .../swagger-codegen/src/main/resources/php/README.mustache    | 4 ++--
 .../src/main/resources/php/configuration.mustache             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/README.mustache b/modules/swagger-codegen/src/main/resources/php/README.mustache
index 1f96e378f1b4..125f4212dd43 100644
--- a/modules/swagger-codegen/src/main/resources/php/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/README.mustache
@@ -6,8 +6,8 @@
 This PHP package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: {{appVersion}}
-- Package version: {{artifactVersion}}
-- Build date: {{generatedDate}}
+{{#artifactVersion}}- Package version: {{artifactVersion}}
+{{/artifactVersion}}- Build date: {{generatedDate}}
 - Build package: {{generatorClass}}
 {{#infoUrl}}
 For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index 1b920e483572..57652c7a2a23 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -110,7 +110,7 @@ class Configuration
      *
      * @var string
      */
-    protected $userAgent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{artifactVersion}}}/php{{/httpUserAgent}}";
+    protected $userAgent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen{{#artifactVersion}}/{{{.}}}{{/artifactVersion}}/php{{/httpUserAgent}}";
 
     /**
      * Debug switch (default set to false)

From c54b4faf139e6886d7c9ec23a41a5a664fcffeb4 Mon Sep 17 00:00:00 2001
From: Mikolaj Przybysz <mikolaj.przybysz@home24.de>
Date: Tue, 24 May 2016 14:02:41 +0200
Subject: [PATCH 008/139] Removed printing artifactVersion if it is not set
 from debug information

---
 .../src/main/resources/php/configuration.mustache             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index 57652c7a2a23..edc3e787c16c 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -516,8 +516,8 @@ class Configuration
         $report  = "PHP SDK ({{invokerPackage}}) Debug Report:\n";
         $report .= "    OS: ".php_uname()."\n";
         $report .= "    PHP Version: ".phpversion()."\n";
-        $report .= "    OpenAPI Spec Version: {{version}}\n";
-        $report .= "    SDK Package Version: {{artifactVersion}}\n";
+        $report .= "    OpenAPI Spec Version: {{version}}\n";{{^artifactVersion}}
+        $report .= "    SDK Package Version: {{artifactVersion}}\n";{{/artifactVersion}}
         $report .= "    Temp Folder Path: ".self::getDefaultConfiguration()->getTempFolderPath()."\n";
 
         return $report;

From 18f32b416322cffc27219424239c05e289e0513e Mon Sep 17 00:00:00 2001
From: Mikolaj Przybysz <mikolaj.przybysz@home24.de>
Date: Tue, 24 May 2016 14:03:31 +0200
Subject: [PATCH 009/139] Proper printing of invokerPackage in configuration
 debug report

---
 .../src/main/resources/php/configuration.mustache               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index edc3e787c16c..a3407542ed5d 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -513,7 +513,7 @@ class Configuration
      */
     public static function toDebugReport()
     {
-        $report  = "PHP SDK ({{invokerPackage}}) Debug Report:\n";
+        $report  = 'PHP SDK ({{invokerPackage}}) Debug Report:'."\n";
         $report .= "    OS: ".php_uname()."\n";
         $report .= "    PHP Version: ".phpversion()."\n";
         $report .= "    OpenAPI Spec Version: {{version}}\n";{{^artifactVersion}}

From 3484704fea1d48cf0a3346ee3e05743323a389bd Mon Sep 17 00:00:00 2001
From: Mikolaj Przybysz <mikolaj.przybysz@home24.de>
Date: Tue, 24 May 2016 14:07:51 +0200
Subject: [PATCH 010/139] Updated condition for artifactVersion check

---
 .../src/main/resources/php/configuration.mustache               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index a3407542ed5d..d2a2078fae98 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -516,7 +516,7 @@ class Configuration
         $report  = 'PHP SDK ({{invokerPackage}}) Debug Report:'."\n";
         $report .= "    OS: ".php_uname()."\n";
         $report .= "    PHP Version: ".phpversion()."\n";
-        $report .= "    OpenAPI Spec Version: {{version}}\n";{{^artifactVersion}}
+        $report .= "    OpenAPI Spec Version: {{version}}\n";{{#artifactVersion}}
         $report .= "    SDK Package Version: {{artifactVersion}}\n";{{/artifactVersion}}
         $report .= "    Temp Folder Path: ".self::getDefaultConfiguration()->getTempFolderPath()."\n";
 

From 4404b907bc5ea7fc6fd0941c81293c63fa2cee72 Mon Sep 17 00:00:00 2001
From: Fabien Da Silva <dasilvafabien@free.fr>
Date: Tue, 24 May 2016 21:54:46 +0200
Subject: [PATCH 011/139] [Swift] Remove force unwrap in model constructor

Fix #2955
---
 modules/swagger-codegen/src/main/resources/swift/model.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/resources/swift/model.mustache b/modules/swagger-codegen/src/main/resources/swift/model.mustache
index 96c4d2ff6837..a42ff74a6447 100644
--- a/modules/swagger-codegen/src/main/resources/swift/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/model.mustache
@@ -33,7 +33,7 @@ public class {{classname}}: JSONEncodable {
     public init() {}
 {{/unwrapRequired}}
 {{#unwrapRequired}}
-    public init({{#requiredVars}}{{^-first}}, {{/-first}}{{name}}: {{#isEnum}}{{datatypeWithEnum}}!{{/isEnum}}{{^isEnum}}{{datatype}}!{{/isEnum}}{{/requiredVars}}) {
+    public init({{#requiredVars}}{{^-first}}, {{/-first}}{{name}}: {{#isEnum}}{{datatypeWithEnum}}{{/isEnum}}{{^isEnum}}{{datatype}}{{/isEnum}}{{/requiredVars}}) {
         {{#requiredVars}}
         self.{{name}} = {{name}}
         {{/requiredVars}}

From d55a691e1156e2e9ab1316695c0aa6b2ca072c36 Mon Sep 17 00:00:00 2001
From: Joseph Zuromski <jaz@activehours.com>
Date: Tue, 24 May 2016 14:37:37 -0700
Subject: [PATCH 012/139] fix path

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4dfd8c6fdcda..73ea4f2f0ba9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -411,7 +411,7 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/swift/SwaggerClientTests</module>
+                <module>samples/client/petstore/swift/default/SwaggerClientTests</module>
             </modules>
         </profile>
         <profile>

From 537ee960b6be293a9885aa5c2d6726c77c31fb16 Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Wed, 25 May 2016 15:09:05 +0200
Subject: [PATCH 013/139] [Objc] Add Apache v2 license to auto-generated files
 #2963

---
 .../codegen/languages/ObjcClientCodegen.java  |  12 +-
 .../src/main/resources/objc/LICENSE.mustache  | 201 ++++++++++++++++++
 .../src/main/resources/objc/podspec.mustache  |   2 +-
 samples/client/petstore/objc/LICENSE          | 201 ++++++++++++++++++
 .../petstore/objc/SwaggerClient.podspec       |   2 +-
 5 files changed, 412 insertions(+), 6 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/objc/LICENSE.mustache
 create mode 100644 samples/client/petstore/objc/LICENSE

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
index 1a9d0a80c24c..474f800e2b42 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
@@ -26,9 +26,11 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     public static final String POD_NAME = "podName";
     public static final String AUTHOR_NAME = "authorName";
     public static final String AUTHOR_EMAIL = "authorEmail";
-    public static final String GIT_REPO_URL = "gitRepoURL";
     public static final String LICENSE = "license";
-    
+    public static final String GIT_REPO_URL = "gitRepoURL";
+
+    public static final String DEFAULT_LICENSE = "Apache License, Version 2.0";
+
     public static final String BinaryDataType = "ObjcClientCodegenBinaryData";
     
     protected Set<String> foundationClasses = new HashSet<String>();
@@ -37,7 +39,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String classPrefix = "SWG";
     protected String authorName = "Swagger";
     protected String authorEmail = "apiteam@swagger.io";
-    protected String license = "MIT";
+    protected String license = DEFAULT_LICENSE;
     protected String gitRepoURL = "https://github.com/swagger-api/swagger-codegen";
     protected String[] specialWords = {"new", "copy"};
     protected String apiDocPath = "docs/";
@@ -254,7 +256,9 @@ public class ObjcClientCodegen 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"));
-
+        if (license == null || DEFAULT_LICENSE.equals(license)) {
+            supportingFiles.add(new SupportingFile("LICENSE.mustache", "", "LICENSE"));
+        }
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/objc/LICENSE.mustache b/modules/swagger-codegen/src/main/resources/objc/LICENSE.mustache
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/LICENSE.mustache
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   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/objc/podspec.mustache b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
index c308a399c0ae..706a583454fe 100644
--- a/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
     s.framework    = 'SystemConfiguration'
     
     s.homepage     = "{{gitRepoURL}}"
-    s.license      = "{{license}}"
+    s.license      = "{{#license}}{{license}}{{/license}}{{^license}}Apache License, Version 2.0{{/license}}"
     s.source       = { :git => "{{gitRepoURL}}.git", :tag => "#{s.version}" }
     s.author       = { "{{authorName}}" => "{{authorEmail}}" }
 
diff --git a/samples/client/petstore/objc/LICENSE b/samples/client/petstore/objc/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/objc/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/objc/SwaggerClient.podspec b/samples/client/petstore/objc/SwaggerClient.podspec
index 885b29f7806e..3c8e0e795163 100644
--- a/samples/client/petstore/objc/SwaggerClient.podspec
+++ b/samples/client/petstore/objc/SwaggerClient.podspec
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
     s.framework    = 'SystemConfiguration'
     
     s.homepage     = "https://github.com/swagger-api/swagger-codegen"
-    s.license      = "MIT"
+    s.license      = "Apache License, Version 2.0"
     s.source       = { :git => "https://github.com/swagger-api/swagger-codegen.git", :tag => "#{s.version}" }
     s.author       = { "Swagger" => "apiteam@swagger.io" }
 

From 09a29063be73a1f194d63ae3aca687688412b815 Mon Sep 17 00:00:00 2001
From: zhenjun115 <huangzhenjun115@hotmail.com>
Date: Wed, 25 May 2016 23:44:44 +0800
Subject: [PATCH 014/139] add markdown docs for java api client using
 retrofit2;

---
 .../codegen/languages/JavaClientCodegen.java  |   7 +
 .../docs/AdditionalPropertiesClass.md         |   9 +
 .../petstore/java/retrofit2/docs/Animal.md    |  11 +
 .../java/retrofit2/docs/AnimalFarm.md         |   9 +
 .../petstore/java/retrofit2/docs/ArrayTest.md |   9 +
 .../petstore/java/retrofit2/docs/Cat.md       |  12 +
 .../petstore/java/retrofit2/docs/Category.md  |  11 +
 .../petstore/java/retrofit2/docs/Dog.md       |  12 +
 .../petstore/java/retrofit2/docs/EnumClass.md |  14 +
 .../petstore/java/retrofit2/docs/EnumTest.md  |  36 ++
 .../petstore/java/retrofit2/docs/FakeApi.md   |  76 +++
 .../java/retrofit2/docs/FormatTest.md         |  22 +
 ...dPropertiesAndAdditionalPropertiesClass.md |  11 +
 .../java/retrofit2/docs/Model200Response.md   |  10 +
 .../java/retrofit2/docs/ModelApiResponse.md   |  12 +
 .../java/retrofit2/docs/ModelReturn.md        |  10 +
 .../petstore/java/retrofit2/docs/Name.md      |  13 +
 .../petstore/java/retrofit2/docs/Order.md     |  24 +
 .../petstore/java/retrofit2/docs/Pet.md       |  24 +
 .../petstore/java/retrofit2/docs/PetApi.md    | 452 ++++++++++++++++++
 .../java/retrofit2/docs/ReadOnlyFirst.md      |  11 +
 .../java/retrofit2/docs/SpecialModelName.md   |  10 +
 .../petstore/java/retrofit2/docs/StoreApi.md  | 198 ++++++++
 .../petstore/java/retrofit2/docs/Tag.md       |  11 +
 .../petstore/java/retrofit2/docs/User.md      |  17 +
 .../petstore/java/retrofit2/docs/UserApi.md   | 376 +++++++++++++++
 .../docs/AdditionalPropertiesClass.md         |   9 +
 .../petstore/java/retrofit2rx/docs/Animal.md  |  11 +
 .../java/retrofit2rx/docs/AnimalFarm.md       |   9 +
 .../java/retrofit2rx/docs/ArrayTest.md        |   9 +
 .../petstore/java/retrofit2rx/docs/Cat.md     |  12 +
 .../java/retrofit2rx/docs/Category.md         |  11 +
 .../petstore/java/retrofit2rx/docs/Dog.md     |  12 +
 .../java/retrofit2rx/docs/EnumClass.md        |  14 +
 .../java/retrofit2rx/docs/EnumTest.md         |  36 ++
 .../petstore/java/retrofit2rx/docs/FakeApi.md |  76 +++
 .../java/retrofit2rx/docs/FormatTest.md       |  22 +
 ...dPropertiesAndAdditionalPropertiesClass.md |  11 +
 .../java/retrofit2rx/docs/Model200Response.md |  10 +
 .../java/retrofit2rx/docs/ModelApiResponse.md |  12 +
 .../java/retrofit2rx/docs/ModelReturn.md      |  10 +
 .../petstore/java/retrofit2rx/docs/Name.md    |  13 +
 .../petstore/java/retrofit2rx/docs/Order.md   |  24 +
 .../petstore/java/retrofit2rx/docs/Pet.md     |  24 +
 .../petstore/java/retrofit2rx/docs/PetApi.md  | 452 ++++++++++++++++++
 .../java/retrofit2rx/docs/ReadOnlyFirst.md    |  11 +
 .../java/retrofit2rx/docs/SpecialModelName.md |  10 +
 .../java/retrofit2rx/docs/StoreApi.md         | 198 ++++++++
 .../petstore/java/retrofit2rx/docs/Tag.md     |  11 +
 .../petstore/java/retrofit2rx/docs/User.md    |  17 +
 .../petstore/java/retrofit2rx/docs/UserApi.md | 376 +++++++++++++++
 51 files changed, 2807 insertions(+)
 create mode 100644 samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/Animal.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/AnimalFarm.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/ArrayTest.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/Cat.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/Category.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/Dog.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/EnumClass.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/EnumTest.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/FakeApi.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/FormatTest.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/Model200Response.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/ModelApiResponse.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/ModelReturn.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/Name.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/Order.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/Pet.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/PetApi.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/ReadOnlyFirst.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/SpecialModelName.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/StoreApi.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/Tag.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/User.md
 create mode 100644 samples/client/petstore/java/retrofit2/docs/UserApi.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/Animal.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/AnimalFarm.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/ArrayTest.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/Cat.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/Category.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/Dog.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/EnumClass.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/EnumTest.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/FakeApi.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/FormatTest.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/Model200Response.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/ModelApiResponse.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/ModelReturn.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/Name.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/Order.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/Pet.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/PetApi.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/ReadOnlyFirst.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/SpecialModelName.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/StoreApi.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/Tag.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/User.md
 create mode 100644 samples/client/petstore/java/retrofit2rx/docs/UserApi.md

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
index 1fba93891a4c..9f771f056078 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -332,6 +332,13 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
                     gradleWrapperPackage.replace( ".", File.separator ), "gradle-wrapper.properties") ); 
             supportingFiles.add( new SupportingFile( "gradle-wrapper.jar", 
                     gradleWrapperPackage.replace( ".", File.separator ), "gradle-wrapper.jar") );
+
+            //generate markdown docs for retrofit2
+            if ( usesRetrofit2Library() ){
+                modelDocTemplateFiles.put("model_doc.mustache", ".md");
+                apiDocTemplateFiles.put("api_doc.mustache", ".md");
+            }
+
         } else if("jersey2".equals(getLibrary())) {
             // generate markdown docs
             modelDocTemplateFiles.put("model_doc.mustache", ".md");
diff --git a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md
new file mode 100644
index 000000000000..c72785d450f4
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md
@@ -0,0 +1,9 @@
+
+# AdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/Animal.md b/samples/client/petstore/java/retrofit2/docs/Animal.md
new file mode 100644
index 000000000000..b3f325c3524d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/Animal.md
@@ -0,0 +1,11 @@
+
+# Animal
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+**color** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/AnimalFarm.md b/samples/client/petstore/java/retrofit2/docs/AnimalFarm.md
new file mode 100644
index 000000000000..c7c7f1ddcce6
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/AnimalFarm.md
@@ -0,0 +1,9 @@
+
+# AnimalFarm
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/ArrayTest.md b/samples/client/petstore/java/retrofit2/docs/ArrayTest.md
new file mode 100644
index 000000000000..73c3e5305ada
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/ArrayTest.md
@@ -0,0 +1,9 @@
+
+# ArrayTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/Cat.md b/samples/client/petstore/java/retrofit2/docs/Cat.md
new file mode 100644
index 000000000000..be6e56fa8ce3
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/Cat.md
@@ -0,0 +1,12 @@
+
+# Cat
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+**color** | **String** |  |  [optional]
+**declawed** | **Boolean** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/Category.md b/samples/client/petstore/java/retrofit2/docs/Category.md
new file mode 100644
index 000000000000..e2df08032787
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/Category.md
@@ -0,0 +1,11 @@
+
+# Category
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/Dog.md b/samples/client/petstore/java/retrofit2/docs/Dog.md
new file mode 100644
index 000000000000..71a7dbe809e2
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/Dog.md
@@ -0,0 +1,12 @@
+
+# Dog
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+**color** | **String** |  |  [optional]
+**breed** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/EnumClass.md b/samples/client/petstore/java/retrofit2/docs/EnumClass.md
new file mode 100644
index 000000000000..c746edc3cb1e
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/EnumClass.md
@@ -0,0 +1,14 @@
+
+# EnumClass
+
+## Enum
+
+
+* `_ABC` (value: `"_abc"`)
+
+* `_EFG` (value: `"-efg"`)
+
+* `_XYZ_` (value: `"(xyz)"`)
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/EnumTest.md b/samples/client/petstore/java/retrofit2/docs/EnumTest.md
new file mode 100644
index 000000000000..deb1951c5528
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/EnumTest.md
@@ -0,0 +1,36 @@
+
+# EnumTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**enumString** | [**EnumStringEnum**](#EnumStringEnum) |  |  [optional]
+**enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) |  |  [optional]
+**enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) |  |  [optional]
+
+
+<a name="EnumStringEnum"></a>
+## Enum: EnumStringEnum
+Name | Value
+---- | -----
+UPPER | &quot;UPPER&quot;
+LOWER | &quot;lower&quot;
+
+
+<a name="EnumIntegerEnum"></a>
+## Enum: EnumIntegerEnum
+Name | Value
+---- | -----
+NUMBER_1 | 1
+NUMBER_MINUS_1 | -1
+
+
+<a name="EnumNumberEnum"></a>
+## Enum: EnumNumberEnum
+Name | Value
+---- | -----
+NUMBER_1_DOT_1 | 1.1
+NUMBER_MINUS_1_DOT_2 | -1.2
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2/docs/FakeApi.md
new file mode 100644
index 000000000000..55f7cef2df48
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/FakeApi.md
@@ -0,0 +1,76 @@
+# FakeApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+
+<a name="testEndpointParameters"></a>
+# **testEndpointParameters**
+> Void testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password)
+
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.FakeApi;
+
+
+FakeApi apiInstance = new FakeApi();
+BigDecimal number = new BigDecimal(); // BigDecimal | None
+Double _double = 3.4D; // Double | None
+String string = "string_example"; // String | None
+byte[] _byte = B; // byte[] | None
+Integer integer = 56; // Integer | None
+Integer int32 = 56; // Integer | None
+Long int64 = 789L; // Long | None
+Float _float = 3.4F; // Float | None
+byte[] binary = B; // byte[] | None
+Date date = new Date(); // Date | None
+Date dateTime = new Date(); // Date | None
+String password = "password_example"; // String | None
+try {
+    Void result = apiInstance.testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling FakeApi#testEndpointParameters");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **number** | **BigDecimal**| None |
+ **_double** | **Double**| None |
+ **string** | **String**| None |
+ **_byte** | **byte[]**| None |
+ **integer** | **Integer**| None | [optional]
+ **int32** | **Integer**| None | [optional]
+ **int64** | **Long**| None | [optional]
+ **_float** | **Float**| None | [optional]
+ **binary** | **byte[]**| None | [optional]
+ **date** | **Date**| None | [optional]
+ **dateTime** | **Date**| None | [optional]
+ **password** | **String**| None | [optional]
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
+ - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
+
diff --git a/samples/client/petstore/java/retrofit2/docs/FormatTest.md b/samples/client/petstore/java/retrofit2/docs/FormatTest.md
new file mode 100644
index 000000000000..dc2b559dad28
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/FormatTest.md
@@ -0,0 +1,22 @@
+
+# FormatTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**integer** | **Integer** |  |  [optional]
+**int32** | **Integer** |  |  [optional]
+**int64** | **Long** |  |  [optional]
+**number** | [**BigDecimal**](BigDecimal.md) |  | 
+**_float** | **Float** |  |  [optional]
+**_double** | **Double** |  |  [optional]
+**string** | **String** |  |  [optional]
+**_byte** | **byte[]** |  | 
+**binary** | **byte[]** |  |  [optional]
+**date** | [**Date**](Date.md) |  | 
+**dateTime** | [**Date**](Date.md) |  |  [optional]
+**uuid** | **String** |  |  [optional]
+**password** | **String** |  | 
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
new file mode 100644
index 000000000000..fcdbd3905172
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -0,0 +1,11 @@
+
+# MixedPropertiesAndAdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**uuid** | **String** |  |  [optional]
+**dateTime** | [**Date**](Date.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/Model200Response.md b/samples/client/petstore/java/retrofit2/docs/Model200Response.md
new file mode 100644
index 000000000000..0819b88c4f4d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/Model200Response.md
@@ -0,0 +1,10 @@
+
+# Model200Response
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/ModelApiResponse.md b/samples/client/petstore/java/retrofit2/docs/ModelApiResponse.md
new file mode 100644
index 000000000000..3eec8686cc95
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/ModelApiResponse.md
@@ -0,0 +1,12 @@
+
+# ModelApiResponse
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**code** | **Integer** |  |  [optional]
+**type** | **String** |  |  [optional]
+**message** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/ModelReturn.md b/samples/client/petstore/java/retrofit2/docs/ModelReturn.md
new file mode 100644
index 000000000000..a679b04953e5
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/ModelReturn.md
@@ -0,0 +1,10 @@
+
+# ModelReturn
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_return** | **Integer** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/Name.md b/samples/client/petstore/java/retrofit2/docs/Name.md
new file mode 100644
index 000000000000..ce2fb4dee50c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/Name.md
@@ -0,0 +1,13 @@
+
+# Name
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  | 
+**snakeCase** | **Integer** |  |  [optional]
+**property** | **String** |  |  [optional]
+**_123Number** | **Integer** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/Order.md b/samples/client/petstore/java/retrofit2/docs/Order.md
new file mode 100644
index 000000000000..29ca3ddbc6b2
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/Order.md
@@ -0,0 +1,24 @@
+
+# Order
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**petId** | **Long** |  |  [optional]
+**quantity** | **Integer** |  |  [optional]
+**shipDate** | [**Date**](Date.md) |  |  [optional]
+**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
+**complete** | **Boolean** |  |  [optional]
+
+
+<a name="StatusEnum"></a>
+## Enum: StatusEnum
+Name | Value
+---- | -----
+PLACED | &quot;placed&quot;
+APPROVED | &quot;approved&quot;
+DELIVERED | &quot;delivered&quot;
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/Pet.md b/samples/client/petstore/java/retrofit2/docs/Pet.md
new file mode 100644
index 000000000000..5b63109ef924
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/Pet.md
@@ -0,0 +1,24 @@
+
+# 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** | [**StatusEnum**](#StatusEnum) | pet status in the store |  [optional]
+
+
+<a name="StatusEnum"></a>
+## Enum: StatusEnum
+Name | Value
+---- | -----
+AVAILABLE | &quot;available&quot;
+PENDING | &quot;pending&quot;
+SOLD | &quot;sold&quot;
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/PetApi.md b/samples/client/petstore/java/retrofit2/docs/PetApi.md
new file mode 100644
index 000000000000..40ea199b153a
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/PetApi.md
@@ -0,0 +1,452 @@
+# 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
+
+
+<a name="addPet"></a>
+# **addPet**
+> Void addPet(body)
+
+Add a new pet to the store
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+try {
+    Void result = apiInstance.addPet(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#addPet");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/xml, application/json
+
+<a name="deletePet"></a>
+# **deletePet**
+> Void deletePet(petId, apiKey)
+
+Deletes a pet
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+Long petId = 789L; // Long | Pet id to delete
+String apiKey = "apiKey_example"; // String | 
+try {
+    Void result = apiInstance.deletePet(petId, apiKey);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#deletePet");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| Pet id to delete |
+ **apiKey** | **String**|  | [optional]
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="findPetsByStatus"></a>
+# **findPetsByStatus**
+> List&lt;Pet&gt; findPetsByStatus(status)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+List<String> status = Arrays.asList("status_example"); // List<String> | Status values that need to be considered for filter
+try {
+    List<Pet> result = apiInstance.findPetsByStatus(status);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#findPetsByStatus");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter |
+
+### Return type
+
+[**List&lt;Pet&gt;**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="findPetsByTags"></a>
+# **findPetsByTags**
+> List&lt;Pet&gt; findPetsByTags(tags)
+
+Finds Pets by tags
+
+Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+List<String> tags = Arrays.asList("tags_example"); // List<String> | Tags to filter by
+try {
+    List<Pet> result = apiInstance.findPetsByTags(tags);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#findPetsByTags");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**List&lt;String&gt;**](String.md)| Tags to filter by |
+
+### Return type
+
+[**List&lt;Pet&gt;**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="getPetById"></a>
+# **getPetById**
+> Pet getPetById(petId)
+
+Find pet by ID
+
+Returns a single pet
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key
+ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
+api_key.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.setApiKeyPrefix("Token");
+
+PetApi apiInstance = new PetApi();
+Long petId = 789L; // Long | ID of pet to return
+try {
+    Pet result = apiInstance.getPetById(petId);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#getPetById");
+    e.printStackTrace();
+}
+```
+
+### 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
+
+<a name="updatePet"></a>
+# **updatePet**
+> Void updatePet(body)
+
+Update an existing pet
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+try {
+    Void result = apiInstance.updatePet(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#updatePet");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/xml, application/json
+
+<a name="updatePetWithForm"></a>
+# **updatePetWithForm**
+> Void updatePetWithForm(petId, name, status)
+
+Updates a pet in the store with form data
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+Long petId = 789L; // Long | ID of pet that needs to be updated
+String name = "name_example"; // String | Updated name of the pet
+String status = "status_example"; // String | Updated status of the pet
+try {
+    Void result = apiInstance.updatePetWithForm(petId, name, status);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#updatePetWithForm");
+    e.printStackTrace();
+}
+```
+
+### 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**](.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: application/xml, application/json
+
+<a name="uploadFile"></a>
+# **uploadFile**
+> ModelApiResponse uploadFile(petId, additionalMetadata, file)
+
+uploads an image
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+Long petId = 789L; // Long | ID of pet to update
+String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
+File file = new File("/path/to/file.txt"); // File | file to upload
+try {
+    ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#uploadFile");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet to update |
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional]
+ **file** | **File**| file to upload | [optional]
+
+### Return type
+
+[**ModelApiResponse**](ModelApiResponse.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/java/retrofit2/docs/ReadOnlyFirst.md b/samples/client/petstore/java/retrofit2/docs/ReadOnlyFirst.md
new file mode 100644
index 000000000000..426b7cde95ab
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/ReadOnlyFirst.md
@@ -0,0 +1,11 @@
+
+# ReadOnlyFirst
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**bar** | **String** |  |  [optional]
+**baz** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/SpecialModelName.md b/samples/client/petstore/java/retrofit2/docs/SpecialModelName.md
new file mode 100644
index 000000000000..c2c6117c552c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/SpecialModelName.md
@@ -0,0 +1,10 @@
+
+# SpecialModelName
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**specialPropertyName** | **Long** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/StoreApi.md b/samples/client/petstore/java/retrofit2/docs/StoreApi.md
new file mode 100644
index 000000000000..30e3c11d440c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/StoreApi.md
@@ -0,0 +1,198 @@
+# 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
+
+
+<a name="deleteOrder"></a>
+# **deleteOrder**
+> Void deleteOrder(orderId)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.StoreApi;
+
+
+StoreApi apiInstance = new StoreApi();
+String orderId = "orderId_example"; // String | ID of the order that needs to be deleted
+try {
+    Void result = apiInstance.deleteOrder(orderId);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling StoreApi#deleteOrder");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **String**| ID of the order that needs to be deleted |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="getInventory"></a>
+# **getInventory**
+> Map&lt;String, Integer&gt; getInventory()
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.StoreApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key
+ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
+api_key.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.setApiKeyPrefix("Token");
+
+StoreApi apiInstance = new StoreApi();
+try {
+    Map<String, Integer> result = apiInstance.getInventory();
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling StoreApi#getInventory");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**Map&lt;String, Integer&gt;**](Map.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+<a name="getOrderById"></a>
+# **getOrderById**
+> Order getOrderById(orderId)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.StoreApi;
+
+
+StoreApi apiInstance = new StoreApi();
+Long orderId = 789L; // Long | ID of pet that needs to be fetched
+try {
+    Order result = apiInstance.getOrderById(orderId);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling StoreApi#getOrderById");
+    e.printStackTrace();
+}
+```
+
+### 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
+
+<a name="placeOrder"></a>
+# **placeOrder**
+> Order placeOrder(body)
+
+Place an order for a pet
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.StoreApi;
+
+
+StoreApi apiInstance = new StoreApi();
+Order body = new Order(); // Order | order placed for purchasing the pet
+try {
+    Order result = apiInstance.placeOrder(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling StoreApi#placeOrder");
+    e.printStackTrace();
+}
+```
+
+### 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/java/retrofit2/docs/Tag.md b/samples/client/petstore/java/retrofit2/docs/Tag.md
new file mode 100644
index 000000000000..de6814b55d57
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/Tag.md
@@ -0,0 +1,11 @@
+
+# Tag
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/User.md b/samples/client/petstore/java/retrofit2/docs/User.md
new file mode 100644
index 000000000000..8b6753dd284a
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/User.md
@@ -0,0 +1,17 @@
+
+# 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** | **Integer** | User Status |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2/docs/UserApi.md b/samples/client/petstore/java/retrofit2/docs/UserApi.md
new file mode 100644
index 000000000000..b0a0149a50af
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/docs/UserApi.md
@@ -0,0 +1,376 @@
+# UserApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**createUser**](UserApi.md#createUser) | **POST** user | Create user
+[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** user/createWithList | Creates list of users with given input array
+[**deleteUser**](UserApi.md#deleteUser) | **DELETE** user/{username} | Delete user
+[**getUserByName**](UserApi.md#getUserByName) | **GET** user/{username} | Get user by user name
+[**loginUser**](UserApi.md#loginUser) | **GET** user/login | Logs user into the system
+[**logoutUser**](UserApi.md#logoutUser) | **GET** user/logout | Logs out current logged in user session
+[**updateUser**](UserApi.md#updateUser) | **PUT** user/{username} | Updated user
+
+
+<a name="createUser"></a>
+# **createUser**
+> Void createUser(body)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+User body = new User(); // User | Created user object
+try {
+    Void result = apiInstance.createUser(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#createUser");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| Created user object |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="createUsersWithArrayInput"></a>
+# **createUsersWithArrayInput**
+> Void createUsersWithArrayInput(body)
+
+Creates list of users with given input array
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+List<User> body = Arrays.asList(new User()); // List<User> | List of user object
+try {
+    Void result = apiInstance.createUsersWithArrayInput(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List&lt;User&gt;**](User.md)| List of user object |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="createUsersWithListInput"></a>
+# **createUsersWithListInput**
+> Void createUsersWithListInput(body)
+
+Creates list of users with given input array
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+List<User> body = Arrays.asList(new User()); // List<User> | List of user object
+try {
+    Void result = apiInstance.createUsersWithListInput(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#createUsersWithListInput");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List&lt;User&gt;**](User.md)| List of user object |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="deleteUser"></a>
+# **deleteUser**
+> Void deleteUser(username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+String username = "username_example"; // String | The name that needs to be deleted
+try {
+    Void result = apiInstance.deleteUser(username);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#deleteUser");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be deleted |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="getUserByName"></a>
+# **getUserByName**
+> User getUserByName(username)
+
+Get user by user name
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. 
+try {
+    User result = apiInstance.getUserByName(username);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#getUserByName");
+    e.printStackTrace();
+}
+```
+
+### 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
+
+<a name="loginUser"></a>
+# **loginUser**
+> String loginUser(username, password)
+
+Logs user into the system
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+String username = "username_example"; // String | The user name for login
+String password = "password_example"; // String | The password for login in clear text
+try {
+    String result = apiInstance.loginUser(username, password);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#loginUser");
+    e.printStackTrace();
+}
+```
+
+### 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
+
+<a name="logoutUser"></a>
+# **logoutUser**
+> Void logoutUser()
+
+Logs out current logged in user session
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+try {
+    Void result = apiInstance.logoutUser();
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#logoutUser");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="updateUser"></a>
+# **updateUser**
+> Void updateUser(username, body)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+String username = "username_example"; // String | name that need to be deleted
+User body = new User(); // User | Updated user object
+try {
+    Void result = apiInstance.updateUser(username, body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#updateUser");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| name that need to be deleted |
+ **body** | [**User**](User.md)| Updated user object |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md
new file mode 100644
index 000000000000..c72785d450f4
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md
@@ -0,0 +1,9 @@
+
+# AdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Animal.md b/samples/client/petstore/java/retrofit2rx/docs/Animal.md
new file mode 100644
index 000000000000..b3f325c3524d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/Animal.md
@@ -0,0 +1,11 @@
+
+# Animal
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+**color** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AnimalFarm.md b/samples/client/petstore/java/retrofit2rx/docs/AnimalFarm.md
new file mode 100644
index 000000000000..c7c7f1ddcce6
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/AnimalFarm.md
@@ -0,0 +1,9 @@
+
+# AnimalFarm
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/ArrayTest.md b/samples/client/petstore/java/retrofit2rx/docs/ArrayTest.md
new file mode 100644
index 000000000000..73c3e5305ada
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/ArrayTest.md
@@ -0,0 +1,9 @@
+
+# ArrayTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Cat.md b/samples/client/petstore/java/retrofit2rx/docs/Cat.md
new file mode 100644
index 000000000000..be6e56fa8ce3
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/Cat.md
@@ -0,0 +1,12 @@
+
+# Cat
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+**color** | **String** |  |  [optional]
+**declawed** | **Boolean** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Category.md b/samples/client/petstore/java/retrofit2rx/docs/Category.md
new file mode 100644
index 000000000000..e2df08032787
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/Category.md
@@ -0,0 +1,11 @@
+
+# Category
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Dog.md b/samples/client/petstore/java/retrofit2rx/docs/Dog.md
new file mode 100644
index 000000000000..71a7dbe809e2
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/Dog.md
@@ -0,0 +1,12 @@
+
+# Dog
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+**color** | **String** |  |  [optional]
+**breed** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/EnumClass.md b/samples/client/petstore/java/retrofit2rx/docs/EnumClass.md
new file mode 100644
index 000000000000..c746edc3cb1e
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/EnumClass.md
@@ -0,0 +1,14 @@
+
+# EnumClass
+
+## Enum
+
+
+* `_ABC` (value: `"_abc"`)
+
+* `_EFG` (value: `"-efg"`)
+
+* `_XYZ_` (value: `"(xyz)"`)
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/EnumTest.md b/samples/client/petstore/java/retrofit2rx/docs/EnumTest.md
new file mode 100644
index 000000000000..deb1951c5528
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/EnumTest.md
@@ -0,0 +1,36 @@
+
+# EnumTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**enumString** | [**EnumStringEnum**](#EnumStringEnum) |  |  [optional]
+**enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) |  |  [optional]
+**enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) |  |  [optional]
+
+
+<a name="EnumStringEnum"></a>
+## Enum: EnumStringEnum
+Name | Value
+---- | -----
+UPPER | &quot;UPPER&quot;
+LOWER | &quot;lower&quot;
+
+
+<a name="EnumIntegerEnum"></a>
+## Enum: EnumIntegerEnum
+Name | Value
+---- | -----
+NUMBER_1 | 1
+NUMBER_MINUS_1 | -1
+
+
+<a name="EnumNumberEnum"></a>
+## Enum: EnumNumberEnum
+Name | Value
+---- | -----
+NUMBER_1_DOT_1 | 1.1
+NUMBER_MINUS_1_DOT_2 | -1.2
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md
new file mode 100644
index 000000000000..55f7cef2df48
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md
@@ -0,0 +1,76 @@
+# FakeApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+
+<a name="testEndpointParameters"></a>
+# **testEndpointParameters**
+> Void testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password)
+
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.FakeApi;
+
+
+FakeApi apiInstance = new FakeApi();
+BigDecimal number = new BigDecimal(); // BigDecimal | None
+Double _double = 3.4D; // Double | None
+String string = "string_example"; // String | None
+byte[] _byte = B; // byte[] | None
+Integer integer = 56; // Integer | None
+Integer int32 = 56; // Integer | None
+Long int64 = 789L; // Long | None
+Float _float = 3.4F; // Float | None
+byte[] binary = B; // byte[] | None
+Date date = new Date(); // Date | None
+Date dateTime = new Date(); // Date | None
+String password = "password_example"; // String | None
+try {
+    Void result = apiInstance.testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling FakeApi#testEndpointParameters");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **number** | **BigDecimal**| None |
+ **_double** | **Double**| None |
+ **string** | **String**| None |
+ **_byte** | **byte[]**| None |
+ **integer** | **Integer**| None | [optional]
+ **int32** | **Integer**| None | [optional]
+ **int64** | **Long**| None | [optional]
+ **_float** | **Float**| None | [optional]
+ **binary** | **byte[]**| None | [optional]
+ **date** | **Date**| None | [optional]
+ **dateTime** | **Date**| None | [optional]
+ **password** | **String**| None | [optional]
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
+ - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/FormatTest.md b/samples/client/petstore/java/retrofit2rx/docs/FormatTest.md
new file mode 100644
index 000000000000..dc2b559dad28
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/FormatTest.md
@@ -0,0 +1,22 @@
+
+# FormatTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**integer** | **Integer** |  |  [optional]
+**int32** | **Integer** |  |  [optional]
+**int64** | **Long** |  |  [optional]
+**number** | [**BigDecimal**](BigDecimal.md) |  | 
+**_float** | **Float** |  |  [optional]
+**_double** | **Double** |  |  [optional]
+**string** | **String** |  |  [optional]
+**_byte** | **byte[]** |  | 
+**binary** | **byte[]** |  |  [optional]
+**date** | [**Date**](Date.md) |  | 
+**dateTime** | [**Date**](Date.md) |  |  [optional]
+**uuid** | **String** |  |  [optional]
+**password** | **String** |  | 
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
new file mode 100644
index 000000000000..fcdbd3905172
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -0,0 +1,11 @@
+
+# MixedPropertiesAndAdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**uuid** | **String** |  |  [optional]
+**dateTime** | [**Date**](Date.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Model200Response.md b/samples/client/petstore/java/retrofit2rx/docs/Model200Response.md
new file mode 100644
index 000000000000..0819b88c4f4d
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/Model200Response.md
@@ -0,0 +1,10 @@
+
+# Model200Response
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/ModelApiResponse.md b/samples/client/petstore/java/retrofit2rx/docs/ModelApiResponse.md
new file mode 100644
index 000000000000..3eec8686cc95
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/ModelApiResponse.md
@@ -0,0 +1,12 @@
+
+# ModelApiResponse
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**code** | **Integer** |  |  [optional]
+**type** | **String** |  |  [optional]
+**message** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/ModelReturn.md b/samples/client/petstore/java/retrofit2rx/docs/ModelReturn.md
new file mode 100644
index 000000000000..a679b04953e5
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/ModelReturn.md
@@ -0,0 +1,10 @@
+
+# ModelReturn
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_return** | **Integer** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Name.md b/samples/client/petstore/java/retrofit2rx/docs/Name.md
new file mode 100644
index 000000000000..ce2fb4dee50c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/Name.md
@@ -0,0 +1,13 @@
+
+# Name
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  | 
+**snakeCase** | **Integer** |  |  [optional]
+**property** | **String** |  |  [optional]
+**_123Number** | **Integer** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Order.md b/samples/client/petstore/java/retrofit2rx/docs/Order.md
new file mode 100644
index 000000000000..29ca3ddbc6b2
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/Order.md
@@ -0,0 +1,24 @@
+
+# Order
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**petId** | **Long** |  |  [optional]
+**quantity** | **Integer** |  |  [optional]
+**shipDate** | [**Date**](Date.md) |  |  [optional]
+**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
+**complete** | **Boolean** |  |  [optional]
+
+
+<a name="StatusEnum"></a>
+## Enum: StatusEnum
+Name | Value
+---- | -----
+PLACED | &quot;placed&quot;
+APPROVED | &quot;approved&quot;
+DELIVERED | &quot;delivered&quot;
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Pet.md b/samples/client/petstore/java/retrofit2rx/docs/Pet.md
new file mode 100644
index 000000000000..5b63109ef924
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/Pet.md
@@ -0,0 +1,24 @@
+
+# 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** | [**StatusEnum**](#StatusEnum) | pet status in the store |  [optional]
+
+
+<a name="StatusEnum"></a>
+## Enum: StatusEnum
+Name | Value
+---- | -----
+AVAILABLE | &quot;available&quot;
+PENDING | &quot;pending&quot;
+SOLD | &quot;sold&quot;
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/PetApi.md b/samples/client/petstore/java/retrofit2rx/docs/PetApi.md
new file mode 100644
index 000000000000..40ea199b153a
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/PetApi.md
@@ -0,0 +1,452 @@
+# 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
+
+
+<a name="addPet"></a>
+# **addPet**
+> Void addPet(body)
+
+Add a new pet to the store
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+try {
+    Void result = apiInstance.addPet(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#addPet");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/xml, application/json
+
+<a name="deletePet"></a>
+# **deletePet**
+> Void deletePet(petId, apiKey)
+
+Deletes a pet
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+Long petId = 789L; // Long | Pet id to delete
+String apiKey = "apiKey_example"; // String | 
+try {
+    Void result = apiInstance.deletePet(petId, apiKey);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#deletePet");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| Pet id to delete |
+ **apiKey** | **String**|  | [optional]
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="findPetsByStatus"></a>
+# **findPetsByStatus**
+> List&lt;Pet&gt; findPetsByStatus(status)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+List<String> status = Arrays.asList("status_example"); // List<String> | Status values that need to be considered for filter
+try {
+    List<Pet> result = apiInstance.findPetsByStatus(status);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#findPetsByStatus");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter |
+
+### Return type
+
+[**List&lt;Pet&gt;**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="findPetsByTags"></a>
+# **findPetsByTags**
+> List&lt;Pet&gt; findPetsByTags(tags)
+
+Finds Pets by tags
+
+Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+List<String> tags = Arrays.asList("tags_example"); // List<String> | Tags to filter by
+try {
+    List<Pet> result = apiInstance.findPetsByTags(tags);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#findPetsByTags");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**List&lt;String&gt;**](String.md)| Tags to filter by |
+
+### Return type
+
+[**List&lt;Pet&gt;**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="getPetById"></a>
+# **getPetById**
+> Pet getPetById(petId)
+
+Find pet by ID
+
+Returns a single pet
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key
+ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
+api_key.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.setApiKeyPrefix("Token");
+
+PetApi apiInstance = new PetApi();
+Long petId = 789L; // Long | ID of pet to return
+try {
+    Pet result = apiInstance.getPetById(petId);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#getPetById");
+    e.printStackTrace();
+}
+```
+
+### 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
+
+<a name="updatePet"></a>
+# **updatePet**
+> Void updatePet(body)
+
+Update an existing pet
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+try {
+    Void result = apiInstance.updatePet(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#updatePet");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: application/xml, application/json
+
+<a name="updatePetWithForm"></a>
+# **updatePetWithForm**
+> Void updatePetWithForm(petId, name, status)
+
+Updates a pet in the store with form data
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+Long petId = 789L; // Long | ID of pet that needs to be updated
+String name = "name_example"; // String | Updated name of the pet
+String status = "status_example"; // String | Updated status of the pet
+try {
+    Void result = apiInstance.updatePetWithForm(petId, name, status);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#updatePetWithForm");
+    e.printStackTrace();
+}
+```
+
+### 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**](.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: application/xml, application/json
+
+<a name="uploadFile"></a>
+# **uploadFile**
+> ModelApiResponse uploadFile(petId, additionalMetadata, file)
+
+uploads an image
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.PetApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure OAuth2 access token for authorization: petstore_auth
+OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+PetApi apiInstance = new PetApi();
+Long petId = 789L; // Long | ID of pet to update
+String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
+File file = new File("/path/to/file.txt"); // File | file to upload
+try {
+    ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling PetApi#uploadFile");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet to update |
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional]
+ **file** | **File**| file to upload | [optional]
+
+### Return type
+
+[**ModelApiResponse**](ModelApiResponse.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/java/retrofit2rx/docs/ReadOnlyFirst.md b/samples/client/petstore/java/retrofit2rx/docs/ReadOnlyFirst.md
new file mode 100644
index 000000000000..426b7cde95ab
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/ReadOnlyFirst.md
@@ -0,0 +1,11 @@
+
+# ReadOnlyFirst
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**bar** | **String** |  |  [optional]
+**baz** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/SpecialModelName.md b/samples/client/petstore/java/retrofit2rx/docs/SpecialModelName.md
new file mode 100644
index 000000000000..c2c6117c552c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/SpecialModelName.md
@@ -0,0 +1,10 @@
+
+# SpecialModelName
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**specialPropertyName** | **Long** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md b/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md
new file mode 100644
index 000000000000..30e3c11d440c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md
@@ -0,0 +1,198 @@
+# 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
+
+
+<a name="deleteOrder"></a>
+# **deleteOrder**
+> Void deleteOrder(orderId)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.StoreApi;
+
+
+StoreApi apiInstance = new StoreApi();
+String orderId = "orderId_example"; // String | ID of the order that needs to be deleted
+try {
+    Void result = apiInstance.deleteOrder(orderId);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling StoreApi#deleteOrder");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **String**| ID of the order that needs to be deleted |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="getInventory"></a>
+# **getInventory**
+> Map&lt;String, Integer&gt; getInventory()
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiClient;
+//import io.swagger.client.ApiException;
+//import io.swagger.client.Configuration;
+//import io.swagger.client.auth.*;
+//import io.swagger.client.api.StoreApi;
+
+ApiClient defaultClient = Configuration.getDefaultApiClient();
+
+// Configure API key authorization: api_key
+ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
+api_key.setApiKey("YOUR API KEY");
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//api_key.setApiKeyPrefix("Token");
+
+StoreApi apiInstance = new StoreApi();
+try {
+    Map<String, Integer> result = apiInstance.getInventory();
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling StoreApi#getInventory");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**Map&lt;String, Integer&gt;**](Map.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+<a name="getOrderById"></a>
+# **getOrderById**
+> Order getOrderById(orderId)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.StoreApi;
+
+
+StoreApi apiInstance = new StoreApi();
+Long orderId = 789L; // Long | ID of pet that needs to be fetched
+try {
+    Order result = apiInstance.getOrderById(orderId);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling StoreApi#getOrderById");
+    e.printStackTrace();
+}
+```
+
+### 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
+
+<a name="placeOrder"></a>
+# **placeOrder**
+> Order placeOrder(body)
+
+Place an order for a pet
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.StoreApi;
+
+
+StoreApi apiInstance = new StoreApi();
+Order body = new Order(); // Order | order placed for purchasing the pet
+try {
+    Order result = apiInstance.placeOrder(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling StoreApi#placeOrder");
+    e.printStackTrace();
+}
+```
+
+### 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/java/retrofit2rx/docs/Tag.md b/samples/client/petstore/java/retrofit2rx/docs/Tag.md
new file mode 100644
index 000000000000..de6814b55d57
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/Tag.md
@@ -0,0 +1,11 @@
+
+# Tag
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/User.md b/samples/client/petstore/java/retrofit2rx/docs/User.md
new file mode 100644
index 000000000000..8b6753dd284a
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/User.md
@@ -0,0 +1,17 @@
+
+# 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** | **Integer** | User Status |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/retrofit2rx/docs/UserApi.md b/samples/client/petstore/java/retrofit2rx/docs/UserApi.md
new file mode 100644
index 000000000000..b0a0149a50af
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/docs/UserApi.md
@@ -0,0 +1,376 @@
+# UserApi
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**createUser**](UserApi.md#createUser) | **POST** user | Create user
+[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** user/createWithList | Creates list of users with given input array
+[**deleteUser**](UserApi.md#deleteUser) | **DELETE** user/{username} | Delete user
+[**getUserByName**](UserApi.md#getUserByName) | **GET** user/{username} | Get user by user name
+[**loginUser**](UserApi.md#loginUser) | **GET** user/login | Logs user into the system
+[**logoutUser**](UserApi.md#logoutUser) | **GET** user/logout | Logs out current logged in user session
+[**updateUser**](UserApi.md#updateUser) | **PUT** user/{username} | Updated user
+
+
+<a name="createUser"></a>
+# **createUser**
+> Void createUser(body)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+User body = new User(); // User | Created user object
+try {
+    Void result = apiInstance.createUser(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#createUser");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| Created user object |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="createUsersWithArrayInput"></a>
+# **createUsersWithArrayInput**
+> Void createUsersWithArrayInput(body)
+
+Creates list of users with given input array
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+List<User> body = Arrays.asList(new User()); // List<User> | List of user object
+try {
+    Void result = apiInstance.createUsersWithArrayInput(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List&lt;User&gt;**](User.md)| List of user object |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="createUsersWithListInput"></a>
+# **createUsersWithListInput**
+> Void createUsersWithListInput(body)
+
+Creates list of users with given input array
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+List<User> body = Arrays.asList(new User()); // List<User> | List of user object
+try {
+    Void result = apiInstance.createUsersWithListInput(body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#createUsersWithListInput");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List&lt;User&gt;**](User.md)| List of user object |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="deleteUser"></a>
+# **deleteUser**
+> Void deleteUser(username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+String username = "username_example"; // String | The name that needs to be deleted
+try {
+    Void result = apiInstance.deleteUser(username);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#deleteUser");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be deleted |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="getUserByName"></a>
+# **getUserByName**
+> User getUserByName(username)
+
+Get user by user name
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. 
+try {
+    User result = apiInstance.getUserByName(username);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#getUserByName");
+    e.printStackTrace();
+}
+```
+
+### 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
+
+<a name="loginUser"></a>
+# **loginUser**
+> String loginUser(username, password)
+
+Logs user into the system
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+String username = "username_example"; // String | The user name for login
+String password = "password_example"; // String | The password for login in clear text
+try {
+    String result = apiInstance.loginUser(username, password);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#loginUser");
+    e.printStackTrace();
+}
+```
+
+### 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
+
+<a name="logoutUser"></a>
+# **logoutUser**
+> Void logoutUser()
+
+Logs out current logged in user session
+
+
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+try {
+    Void result = apiInstance.logoutUser();
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#logoutUser");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+<a name="updateUser"></a>
+# **updateUser**
+> Void updateUser(username, body)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example
+```java
+// Import classes:
+//import io.swagger.client.ApiException;
+//import io.swagger.client.api.UserApi;
+
+
+UserApi apiInstance = new UserApi();
+String username = "username_example"; // String | name that need to be deleted
+User body = new User(); // User | Updated user object
+try {
+    Void result = apiInstance.updateUser(username, body);
+    System.out.println(result);
+} catch (ApiException e) {
+    System.err.println("Exception when calling UserApi#updateUser");
+    e.printStackTrace();
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| name that need to be deleted |
+ **body** | [**User**](User.md)| Updated user object |
+
+### Return type
+
+[**Void**](.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+

From c68168fa27805dd824a017c637fa2bc6e608859b Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Wed, 25 May 2016 18:13:27 +0200
Subject: [PATCH 015/139] - Remove optional license property - License in all
 header files

---
 .../codegen/languages/ObjcClientCodegen.java  |  9 +-----
 .../resources/objc/ApiClient-header.mustache  |  7 ++---
 .../objc/Configuration-header.mustache        |  7 +----
 .../JSONRequestSerializer-header.mustache     |  2 ++
 .../JSONResponseSerializer-header.mustache    |  2 ++
 .../objc/JSONValueTransformer+ISO8601.h       |  3 ++
 .../resources/objc/Logger-header.mustache     |  6 +---
 .../resources/objc/Object-header.mustache     |  3 ++
 .../objc/QueryParamCollection-header.mustache |  2 ++
 .../objc/ResponseDeserializer-header.mustache |  6 +---
 .../resources/objc/Sanitizer-header.mustache  |  6 +---
 .../main/resources/objc/api-header.mustache   | 12 +++-----
 .../main/resources/objc/api-protocol.mustache |  6 +---
 .../main/resources/objc/licenceInfo.mustache  | 23 +++++++++++++++
 .../main/resources/objc/model-header.mustache |  6 +---
 .../petstore/objc/.swagger-codegen-ignore     | 23 +++++++++++++++
 samples/client/petstore/objc/README.md        | 14 ++++-----
 .../objc/SwaggerClient/Api/SWGPetApi.h        | 26 ++++++++++++++---
 .../objc/SwaggerClient/Api/SWGPetApi.m        |  2 +-
 .../objc/SwaggerClient/Api/SWGStoreApi.h      | 26 ++++++++++++++---
 .../objc/SwaggerClient/Api/SWGUserApi.h       | 26 ++++++++++++++---
 .../Core/JSONValueTransformer+ISO8601.h       |  3 ++
 .../petstore/objc/SwaggerClient/Core/SWGApi.h | 26 ++++++++++++++---
 .../objc/SwaggerClient/Core/SWGApiClient.h    | 27 ++++++++++++++---
 .../SwaggerClient/Core/SWGConfiguration.h     | 29 +++++++++++++++----
 .../SwaggerClient/Core/SWGConfiguration.m     | 14 ++++-----
 .../Core/SWGJSONRequestSerializer.h           | 24 +++++++++++++++
 .../Core/SWGJSONResponseSerializer.h          | 24 +++++++++++++++
 .../objc/SwaggerClient/Core/SWGLogger.h       | 26 ++++++++++++++---
 .../objc/SwaggerClient/Core/SWGObject.h       | 25 ++++++++++++++++
 .../Core/SWGQueryParamCollection.h            | 24 +++++++++++++++
 .../Core/SWGResponseDeserializer.h            | 26 ++++++++++++++---
 .../objc/SwaggerClient/Core/SWGSanitizer.h    | 26 ++++++++++++++---
 .../objc/SwaggerClient/Model/SWGCategory.h    | 26 ++++++++++++++---
 .../objc/SwaggerClient/Model/SWGCategory.m    |  2 +-
 .../objc/SwaggerClient/Model/SWGOrder.h       | 26 ++++++++++++++---
 .../objc/SwaggerClient/Model/SWGOrder.m       |  2 +-
 .../objc/SwaggerClient/Model/SWGPet.h         | 26 ++++++++++++++---
 .../objc/SwaggerClient/Model/SWGPet.m         |  2 +-
 .../objc/SwaggerClient/Model/SWGTag.h         | 26 ++++++++++++++---
 .../objc/SwaggerClient/Model/SWGTag.m         |  2 +-
 .../objc/SwaggerClient/Model/SWGUser.h        | 26 ++++++++++++++---
 .../objc/SwaggerClient/Model/SWGUser.m        |  2 +-
 .../client/petstore/objc/docs/SWGPetApi.md    |  8 ++---
 44 files changed, 505 insertions(+), 134 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/objc/licenceInfo.mustache
 create mode 100644 samples/client/petstore/objc/.swagger-codegen-ignore

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
index 474f800e2b42..57f14bf2bce6 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
@@ -166,7 +166,6 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         cliOptions.add(new CliOption(AUTHOR_EMAIL, "Email to use in the podspec file.").defaultValue("apiteam@swagger.io"));
         cliOptions.add(new CliOption(GIT_REPO_URL, "URL for the git repo where this podspec should point to.")
                 .defaultValue("https://github.com/swagger-api/swagger-codegen"));
-        cliOptions.add(new CliOption(LICENSE, "License to use in the podspec file.").defaultValue("MIT"));
     }
 
     @Override
@@ -212,10 +211,6 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
             setGitRepoURL((String) additionalProperties.get(GIT_REPO_URL));
         }
 
-        if (additionalProperties.containsKey(LICENSE)) {
-            setLicense((String) additionalProperties.get(LICENSE));
-        }
-
         additionalProperties.put(POD_NAME, podName);
         additionalProperties.put(CodegenConstants.POD_VERSION, podVersion);
         additionalProperties.put(CLASS_PREFIX, classPrefix);
@@ -256,9 +251,7 @@ public class ObjcClientCodegen 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"));
-        if (license == null || DEFAULT_LICENSE.equals(license)) {
-            supportingFiles.add(new SupportingFile("LICENSE.mustache", "", "LICENSE"));
-        }
+        supportingFiles.add(new SupportingFile("LICENSE.mustache", "", "LICENSE"));
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
index db7df9b34076..125d42e34915 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
@@ -8,11 +8,8 @@
 #import "{{classPrefix}}ResponseDeserializer.h"
 #import "{{classPrefix}}Sanitizer.h"
 #import "{{classPrefix}}Logger.h"
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+
+{{>licenceInfo}}
 
 {{#models}}{{#model}}#import "{{classname}}.h"
 {{/model}}{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/Configuration-header.mustache b/modules/swagger-codegen/src/main/resources/objc/Configuration-header.mustache
index 12807ca54110..e727942a4f28 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Configuration-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Configuration-header.mustache
@@ -2,12 +2,7 @@
 #import "{{classPrefix}}ApiClient.h"
 #import "{{classPrefix}}Logger.h"
 
-/** The `{{classPrefix}}Configuration` class manages the configurations for the sdk.
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 @class {{classPrefix}}ApiClient;
 
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-header.mustache
index a0732b937067..1259c5d15305 100644
--- a/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-header.mustache
@@ -1,5 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <AFNetworking/AFURLRequestSerialization.h>
 
+{{>licenceInfo}}
+
 @interface {{classPrefix}}JSONRequestSerializer : AFJSONRequestSerializer
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-header.mustache
index 7a5f152e271e..360e4f9cdc5a 100644
--- a/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-header.mustache
@@ -1,6 +1,8 @@
 #import <Foundation/Foundation.h>
 #import <AFNetworking/AFURLResponseSerialization.h>
 
+{{>licenceInfo}}
+
 @interface {{classPrefix}}JSONResponseSerializer : AFJSONResponseSerializer
 
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.h b/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.h
index 832f485f4f0c..2a8d5b0c9e7d 100644
--- a/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.h
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.h
@@ -2,5 +2,8 @@
 #import <ISO8601/ISO8601.h>
 #import <JSONModel/JSONValueTransformer.h>
 
+{{>licenceInfo}}
+
 @interface JSONValueTransformer (ISO8601)
+
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/Logger-header.mustache b/modules/swagger-codegen/src/main/resources/objc/Logger-header.mustache
index 2070f95ae9f2..37afea41a097 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Logger-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Logger-header.mustache
@@ -1,10 +1,6 @@
 #import <Foundation/Foundation.h>
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 #ifndef {{classPrefix}}DebugLogResponse
 #define {{classPrefix}}DebugLogResponse(response, responseObject,request, error) [[{{classPrefix}}Logger sharedLogger] logResponse:response responseObject:responseObject request:request error:error];
diff --git a/modules/swagger-codegen/src/main/resources/objc/Object-header.mustache b/modules/swagger-codegen/src/main/resources/objc/Object-header.mustache
index d96e379908f5..89da6a4d8b6c 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Object-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Object-header.mustache
@@ -1,5 +1,8 @@
 #import <Foundation/Foundation.h>
 #import <JSONModel/JSONModel.h>
 
+{{>licenceInfo}}
+
 @interface {{classPrefix}}Object : JSONModel
+
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-header.mustache b/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-header.mustache
index 0389cce98bec..9729c182bd8a 100644
--- a/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/QueryParamCollection-header.mustache
@@ -1,5 +1,7 @@
 #import <Foundation/Foundation.h>
 
+{{>licenceInfo}}
+
 @interface {{classPrefix}}QueryParamCollection : NSObject
 
 @property(nonatomic, readonly) NSArray* values;
diff --git a/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-header.mustache
index 2dd038c13f03..90aa174d7c43 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ResponseDeserializer-header.mustache
@@ -1,10 +1,6 @@
 #import <Foundation/Foundation.h>
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 /**
  * A key for deserialization ErrorDomain
diff --git a/modules/swagger-codegen/src/main/resources/objc/Sanitizer-header.mustache b/modules/swagger-codegen/src/main/resources/objc/Sanitizer-header.mustache
index cd9466616156..f975018a020d 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Sanitizer-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Sanitizer-header.mustache
@@ -1,10 +1,6 @@
 #import <Foundation/Foundation.h>
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 extern NSString * {{classPrefix}}PercentEscapedStringFromString(NSString *string);
 
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 67bb9045ec8c..abe4cf64eb03 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
@@ -2,14 +2,9 @@
 {{#imports}}#import "{{import}}.h"
 {{/imports}}
 #import "{{classPrefix}}Api.h"
-{{newline}}
-/**
- * NOTE: This class is auto generated by the swagger code generator program. 
- * https://github.com/swagger-api/swagger-codegen 
- * Do not edit the class manually.
- */
 
-{{#operations}}
+{{>licenceInfo}}
+
 
 @interface {{classname}}: NSObject <{{classPrefix}}Api>
 
@@ -18,6 +13,7 @@ extern NSInteger k{{classname}}MissingParamErrorCode;
 
 +(instancetype) sharedAPI;
 
+{{#operations}}
 {{#operation}}
 /// {{{summary}}}
 /// {{#notes}}{{{notes}}}{{/notes}}
@@ -33,6 +29,6 @@ extern NSInteger k{{classname}}MissingParamErrorCode;
 
 {{newline}}
 {{/operation}}
-
 {{/operations}}
+
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/api-protocol.mustache b/modules/swagger-codegen/src/main/resources/objc/api-protocol.mustache
index 142b75dabaa9..da87a712fa26 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api-protocol.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api-protocol.mustache
@@ -2,11 +2,7 @@
 #import "{{classPrefix}}Object.h"
 #import "{{classPrefix}}ApiClient.h"
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 @protocol {{classPrefix}}Api <NSObject>
 
diff --git a/modules/swagger-codegen/src/main/resources/objc/licenceInfo.mustache b/modules/swagger-codegen/src/main/resources/objc/licenceInfo.mustache
new file mode 100644
index 000000000000..2f0f1940e891
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/licenceInfo.mustache
@@ -0,0 +1,23 @@
+/**
+* {{{appName}}}
+* {{{appDescription}}}
+*
+* {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
+* {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/objc/model-header.mustache b/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
index f9a330424912..04570e71a2fa 100644
--- a/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
@@ -1,11 +1,7 @@
 #import <Foundation/Foundation.h>
 #import "{{classPrefix}}Object.h"
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 {{#imports}}#import "{{import}}.h"
 {{/imports}}
diff --git a/samples/client/petstore/objc/.swagger-codegen-ignore b/samples/client/petstore/objc/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/objc/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/objc/README.md b/samples/client/petstore/objc/README.md
index 32999a5e80b0..c30a7813e83f 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-05-18T23:48:57.670+08:00
+- Build date: 2016-05-25T18:06:49.729+02:00
 - Build package: class io.swagger.codegen.languages.ObjcClientCodegen
 
 ## Requirements
@@ -124,12 +124,6 @@ Class | Method | HTTP request | Description
 ## Documentation For Authorization
 
 
-## api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
 ## petstore_auth
 
 - **Type**: OAuth
@@ -139,6 +133,12 @@ Class | Method | HTTP request | Description
  - **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
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.h b/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.h
index be068cdb77e3..97f914a627ef 100644
--- a/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.h
@@ -3,10 +3,28 @@
 #import "SWGApi.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program. 
- * https://github.com/swagger-api/swagger-codegen 
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 
 @interface SWGPetApi: NSObject <SWGApi>
diff --git a/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.m b/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.m
index e35421fc5202..409f5b866557 100644
--- a/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.m
+++ b/samples/client/petstore/objc/SwaggerClient/Api/SWGPetApi.m
@@ -376,7 +376,7 @@ NSInteger kSWGPetApiMissingParamErrorCode = 234513;
     NSString *requestContentType = [self.apiClient.sanitizer selectHeaderContentType:@[]];
 
     // Authentication setting
-    NSArray *authSettings = @[@"api_key", @"petstore_auth"];
+    NSArray *authSettings = @[@"petstore_auth", @"api_key"];
 
     id bodyParam = nil;
     NSMutableDictionary *formParams = [[NSMutableDictionary alloc] init];
diff --git a/samples/client/petstore/objc/SwaggerClient/Api/SWGStoreApi.h b/samples/client/petstore/objc/SwaggerClient/Api/SWGStoreApi.h
index b39dcce9e6b5..bbd588dba259 100644
--- a/samples/client/petstore/objc/SwaggerClient/Api/SWGStoreApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/Api/SWGStoreApi.h
@@ -3,10 +3,28 @@
 #import "SWGApi.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program. 
- * https://github.com/swagger-api/swagger-codegen 
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 
 @interface SWGStoreApi: NSObject <SWGApi>
diff --git a/samples/client/petstore/objc/SwaggerClient/Api/SWGUserApi.h b/samples/client/petstore/objc/SwaggerClient/Api/SWGUserApi.h
index c3b375d71338..67f8ec9cbb21 100644
--- a/samples/client/petstore/objc/SwaggerClient/Api/SWGUserApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/Api/SWGUserApi.h
@@ -3,10 +3,28 @@
 #import "SWGApi.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program. 
- * https://github.com/swagger-api/swagger-codegen 
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 
 @interface SWGUserApi: NSObject <SWGApi>
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h b/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
index 832f485f4f0c..2a8d5b0c9e7d 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
@@ -2,5 +2,8 @@
 #import <ISO8601/ISO8601.h>
 #import <JSONModel/JSONValueTransformer.h>
 
+{{>licenceInfo}}
+
 @interface JSONValueTransformer (ISO8601)
+
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGApi.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGApi.h
index 874f1f48a5d3..93b564be3d12 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGApi.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGApi.h
@@ -3,10 +3,28 @@
 #import "SWGApiClient.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 @protocol SWGApi <NSObject>
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h
index bd35b341eff7..a926598ce5f5 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h
@@ -8,11 +8,30 @@
 #import "SWGResponseDeserializer.h"
 #import "SWGSanitizer.h"
 #import "SWGLogger.h"
+
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 #import "SWGCategory.h"
 #import "SWGOrder.h"
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.h
index 0738a528171b..b6c37405ca2f 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.h
@@ -2,12 +2,29 @@
 #import "SWGApiClient.h"
 #import "SWGLogger.h"
 
-/** The `SWGConfiguration` class manages the configurations for the sdk.
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 @class SWGApiClient;
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m b/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m
index 630c751ce740..cd8d6e7aeef7 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m
@@ -109,13 +109,6 @@
 
 - (NSDictionary *) authSettings {
     return @{
-               @"api_key":
-                   @{
-                       @"type": @"api_key",
-                       @"in": @"header",
-                       @"key": @"api_key",
-                       @"value": [self getApiKeyWithPrefix:@"api_key"]
-                   },
                @"petstore_auth":
                    @{
                        @"type": @"oauth",
@@ -123,6 +116,13 @@
                        @"key": @"Authorization",
                        @"value": [self getAccessToken]
                    },
+               @"api_key":
+                   @{
+                       @"type": @"api_key",
+                       @"in": @"header",
+                       @"key": @"api_key",
+                       @"value": [self getApiKeyWithPrefix:@"api_key"]
+                   },
                };
 }
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.h
index 49dd7fca3e20..d9c4d4ad0604 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.h
@@ -1,5 +1,29 @@
 #import <Foundation/Foundation.h>
 #import <AFNetworking/AFURLRequestSerialization.h>
 
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
+
 @interface SWGJSONRequestSerializer : AFJSONRequestSerializer
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.h
index 16cda1222172..20535a6b92e6 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.h
@@ -1,6 +1,30 @@
 #import <Foundation/Foundation.h>
 #import <AFNetworking/AFURLResponseSerialization.h>
 
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
+
 @interface SWGJSONResponseSerializer : AFJSONResponseSerializer
 
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGLogger.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGLogger.h
index 19c1e509dfa6..cb4279f182b7 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGLogger.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGLogger.h
@@ -1,10 +1,28 @@
 #import <Foundation/Foundation.h>
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 #ifndef SWGDebugLogResponse
 #define SWGDebugLogResponse(response, responseObject,request, error) [[SWGLogger sharedLogger] logResponse:response responseObject:responseObject request:request error:error];
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGObject.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGObject.h
index fb27b4a4ebbd..be57583b8f66 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGObject.h
@@ -1,5 +1,30 @@
 #import <Foundation/Foundation.h>
 #import <JSONModel/JSONModel.h>
 
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
+
 @interface SWGObject : JSONModel
+
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGQueryParamCollection.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGQueryParamCollection.h
index 3b771881b0f5..69a5ab3c133b 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGQueryParamCollection.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGQueryParamCollection.h
@@ -1,5 +1,29 @@
 #import <Foundation/Foundation.h>
 
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
+
 @interface SWGQueryParamCollection : NSObject
 
 @property(nonatomic, readonly) NSArray* values;
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGResponseDeserializer.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGResponseDeserializer.h
index b20ead44f83a..c0d7b716a01e 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGResponseDeserializer.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGResponseDeserializer.h
@@ -1,10 +1,28 @@
 #import <Foundation/Foundation.h>
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 /**
  * A key for deserialization ErrorDomain
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGSanitizer.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGSanitizer.h
index aa2c6f851631..59699c2bdd5c 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGSanitizer.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGSanitizer.h
@@ -1,10 +1,28 @@
 #import <Foundation/Foundation.h>
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 extern NSString * SWGPercentEscapedStringFromString(NSString *string);
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.h
index 983fd610123a..1565724cf8c6 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.h
@@ -2,10 +2,28 @@
 #import "SWGObject.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m
index 29e3bc16226d..85297c56d782 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m
@@ -5,7 +5,7 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    // initalise property's default value, if any
+    // initialize property's default value, if any
     
   }
   return self;
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.h
index 48a7cf0d6c1f..5c29f61c0e62 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.h
@@ -2,10 +2,28 @@
 #import "SWGObject.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m
index d10ed802b8d7..299385f616f9 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m
@@ -5,7 +5,7 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    // initalise property's default value, if any
+    // initialize property's default value, if any
     
   }
   return self;
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.h
index 2f83af6c4e12..90de23fbbf51 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.h
@@ -2,10 +2,28 @@
 #import "SWGObject.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 #import "SWGCategory.h"
 #import "SWGTag.h"
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m
index 98e75189ed3a..0518c3118506 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m
@@ -5,7 +5,7 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    // initalise property's default value, if any
+    // initialize property's default value, if any
     
   }
   return self;
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.h
index 97e958075500..97aa6162af6c 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.h
@@ -2,10 +2,28 @@
 #import "SWGObject.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m
index 8ad1742750d4..2b720d287e11 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m
@@ -5,7 +5,7 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    // initalise property's default value, if any
+    // initialize property's default value, if any
     
   }
   return self;
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.h
index 6ba19e632b8a..2c94220a57e3 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.h
@@ -2,10 +2,28 @@
 #import "SWGObject.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m
index 2551108cb5f9..7aed8343af9b 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m
@@ -5,7 +5,7 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    // initalise property's default value, if any
+    // initialize property's default value, if any
     
   }
   return self;
diff --git a/samples/client/petstore/objc/docs/SWGPetApi.md b/samples/client/petstore/objc/docs/SWGPetApi.md
index 92fb2c4de81b..d702c353855c 100644
--- a/samples/client/petstore/objc/docs/SWGPetApi.md
+++ b/samples/client/petstore/objc/docs/SWGPetApi.md
@@ -246,14 +246,14 @@ Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error cond
 ```objc
 SWGConfiguration *apiConfig = [SWGConfiguration sharedConfig];
 
+// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
+[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
+
 // Configure API key authorization: (authentication scheme: api_key)
 [apiConfig setApiKey:@"YOUR_API_KEY" forApiKeyIdentifier:@"api_key"];
 // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 //[apiConfig setApiKeyPrefix:@"Bearer" forApiKeyIdentifier:@"api_key"];
 
-// Configure OAuth2 access token for authorization: (authentication scheme: petstore_auth)
-[apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
-
 
 NSNumber* petId = @789; // ID of pet that needs to be fetched
 
@@ -283,7 +283,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+[petstore_auth](../README.md#petstore_auth), [api_key](../README.md#api_key)
 
 ### HTTP request headers
 

From 7b57a26a97ff000f5cdde47ae242ce3c5c18f5e8 Mon Sep 17 00:00:00 2001
From: Guo Huang <guohuang@gmail.com>
Date: Wed, 25 May 2016 10:11:52 -0700
Subject: [PATCH 016/139] added apache LICENSE

---
 .../codegen/languages/GoClientCodegen.java    |   1 +
 .../src/main/resources/go/LICENSE             | 201 ++++++++++++++++++
 .../src/main/resources/go/api.mustache        |   1 +
 .../src/main/resources/go/api_client.mustache |   1 +
 .../main/resources/go/api_response.mustache   |   1 +
 .../main/resources/go/configuration.mustache  |   1 +
 .../src/main/resources/go/model.mustache      |   1 +
 .../main/resources/go/partial_header.mustache |  25 +++
 .../go/go-petstore/.swagger-codegen-ignore    |  23 ++
 .../client/petstore/go/go-petstore/LICENSE    | 201 ++++++++++++++++++
 .../client/petstore/go/go-petstore/README.md  |   2 +-
 .../petstore/go/go-petstore/api_client.go     |  22 ++
 .../petstore/go/go-petstore/api_response.go   |  22 ++
 .../petstore/go/go-petstore/category.go       |  22 ++
 .../petstore/go/go-petstore/configuration.go  |  22 ++
 .../go/go-petstore/model_api_response.go      |  22 ++
 .../client/petstore/go/go-petstore/order.go   |  22 ++
 samples/client/petstore/go/go-petstore/pet.go |  22 ++
 .../client/petstore/go/go-petstore/pet_api.go |  22 ++
 .../petstore/go/go-petstore/store_api.go      |  22 ++
 samples/client/petstore/go/go-petstore/tag.go |  22 ++
 .../client/petstore/go/go-petstore/user.go    |  22 ++
 .../petstore/go/go-petstore/user_api.go       |  22 ++
 23 files changed, 721 insertions(+), 1 deletion(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/go/LICENSE
 create mode 100644 modules/swagger-codegen/src/main/resources/go/partial_header.mustache
 create mode 100644 samples/client/petstore/go/go-petstore/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/go/go-petstore/LICENSE

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 f1c3db7c430e..efcde6d8c419 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
@@ -148,6 +148,7 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("api_response.mustache", "", "api_response.go"));
         supportingFiles.add(new SupportingFile(".travis.yml", "", ".travis.yml"));
         supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/go/LICENSE b/modules/swagger-codegen/src/main/resources/go/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   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/go/api.mustache b/modules/swagger-codegen/src/main/resources/go/api.mustache
index 0209e8590c37..b3e2f6db9af2 100644
--- a/modules/swagger-codegen/src/main/resources/go/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/api.mustache
@@ -1,3 +1,4 @@
+{{>partial_header}}
 package {{packageName}}
 
 {{#operations}}
diff --git a/modules/swagger-codegen/src/main/resources/go/api_client.mustache b/modules/swagger-codegen/src/main/resources/go/api_client.mustache
index 2fa6d14ef2be..be0f60673d8d 100644
--- a/modules/swagger-codegen/src/main/resources/go/api_client.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/api_client.mustache
@@ -1,3 +1,4 @@
+{{>partial_header}}
 package {{packageName}}
 
 import (
diff --git a/modules/swagger-codegen/src/main/resources/go/api_response.mustache b/modules/swagger-codegen/src/main/resources/go/api_response.mustache
index a15293f44021..9bacc9578e4e 100644
--- a/modules/swagger-codegen/src/main/resources/go/api_response.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/api_response.mustache
@@ -1,3 +1,4 @@
+{{>partial_header}}
 package {{packageName}}
 
 import (
diff --git a/modules/swagger-codegen/src/main/resources/go/configuration.mustache b/modules/swagger-codegen/src/main/resources/go/configuration.mustache
index 463f77c54dc3..fbc22f603d0e 100644
--- a/modules/swagger-codegen/src/main/resources/go/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/configuration.mustache
@@ -1,3 +1,4 @@
+{{>partial_header}}
 package {{packageName}}
 
 import (
diff --git a/modules/swagger-codegen/src/main/resources/go/model.mustache b/modules/swagger-codegen/src/main/resources/go/model.mustache
index fd799a0e35d6..7cc53fabbcef 100644
--- a/modules/swagger-codegen/src/main/resources/go/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/model.mustache
@@ -1,3 +1,4 @@
+{{>partial_header}}
 package {{packageName}}
 {{#models}}{{#imports}}
 import ({{/imports}}{{#imports}}
diff --git a/modules/swagger-codegen/src/main/resources/go/partial_header.mustache b/modules/swagger-codegen/src/main/resources/go/partial_header.mustache
new file mode 100644
index 000000000000..bf5862deafd4
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/go/partial_header.mustache
@@ -0,0 +1,25 @@
+/* 
+ {{#appName}}
+ * {{{appName}}}
+ *
+ {{/appName}}
+ {{#appDescription}}
+ * {{{appDescription}}}
+ *
+ {{/appDescription}}
+ * {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
+ * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
diff --git a/samples/client/petstore/go/go-petstore/.swagger-codegen-ignore b/samples/client/petstore/go/go-petstore/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/go/go-petstore/LICENSE b/samples/client/petstore/go/go-petstore/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/go/go-petstore/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/go/go-petstore/README.md b/samples/client/petstore/go/go-petstore/README.md
index 9f725fb007b9..200834691107 100644
--- a/samples/client/petstore/go/go-petstore/README.md
+++ b/samples/client/petstore/go/go-petstore/README.md
@@ -7,7 +7,7 @@ This API client was generated by the [swagger-codegen](https://github.com/swagge
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-05-03T10:14:09.589-07:00
+- Build date: 2016-05-25T10:00:28.559-07:00
 - Build package: class io.swagger.codegen.languages.GoClientCodegen
 
 ## Installation
diff --git a/samples/client/petstore/go/go-petstore/api_client.go b/samples/client/petstore/go/go-petstore/api_client.go
index fe73dc5682a7..132ca3949fb4 100644
--- a/samples/client/petstore/go/go-petstore/api_client.go
+++ b/samples/client/petstore/go/go-petstore/api_client.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 import (
diff --git a/samples/client/petstore/go/go-petstore/api_response.go b/samples/client/petstore/go/go-petstore/api_response.go
index 0404289f96b1..57b94271eaec 100644
--- a/samples/client/petstore/go/go-petstore/api_response.go
+++ b/samples/client/petstore/go/go-petstore/api_response.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 import (
diff --git a/samples/client/petstore/go/go-petstore/category.go b/samples/client/petstore/go/go-petstore/category.go
index 197316d62efd..b85918115117 100644
--- a/samples/client/petstore/go/go-petstore/category.go
+++ b/samples/client/petstore/go/go-petstore/category.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 type Category struct {
diff --git a/samples/client/petstore/go/go-petstore/configuration.go b/samples/client/petstore/go/go-petstore/configuration.go
index 5d7df91948e0..2bba74c7f53d 100644
--- a/samples/client/petstore/go/go-petstore/configuration.go
+++ b/samples/client/petstore/go/go-petstore/configuration.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 import (
diff --git a/samples/client/petstore/go/go-petstore/model_api_response.go b/samples/client/petstore/go/go-petstore/model_api_response.go
index 774f781ee93c..85bba3df10e2 100644
--- a/samples/client/petstore/go/go-petstore/model_api_response.go
+++ b/samples/client/petstore/go/go-petstore/model_api_response.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 type ModelApiResponse struct {
diff --git a/samples/client/petstore/go/go-petstore/order.go b/samples/client/petstore/go/go-petstore/order.go
index 582d45a747fd..f5b83768175c 100644
--- a/samples/client/petstore/go/go-petstore/order.go
+++ b/samples/client/petstore/go/go-petstore/order.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 import (
diff --git a/samples/client/petstore/go/go-petstore/pet.go b/samples/client/petstore/go/go-petstore/pet.go
index 88e86af73999..b230ea45dacd 100644
--- a/samples/client/petstore/go/go-petstore/pet.go
+++ b/samples/client/petstore/go/go-petstore/pet.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 type Pet struct {
diff --git a/samples/client/petstore/go/go-petstore/pet_api.go b/samples/client/petstore/go/go-petstore/pet_api.go
index 34efe36d9be1..07dc51eb90e2 100644
--- a/samples/client/petstore/go/go-petstore/pet_api.go
+++ b/samples/client/petstore/go/go-petstore/pet_api.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 import (
diff --git a/samples/client/petstore/go/go-petstore/store_api.go b/samples/client/petstore/go/go-petstore/store_api.go
index 9e24fe68b535..e2de74695ee6 100644
--- a/samples/client/petstore/go/go-petstore/store_api.go
+++ b/samples/client/petstore/go/go-petstore/store_api.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 import (
diff --git a/samples/client/petstore/go/go-petstore/tag.go b/samples/client/petstore/go/go-petstore/tag.go
index ae901c30ec4e..80d219bb36c8 100644
--- a/samples/client/petstore/go/go-petstore/tag.go
+++ b/samples/client/petstore/go/go-petstore/tag.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 type Tag struct {
diff --git a/samples/client/petstore/go/go-petstore/user.go b/samples/client/petstore/go/go-petstore/user.go
index 140a94a275b1..a2cc5850d75b 100644
--- a/samples/client/petstore/go/go-petstore/user.go
+++ b/samples/client/petstore/go/go-petstore/user.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 type User struct {
diff --git a/samples/client/petstore/go/go-petstore/user_api.go b/samples/client/petstore/go/go-petstore/user_api.go
index af0ea7b85f59..2cd9ed6605cd 100644
--- a/samples/client/petstore/go/go-petstore/user_api.go
+++ b/samples/client/petstore/go/go-petstore/user_api.go
@@ -1,3 +1,25 @@
+/* 
+ * Swagger Petstore
+ *
+ * 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.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package petstore
 
 import (

From d9d3a41deb3a7d7b45578cc88bd149370a27cac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Wed, 25 May 2016 22:49:24 +0200
Subject: [PATCH 017/139] [PHP] add apache v2 license to PHP client

See #2963.
---
 .../codegen/languages/PhpClientCodegen.java   |   3 +-
 .../src/main/resources/php/ApiClient.mustache |  17 +-
 .../main/resources/php/ApiException.mustache  |  17 +-
 .../src/main/resources/php/LICENSE            | 201 ++++++++++++++++++
 .../resources/php/ObjectSerializer.mustache   |  17 +-
 .../src/main/resources/php/api.mustache       |  16 +-
 .../src/main/resources/php/api_test.mustache  |  16 +-
 .../src/main/resources/php/autoload.mustache  |   2 +
 .../main/resources/php/configuration.mustache |  17 +-
 .../src/main/resources/php/model.mustache     |  17 +-
 .../main/resources/php/model_test.mustache    |  17 +-
 .../resources/php/partial_header.mustache     |  25 +++
 12 files changed, 243 insertions(+), 122 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/php/LICENSE
 create mode 100644 modules/swagger-codegen/src/main/resources/php/partial_header.mustache

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 c89a7b4e5ba1..fed3a68f15cc 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
@@ -264,7 +264,8 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("README.mustache", getPackagePath(), "README.md"));
         supportingFiles.add(new SupportingFile(".travis.yml", getPackagePath(), ".travis.yml"));
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", getPackagePath(), "git_push.sh"));
-
+        // apache v2 license
+        supportingFiles.add(new SupportingFile("LICENSE", getPackagePath(), "LICENSE"));
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
index 508e40a4afab..98a6ad5df8cf 100644
--- a/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
@@ -10,21 +10,8 @@
  * @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.
- */
+
+{{>partial_header}}
 /**
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen
diff --git a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
index 031e8cd995ee..2cffdea5ccff 100644
--- a/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ApiException.mustache
@@ -9,21 +9,8 @@
  * @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.
- */
+
+{{>partial_header}}
 /**
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen
diff --git a/modules/swagger-codegen/src/main/resources/php/LICENSE b/modules/swagger-codegen/src/main/resources/php/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   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/php/ObjectSerializer.mustache b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
index 06b21d05e548..4f99eaac4c30 100644
--- a/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/ObjectSerializer.mustache
@@ -10,21 +10,8 @@
  * @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.
- */
+
+{{>partial_header}}
 /**
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen
diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache
index 26024ea47890..26f79cd6139f 100644
--- a/modules/swagger-codegen/src/main/resources/php/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api.mustache
@@ -9,22 +9,8 @@
  * @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.
- */
 
+{{>partial_header}}
 /**
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen
diff --git a/modules/swagger-codegen/src/main/resources/php/api_test.mustache b/modules/swagger-codegen/src/main/resources/php/api_test.mustache
index 6a5252235844..c53cd6e1ad2d 100644
--- a/modules/swagger-codegen/src/main/resources/php/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api_test.mustache
@@ -9,22 +9,8 @@
  * @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.
- */
 
+{{>partial_header}}
 /**
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen
diff --git a/modules/swagger-codegen/src/main/resources/php/autoload.mustache b/modules/swagger-codegen/src/main/resources/php/autoload.mustache
index 0942715ce8da..28ce32ae50a5 100644
--- a/modules/swagger-codegen/src/main/resources/php/autoload.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/autoload.mustache
@@ -1,4 +1,6 @@
 <?php
+
+{{>partial_header}}
 /**
  * An example of a project-specific implementation.
  *
diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index 704edbe0f613..da21523cfa59 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -10,22 +10,7 @@
  * @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.
- */
-
+{{>partial_header}}
 /**
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen
diff --git a/modules/swagger-codegen/src/main/resources/php/model.mustache b/modules/swagger-codegen/src/main/resources/php/model.mustache
index 488b82433d91..9fc2b620ddde 100644
--- a/modules/swagger-codegen/src/main/resources/php/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/model.mustache
@@ -12,21 +12,8 @@
  * @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.
- */
+
+{{>partial_header}}
 /**
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen
diff --git a/modules/swagger-codegen/src/main/resources/php/model_test.mustache b/modules/swagger-codegen/src/main/resources/php/model_test.mustache
index 3482629f917f..d7d93f32186a 100644
--- a/modules/swagger-codegen/src/main/resources/php/model_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/model_test.mustache
@@ -12,21 +12,8 @@
  * @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.
- */
+
+{{>partial_header}}
 /**
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen
diff --git a/modules/swagger-codegen/src/main/resources/php/partial_header.mustache b/modules/swagger-codegen/src/main/resources/php/partial_header.mustache
new file mode 100644
index 000000000000..61098d84563c
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/partial_header.mustache
@@ -0,0 +1,25 @@
+/**
+ {{#appName}}
+ * {{{appName}}}
+ *
+ {{/appName}}
+ {{#appDescription}}
+ * {{{appDescription}}}
+ *
+ {{/appDescription}}
+ * {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
+ * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

From 5c97d1b8f7755385fa5d2a3c39909c3267eb78af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Wed, 25 May 2016 22:51:40 +0200
Subject: [PATCH 018/139] [PHP] Improve code style of generated code

Avoid trailing whitespace.
---
 .../io/swagger/codegen/languages/PhpClientCodegen.java   | 9 +++++++++
 .../src/main/resources/php/api_doc.mustache              | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

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 fed3a68f15cc..ac76770c1a40 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
@@ -167,6 +167,15 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
                     .replaceAll(regLastPathSeparator+ "$", "");
     }
 
+    @Override
+    public String escapeText(String input) {
+        if (input != null) {
+            // Trim the string to avoid leading and trailing spaces.
+            return super.escapeText(input).trim();
+        }
+        return input;
+    }
+
     @Override
     public CodegenType getTag() {
         return CodegenType.CLIENT;
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 1edcf0a3f3a2..75ec5f8acd89 100644
--- a/modules/swagger-codegen/src/main/resources/php/api_doc.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api_doc.mustache
@@ -50,7 +50,7 @@ try {
 {{^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}}**](../Model/{{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{#allParams}} **{{paramName}}** | {{#isFile}}**{{dataType}}**{{/isFile}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}[**{{dataType}}**](../Model/{{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} |{{^required}} [optional]{{/required}}{{#defaultValue}} [default to {{defaultValue}}]{{/defaultValue}}
 {{/allParams}}
 
 ### Return type

From 349b727b2c839f1ce3aff989f66275bc11eebfe9 Mon Sep 17 00:00:00 2001
From: Scott Williams <scott.rw93@gmail.com>
Date: Wed, 25 May 2016 22:20:08 +0100
Subject: [PATCH 019/139] Include license in genrated client

---
 .../languages/PythonClientCodegen.java        |   3 +-
 .../src/main/resources/python/LICENSE         | 201 ++++++++++++++++++
 .../petstore/python/.swagger-codegen-ignore   |  23 ++
 samples/client/petstore/python/LICENSE        | 201 ++++++++++++++++++
 samples/client/petstore/python/README.md      |   6 +-
 .../python/docs/AdditionalPropertiesClass.md  |   9 +
 .../client/petstore/python/docs/ArrayTest.md  |   9 +
 .../client/petstore/python/docs/FakeApi.md    |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |  11 +
 .../petstore/python/docs/ReadOnlyFirst.md     |  11 +
 .../python/swagger_client/__init__.py         |   4 +
 .../python/swagger_client/apis/fake_api.py    |   4 +-
 .../python/swagger_client/models/__init__.py  |   4 +
 .../models/additional_properties_class.py     |  98 +++++++++
 .../swagger_client/models/array_test.py       |  98 +++++++++
 ...perties_and_additional_properties_class.py | 148 +++++++++++++
 .../swagger_client/models/read_only_first.py  | 148 +++++++++++++
 .../test/test_additional_properties_class.py  |  49 +++++
 .../petstore/python/test/test_array_test.py   |  49 +++++
 ...perties_and_additional_properties_class.py |  49 +++++
 .../python/test/test_read_only_first.py       |  49 +++++
 21 files changed, 1172 insertions(+), 6 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/python/LICENSE
 create mode 100644 samples/client/petstore/python/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/python/LICENSE
 create mode 100644 samples/client/petstore/python/docs/AdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/python/docs/ArrayTest.md
 create mode 100644 samples/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/python/docs/ReadOnlyFirst.md
 create mode 100644 samples/client/petstore/python/swagger_client/models/additional_properties_class.py
 create mode 100644 samples/client/petstore/python/swagger_client/models/array_test.py
 create mode 100644 samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
 create mode 100644 samples/client/petstore/python/swagger_client/models/read_only_first.py
 create mode 100644 samples/client/petstore/python/test/test_additional_properties_class.py
 create mode 100644 samples/client/petstore/python/test/test_array_test.py
 create mode 100644 samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py
 create mode 100644 samples/client/petstore/python/test/test_read_only_first.py

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 8bc117120d62..51bd143ba8ff 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
@@ -15,7 +15,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -149,6 +148,8 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
         apiPackage = swaggerFolder + File.separatorChar + "apis";
 
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
+        
         supportingFiles.add(new SupportingFile("setup.mustache", "", "setup.py"));
         supportingFiles.add(new SupportingFile("tox.mustache", "", "tox.ini"));
         supportingFiles.add(new SupportingFile("test-requirements.mustache", "", "test-requirements.txt"));
diff --git a/modules/swagger-codegen/src/main/resources/python/LICENSE b/modules/swagger-codegen/src/main/resources/python/LICENSE
new file mode 100644
index 000000000000..9c8f3ea0871e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/python/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   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.
\ No newline at end of file
diff --git a/samples/client/petstore/python/.swagger-codegen-ignore b/samples/client/petstore/python/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/python/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/python/LICENSE b/samples/client/petstore/python/LICENSE
new file mode 100644
index 000000000000..9c8f3ea0871e
--- /dev/null
+++ b/samples/client/petstore/python/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   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.
\ No newline at end of file
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index cc5c7c61f754..b7786c79141f 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-05-17T19:47:06.491+01:00
+- Build date: 2016-05-25T22:17:08.920+01:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -104,20 +104,24 @@ Class | Method | HTTP request | Description
 
 ## Documentation For Models
 
+ - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
  - [Animal](docs/Animal.md)
  - [AnimalFarm](docs/AnimalFarm.md)
  - [ApiResponse](docs/ApiResponse.md)
+ - [ArrayTest](docs/ArrayTest.md)
  - [Cat](docs/Cat.md)
  - [Category](docs/Category.md)
  - [Dog](docs/Dog.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
  - [FormatTest](docs/FormatTest.md)
+ - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [Model200Response](docs/Model200Response.md)
  - [ModelReturn](docs/ModelReturn.md)
  - [Name](docs/Name.md)
  - [Order](docs/Order.md)
  - [Pet](docs/Pet.md)
+ - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
  - [User](docs/User.md)
diff --git a/samples/client/petstore/python/docs/AdditionalPropertiesClass.md b/samples/client/petstore/python/docs/AdditionalPropertiesClass.md
new file mode 100644
index 000000000000..420ac6efe677
--- /dev/null
+++ b/samples/client/petstore/python/docs/AdditionalPropertiesClass.md
@@ -0,0 +1,9 @@
+# AdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/ArrayTest.md b/samples/client/petstore/python/docs/ArrayTest.md
new file mode 100644
index 000000000000..9dcc2c97264c
--- /dev/null
+++ b/samples/client/petstore/python/docs/ArrayTest.md
@@ -0,0 +1,9 @@
+# ArrayTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/FakeApi.md b/samples/client/petstore/python/docs/FakeApi.md
index 81e84f646f2e..6853fa0bee91 100644
--- a/samples/client/petstore/python/docs/FakeApi.md
+++ b/samples/client/petstore/python/docs/FakeApi.md
@@ -70,8 +70,8 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
+ - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
 
 [[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/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
new file mode 100644
index 000000000000..1f8d83427a2c
--- /dev/null
+++ b/samples/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -0,0 +1,11 @@
+# MixedPropertiesAndAdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**uuid** | **str** |  | [optional] 
+**date_time** | **datetime** |  | [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/ReadOnlyFirst.md b/samples/client/petstore/python/docs/ReadOnlyFirst.md
new file mode 100644
index 000000000000..93fed253d01c
--- /dev/null
+++ b/samples/client/petstore/python/docs/ReadOnlyFirst.md
@@ -0,0 +1,11 @@
+# ReadOnlyFirst
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**bar** | **str** |  | [optional] 
+**baz** | **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/swagger_client/__init__.py b/samples/client/petstore/python/swagger_client/__init__.py
index f9e10599854c..98debbaa7785 100644
--- a/samples/client/petstore/python/swagger_client/__init__.py
+++ b/samples/client/petstore/python/swagger_client/__init__.py
@@ -1,20 +1,24 @@
 from __future__ import absolute_import
 
 # import models into sdk package
+from .models.additional_properties_class import AdditionalPropertiesClass
 from .models.animal import Animal
 from .models.animal_farm import AnimalFarm
 from .models.api_response import ApiResponse
+from .models.array_test import ArrayTest
 from .models.cat import Cat
 from .models.category import Category
 from .models.dog import Dog
 from .models.enum_class import EnumClass
 from .models.enum_test import EnumTest
 from .models.format_test import FormatTest
+from .models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass
 from .models.model_200_response import Model200Response
 from .models.model_return import ModelReturn
 from .models.name import Name
 from .models.order import Order
 from .models.pet import Pet
+from .models.read_only_first import ReadOnlyFirst
 from .models.special_model_name import SpecialModelName
 from .models.tag import Tag
 from .models.user import User
diff --git a/samples/client/petstore/python/swagger_client/apis/fake_api.py b/samples/client/petstore/python/swagger_client/apis/fake_api.py
index 9e2b185a5aaf..211dc2d52305 100644
--- a/samples/client/petstore/python/swagger_client/apis/fake_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/fake_api.py
@@ -167,13 +167,13 @@ class FakeApi(object):
 
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
-            select_header_accept(['application/xml', 'application/json'])
+            select_header_accept(['application/xml; charset=utf-8', 'application/json; charset=utf-8'])
         if not header_params['Accept']:
             del header_params['Accept']
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
+            select_header_content_type(['application/xml; charset=utf-8', 'application/json; charset=utf-8'])
 
         # Authentication setting
         auth_settings = []
diff --git a/samples/client/petstore/python/swagger_client/models/__init__.py b/samples/client/petstore/python/swagger_client/models/__init__.py
index 664ec8471dcb..e3ea40f167e8 100644
--- a/samples/client/petstore/python/swagger_client/models/__init__.py
+++ b/samples/client/petstore/python/swagger_client/models/__init__.py
@@ -1,20 +1,24 @@
 from __future__ import absolute_import
 
 # import models into model package
+from .additional_properties_class import AdditionalPropertiesClass
 from .animal import Animal
 from .animal_farm import AnimalFarm
 from .api_response import ApiResponse
+from .array_test import ArrayTest
 from .cat import Cat
 from .category import Category
 from .dog import Dog
 from .enum_class import EnumClass
 from .enum_test import EnumTest
 from .format_test import FormatTest
+from .mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass
 from .model_200_response import Model200Response
 from .model_return import ModelReturn
 from .name import Name
 from .order import Order
 from .pet import Pet
+from .read_only_first import ReadOnlyFirst
 from .special_model_name import SpecialModelName
 from .tag import Tag
 from .user import User
diff --git a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
new file mode 100644
index 000000000000..52e59c2c1938
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
@@ -0,0 +1,98 @@
+# 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
+import re
+
+
+class AdditionalPropertiesClass(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        AdditionalPropertiesClass - 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 = {
+            
+        }
+
+        self.attribute_map = {
+            
+        }
+
+
+    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/array_test.py b/samples/client/petstore/python/swagger_client/models/array_test.py
new file mode 100644
index 000000000000..8de34cb584a6
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/array_test.py
@@ -0,0 +1,98 @@
+# 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
+import re
+
+
+class ArrayTest(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        ArrayTest - 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 = {
+            
+        }
+
+        self.attribute_map = {
+            
+        }
+
+
+    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/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
new file mode 100644
index 000000000000..b177cc4b05f1
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
@@ -0,0 +1,148 @@
+# 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
+import re
+
+
+class MixedPropertiesAndAdditionalPropertiesClass(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        MixedPropertiesAndAdditionalPropertiesClass - 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 = {
+            'uuid': 'str',
+            'date_time': 'datetime'
+        }
+
+        self.attribute_map = {
+            'uuid': 'uuid',
+            'date_time': 'dateTime'
+        }
+
+        self._uuid = None
+        self._date_time = None
+
+    @property
+    def uuid(self):
+        """
+        Gets the uuid of this MixedPropertiesAndAdditionalPropertiesClass.
+
+
+        :return: The uuid of this MixedPropertiesAndAdditionalPropertiesClass.
+        :rtype: str
+        """
+        return self._uuid
+
+    @uuid.setter
+    def uuid(self, uuid):
+        """
+        Sets the uuid of this MixedPropertiesAndAdditionalPropertiesClass.
+
+
+        :param uuid: The uuid of this MixedPropertiesAndAdditionalPropertiesClass.
+        :type: str
+        """
+        
+        self._uuid = uuid
+
+    @property
+    def date_time(self):
+        """
+        Gets the date_time of this MixedPropertiesAndAdditionalPropertiesClass.
+
+
+        :return: The date_time of this MixedPropertiesAndAdditionalPropertiesClass.
+        :rtype: datetime
+        """
+        return self._date_time
+
+    @date_time.setter
+    def date_time(self, date_time):
+        """
+        Sets the date_time of this MixedPropertiesAndAdditionalPropertiesClass.
+
+
+        :param date_time: The date_time of this MixedPropertiesAndAdditionalPropertiesClass.
+        :type: datetime
+        """
+        
+        self._date_time = date_time
+
+    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/read_only_first.py b/samples/client/petstore/python/swagger_client/models/read_only_first.py
new file mode 100644
index 000000000000..f517cb19d710
--- /dev/null
+++ b/samples/client/petstore/python/swagger_client/models/read_only_first.py
@@ -0,0 +1,148 @@
+# 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
+import re
+
+
+class ReadOnlyFirst(object):
+    """
+    NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually.
+    """
+    def __init__(self):
+        """
+        ReadOnlyFirst - 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 = {
+            'bar': 'str',
+            'baz': 'str'
+        }
+
+        self.attribute_map = {
+            'bar': 'bar',
+            'baz': 'baz'
+        }
+
+        self._bar = None
+        self._baz = None
+
+    @property
+    def bar(self):
+        """
+        Gets the bar of this ReadOnlyFirst.
+
+
+        :return: The bar of this ReadOnlyFirst.
+        :rtype: str
+        """
+        return self._bar
+
+    @bar.setter
+    def bar(self, bar):
+        """
+        Sets the bar of this ReadOnlyFirst.
+
+
+        :param bar: The bar of this ReadOnlyFirst.
+        :type: str
+        """
+        
+        self._bar = bar
+
+    @property
+    def baz(self):
+        """
+        Gets the baz of this ReadOnlyFirst.
+
+
+        :return: The baz of this ReadOnlyFirst.
+        :rtype: str
+        """
+        return self._baz
+
+    @baz.setter
+    def baz(self, baz):
+        """
+        Sets the baz of this ReadOnlyFirst.
+
+
+        :param baz: The baz of this ReadOnlyFirst.
+        :type: str
+        """
+        
+        self._baz = baz
+
+    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/test/test_additional_properties_class.py b/samples/client/petstore/python/test/test_additional_properties_class.py
new file mode 100644
index 000000000000..52163f2afec1
--- /dev/null
+++ b/samples/client/petstore/python/test/test_additional_properties_class.py
@@ -0,0 +1,49 @@
+# 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 __future__ import absolute_import
+
+import os
+import sys
+import unittest
+
+import swagger_client
+from swagger_client.rest import ApiException
+from swagger_client.models.additional_properties_class import AdditionalPropertiesClass
+
+
+class TestAdditionalPropertiesClass(unittest.TestCase):
+    """ AdditionalPropertiesClass unit test stubs """
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAdditionalPropertiesClass(self):
+        """
+        Test AdditionalPropertiesClass
+        """
+        model = swagger_client.models.additional_properties_class.AdditionalPropertiesClass()
+
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file
diff --git a/samples/client/petstore/python/test/test_array_test.py b/samples/client/petstore/python/test/test_array_test.py
new file mode 100644
index 000000000000..494596c842f7
--- /dev/null
+++ b/samples/client/petstore/python/test/test_array_test.py
@@ -0,0 +1,49 @@
+# 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 __future__ import absolute_import
+
+import os
+import sys
+import unittest
+
+import swagger_client
+from swagger_client.rest import ApiException
+from swagger_client.models.array_test import ArrayTest
+
+
+class TestArrayTest(unittest.TestCase):
+    """ ArrayTest unit test stubs """
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testArrayTest(self):
+        """
+        Test ArrayTest
+        """
+        model = swagger_client.models.array_test.ArrayTest()
+
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file
diff --git a/samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py
new file mode 100644
index 000000000000..6cea606481cd
--- /dev/null
+++ b/samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py
@@ -0,0 +1,49 @@
+# 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 __future__ import absolute_import
+
+import os
+import sys
+import unittest
+
+import swagger_client
+from swagger_client.rest import ApiException
+from swagger_client.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass
+
+
+class TestMixedPropertiesAndAdditionalPropertiesClass(unittest.TestCase):
+    """ MixedPropertiesAndAdditionalPropertiesClass unit test stubs """
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testMixedPropertiesAndAdditionalPropertiesClass(self):
+        """
+        Test MixedPropertiesAndAdditionalPropertiesClass
+        """
+        model = swagger_client.models.mixed_properties_and_additional_properties_class.MixedPropertiesAndAdditionalPropertiesClass()
+
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file
diff --git a/samples/client/petstore/python/test/test_read_only_first.py b/samples/client/petstore/python/test/test_read_only_first.py
new file mode 100644
index 000000000000..d7073915dfec
--- /dev/null
+++ b/samples/client/petstore/python/test/test_read_only_first.py
@@ -0,0 +1,49 @@
+# 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 __future__ import absolute_import
+
+import os
+import sys
+import unittest
+
+import swagger_client
+from swagger_client.rest import ApiException
+from swagger_client.models.read_only_first import ReadOnlyFirst
+
+
+class TestReadOnlyFirst(unittest.TestCase):
+    """ ReadOnlyFirst unit test stubs """
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testReadOnlyFirst(self):
+        """
+        Test ReadOnlyFirst
+        """
+        model = swagger_client.models.read_only_first.ReadOnlyFirst()
+
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file

From e0dbb44b37a9a2d085bbb25a5e349dca4347c467 Mon Sep 17 00:00:00 2001
From: Scott Williams <scott.rw93@gmail.com>
Date: Wed, 25 May 2016 22:35:38 +0100
Subject: [PATCH 020/139] Put license header in shared file

---
 .../resources/python/__init__model.mustache   |  4 ++++
 .../resources/python/__init__package.mustache |  4 ++++
 .../src/main/resources/python/api.mustache    | 17 +------------
 .../main/resources/python/api_test.mustache   | 18 +-------------
 .../resources/python/configuration.mustache   | 18 +-------------
 .../src/main/resources/python/model.mustache  | 18 +-------------
 .../main/resources/python/model_test.mustache | 18 +-------------
 .../resources/python/partial_header.mustache  | 15 ++++++++++++
 .../src/main/resources/python/rest.mustache   | 18 +-------------
 .../src/main/resources/python/setup.mustache  |  2 ++
 samples/client/petstore/python/README.md      |  2 +-
 samples/client/petstore/python/setup.py       | 16 +++++++++++++
 .../python/swagger_client/__init__.py         | 18 ++++++++++++++
 .../python/swagger_client/apis/fake_api.py    |  3 +--
 .../python/swagger_client/apis/pet_api.py     |  3 +--
 .../python/swagger_client/apis/store_api.py   |  3 +--
 .../python/swagger_client/apis/user_api.py    |  3 +--
 .../python/swagger_client/configuration.py    |  4 +---
 .../python/swagger_client/models/__init__.py  | 18 ++++++++++++++
 .../models/additional_properties_class.py     | 22 ++++++++---------
 .../python/swagger_client/models/animal.py    | 22 ++++++++---------
 .../swagger_client/models/animal_farm.py      | 22 ++++++++---------
 .../swagger_client/models/api_response.py     | 22 ++++++++---------
 .../swagger_client/models/array_test.py       | 22 ++++++++---------
 .../python/swagger_client/models/cat.py       | 22 ++++++++---------
 .../python/swagger_client/models/category.py  | 22 ++++++++---------
 .../python/swagger_client/models/dog.py       | 22 ++++++++---------
 .../swagger_client/models/enum_class.py       | 22 ++++++++---------
 .../python/swagger_client/models/enum_test.py | 22 ++++++++---------
 .../swagger_client/models/format_test.py      | 22 ++++++++---------
 ...perties_and_additional_properties_class.py | 22 ++++++++---------
 .../models/model_200_response.py              | 22 ++++++++---------
 .../swagger_client/models/model_return.py     | 22 ++++++++---------
 .../python/swagger_client/models/name.py      | 22 ++++++++---------
 .../python/swagger_client/models/order.py     | 22 ++++++++---------
 .../python/swagger_client/models/pet.py       | 22 ++++++++---------
 .../swagger_client/models/read_only_first.py  | 22 ++++++++---------
 .../models/special_model_name.py              | 22 ++++++++---------
 .../python/swagger_client/models/tag.py       | 22 ++++++++---------
 .../python/swagger_client/models/user.py      | 22 ++++++++---------
 .../petstore/python/swagger_client/rest.py    | 24 +++++++++----------
 41 files changed, 310 insertions(+), 378 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/python/partial_header.mustache

diff --git a/modules/swagger-codegen/src/main/resources/python/__init__model.mustache b/modules/swagger-codegen/src/main/resources/python/__init__model.mustache
index da086c108732..1a9eaf62794a 100644
--- a/modules/swagger-codegen/src/main/resources/python/__init__model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/__init__model.mustache
@@ -1,3 +1,7 @@
+# coding: utf-8
+
+{{>partial_header}}
+
 from __future__ import absolute_import
 
 # import models into model package
diff --git a/modules/swagger-codegen/src/main/resources/python/__init__package.mustache b/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
index 5265587cfd9d..6528c480eedd 100644
--- a/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
@@ -1,3 +1,7 @@
+# coding: utf-8
+
+{{>partial_header}}
+
 from __future__ import absolute_import
 
 # import models into sdk package
diff --git a/modules/swagger-codegen/src/main/resources/python/api.mustache b/modules/swagger-codegen/src/main/resources/python/api.mustache
index c9c94ad3e3e6..43962c7f5258 100644
--- a/modules/swagger-codegen/src/main/resources/python/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api.mustache
@@ -1,21 +1,6 @@
 # coding: utf-8
 
-"""
-{{classname}}.py
-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.
-"""
+{{>partial_header}}
 
 from __future__ import absolute_import
 
diff --git a/modules/swagger-codegen/src/main/resources/python/api_test.mustache b/modules/swagger-codegen/src/main/resources/python/api_test.mustache
index 5f0b0ab6ecb1..4906d0e03718 100644
--- a/modules/swagger-codegen/src/main/resources/python/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api_test.mustache
@@ -1,22 +1,6 @@
 # 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
-"""
+{{>partial_header}}
 
 from __future__ import absolute_import
 
diff --git a/modules/swagger-codegen/src/main/resources/python/configuration.mustache b/modules/swagger-codegen/src/main/resources/python/configuration.mustache
index 8f878f823183..9ea2ab4a7b5b 100644
--- a/modules/swagger-codegen/src/main/resources/python/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/configuration.mustache
@@ -1,22 +1,6 @@
 # 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
-"""
+{{>partial_header}}
 
 from __future__ import absolute_import
 import base64
diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index e62fa2cbf668..781bb37e4e5a 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -1,22 +1,6 @@
 # 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
-"""
+{{>partial_header}}
 
 {{#models}}
 {{#model}}
diff --git a/modules/swagger-codegen/src/main/resources/python/model_test.mustache b/modules/swagger-codegen/src/main/resources/python/model_test.mustache
index c00a10a9b510..ffd38a52b499 100644
--- a/modules/swagger-codegen/src/main/resources/python/model_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model_test.mustache
@@ -1,22 +1,6 @@
 # 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
-"""
+{{>partial_header}}
 
 from __future__ import absolute_import
 
diff --git a/modules/swagger-codegen/src/main/resources/python/partial_header.mustache b/modules/swagger-codegen/src/main/resources/python/partial_header.mustache
new file mode 100644
index 000000000000..84e3d6aad293
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/python/partial_header.mustache
@@ -0,0 +1,15 @@
+"""
+   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.
+"""
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/python/rest.mustache b/modules/swagger-codegen/src/main/resources/python/rest.mustache
index 352bb503ac5e..e09090a97948 100644
--- a/modules/swagger-codegen/src/main/resources/python/rest.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/rest.mustache
@@ -1,23 +1,7 @@
 # coding: utf-8
 
-"""
-Copyright 2016 SmartBear Software
+{{>partial_header}}
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-Credit: this file (rest.py) is modified based on rest.py in Dropbox Python SDK:
-https://www.dropbox.com/developers/core/sdks/python
-"""
 from __future__ import absolute_import
 
 import sys
diff --git a/modules/swagger-codegen/src/main/resources/python/setup.mustache b/modules/swagger-codegen/src/main/resources/python/setup.mustache
index f95b1f56a0ff..c825911f91a6 100644
--- a/modules/swagger-codegen/src/main/resources/python/setup.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/setup.mustache
@@ -1,5 +1,7 @@
 # coding: utf-8
 
+{{>partial_header}}
+
 import sys
 from setuptools import setup, find_packages
 
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index b7786c79141f..57a8ef605d94 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-05-25T22:17:08.920+01:00
+- Build date: 2016-05-25T22:33:14.808+01:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/samples/client/petstore/python/setup.py b/samples/client/petstore/python/setup.py
index f8985832d252..e642c3f8c5df 100644
--- a/samples/client/petstore/python/setup.py
+++ b/samples/client/petstore/python/setup.py
@@ -1,5 +1,21 @@
 # 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.
+"""
+
 import sys
 from setuptools import setup, find_packages
 
diff --git a/samples/client/petstore/python/swagger_client/__init__.py b/samples/client/petstore/python/swagger_client/__init__.py
index 98debbaa7785..f0b3188a40c8 100644
--- a/samples/client/petstore/python/swagger_client/__init__.py
+++ b/samples/client/petstore/python/swagger_client/__init__.py
@@ -1,3 +1,21 @@
+# 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.
+"""
+
 from __future__ import absolute_import
 
 # import models into sdk package
diff --git a/samples/client/petstore/python/swagger_client/apis/fake_api.py b/samples/client/petstore/python/swagger_client/apis/fake_api.py
index 211dc2d52305..d387abffbea6 100644
--- a/samples/client/petstore/python/swagger_client/apis/fake_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/fake_api.py
@@ -1,8 +1,7 @@
 # coding: utf-8
 
 """
-FakeApi.py
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/client/petstore/python/swagger_client/apis/pet_api.py b/samples/client/petstore/python/swagger_client/apis/pet_api.py
index 3b6d9ba82fed..ff0249e164fa 100644
--- a/samples/client/petstore/python/swagger_client/apis/pet_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/pet_api.py
@@ -1,8 +1,7 @@
 # coding: utf-8
 
 """
-PetApi.py
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/client/petstore/python/swagger_client/apis/store_api.py b/samples/client/petstore/python/swagger_client/apis/store_api.py
index 352ab7eae63b..5f86edc785e6 100644
--- a/samples/client/petstore/python/swagger_client/apis/store_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/store_api.py
@@ -1,8 +1,7 @@
 # coding: utf-8
 
 """
-StoreApi.py
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/client/petstore/python/swagger_client/apis/user_api.py b/samples/client/petstore/python/swagger_client/apis/user_api.py
index d5df6f0f5417..addb836e4cc2 100644
--- a/samples/client/petstore/python/swagger_client/apis/user_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/user_api.py
@@ -1,8 +1,7 @@
 # coding: utf-8
 
 """
-UserApi.py
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/swagger_client/configuration.py
index fe38630927e4..e763bb9bdef0 100644
--- a/samples/client/petstore/python/swagger_client/configuration.py
+++ b/samples/client/petstore/python/swagger_client/configuration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -14,8 +14,6 @@ Copyright 2016 SmartBear Software
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-   ref: https://github.com/swagger-api/swagger-codegen
 """
 
 from __future__ import absolute_import
diff --git a/samples/client/petstore/python/swagger_client/models/__init__.py b/samples/client/petstore/python/swagger_client/models/__init__.py
index e3ea40f167e8..5ed7840453d2 100644
--- a/samples/client/petstore/python/swagger_client/models/__init__.py
+++ b/samples/client/petstore/python/swagger_client/models/__init__.py
@@ -1,3 +1,21 @@
+# 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.
+"""
+
 from __future__ import absolute_import
 
 # import models into model package
diff --git a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
index 52e59c2c1938..ba1a73854a6c 100644
--- a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/animal.py b/samples/client/petstore/python/swagger_client/models/animal.py
index 90735535086e..6da9613c1060 100644
--- a/samples/client/petstore/python/swagger_client/models/animal.py
+++ b/samples/client/petstore/python/swagger_client/models/animal.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/animal_farm.py b/samples/client/petstore/python/swagger_client/models/animal_farm.py
index 5e362497c8dd..39fe6804b4f8 100644
--- a/samples/client/petstore/python/swagger_client/models/animal_farm.py
+++ b/samples/client/petstore/python/swagger_client/models/animal_farm.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/api_response.py b/samples/client/petstore/python/swagger_client/models/api_response.py
index 918b4a982237..c05cc73c2d5b 100644
--- a/samples/client/petstore/python/swagger_client/models/api_response.py
+++ b/samples/client/petstore/python/swagger_client/models/api_response.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/array_test.py b/samples/client/petstore/python/swagger_client/models/array_test.py
index 8de34cb584a6..f7901a4fda9b 100644
--- a/samples/client/petstore/python/swagger_client/models/array_test.py
+++ b/samples/client/petstore/python/swagger_client/models/array_test.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/cat.py b/samples/client/petstore/python/swagger_client/models/cat.py
index 80b1e867a94d..314ffa8b3c39 100644
--- a/samples/client/petstore/python/swagger_client/models/cat.py
+++ b/samples/client/petstore/python/swagger_client/models/cat.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/category.py b/samples/client/petstore/python/swagger_client/models/category.py
index e4f4a993cab0..9c182956cf01 100644
--- a/samples/client/petstore/python/swagger_client/models/category.py
+++ b/samples/client/petstore/python/swagger_client/models/category.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/dog.py b/samples/client/petstore/python/swagger_client/models/dog.py
index 49fcfee4ca00..c76ce7791bb7 100644
--- a/samples/client/petstore/python/swagger_client/models/dog.py
+++ b/samples/client/petstore/python/swagger_client/models/dog.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/enum_class.py b/samples/client/petstore/python/swagger_client/models/enum_class.py
index 7973fd0af8f2..c595a3a6c852 100644
--- a/samples/client/petstore/python/swagger_client/models/enum_class.py
+++ b/samples/client/petstore/python/swagger_client/models/enum_class.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/enum_test.py b/samples/client/petstore/python/swagger_client/models/enum_test.py
index ad81055385c8..df13ce10ba2a 100644
--- a/samples/client/petstore/python/swagger_client/models/enum_test.py
+++ b/samples/client/petstore/python/swagger_client/models/enum_test.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/format_test.py b/samples/client/petstore/python/swagger_client/models/format_test.py
index 7fce3351dd4e..8410e3c687a2 100644
--- a/samples/client/petstore/python/swagger_client/models/format_test.py
+++ b/samples/client/petstore/python/swagger_client/models/format_test.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
index b177cc4b05f1..2a1ba5f76d72 100644
--- a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/model_200_response.py b/samples/client/petstore/python/swagger_client/models/model_200_response.py
index f99847cbdd57..84266a0a2fe3 100644
--- a/samples/client/petstore/python/swagger_client/models/model_200_response.py
+++ b/samples/client/petstore/python/swagger_client/models/model_200_response.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/model_return.py b/samples/client/petstore/python/swagger_client/models/model_return.py
index 8228f41943c6..729b82d5d3c3 100644
--- a/samples/client/petstore/python/swagger_client/models/model_return.py
+++ b/samples/client/petstore/python/swagger_client/models/model_return.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/name.py b/samples/client/petstore/python/swagger_client/models/name.py
index 21015169ee86..f2f637f125f9 100644
--- a/samples/client/petstore/python/swagger_client/models/name.py
+++ b/samples/client/petstore/python/swagger_client/models/name.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/order.py b/samples/client/petstore/python/swagger_client/models/order.py
index 07f2c627d913..b4c2cd94845c 100644
--- a/samples/client/petstore/python/swagger_client/models/order.py
+++ b/samples/client/petstore/python/swagger_client/models/order.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/pet.py b/samples/client/petstore/python/swagger_client/models/pet.py
index 60f762238f3a..6da4260c704e 100644
--- a/samples/client/petstore/python/swagger_client/models/pet.py
+++ b/samples/client/petstore/python/swagger_client/models/pet.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/read_only_first.py b/samples/client/petstore/python/swagger_client/models/read_only_first.py
index f517cb19d710..2fc96e9a0dd4 100644
--- a/samples/client/petstore/python/swagger_client/models/read_only_first.py
+++ b/samples/client/petstore/python/swagger_client/models/read_only_first.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/special_model_name.py b/samples/client/petstore/python/swagger_client/models/special_model_name.py
index 3e45c0e44963..d2e7e7797e32 100644
--- a/samples/client/petstore/python/swagger_client/models/special_model_name.py
+++ b/samples/client/petstore/python/swagger_client/models/special_model_name.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/tag.py b/samples/client/petstore/python/swagger_client/models/tag.py
index f09a4c36df31..58564329cf3f 100644
--- a/samples/client/petstore/python/swagger_client/models/tag.py
+++ b/samples/client/petstore/python/swagger_client/models/tag.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/user.py b/samples/client/petstore/python/swagger_client/models/user.py
index 87d132a5037a..80572965d7e8 100644
--- a/samples/client/petstore/python/swagger_client/models/user.py
+++ b/samples/client/petstore/python/swagger_client/models/user.py
@@ -1,21 +1,19 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/rest.py b/samples/client/petstore/python/swagger_client/rest.py
index 352bb503ac5e..ed0a8e47f649 100644
--- a/samples/client/petstore/python/swagger_client/rest.py
+++ b/samples/client/petstore/python/swagger_client/rest.py
@@ -1,23 +1,21 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+   Copyright 2016 SmartBear Software
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   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
+       http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-Credit: this file (rest.py) is modified based on rest.py in Dropbox Python SDK:
-https://www.dropbox.com/developers/core/sdks/python
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 """
+
 from __future__ import absolute_import
 
 import sys

From e41019fb2b4f3cd908afd5df62d79d7a06eef3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Thu, 26 May 2016 00:13:45 +0200
Subject: [PATCH 021/139] [PHP] Regenerate petstore sample

---
 .../petstore/php/SwaggerClient-php/LICENSE    | 201 +++++++++++++++++
 .../petstore/php/SwaggerClient-php/README.md  |  19 +-
 .../php/SwaggerClient-php/autoload.php        |  23 ++
 .../php/SwaggerClient-php/docs/Api/FakeApi.md |  30 +--
 .../php/SwaggerClient-php/docs/Api/PetApi.md  |  26 +--
 .../SwaggerClient-php/docs/Api/StoreApi.md    |   6 +-
 .../php/SwaggerClient-php/docs/Api/UserApi.md |  20 +-
 .../SwaggerClient-php/docs/Model/ArrayTest.md |   9 +
 .../php/SwaggerClient-php/lib/Api/FakeApi.php |  29 ++-
 .../php/SwaggerClient-php/lib/Api/PetApi.php  |  25 ++-
 .../SwaggerClient-php/lib/Api/StoreApi.php    |  25 ++-
 .../php/SwaggerClient-php/lib/Api/UserApi.php |  29 ++-
 .../php/SwaggerClient-php/lib/ApiClient.php   |  26 ++-
 .../SwaggerClient-php/lib/ApiException.php    |  26 ++-
 .../SwaggerClient-php/lib/Configuration.php   |  24 +-
 .../lib/Model/AdditionalPropertiesClass.php   |  26 ++-
 .../SwaggerClient-php/lib/Model/Animal.php    |  26 ++-
 .../lib/Model/AnimalFarm.php                  |  26 ++-
 .../lib/Model/ApiResponse.php                 |  26 ++-
 .../SwaggerClient-php/lib/Model/ArrayTest.php | 212 ++++++++++++++++++
 .../php/SwaggerClient-php/lib/Model/Cat.php   |  26 ++-
 .../SwaggerClient-php/lib/Model/Category.php  |  26 ++-
 .../php/SwaggerClient-php/lib/Model/Dog.php   |  26 ++-
 .../SwaggerClient-php/lib/Model/EnumClass.php |  26 ++-
 .../SwaggerClient-php/lib/Model/EnumTest.php  |  26 ++-
 .../lib/Model/FormatTest.php                  |  26 ++-
 ...PropertiesAndAdditionalPropertiesClass.php |  26 ++-
 .../lib/Model/Model200Response.php            |  26 ++-
 .../lib/Model/ModelReturn.php                 |  26 ++-
 .../php/SwaggerClient-php/lib/Model/Name.php  |  26 ++-
 .../php/SwaggerClient-php/lib/Model/Order.php |  26 ++-
 .../php/SwaggerClient-php/lib/Model/Pet.php   |  26 ++-
 .../lib/Model/ReadOnlyFirst.php               |  26 ++-
 .../lib/Model/SpecialModelName.php            |  26 ++-
 .../php/SwaggerClient-php/lib/Model/Tag.php   |  26 ++-
 .../php/SwaggerClient-php/lib/Model/User.php  |  26 ++-
 .../lib/ObjectSerializer.php                  |  28 ++-
 .../test/Model/ArrayTestTest.php              |  80 +++++++
 38 files changed, 1051 insertions(+), 307 deletions(-)
 create mode 100644 samples/client/petstore/php/SwaggerClient-php/LICENSE
 create mode 100644 samples/client/petstore/php/SwaggerClient-php/docs/Model/ArrayTest.md
 create mode 100644 samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayTest.php
 create mode 100644 samples/client/petstore/php/SwaggerClient-php/test/Model/ArrayTestTest.php

diff --git a/samples/client/petstore/php/SwaggerClient-php/LICENSE b/samples/client/petstore/php/SwaggerClient-php/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/php/SwaggerClient-php/README.md b/samples/client/petstore/php/SwaggerClient-php/README.md
index cf492be945cf..8d69c7da9e42 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 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: 
-- Build date: 2016-05-24T14:56:49.287+02:00
+- Build date: 2016-05-25T22:55:19.912+02:00
 - Build package: class io.swagger.codegen.languages.PhpClientCodegen
 
 ## Requirements
@@ -87,7 +87,7 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*FakeApi* | [**testEndpointParameters**](docs/Api/FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEndpointParameters**](docs/Api/FakeApi.md#testendpointparameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
 *PetApi* | [**addPet**](docs/Api/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/Api/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
 *PetApi* | [**findPetsByStatus**](docs/Api/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
@@ -116,6 +116,7 @@ Class | Method | HTTP request | Description
  - [Animal](docs/Model/Animal.md)
  - [AnimalFarm](docs/Model/AnimalFarm.md)
  - [ApiResponse](docs/Model/ApiResponse.md)
+ - [ArrayTest](docs/Model/ArrayTest.md)
  - [Cat](docs/Model/Cat.md)
  - [Category](docs/Model/Category.md)
  - [Dog](docs/Model/Dog.md)
@@ -137,12 +138,6 @@ Class | Method | HTTP request | Description
 ## Documentation For Authorization
 
 
-## api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
 ## petstore_auth
 
 - **Type**: OAuth
@@ -152,6 +147,12 @@ Class | Method | HTTP request | Description
  - **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
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/autoload.php b/samples/client/petstore/php/SwaggerClient-php/autoload.php
index 3cbe3df8a215..de411ee498a2 100644
--- a/samples/client/petstore/php/SwaggerClient-php/autoload.php
+++ b/samples/client/petstore/php/SwaggerClient-php/autoload.php
@@ -1,4 +1,27 @@
 <?php
+
+/**
+ * Swagger Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ */
+
 /**
  * An example of a project-specific implementation.
  *
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md
index d3351321e46f..77073b42e69f 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Api/FakeApi.md
@@ -4,15 +4,15 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
 
 
 # **testEndpointParameters**
 > testEndpointParameters($number, $double, $string, $byte, $integer, $int32, $int64, $float, $binary, $date, $date_time, $password)
 
-Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
 
-Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
 
 ### Example
 ```php
@@ -45,18 +45,18 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **number** | **float**| None | 
- **double** | **double**| None | 
- **string** | **string**| None | 
- **byte** | **string**| None | 
- **integer** | **int**| None | [optional] 
- **int32** | **int**| None | [optional] 
- **int64** | **int**| None | [optional] 
- **float** | **float**| None | [optional] 
- **binary** | **string**| None | [optional] 
- **date** | **\DateTime**| None | [optional] 
- **date_time** | **\DateTime**| None | [optional] 
- **password** | **string**| None | [optional] 
+ **number** | **float**| None |
+ **double** | **double**| None |
+ **string** | **string**| None |
+ **byte** | **string**| None |
+ **integer** | **int**| None | [optional]
+ **int32** | **int**| None | [optional]
+ **int64** | **int**| None | [optional]
+ **float** | **float**| None | [optional]
+ **binary** | **string**| None | [optional]
+ **date** | **\DateTime**| None | [optional]
+ **date_time** | **\DateTime**| None | [optional]
+ **password** | **string**| None | [optional]
 
 ### Return type
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Api/PetApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/Api/PetApi.md
index 3d6bbc24a818..d99eea4c925c 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/Api/PetApi.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Api/PetApi.md
@@ -44,7 +44,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\Swagger\Client\Model\Pet**](../Model/\Swagger\Client\Model\Pet.md)| Pet object that needs to be added to the store | 
+ **body** | [**\Swagger\Client\Model\Pet**](../Model/\Swagger\Client\Model\Pet.md)| Pet object that needs to be added to the store |
 
 ### Return type
 
@@ -92,8 +92,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| Pet id to delete | 
- **api_key** | **string**|  | [optional] 
+ **pet_id** | **int**| Pet id to delete |
+ **api_key** | **string**|  | [optional]
 
 ### Return type
 
@@ -141,7 +141,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**string[]**](../Model/string.md)| Status values that need to be considered for filter | 
+ **status** | [**string[]**](../Model/string.md)| Status values that need to be considered for filter |
 
 ### Return type
 
@@ -189,7 +189,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**string[]**](../Model/string.md)| Tags to filter by | 
+ **tags** | [**string[]**](../Model/string.md)| Tags to filter by |
 
 ### Return type
 
@@ -239,7 +239,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| ID of pet to return | 
+ **pet_id** | **int**| ID of pet to return |
 
 ### Return type
 
@@ -286,7 +286,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\Swagger\Client\Model\Pet**](../Model/\Swagger\Client\Model\Pet.md)| Pet object that needs to be added to the store | 
+ **body** | [**\Swagger\Client\Model\Pet**](../Model/\Swagger\Client\Model\Pet.md)| Pet object that needs to be added to the store |
 
 ### Return type
 
@@ -335,9 +335,9 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| ID of pet that needs to be updated | 
- **name** | **string**| Updated name of the pet | [optional] 
- **status** | **string**| Updated status of the pet | [optional] 
+ **pet_id** | **int**| 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
 
@@ -387,9 +387,9 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| ID of pet to update | 
- **additional_metadata** | **string**| Additional data to pass to server | [optional] 
- **file** | **\SplFileObject**| file to upload | [optional] 
+ **pet_id** | **int**| ID of pet to update |
+ **additional_metadata** | **string**| Additional data to pass to server | [optional]
+ **file** | **\SplFileObject**| file to upload | [optional]
 
 ### Return type
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Api/StoreApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/Api/StoreApi.md
index 36a3db3bfb21..4ec88f083c74 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/Api/StoreApi.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Api/StoreApi.md
@@ -37,7 +37,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **order_id** | **string**| ID of the order that needs to be deleted | 
+ **order_id** | **string**| ID of the order that needs to be deleted |
 
 ### Return type
 
@@ -128,7 +128,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **order_id** | **int**| ID of pet that needs to be fetched | 
+ **order_id** | **int**| ID of pet that needs to be fetched |
 
 ### Return type
 
@@ -173,7 +173,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\Swagger\Client\Model\Order**](../Model/\Swagger\Client\Model\Order.md)| order placed for purchasing the pet | 
+ **body** | [**\Swagger\Client\Model\Order**](../Model/\Swagger\Client\Model\Order.md)| order placed for purchasing the pet |
 
 ### Return type
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Api/UserApi.md b/samples/client/petstore/php/SwaggerClient-php/docs/Api/UserApi.md
index cc7a222b13f3..6296b872220d 100644
--- a/samples/client/petstore/php/SwaggerClient-php/docs/Api/UserApi.md
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Api/UserApi.md
@@ -41,7 +41,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\Swagger\Client\Model\User**](../Model/\Swagger\Client\Model\User.md)| Created user object | 
+ **body** | [**\Swagger\Client\Model\User**](../Model/\Swagger\Client\Model\User.md)| Created user object |
 
 ### Return type
 
@@ -85,7 +85,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\Swagger\Client\Model\User[]**](../Model/User.md)| List of user object | 
+ **body** | [**\Swagger\Client\Model\User[]**](../Model/User.md)| List of user object |
 
 ### Return type
 
@@ -129,7 +129,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**\Swagger\Client\Model\User[]**](../Model/User.md)| List of user object | 
+ **body** | [**\Swagger\Client\Model\User[]**](../Model/User.md)| List of user object |
 
 ### Return type
 
@@ -173,7 +173,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **string**| The name that needs to be deleted | 
+ **username** | **string**| The name that needs to be deleted |
 
 ### Return type
 
@@ -203,7 +203,7 @@ Get user by user name
 require_once(__DIR__ . '/vendor/autoload.php');
 
 $api_instance = new Swagger\Client\Api\UserApi();
-$username = "username_example"; // string | The name that needs to be fetched. Use user1 for testing. 
+$username = "username_example"; // string | The name that needs to be fetched. Use user1 for testing.
 
 try {
     $result = $api_instance->getUserByName($username);
@@ -218,7 +218,7 @@ try {
 
 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
 
@@ -264,8 +264,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **string**| The user name for login | 
- **password** | **string**| The password for login in clear text | 
+ **username** | **string**| The user name for login |
+ **password** | **string**| The password for login in clear text |
 
 ### Return type
 
@@ -350,8 +350,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **string**| name that need to be deleted | 
- **body** | [**\Swagger\Client\Model\User**](../Model/\Swagger\Client\Model\User.md)| Updated user object | 
+ **username** | **string**| name that need to be deleted |
+ **body** | [**\Swagger\Client\Model\User**](../Model/\Swagger\Client\Model\User.md)| Updated user object |
 
 ### Return type
 
diff --git a/samples/client/petstore/php/SwaggerClient-php/docs/Model/ArrayTest.md b/samples/client/petstore/php/SwaggerClient-php/docs/Model/ArrayTest.md
new file mode 100644
index 000000000000..9dcc2c97264c
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/docs/Model/ArrayTest.md
@@ -0,0 +1,9 @@
+# ArrayTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/lib/Api/FakeApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
index b8d5c48f5521..d68bf418a007 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
@@ -9,20 +9,27 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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.
  */
 
 /**
@@ -98,7 +105,7 @@ class FakeApi
     /**
      * Operation testEndpointParameters
      *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 .
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트.
      *
      * @param float $number None (required)
      * @param double $double None (required)
@@ -126,7 +133,7 @@ class FakeApi
     /**
      * Operation testEndpointParametersWithHttpInfo
      *
-     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 .
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트.
      *
      * @param float $number None (required)
      * @param double $double None (required)
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 402d727c5bf3..9cca7063a53f 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
@@ -9,20 +9,27 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
index cfc6ddba361f..d19ddb6f8c5b 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
@@ -9,20 +9,27 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
index 7d3188747a5e..d735c0835220 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
@@ -9,20 +9,27 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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.
  */
 
 /**
@@ -435,7 +442,7 @@ class UserApi
      *
      * 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)
      *
      * @return \Swagger\Client\Model\User
      * @throws \Swagger\Client\ApiException on non-2xx response
@@ -452,7 +459,7 @@ class UserApi
      *
      * 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)
      *
      * @return Array of \Swagger\Client\Model\User, HTTP status code, HTTP response headers (array of strings)
      * @throws \Swagger\Client\ApiException on non-2xx response
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
index da1f438f4da5..02fb8729620e 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
index 94421bac1498..48551429c7f8 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
@@ -9,21 +9,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
index aed1094c2698..30b1b6c2dff4 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
@@ -11,19 +11,25 @@
  */
 
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/AdditionalPropertiesClass.php
index 4999bc62a8df..4b5703134c14 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
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 6b05974a644a..33ee60a0b7a9 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php
index a699455bcf95..e9857f27f76f 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
index 53ced7e8810e..fc9c4c2abed3 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayTest.php
new file mode 100644
index 000000000000..44af1286a6dc
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayTest.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * ArrayTest
+ *
+ * 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
+ */
+
+/**
+ * Swagger Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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;
+
+/**
+ * ArrayTest Class Doc Comment
+ *
+ * @category    Class
+ * @package     Swagger\Client
+ * @author      http://github.com/swagger-api/swagger-codegen
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
+ * @link        https://github.com/swagger-api/swagger-codegen
+ */
+class ArrayTest implements ArrayAccess
+{
+    /**
+      * The original name of the model.
+      * @var string
+      */
+    protected static $swaggerModelName = 'ArrayTest';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization
+      * @var string[]
+      */
+    protected static $swaggerTypes = array(
+        
+    );
+
+    public 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[]
+     */
+    protected static $attributeMap = array(
+        
+    );
+
+    public static function attributeMap()
+    {
+        return self::$attributeMap;
+    }
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     * @var string[]
+     */
+    protected static $setters = array(
+        
+    );
+
+    public static function setters()
+    {
+        return self::$setters;
+    }
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     * @var string[]
+     */
+    protected static $getters = array(
+        
+    );
+
+    public static function getters()
+    {
+        return self::$getters;
+    }
+
+    
+
+    
+
+    /**
+     * Associative array for storing property values
+     * @var mixed[]
+     */
+    protected $container = array();
+
+    /**
+     * Constructor
+     * @param mixed[] $data Associated array of property value initalizing the model
+     */
+    public function __construct(array $data = null)
+    {
+    }
+
+    /**
+     * show all the invalid properties with reasons.
+     *
+     * @return array invalid properties with reasons
+     */
+    public function listInvalidProperties()
+    {
+        $invalid_properties = array();
+        return $invalid_properties;
+    }
+
+    /**
+     * validate all the properties in the model
+     * return true if all passed
+     *
+     * @return bool True if all properteis are valid
+     */
+    public function valid()
+    {
+        return true;
+    }
+
+    /**
+     * Returns true if offset exists. False otherwise.
+     * @param  integer $offset Offset
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->container[$offset]);
+    }
+
+    /**
+     * Gets offset.
+     * @param  integer $offset Offset
+     * @return mixed
+     */
+    public function offsetGet($offset)
+    {
+        return isset($this->container[$offset]) ? $this->container[$offset] : null;
+    }
+
+    /**
+     * Sets value based on offset.
+     * @param  integer $offset Offset
+     * @param  mixed   $value  Value to be set
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (is_null($offset)) {
+            $this->container[] = $value;
+        } else {
+            $this->container[$offset] = $value;
+        }
+    }
+
+    /**
+     * Unsets offset.
+     * @param  integer $offset Offset
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->container[$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 9eb4de596d8e..efabd53cbbc1 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
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 8e3c5e6fb5e3..d9ff6aa58e21 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
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 9212a8c5d3be..081fbd4837d2 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php
index 71fb3357d14a..4c67a277dde9 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php
index 77751f9c43f0..673b3ce36249 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
index 07148e701897..e9b8bc9cf7ff 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index 86bb4051f0ed..fd397440cfcf 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
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 88a28981f296..f6d9a4e2e101 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
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 d1b188ff231f..f39fbd0bdef6 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
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 294d45dffe3d..32dac8410f29 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
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 3bd377eae716..cf5f61a9640f 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
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 378c979629c8..a81e9eb33f97 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ReadOnlyFirst.php b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ReadOnlyFirst.php
index 1378f043b64f..22e534a51e53 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ReadOnlyFirst.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
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 025ee4b7b3bd..e7c97a5ef56f 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
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 8fba6e43dd87..6a378c7f3498 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
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 04b4f749437f..e61af43c6472 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
index af6e87f89fcf..ce77aa6c3b39 100644
--- a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php
@@ -10,21 +10,29 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2
  * @link     https://github.com/swagger-api/swagger-codegen
  */
+
 /**
- *  Copyright 2016 SmartBear Software
+ * Swagger Petstore
  *
- *  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
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ * 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
@@ -256,7 +264,7 @@ class ObjectSerializer
             } else {
                 return null;
             }
-        } elseif (in_array($class, array('integer', 'int', 'void', 'number', 'object', 'double', 'float', 'byte', 'DateTime', 'string', 'mixed', 'boolean', 'bool'))) {
+        } elseif (in_array($class, array('void', 'bool', 'string', 'double', 'byte', 'mixed', 'integer', 'float', 'int', 'DateTime', 'number', 'boolean', 'object'))) {
             settype($data, $class);
             return $data;
         } elseif ($class === '\SplFileObject') {
diff --git a/samples/client/petstore/php/SwaggerClient-php/test/Model/ArrayTestTest.php b/samples/client/petstore/php/SwaggerClient-php/test/Model/ArrayTestTest.php
new file mode 100644
index 000000000000..245abb7641ea
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/test/Model/ArrayTestTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * ArrayTestTest
+ *
+ * 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
+ */
+
+/**
+ * Swagger Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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;
+
+/**
+ * ArrayTestTest Class Doc Comment
+ *
+ * @category    Class
+ * @description ArrayTest
+ * @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 ArrayTestTest 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 "ArrayTest"
+     */
+    public function testArrayTest()
+    {
+
+    }
+}

From a589a6b91c54b7571782be84265e8b3d91bed984 Mon Sep 17 00:00:00 2001
From: Leon Yu <leon@leonyu.net>
Date: Wed, 25 May 2016 22:51:10 -0400
Subject: [PATCH 022/139] update package.json and fix webpack.html

---
 .../petstore/typescript-fetch/tests/default/package.json      | 2 +-
 .../typescript-fetch/tests/default/run_tests_via_webpack.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/client/petstore/typescript-fetch/tests/default/package.json b/samples/client/petstore/typescript-fetch/tests/default/package.json
index 07a38691ae12..3bab3bdb789f 100644
--- a/samples/client/petstore/typescript-fetch/tests/default/package.json
+++ b/samples/client/petstore/typescript-fetch/tests/default/package.json
@@ -6,7 +6,7 @@
   "devDependencies": {
     "browserify": "^13.0.1",
     "ts-loader": "^0.8.2",
-    "tsify": "^0.15.5",
+    "tsify": "^0.16.0",
     "typescript": "^1.8.10",
     "typings": "^0.8.1",
     "webpack": "^1.13.0"
diff --git a/samples/client/petstore/typescript-fetch/tests/default/run_tests_via_webpack.html b/samples/client/petstore/typescript-fetch/tests/default/run_tests_via_webpack.html
index 625c88594225..ace737c7ccd2 100644
--- a/samples/client/petstore/typescript-fetch/tests/default/run_tests_via_webpack.html
+++ b/samples/client/petstore/typescript-fetch/tests/default/run_tests_via_webpack.html
@@ -15,8 +15,8 @@
     });
   </script>
 
-  <script src="./dist/vendor.bundle.js"></script>
-  <script src="./dist/test.bundle.js"></script>
+  <script src="./dist/vendor.webpack-bundle.js"></script>
+  <script src="./dist/test.webpack-bundle.js"></script>
 
   <script>
     mocha.checkLeaks();

From a86a4ac94e0e2156ae0916e99c436be9324b32a3 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Thu, 26 May 2016 15:42:45 +0800
Subject: [PATCH 023/139] add dbbest

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7099b0e238d1..6f10731e9986 100644
--- a/README.md
+++ b/README.md
@@ -814,6 +814,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you
 - [Cachet Financial](http://www.cachetfinancial.com/)
 - [CloudBoost](https://www.CloudBoost.io/)
 - [Cupix](http://www.cupix.com)
+- [DBBest Technologies](https://www.dbbest.com) 
 - [DocuSign](https://www.docusign.com)
 - [Ergon](http://www.ergon.ch/)
 - [eureka](http://eure.jp/)

From 3e131d190187c1c0a220327a08a6446fd921aa1b Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Thu, 26 May 2016 17:50:13 +0800
Subject: [PATCH 024/139] update pom to cover ts fetch api client

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3e6ce4df8554..2b6c45f8662c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -543,13 +543,13 @@
                 </property>
             </activation>
             <modules>
-                <!--<module>samples/client/petstore/typescript-fetch/tests/default</module>
-                <module>samples/client/petstore/typescript-fetch/builds/default</module>
-                <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
-                <module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>-->
                 <!-- run ruby test first which has a random delay script to
                      avoid issues with running 2 CI jobs in parallel.       -->
                 <module>samples/client/petstore/ruby</module>
+                <module>samples/client/petstore/typescript-fetch/tests/default</module>
+                <module>samples/client/petstore/typescript-fetch/builds/default</module>
+                <module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
+                <module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
                 <module>samples/client/petstore/typescript-angular</module>
                 <module>samples/client/petstore/typescript-node/npm</module>
                 <module>samples/client/petstore/android/volley</module>

From 030b1bc8c29ef4760c432d801645f2d3e87c8f7b Mon Sep 17 00:00:00 2001
From: Mikolaj Przybysz <mikolaj.przybysz@home24.de>
Date: Thu, 26 May 2016 15:12:28 +0200
Subject: [PATCH 025/139] added default version 1.0.0 to userAgent

---
 .../src/main/resources/php/configuration.mustache               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index d2a2078fae98..b5fc7f739feb 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -110,7 +110,7 @@ class Configuration
      *
      * @var string
      */
-    protected $userAgent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen{{#artifactVersion}}/{{{.}}}{{/artifactVersion}}/php{{/httpUserAgent}}";
+    protected $userAgent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{#artifactVersion}}{{{.}}}{{/artifactVersion}}{{^artifactVersion}}1.0.0{{/artifactVersion}}/php{{/httpUserAgent}}";
 
     /**
      * Debug switch (default set to false)

From 23271d74ea1d5bd1ab03d65756c4a9b3dc2cc3f6 Mon Sep 17 00:00:00 2001
From: Scott Williams <scott.rw93@gmail.com>
Date: Thu, 26 May 2016 21:42:37 +0100
Subject: [PATCH 026/139] Update license header

---
 .../resources/python/partial_header.mustache  | 34 ++++++++++++-------
 samples/client/petstore/python/README.md      |  2 +-
 samples/client/petstore/python/setup.py       | 30 +++++++++-------
 .../python/swagger_client/__init__.py         | 30 +++++++++-------
 .../python/swagger_client/apis/fake_api.py    | 30 +++++++++-------
 .../python/swagger_client/apis/pet_api.py     | 30 +++++++++-------
 .../python/swagger_client/apis/store_api.py   | 30 +++++++++-------
 .../python/swagger_client/apis/user_api.py    | 30 +++++++++-------
 .../python/swagger_client/configuration.py    | 30 +++++++++-------
 .../python/swagger_client/models/__init__.py  | 30 +++++++++-------
 .../models/additional_properties_class.py     | 30 +++++++++-------
 .../python/swagger_client/models/animal.py    | 30 +++++++++-------
 .../swagger_client/models/animal_farm.py      | 30 +++++++++-------
 .../swagger_client/models/api_response.py     | 30 +++++++++-------
 .../swagger_client/models/array_test.py       | 30 +++++++++-------
 .../python/swagger_client/models/cat.py       | 30 +++++++++-------
 .../python/swagger_client/models/category.py  | 30 +++++++++-------
 .../python/swagger_client/models/dog.py       | 30 +++++++++-------
 .../swagger_client/models/enum_class.py       | 30 +++++++++-------
 .../python/swagger_client/models/enum_test.py | 30 +++++++++-------
 .../swagger_client/models/format_test.py      | 30 +++++++++-------
 ...perties_and_additional_properties_class.py | 30 +++++++++-------
 .../models/model_200_response.py              | 30 +++++++++-------
 .../swagger_client/models/model_return.py     | 30 +++++++++-------
 .../python/swagger_client/models/name.py      | 30 +++++++++-------
 .../python/swagger_client/models/order.py     | 30 +++++++++-------
 .../python/swagger_client/models/pet.py       | 30 +++++++++-------
 .../swagger_client/models/read_only_first.py  | 30 +++++++++-------
 .../models/special_model_name.py              | 30 +++++++++-------
 .../python/swagger_client/models/tag.py       | 30 +++++++++-------
 .../python/swagger_client/models/user.py      | 30 +++++++++-------
 .../petstore/python/swagger_client/rest.py    | 30 +++++++++-------
 32 files changed, 532 insertions(+), 404 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/python/partial_header.mustache b/modules/swagger-codegen/src/main/resources/python/partial_header.mustache
index 84e3d6aad293..489d9524667e 100644
--- a/modules/swagger-codegen/src/main/resources/python/partial_header.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/partial_header.mustache
@@ -1,15 +1,23 @@
 """
-   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.
+{{#appName}}
+    {{{appName}}}
+{{/appName}}
+{{#appDescription}}
+    {{{appDescription}}}
+{{/appDescription}}
+    {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
+    {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    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.
 """
\ No newline at end of file
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index 57a8ef605d94..58ca5746ba88 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-05-25T22:33:14.808+01:00
+- Build date: 2016-05-26T21:41:00.685+01:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/samples/client/petstore/python/setup.py b/samples/client/petstore/python/setup.py
index e642c3f8c5df..f5a6a71fd7b4 100644
--- a/samples/client/petstore/python/setup.py
+++ b/samples/client/petstore/python/setup.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 import sys
diff --git a/samples/client/petstore/python/swagger_client/__init__.py b/samples/client/petstore/python/swagger_client/__init__.py
index f0b3188a40c8..56c1a8186e21 100644
--- a/samples/client/petstore/python/swagger_client/__init__.py
+++ b/samples/client/petstore/python/swagger_client/__init__.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
diff --git a/samples/client/petstore/python/swagger_client/apis/fake_api.py b/samples/client/petstore/python/swagger_client/apis/fake_api.py
index d387abffbea6..9b3f2f525196 100644
--- a/samples/client/petstore/python/swagger_client/apis/fake_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/fake_api.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
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 ff0249e164fa..e9f09da74fea 100644
--- a/samples/client/petstore/python/swagger_client/apis/pet_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/pet_api.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
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 5f86edc785e6..2b66c6e83954 100644
--- a/samples/client/petstore/python/swagger_client/apis/store_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/store_api.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
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 addb836e4cc2..445333f0f1ec 100644
--- a/samples/client/petstore/python/swagger_client/apis/user_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/user_api.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/swagger_client/configuration.py
index e763bb9bdef0..750c6aca63fe 100644
--- a/samples/client/petstore/python/swagger_client/configuration.py
+++ b/samples/client/petstore/python/swagger_client/configuration.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
diff --git a/samples/client/petstore/python/swagger_client/models/__init__.py b/samples/client/petstore/python/swagger_client/models/__init__.py
index 5ed7840453d2..ce5e9830c8e4 100644
--- a/samples/client/petstore/python/swagger_client/models/__init__.py
+++ b/samples/client/petstore/python/swagger_client/models/__init__.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
diff --git a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
index ba1a73854a6c..a6b08a88f008 100644
--- a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/animal.py b/samples/client/petstore/python/swagger_client/models/animal.py
index 6da9613c1060..b7c8616f70f6 100644
--- a/samples/client/petstore/python/swagger_client/models/animal.py
+++ b/samples/client/petstore/python/swagger_client/models/animal.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/animal_farm.py b/samples/client/petstore/python/swagger_client/models/animal_farm.py
index 39fe6804b4f8..9ca5cab720d4 100644
--- a/samples/client/petstore/python/swagger_client/models/animal_farm.py
+++ b/samples/client/petstore/python/swagger_client/models/animal_farm.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/api_response.py b/samples/client/petstore/python/swagger_client/models/api_response.py
index c05cc73c2d5b..11d164ed918f 100644
--- a/samples/client/petstore/python/swagger_client/models/api_response.py
+++ b/samples/client/petstore/python/swagger_client/models/api_response.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/array_test.py b/samples/client/petstore/python/swagger_client/models/array_test.py
index f7901a4fda9b..e99bcf20d93c 100644
--- a/samples/client/petstore/python/swagger_client/models/array_test.py
+++ b/samples/client/petstore/python/swagger_client/models/array_test.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/cat.py b/samples/client/petstore/python/swagger_client/models/cat.py
index 314ffa8b3c39..4a49a5720533 100644
--- a/samples/client/petstore/python/swagger_client/models/cat.py
+++ b/samples/client/petstore/python/swagger_client/models/cat.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/category.py b/samples/client/petstore/python/swagger_client/models/category.py
index 9c182956cf01..0747166583e6 100644
--- a/samples/client/petstore/python/swagger_client/models/category.py
+++ b/samples/client/petstore/python/swagger_client/models/category.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/dog.py b/samples/client/petstore/python/swagger_client/models/dog.py
index c76ce7791bb7..4043b2d84228 100644
--- a/samples/client/petstore/python/swagger_client/models/dog.py
+++ b/samples/client/petstore/python/swagger_client/models/dog.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/enum_class.py b/samples/client/petstore/python/swagger_client/models/enum_class.py
index c595a3a6c852..2caa5493800b 100644
--- a/samples/client/petstore/python/swagger_client/models/enum_class.py
+++ b/samples/client/petstore/python/swagger_client/models/enum_class.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/enum_test.py b/samples/client/petstore/python/swagger_client/models/enum_test.py
index df13ce10ba2a..3ff06b319c15 100644
--- a/samples/client/petstore/python/swagger_client/models/enum_test.py
+++ b/samples/client/petstore/python/swagger_client/models/enum_test.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/format_test.py b/samples/client/petstore/python/swagger_client/models/format_test.py
index 8410e3c687a2..622eb13f17c0 100644
--- a/samples/client/petstore/python/swagger_client/models/format_test.py
+++ b/samples/client/petstore/python/swagger_client/models/format_test.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
index 2a1ba5f76d72..4391418c1bd0 100644
--- a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/model_200_response.py b/samples/client/petstore/python/swagger_client/models/model_200_response.py
index 84266a0a2fe3..0fc1206b404c 100644
--- a/samples/client/petstore/python/swagger_client/models/model_200_response.py
+++ b/samples/client/petstore/python/swagger_client/models/model_200_response.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/model_return.py b/samples/client/petstore/python/swagger_client/models/model_return.py
index 729b82d5d3c3..15a652f07c32 100644
--- a/samples/client/petstore/python/swagger_client/models/model_return.py
+++ b/samples/client/petstore/python/swagger_client/models/model_return.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/name.py b/samples/client/petstore/python/swagger_client/models/name.py
index f2f637f125f9..8137032e62b1 100644
--- a/samples/client/petstore/python/swagger_client/models/name.py
+++ b/samples/client/petstore/python/swagger_client/models/name.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/order.py b/samples/client/petstore/python/swagger_client/models/order.py
index b4c2cd94845c..910ecf8f92cc 100644
--- a/samples/client/petstore/python/swagger_client/models/order.py
+++ b/samples/client/petstore/python/swagger_client/models/order.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/pet.py b/samples/client/petstore/python/swagger_client/models/pet.py
index 6da4260c704e..76491be7a4dd 100644
--- a/samples/client/petstore/python/swagger_client/models/pet.py
+++ b/samples/client/petstore/python/swagger_client/models/pet.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/read_only_first.py b/samples/client/petstore/python/swagger_client/models/read_only_first.py
index 2fc96e9a0dd4..b2513ab881fd 100644
--- a/samples/client/petstore/python/swagger_client/models/read_only_first.py
+++ b/samples/client/petstore/python/swagger_client/models/read_only_first.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/special_model_name.py b/samples/client/petstore/python/swagger_client/models/special_model_name.py
index d2e7e7797e32..dc7808efc70a 100644
--- a/samples/client/petstore/python/swagger_client/models/special_model_name.py
+++ b/samples/client/petstore/python/swagger_client/models/special_model_name.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/tag.py b/samples/client/petstore/python/swagger_client/models/tag.py
index 58564329cf3f..d4ed374cad05 100644
--- a/samples/client/petstore/python/swagger_client/models/tag.py
+++ b/samples/client/petstore/python/swagger_client/models/tag.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/models/user.py b/samples/client/petstore/python/swagger_client/models/user.py
index 80572965d7e8..e39faba060e0 100644
--- a/samples/client/petstore/python/swagger_client/models/user.py
+++ b/samples/client/petstore/python/swagger_client/models/user.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from pprint import pformat
diff --git a/samples/client/petstore/python/swagger_client/rest.py b/samples/client/petstore/python/swagger_client/rest.py
index ed0a8e47f649..9ffadf691cf1 100644
--- a/samples/client/petstore/python/swagger_client/rest.py
+++ b/samples/client/petstore/python/swagger_client/rest.py
@@ -1,19 +1,23 @@
 # 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.
+    Swagger Petstore
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import

From c18241cffceecf1e2c4a3a776d0b48b6a24c15ab Mon Sep 17 00:00:00 2001
From: Scott Williams <scott.rw93@gmail.com>
Date: Thu, 26 May 2016 21:44:40 +0100
Subject: [PATCH 027/139] Update license header

---
 .../src/main/resources/python/partial_header.mustache           | 2 ++
 samples/client/petstore/python/README.md                        | 2 +-
 samples/client/petstore/python/setup.py                         | 2 ++
 samples/client/petstore/python/swagger_client/__init__.py       | 2 ++
 samples/client/petstore/python/swagger_client/apis/fake_api.py  | 2 ++
 samples/client/petstore/python/swagger_client/apis/pet_api.py   | 2 ++
 samples/client/petstore/python/swagger_client/apis/store_api.py | 2 ++
 samples/client/petstore/python/swagger_client/apis/user_api.py  | 2 ++
 samples/client/petstore/python/swagger_client/configuration.py  | 2 ++
 .../client/petstore/python/swagger_client/models/__init__.py    | 2 ++
 .../python/swagger_client/models/additional_properties_class.py | 2 ++
 samples/client/petstore/python/swagger_client/models/animal.py  | 2 ++
 .../client/petstore/python/swagger_client/models/animal_farm.py | 2 ++
 .../petstore/python/swagger_client/models/api_response.py       | 2 ++
 .../client/petstore/python/swagger_client/models/array_test.py  | 2 ++
 samples/client/petstore/python/swagger_client/models/cat.py     | 2 ++
 .../client/petstore/python/swagger_client/models/category.py    | 2 ++
 samples/client/petstore/python/swagger_client/models/dog.py     | 2 ++
 .../client/petstore/python/swagger_client/models/enum_class.py  | 2 ++
 .../client/petstore/python/swagger_client/models/enum_test.py   | 2 ++
 .../client/petstore/python/swagger_client/models/format_test.py | 2 ++
 .../models/mixed_properties_and_additional_properties_class.py  | 2 ++
 .../petstore/python/swagger_client/models/model_200_response.py | 2 ++
 .../petstore/python/swagger_client/models/model_return.py       | 2 ++
 samples/client/petstore/python/swagger_client/models/name.py    | 2 ++
 samples/client/petstore/python/swagger_client/models/order.py   | 2 ++
 samples/client/petstore/python/swagger_client/models/pet.py     | 2 ++
 .../petstore/python/swagger_client/models/read_only_first.py    | 2 ++
 .../petstore/python/swagger_client/models/special_model_name.py | 2 ++
 samples/client/petstore/python/swagger_client/models/tag.py     | 2 ++
 samples/client/petstore/python/swagger_client/models/user.py    | 2 ++
 samples/client/petstore/python/swagger_client/rest.py           | 2 ++
 32 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/resources/python/partial_header.mustache b/modules/swagger-codegen/src/main/resources/python/partial_header.mustache
index 489d9524667e..ea97064963c8 100644
--- a/modules/swagger-codegen/src/main/resources/python/partial_header.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/partial_header.mustache
@@ -2,9 +2,11 @@
 {{#appName}}
     {{{appName}}}
 {{/appName}}
+
 {{#appDescription}}
     {{{appDescription}}}
 {{/appDescription}}
+
     {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
     {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index 58ca5746ba88..1c037fa92522 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-05-26T21:41:00.685+01:00
+- Build date: 2016-05-26T21:44:18.823+01:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/samples/client/petstore/python/setup.py b/samples/client/petstore/python/setup.py
index f5a6a71fd7b4..a4d22d206ac4 100644
--- a/samples/client/petstore/python/setup.py
+++ b/samples/client/petstore/python/setup.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/__init__.py b/samples/client/petstore/python/swagger_client/__init__.py
index 56c1a8186e21..13fbf2257b09 100644
--- a/samples/client/petstore/python/swagger_client/__init__.py
+++ b/samples/client/petstore/python/swagger_client/__init__.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/apis/fake_api.py b/samples/client/petstore/python/swagger_client/apis/fake_api.py
index 9b3f2f525196..f8c522d2bf84 100644
--- a/samples/client/petstore/python/swagger_client/apis/fake_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/fake_api.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
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 e9f09da74fea..dd730f31dfee 100644
--- a/samples/client/petstore/python/swagger_client/apis/pet_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/pet_api.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
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 2b66c6e83954..61a2d50a5fff 100644
--- a/samples/client/petstore/python/swagger_client/apis/store_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/store_api.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
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 445333f0f1ec..17865142a703 100644
--- a/samples/client/petstore/python/swagger_client/apis/user_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/user_api.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/swagger_client/configuration.py
index 750c6aca63fe..a1efadf13b7d 100644
--- a/samples/client/petstore/python/swagger_client/configuration.py
+++ b/samples/client/petstore/python/swagger_client/configuration.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/__init__.py b/samples/client/petstore/python/swagger_client/models/__init__.py
index ce5e9830c8e4..a3c738c19a8d 100644
--- a/samples/client/petstore/python/swagger_client/models/__init__.py
+++ b/samples/client/petstore/python/swagger_client/models/__init__.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
index a6b08a88f008..ed19d7536aee 100644
--- a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/animal.py b/samples/client/petstore/python/swagger_client/models/animal.py
index b7c8616f70f6..1fe5bc6d4bae 100644
--- a/samples/client/petstore/python/swagger_client/models/animal.py
+++ b/samples/client/petstore/python/swagger_client/models/animal.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/animal_farm.py b/samples/client/petstore/python/swagger_client/models/animal_farm.py
index 9ca5cab720d4..d240be4b7ff6 100644
--- a/samples/client/petstore/python/swagger_client/models/animal_farm.py
+++ b/samples/client/petstore/python/swagger_client/models/animal_farm.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/api_response.py b/samples/client/petstore/python/swagger_client/models/api_response.py
index 11d164ed918f..dfbe253b8d9d 100644
--- a/samples/client/petstore/python/swagger_client/models/api_response.py
+++ b/samples/client/petstore/python/swagger_client/models/api_response.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/array_test.py b/samples/client/petstore/python/swagger_client/models/array_test.py
index e99bcf20d93c..ab340f1d1305 100644
--- a/samples/client/petstore/python/swagger_client/models/array_test.py
+++ b/samples/client/petstore/python/swagger_client/models/array_test.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/cat.py b/samples/client/petstore/python/swagger_client/models/cat.py
index 4a49a5720533..92fe431523c4 100644
--- a/samples/client/petstore/python/swagger_client/models/cat.py
+++ b/samples/client/petstore/python/swagger_client/models/cat.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/category.py b/samples/client/petstore/python/swagger_client/models/category.py
index 0747166583e6..6962ce3a7a52 100644
--- a/samples/client/petstore/python/swagger_client/models/category.py
+++ b/samples/client/petstore/python/swagger_client/models/category.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/dog.py b/samples/client/petstore/python/swagger_client/models/dog.py
index 4043b2d84228..62b03f7a405f 100644
--- a/samples/client/petstore/python/swagger_client/models/dog.py
+++ b/samples/client/petstore/python/swagger_client/models/dog.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/enum_class.py b/samples/client/petstore/python/swagger_client/models/enum_class.py
index 2caa5493800b..1a7e9fec7384 100644
--- a/samples/client/petstore/python/swagger_client/models/enum_class.py
+++ b/samples/client/petstore/python/swagger_client/models/enum_class.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/enum_test.py b/samples/client/petstore/python/swagger_client/models/enum_test.py
index 3ff06b319c15..0f6c734a5b4f 100644
--- a/samples/client/petstore/python/swagger_client/models/enum_test.py
+++ b/samples/client/petstore/python/swagger_client/models/enum_test.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/format_test.py b/samples/client/petstore/python/swagger_client/models/format_test.py
index 622eb13f17c0..b7aa17b3ee6c 100644
--- a/samples/client/petstore/python/swagger_client/models/format_test.py
+++ b/samples/client/petstore/python/swagger_client/models/format_test.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
index 4391418c1bd0..90b9dcc7d795 100644
--- a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/model_200_response.py b/samples/client/petstore/python/swagger_client/models/model_200_response.py
index 0fc1206b404c..e566d5e16cde 100644
--- a/samples/client/petstore/python/swagger_client/models/model_200_response.py
+++ b/samples/client/petstore/python/swagger_client/models/model_200_response.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/model_return.py b/samples/client/petstore/python/swagger_client/models/model_return.py
index 15a652f07c32..840e64004d6f 100644
--- a/samples/client/petstore/python/swagger_client/models/model_return.py
+++ b/samples/client/petstore/python/swagger_client/models/model_return.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/name.py b/samples/client/petstore/python/swagger_client/models/name.py
index 8137032e62b1..8c66493dafac 100644
--- a/samples/client/petstore/python/swagger_client/models/name.py
+++ b/samples/client/petstore/python/swagger_client/models/name.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/order.py b/samples/client/petstore/python/swagger_client/models/order.py
index 910ecf8f92cc..54c30dea04cb 100644
--- a/samples/client/petstore/python/swagger_client/models/order.py
+++ b/samples/client/petstore/python/swagger_client/models/order.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/pet.py b/samples/client/petstore/python/swagger_client/models/pet.py
index 76491be7a4dd..f5dc79384b55 100644
--- a/samples/client/petstore/python/swagger_client/models/pet.py
+++ b/samples/client/petstore/python/swagger_client/models/pet.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/read_only_first.py b/samples/client/petstore/python/swagger_client/models/read_only_first.py
index b2513ab881fd..b4014f3a78b1 100644
--- a/samples/client/petstore/python/swagger_client/models/read_only_first.py
+++ b/samples/client/petstore/python/swagger_client/models/read_only_first.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/special_model_name.py b/samples/client/petstore/python/swagger_client/models/special_model_name.py
index dc7808efc70a..9aac6ae248c1 100644
--- a/samples/client/petstore/python/swagger_client/models/special_model_name.py
+++ b/samples/client/petstore/python/swagger_client/models/special_model_name.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/tag.py b/samples/client/petstore/python/swagger_client/models/tag.py
index d4ed374cad05..9ba29be5cd1f 100644
--- a/samples/client/petstore/python/swagger_client/models/tag.py
+++ b/samples/client/petstore/python/swagger_client/models/tag.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/models/user.py b/samples/client/petstore/python/swagger_client/models/user.py
index e39faba060e0..4559387a9fec 100644
--- a/samples/client/petstore/python/swagger_client/models/user.py
+++ b/samples/client/petstore/python/swagger_client/models/user.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
diff --git a/samples/client/petstore/python/swagger_client/rest.py b/samples/client/petstore/python/swagger_client/rest.py
index 9ffadf691cf1..96c3b6dabccd 100644
--- a/samples/client/petstore/python/swagger_client/rest.py
+++ b/samples/client/petstore/python/swagger_client/rest.py
@@ -2,7 +2,9 @@
 
 """
     Swagger Petstore
+
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git

From a56d927b0cff26d1f933a8e6919f5143030e570b Mon Sep 17 00:00:00 2001
From: Malcolm Barclay <malcolm@mbarclay.net>
Date: Fri, 27 May 2016 06:48:39 +0100
Subject: [PATCH 028/139] Added date format string #2935

Support decoding of RFC3339 compliant date-time strings with fractional seconds, but no timezone.
---
 .../src/main/resources/swift/Models.mustache    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/swift/Models.mustache b/modules/swagger-codegen/src/main/resources/swift/Models.mustache
index 49798250e726..17b9c2cd276b 100644
--- a/modules/swagger-codegen/src/main/resources/swift/Models.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/Models.mustache
@@ -34,17 +34,17 @@ public class Response<T> {
 private var once = dispatch_once_t()
 class Decoders {
     static private var decoders = Dictionary<String, ((AnyObject) -> AnyObject)>()
-    
+
     static func addDecoder<T>(clazz clazz: T.Type, decoder: ((AnyObject) -> T)) {
         let key = "\(T.self)"
         decoders[key] = { decoder($0) as! AnyObject }
     }
-    
+
     static func decode<T>(clazz clazz: [T].Type, source: AnyObject) -> [T] {
         let array = source as! [AnyObject]
         return array.map { Decoders.decode(clazz: T.self, source: $0) }
     }
-    
+
     static func decode<T, Key: Hashable>(clazz clazz: [Key:T].Type, source: AnyObject) -> [Key:T] {
         let sourceDictionary = source as! [Key: AnyObject]
         var dictionary = [Key:T]()
@@ -53,7 +53,7 @@ class Decoders {
         }
         return dictionary
     }
-    
+
     static func decode<T>(clazz clazz: T.Type, source: AnyObject) -> T {
         initialize()
         if T.self is Int32.Type && source is NSNumber {
@@ -65,7 +65,7 @@ class Decoders {
         if source is T {
             return source as! T
         }
-        
+
         let key = "\(T.self)"
         if let decoder = decoders[key] {
            return decoder(source) as! T
@@ -100,14 +100,15 @@ class Decoders {
             Decoders.decode(clazz: clazz, source: someSource)
         }
     }
-	
+
     static private func initialize() {
         dispatch_once(&once) {
             let formatters = [
                 "yyyy-MM-dd",
                 "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
                 "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ",
-                "yyyy-MM-dd'T'HH:mm:ss'Z'"
+                "yyyy-MM-dd'T'HH:mm:ss'Z'",
+                "yyyy-MM-dd'T'HH:mm:ss.SSS"
             ].map { (format: String) -> NSDateFormatter in
                 let formatter = NSDateFormatter()
                 formatter.dateFormat = format
@@ -121,7 +122,7 @@ class Decoders {
                             return date
                         }
                     }
-                
+
                 }
                 if let sourceInt = source as? Int {
                     // treat as a java date

From d82c77da34a29cd9bba71dfde57c9479ae39ad7f Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Fri, 27 May 2016 12:46:09 +0200
Subject: [PATCH 029/139] - [Objc] Fix test after removing license property -
 Moved adding License file to DefaultGenerator

---
 .../io/swagger/codegen/DefaultCodegen.java    |  2 ++
 .../io/swagger/codegen/DefaultGenerator.java  |  9 ++++++---
 .../io/swagger/codegen/SupportingFile.java    | 19 ++++++++++++++++++-
 .../codegen/languages/ObjcClientCodegen.java  |  1 -
 .../{objc => _common}/LICENSE.mustache        |  0
 .../codegen/objc/ObjcClientOptionsTest.java   |  2 --
 .../options/ObjcClientOptionsProvider.java    |  2 --
 samples/client/petstore/objc/README.md        |  2 +-
 8 files changed, 27 insertions(+), 10 deletions(-)
 rename modules/swagger-codegen/src/main/resources/{objc => _common}/LICENSE.mustache (100%)

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 7623899f2a68..cc850a39e112 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
@@ -792,6 +792,8 @@ public class DefaultCodegen {
         importMapping.put("LocalDate", "org.joda.time.*");
         importMapping.put("LocalTime", "org.joda.time.*");
 
+        supportingFiles.add(new SupportingFile.GlobalSupportingFile("LICENSE.mustache", "LICENSE"));
+
         cliOptions.add(CliOption.newBoolean(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG,
                 CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC).defaultValue(Boolean.TRUE.toString()));
         cliOptions.add(CliOption.newBoolean(CodegenConstants.ENSURE_UNIQUE_PARAMS, CodegenConstants
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
index 769a6185336b..1684bf407050 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -530,9 +530,12 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                         LOGGER.info("Skipped overwriting " + outputFilename);
                         continue;
                     }
-
-                    String templateFile = getFullTemplateFile(config, support.templateFile);
-
+                    String templateFile;
+                    if( support instanceof SupportingFile.GlobalSupportingFile) {
+                        templateFile = config.getCommonTemplateDir() + File.separator +  support.templateFile;
+                    } else {
+                        templateFile = getFullTemplateFile(config, support.templateFile);
+                    }
                     boolean shouldGenerate = true;
                     if(supportingFilesToGenerate != null && supportingFilesToGenerate.size() > 0) {
                         if(supportingFilesToGenerate.contains(support.destinationFilename)) {
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
index e5fb6a27da69..3643c8c6a92a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
@@ -5,6 +5,10 @@ public class SupportingFile {
     public String folder;
     public String destinationFilename;
 
+    public SupportingFile(String templateFile, String destinationFilename) {
+        this(templateFile, "", destinationFilename);
+    }
+
     public SupportingFile(String templateFile, String folder, String destinationFilename) {
         this.templateFile = templateFile;
         this.folder = folder;
@@ -44,4 +48,17 @@ public class SupportingFile {
         result = 31 * result + (destinationFilename != null ? destinationFilename.hashCode() : 0);
         return result;
     }
-}
\ No newline at end of file
+
+    static public class GlobalSupportingFile extends SupportingFile {
+
+        GlobalSupportingFile(String templateFile, String folder, String destinationFilename) {
+            super(templateFile, folder, destinationFilename);
+        }
+
+        GlobalSupportingFile(String templateFile, String destinationFilename) {
+            super(templateFile, destinationFilename);
+        }
+    }
+}
+
+
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
index 57f14bf2bce6..431bb4ba51f8 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
@@ -251,7 +251,6 @@ public class ObjcClientCodegen 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("LICENSE.mustache", "", "LICENSE"));
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/objc/LICENSE.mustache b/modules/swagger-codegen/src/main/resources/_common/LICENSE.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/objc/LICENSE.mustache
rename to modules/swagger-codegen/src/main/resources/_common/LICENSE.mustache
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java
index 795c6ee2d9cf..f1d55e007da1 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java
@@ -38,8 +38,6 @@ public class ObjcClientOptionsTest extends AbstractOptionsTest {
             times = 1;
             clientCodegen.setGitRepoURL(ObjcClientOptionsProvider.GIT_REPO_URL_VALUE);
             times = 1;
-            clientCodegen.setLicense(ObjcClientOptionsProvider.LICENSE_VALUE);
-            times = 1;
         }};
     }
 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java
index 2f76199e4f3d..5057dd3b4ff2 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java
@@ -14,7 +14,6 @@ public class ObjcClientOptionsProvider implements OptionsProvider {
     public static final String AUTHOR_NAME_VALUE = "SwaggerObjc";
     public static final String AUTHOR_EMAIL_VALUE = "objc@swagger.io";
     public static final String GIT_REPO_URL_VALUE = "https://github.com/swagger-api/swagger-codegen";
-    public static final String LICENSE_VALUE = "MIT";
 
     @Override
     public String getLanguage() {
@@ -30,7 +29,6 @@ public class ObjcClientOptionsProvider implements OptionsProvider {
                 .put(ObjcClientCodegen.AUTHOR_NAME, AUTHOR_NAME_VALUE)
                 .put(ObjcClientCodegen.AUTHOR_EMAIL, AUTHOR_EMAIL_VALUE)
                 .put(ObjcClientCodegen.GIT_REPO_URL, GIT_REPO_URL_VALUE)
-                .put(ObjcClientCodegen.LICENSE, LICENSE_VALUE)
                 .build();
     }
 
diff --git a/samples/client/petstore/objc/README.md b/samples/client/petstore/objc/README.md
index c30a7813e83f..f129b95b5014 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-05-25T18:06:49.729+02:00
+- Build date: 2016-05-27T12:41:24.581+02:00
 - Build package: class io.swagger.codegen.languages.ObjcClientCodegen
 
 ## Requirements

From ef66f9622cdbadec8c1d952aa385b2bf3569a46f Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Fri, 27 May 2016 16:04:20 +0200
Subject: [PATCH 030/139] Moved GlobalSupportingFile to separate file

---
 .../io/swagger/codegen/DefaultCodegen.java    |  2 +-
 .../io/swagger/codegen/DefaultGenerator.java  |  2 +-
 .../swagger/codegen/GlobalSupportingFile.java | 12 +++++++++
 .../io/swagger/codegen/SupportingFile.java    | 11 --------
 .../codegen/languages/ObjcClientCodegen.java  |  4 +--
 .../_common/{LICENSE.mustache => LICENSE}     | 25 -------------------
 ...SONValueTransformer+ISO8601-body.mustache} |  0
 ...NValueTransformer+ISO8601-header.mustache} |  0
 samples/client/petstore/objc/LICENSE          | 25 -------------------
 samples/client/petstore/objc/README.md        |  2 +-
 .../Core/JSONValueTransformer+ISO8601.h       | 24 +++++++++++++++++-
 11 files changed, 40 insertions(+), 67 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/java/io/swagger/codegen/GlobalSupportingFile.java
 rename modules/swagger-codegen/src/main/resources/_common/{LICENSE.mustache => LICENSE} (89%)
 rename modules/swagger-codegen/src/main/resources/objc/{JSONValueTransformer+ISO8601.m => JSONValueTransformer+ISO8601-body.mustache} (100%)
 rename modules/swagger-codegen/src/main/resources/objc/{JSONValueTransformer+ISO8601.h => JSONValueTransformer+ISO8601-header.mustache} (100%)

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 cc850a39e112..fceb69ac8db3 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
@@ -792,7 +792,7 @@ public class DefaultCodegen {
         importMapping.put("LocalDate", "org.joda.time.*");
         importMapping.put("LocalTime", "org.joda.time.*");
 
-        supportingFiles.add(new SupportingFile.GlobalSupportingFile("LICENSE.mustache", "LICENSE"));
+        supportingFiles.add(new GlobalSupportingFile("LICENSE", "LICENSE"));
 
         cliOptions.add(CliOption.newBoolean(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG,
                 CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC).defaultValue(Boolean.TRUE.toString()));
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
index 1684bf407050..231cf496d05c 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -531,7 +531,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                         continue;
                     }
                     String templateFile;
-                    if( support instanceof SupportingFile.GlobalSupportingFile) {
+                    if( support instanceof GlobalSupportingFile) {
                         templateFile = config.getCommonTemplateDir() + File.separator +  support.templateFile;
                     } else {
                         templateFile = getFullTemplateFile(config, support.templateFile);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/GlobalSupportingFile.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/GlobalSupportingFile.java
new file mode 100644
index 000000000000..ee7a1dc659b3
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/GlobalSupportingFile.java
@@ -0,0 +1,12 @@
+package io.swagger.codegen;
+
+public class GlobalSupportingFile extends SupportingFile {
+
+    GlobalSupportingFile(String templateFile, String folder, String destinationFilename) {
+        super(templateFile, folder, destinationFilename);
+    }
+
+    GlobalSupportingFile(String templateFile, String destinationFilename) {
+        super(templateFile, destinationFilename);
+    }
+}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
index 3643c8c6a92a..74bee83ef240 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java
@@ -48,17 +48,6 @@ public class SupportingFile {
         result = 31 * result + (destinationFilename != null ? destinationFilename.hashCode() : 0);
         return result;
     }
-
-    static public class GlobalSupportingFile extends SupportingFile {
-
-        GlobalSupportingFile(String templateFile, String folder, String destinationFilename) {
-            super(templateFile, folder, destinationFilename);
-        }
-
-        GlobalSupportingFile(String templateFile, String destinationFilename) {
-            super(templateFile, destinationFilename);
-        }
-    }
 }
 
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
index 431bb4ba51f8..0a2a812ab0e5 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
@@ -242,8 +242,8 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("Sanitizer-header.mustache",  coreFileFolder(), classPrefix + "Sanitizer.h"));
         supportingFiles.add(new SupportingFile("Logger-body.mustache",  coreFileFolder(), classPrefix + "Logger.m"));
         supportingFiles.add(new SupportingFile("Logger-header.mustache",  coreFileFolder(), classPrefix + "Logger.h"));
-        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.m",  coreFileFolder(), "JSONValueTransformer+ISO8601.m"));
-        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.h",  coreFileFolder(), "JSONValueTransformer+ISO8601.h"));
+        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601-body.mustache",  coreFileFolder(), "JSONValueTransformer+ISO8601.m"));
+        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601-header.mustache",  coreFileFolder(), "JSONValueTransformer+ISO8601.h"));
         supportingFiles.add(new SupportingFile("Configuration-body.mustache",  coreFileFolder(), classPrefix + "Configuration.m"));
         supportingFiles.add(new SupportingFile("Configuration-header.mustache",  coreFileFolder(), classPrefix + "Configuration.h"));
         supportingFiles.add(new SupportingFile("api-protocol.mustache", coreFileFolder(), classPrefix + "Api.h"));
diff --git a/modules/swagger-codegen/src/main/resources/_common/LICENSE.mustache b/modules/swagger-codegen/src/main/resources/_common/LICENSE
similarity index 89%
rename from modules/swagger-codegen/src/main/resources/_common/LICENSE.mustache
rename to modules/swagger-codegen/src/main/resources/_common/LICENSE
index 8dada3edaf50..d9a10c0d8e86 100644
--- a/modules/swagger-codegen/src/main/resources/_common/LICENSE.mustache
+++ b/modules/swagger-codegen/src/main/resources/_common/LICENSE
@@ -174,28 +174,3 @@
       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 {yyyy} {name of copyright owner}
-
-   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/objc/JSONValueTransformer+ISO8601.m b/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601-body.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.m
rename to modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601-body.mustache
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.h b/modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601-header.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601.h
rename to modules/swagger-codegen/src/main/resources/objc/JSONValueTransformer+ISO8601-header.mustache
diff --git a/samples/client/petstore/objc/LICENSE b/samples/client/petstore/objc/LICENSE
index 8dada3edaf50..d9a10c0d8e86 100644
--- a/samples/client/petstore/objc/LICENSE
+++ b/samples/client/petstore/objc/LICENSE
@@ -174,28 +174,3 @@
       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 {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/samples/client/petstore/objc/README.md b/samples/client/petstore/objc/README.md
index f129b95b5014..44bff87c42e7 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-05-27T12:41:24.581+02:00
+- Build date: 2016-05-27T16:03:28.462+02:00
 - Build package: class io.swagger.codegen.languages.ObjcClientCodegen
 
 ## Requirements
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h b/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
index 2a8d5b0c9e7d..dd8e721b3b91 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/JSONValueTransformer+ISO8601.h
@@ -2,7 +2,29 @@
 #import <ISO8601/ISO8601.h>
 #import <JSONModel/JSONValueTransformer.h>
 
-{{>licenceInfo}}
+/**
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 @interface JSONValueTransformer (ISO8601)
 

From fafcd33e276faf28966813a6e81f19d1a2b7c242 Mon Sep 17 00:00:00 2001
From: Jim Schubert <james.schubert@gmail.com>
Date: Fri, 27 May 2016 22:10:06 -0400
Subject: [PATCH 031/139] [csharp] Intercept hooks for req/res and
 ExceptionFactory

---
 .../languages/CSharpClientCodegen.java        |  2 +
 .../main/resources/csharp/ApiClient.mustache  | 22 +++++++++-
 .../resources/csharp/Configuration.mustache   | 11 +++++
 .../csharp/ExceptionFactory.mustache          |  7 ++++
 .../src/main/resources/csharp/api.mustache    | 40 +++++++++++++++----
 5 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/csharp/ExceptionFactory.mustache

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 e926235ba905..7546d89e9688 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
@@ -233,6 +233,8 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
                 clientPackageDir, "ApiException.cs"));
         supportingFiles.add(new SupportingFile("ApiResponse.mustache",
                 clientPackageDir, "ApiResponse.cs"));
+        supportingFiles.add(new SupportingFile("ExceptionFactory.mustache",
+                clientPackageDir, "ExceptionFactory.cs"));
 
         supportingFiles.add(new SupportingFile("compile.mustache", "", "build.bat"));
         supportingFiles.add(new SupportingFile("compile-mono.sh.mustache", "", "build.sh"));
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
index 1d34ff21eaec..6ab34216b9f3 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
@@ -17,15 +17,28 @@ using RestSharp;
 namespace {{packageName}}.Client
 {
     /// <summary>
-    /// API client is mainly responible for making the HTTP call to the API backend.
+    /// API client is mainly responsible for making the HTTP call to the API backend.
     /// </summary>
-    public class ApiClient
+    public partial class ApiClient
     {
         private JsonSerializerSettings serializerSettings = new JsonSerializerSettings
         {
             ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor
         };
 
+        /// <summary>
+        /// Allows for extending request processing for <see cref="ApiClient"/> generated code.
+        /// </summary>
+        /// <param name="request">The RestSharp request object</param>
+        partial void InterceptRequest(IRestRequest request);
+
+        /// <summary>
+        /// Allows for extending response processing for <see cref="ApiClient"/> generated code.
+        /// </summary>
+        /// <param name="request">The RestSharp request object</param>
+        /// <param name="response">The RestSharp response object</param>
+        partial void InterceptResponse(IRestRequest request, IRestResponse response);
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiClient" /> class
         /// with default configuration and base path ({{basePath}}).
@@ -165,6 +178,7 @@ namespace {{packageName}}.Client
             // set user agent
             RestClient.UserAgent = Configuration.UserAgent;
 
+            InterceptRequest(request);
             {{^supportsUWP}}
             var response = RestClient.Execute(request);
             {{/supportsUWP}}
@@ -172,6 +186,8 @@ namespace {{packageName}}.Client
             // Using async method to perform sync call (uwp-only)
             var response = RestClient.ExecuteTaskAsync(request).Result;
             {{/supportsUWP}}
+            InterceptResponse(request, response);
+
             return (Object) response;
         }
         {{#supportsAsync}}
@@ -197,7 +213,9 @@ namespace {{packageName}}.Client
             var request = PrepareRequest(
                 path, method, queryParams, postBody, headerParams, formParams, fileParams,
                 pathParams, contentType);
+            InterceptRequest(request);
             var response = await RestClient.ExecuteTaskAsync(request);
+            InterceptResponse(request, response);
             return (Object)response;
         }{{/supportsAsync}}
 
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
index eddb9d0de1f1..48b2886f6c94 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
@@ -80,6 +80,17 @@ namespace {{packageName}}.Client
         /// <value>Configuration.</value>
         public static Configuration Default = new Configuration();
 
+        /// <summary>
+        /// Default creation of exceptions for a given method name and response object
+        /// </summary>
+        public static readonly ExceptionFactory DefaultExceptionFactory = (methodName, response) =>
+        {
+            int status = (int) response.StatusCode;
+            if (status >= 400) return new ApiException(status, String.Format("Error calling {0}: {1}", methodName, response.Content), response.Content);
+            if (status == 0) return new ApiException(status, String.Format("Error calling {0}: {1}", methodName, response.ErrorMessage), response.ErrorMessage);
+            return null;
+        };
+
         /// <summary>
         /// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
         /// </summary>
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ExceptionFactory.mustache b/modules/swagger-codegen/src/main/resources/csharp/ExceptionFactory.mustache
new file mode 100644
index 000000000000..ad3cd2ac02f5
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/ExceptionFactory.mustache
@@ -0,0 +1,7 @@
+using System;
+using RestSharp;
+
+namespace {{packageName}}.Client
+{
+    public delegate Exception ExceptionFactory(string methodName, IRestResponse response);
+}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
index 1145421d22dd..807155e4a451 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
@@ -75,6 +75,8 @@ namespace {{packageName}}.Api
     /// </summary>
     public partial class {{classname}} : I{{classname}}
     {
+        private {{packageName}}.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="{{classname}}"/> class.
         /// </summary>
@@ -83,6 +85,8 @@ namespace {{packageName}}.Api
         {
             this.Configuration = new Configuration(new ApiClient(basePath));
 
+            ExceptionFactory = {{packageName}}.Client.Configuration.DefaultExceptionFactory;
+
             // ensure API client has configuration ready
             if (Configuration.ApiClient.Configuration == null)
             {
@@ -103,6 +107,8 @@ namespace {{packageName}}.Api
             else
                 this.Configuration = configuration;
 
+            ExceptionFactory = {{packageName}}.Client.Configuration.DefaultExceptionFactory;
+
             // ensure API client has configuration ready
             if (Configuration.ApiClient.Configuration == null)
             {
@@ -135,6 +141,22 @@ namespace {{packageName}}.Api
         /// <value>An instance of the Configuration</value>
         public Configuration Configuration {get; set;}
 
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public {{packageName}}.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
         /// <summary>
         /// Gets the default header.
         /// </summary>
@@ -276,10 +298,11 @@ namespace {{packageName}}.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling {{operationId}}: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling {{operationId}}: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("{{operationId}}", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             {{#returnType}}return new ApiResponse<{{{returnType}}}>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -410,10 +433,11 @@ namespace {{packageName}}.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling {{operationId}}: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling {{operationId}}: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("{{operationId}}", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             {{#returnType}}return new ApiResponse<{{{returnType}}}>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),

From 955d837609abb798350c2f6b78849f3ca1c7de9a Mon Sep 17 00:00:00 2001
From: Malcolm Barclay <malcolm@mbarclay.net>
Date: Sat, 28 May 2016 12:51:02 +0100
Subject: [PATCH 032/139] Updated petstore swift-promisekit swagger client.

Ran integration tests (passed)
---
 .../swift-promisekit/.swagger-codegen-ignore  | 23 +++++++++++++++++++
 .../Classes/Swaggers/Models.swift             | 17 +++++++-------
 .../SwaggerClientTests/Podfile.lock           | 12 +++++-----
 .../SwaggerClientTests/Pods/Manifest.lock     | 12 +++++-----
 .../Pods/OMGHTTPURLRQ/README.markdown         |  6 ++---
 .../Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m  |  4 ++--
 .../OMGHTTPURLRQ/Info.plist                   |  2 +-
 7 files changed, 50 insertions(+), 26 deletions(-)
 create mode 100644 samples/client/petstore/swift-promisekit/.swagger-codegen-ignore

diff --git a/samples/client/petstore/swift-promisekit/.swagger-codegen-ignore b/samples/client/petstore/swift-promisekit/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/swift-promisekit/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models.swift
index 5a8eade51b37..cad60a236a78 100644
--- a/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models.swift
+++ b/samples/client/petstore/swift-promisekit/PetstoreClient/Classes/Swaggers/Models.swift
@@ -34,17 +34,17 @@ public class Response<T> {
 private var once = dispatch_once_t()
 class Decoders {
     static private var decoders = Dictionary<String, ((AnyObject) -> AnyObject)>()
-    
+
     static func addDecoder<T>(clazz clazz: T.Type, decoder: ((AnyObject) -> T)) {
         let key = "\(T.self)"
         decoders[key] = { decoder($0) as! AnyObject }
     }
-    
+
     static func decode<T>(clazz clazz: [T].Type, source: AnyObject) -> [T] {
         let array = source as! [AnyObject]
         return array.map { Decoders.decode(clazz: T.self, source: $0) }
     }
-    
+
     static func decode<T, Key: Hashable>(clazz clazz: [Key:T].Type, source: AnyObject) -> [Key:T] {
         let sourceDictionary = source as! [Key: AnyObject]
         var dictionary = [Key:T]()
@@ -53,7 +53,7 @@ class Decoders {
         }
         return dictionary
     }
-    
+
     static func decode<T>(clazz clazz: T.Type, source: AnyObject) -> T {
         initialize()
         if T.self is Int32.Type && source is NSNumber {
@@ -65,7 +65,7 @@ class Decoders {
         if source is T {
             return source as! T
         }
-        
+
         let key = "\(T.self)"
         if let decoder = decoders[key] {
            return decoder(source) as! T
@@ -100,14 +100,15 @@ class Decoders {
             Decoders.decode(clazz: clazz, source: someSource)
         }
     }
-	
+
     static private func initialize() {
         dispatch_once(&once) {
             let formatters = [
                 "yyyy-MM-dd",
                 "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
                 "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ",
-                "yyyy-MM-dd'T'HH:mm:ss'Z'"
+                "yyyy-MM-dd'T'HH:mm:ss'Z'",
+                "yyyy-MM-dd'T'HH:mm:ss.SSS"
             ].map { (format: String) -> NSDateFormatter in
                 let formatter = NSDateFormatter()
                 formatter.dateFormat = format
@@ -121,7 +122,7 @@ class Decoders {
                             return date
                         }
                     }
-                
+
                 }
                 if let sourceInt = source as? Int {
                     // treat as a java date
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Podfile.lock b/samples/client/petstore/swift-promisekit/SwaggerClientTests/Podfile.lock
index cfeb94991080..fa9ebeb16ef5 100644
--- a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Podfile.lock
+++ b/samples/client/petstore/swift-promisekit/SwaggerClientTests/Podfile.lock
@@ -1,12 +1,12 @@
 PODS:
   - Alamofire (3.1.5)
-  - OMGHTTPURLRQ (3.1.1):
-    - OMGHTTPURLRQ/RQ (= 3.1.1)
-  - OMGHTTPURLRQ/FormURLEncode (3.1.1)
-  - OMGHTTPURLRQ/RQ (3.1.1):
+  - OMGHTTPURLRQ (3.1.2):
+    - OMGHTTPURLRQ/RQ (= 3.1.2)
+  - OMGHTTPURLRQ/FormURLEncode (3.1.2)
+  - OMGHTTPURLRQ/RQ (3.1.2):
     - OMGHTTPURLRQ/FormURLEncode
     - OMGHTTPURLRQ/UserAgent
-  - OMGHTTPURLRQ/UserAgent (3.1.1)
+  - OMGHTTPURLRQ/UserAgent (3.1.2)
   - PetstoreClient (0.0.1):
     - Alamofire (~> 3.1.5)
     - PromiseKit (~> 3.1.1)
@@ -32,7 +32,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: 5f730ba29fd113b7ddd71c1e65d0c630acf5d7b0
-  OMGHTTPURLRQ: 633f98ee745aeda02345935a52eec1784cddb589
+  OMGHTTPURLRQ: 38316b56d88125c600bcdb16df8329147da2b0ee
   PetstoreClient: efd495da2b7a6f3e798752702d59f96e306dbace
   PromiseKit: 4e8127c22a9b29d1b44958ab2ec762ea6115cbfb
 
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Manifest.lock b/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Manifest.lock
index cfeb94991080..fa9ebeb16ef5 100644
--- a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Manifest.lock
+++ b/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Manifest.lock
@@ -1,12 +1,12 @@
 PODS:
   - Alamofire (3.1.5)
-  - OMGHTTPURLRQ (3.1.1):
-    - OMGHTTPURLRQ/RQ (= 3.1.1)
-  - OMGHTTPURLRQ/FormURLEncode (3.1.1)
-  - OMGHTTPURLRQ/RQ (3.1.1):
+  - OMGHTTPURLRQ (3.1.2):
+    - OMGHTTPURLRQ/RQ (= 3.1.2)
+  - OMGHTTPURLRQ/FormURLEncode (3.1.2)
+  - OMGHTTPURLRQ/RQ (3.1.2):
     - OMGHTTPURLRQ/FormURLEncode
     - OMGHTTPURLRQ/UserAgent
-  - OMGHTTPURLRQ/UserAgent (3.1.1)
+  - OMGHTTPURLRQ/UserAgent (3.1.2)
   - PetstoreClient (0.0.1):
     - Alamofire (~> 3.1.5)
     - PromiseKit (~> 3.1.1)
@@ -32,7 +32,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: 5f730ba29fd113b7ddd71c1e65d0c630acf5d7b0
-  OMGHTTPURLRQ: 633f98ee745aeda02345935a52eec1784cddb589
+  OMGHTTPURLRQ: 38316b56d88125c600bcdb16df8329147da2b0ee
   PetstoreClient: efd495da2b7a6f3e798752702d59f96e306dbace
   PromiseKit: 4e8127c22a9b29d1b44958ab2ec762ea6115cbfb
 
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown b/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown
index ff905517872c..1cd71258ad38 100644
--- a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown
+++ b/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/README.markdown
@@ -39,7 +39,7 @@ NSData *data2 = UIImagePNGRepresentation(image2);
 [multipartFormData addFile:data2 parameterName:@"file2" filename:@"myimage2.png" contentType:@"image/png"];
 
 // SUPER Ideally you would not want to re-encode the JPEG as the process
-// is lossy. If you image comes from the AssetLibrary you *CAN* get the
+// is lossy. If your image comes from the AssetLibrary you *CAN* get the
 // original `NSData`. See stackoverflow.com.
 UIImage *image3 = [UIImage imageNamed:@"image3"];
 NSData *data3 = UIImageJPEGRepresentation(image3);
@@ -97,7 +97,7 @@ your API keys that registering at https://dev.twitter.com will provide
 you.
 
 ```objc
-NSMutableURLRequest *rq = [TDOAuth URLRequestForPath:@"/oauth/request_token" POSTParameters:@{@"x_auth_mode" : @"reverse_auth"} host:@"api.twitter.com"consumerKey:APIKey consumerSecret:APISecret accessToken:nil tokenSecret:nil];
+NSMutableURLRequest *rq = [TDOAuth URLRequestForPath:@"/oauth/request_token" POSTParameters:@{@"x_auth_mode" : @"reverse_auth"} host:@"api.twitter.com" consumerKey:APIKey consumerSecret:APISecret accessToken:nil tokenSecret:nil];
 [rq addValue:OMGUserAgent() forHTTPHeaderField:@"User-Agent"];
 
 [NSURLConnection sendAsynchronousRequest:rq queue:nil completionHandler:^(NSURLResponse *response, NSData *data, NSError *connectionError) {
@@ -142,4 +142,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-```
\ No newline at end of file
+```
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m b/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m
index 0854acd0eb78..3f48ace500e4 100644
--- a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m
+++ b/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/OMGHTTPURLRQ/Sources/OMGHTTPURLRQ.m
@@ -71,8 +71,8 @@ static inline NSMutableURLRequest *OMGMutableURLRequest() {
 @implementation OMGHTTPURLRQ
 
 + (NSMutableURLRequest *)GET:(NSString *)urlString :(NSDictionary *)params error:(NSError **)error {
-    id queryString = OMGFormURLEncode(params);
-    if (queryString) urlString = [urlString stringByAppendingFormat:@"?%@", queryString];
+    NSString *queryString = OMGFormURLEncode(params);
+    if (queryString.length) urlString = [urlString stringByAppendingFormat:@"?%@", queryString];
 
     id url = [NSURL URLWithString:urlString];
     if (!url) {
diff --git a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist b/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist
index 793d31a9fddd..c11c2ee42e9f 100644
--- a/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist	
+++ b/samples/client/petstore/swift-promisekit/SwaggerClientTests/Pods/Target Support Files/OMGHTTPURLRQ/Info.plist	
@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>3.1.1</string>
+  <string>3.1.2</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

From f2bd3d981e404891c5cfe6623e6afd7f9a9ab0b6 Mon Sep 17 00:00:00 2001
From: Malcolm Barclay <malcolm@mbarclay.net>
Date: Sat, 28 May 2016 15:11:25 +0100
Subject: [PATCH 033/139] Updated petstore swift swagger client.

Enabled execute (755) permissions on swift-petstore.sh Ran integration test (passed).
---
 bin/swift-petstore.sh                         |  0
 .../petstore/swift/.swagger-codegen-ignore    | 23 +++++++++++++++++++
 .../Classes/Swaggers/Models.swift             | 17 +++++++-------
 3 files changed, 32 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 bin/swift-petstore.sh
 create mode 100644 samples/client/petstore/swift/.swagger-codegen-ignore

diff --git a/bin/swift-petstore.sh b/bin/swift-petstore.sh
old mode 100644
new mode 100755
diff --git a/samples/client/petstore/swift/.swagger-codegen-ignore b/samples/client/petstore/swift/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/swift/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
index 5a8eade51b37..cad60a236a78 100644
--- a/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
+++ b/samples/client/petstore/swift/PetstoreClient/Classes/Swaggers/Models.swift
@@ -34,17 +34,17 @@ public class Response<T> {
 private var once = dispatch_once_t()
 class Decoders {
     static private var decoders = Dictionary<String, ((AnyObject) -> AnyObject)>()
-    
+
     static func addDecoder<T>(clazz clazz: T.Type, decoder: ((AnyObject) -> T)) {
         let key = "\(T.self)"
         decoders[key] = { decoder($0) as! AnyObject }
     }
-    
+
     static func decode<T>(clazz clazz: [T].Type, source: AnyObject) -> [T] {
         let array = source as! [AnyObject]
         return array.map { Decoders.decode(clazz: T.self, source: $0) }
     }
-    
+
     static func decode<T, Key: Hashable>(clazz clazz: [Key:T].Type, source: AnyObject) -> [Key:T] {
         let sourceDictionary = source as! [Key: AnyObject]
         var dictionary = [Key:T]()
@@ -53,7 +53,7 @@ class Decoders {
         }
         return dictionary
     }
-    
+
     static func decode<T>(clazz clazz: T.Type, source: AnyObject) -> T {
         initialize()
         if T.self is Int32.Type && source is NSNumber {
@@ -65,7 +65,7 @@ class Decoders {
         if source is T {
             return source as! T
         }
-        
+
         let key = "\(T.self)"
         if let decoder = decoders[key] {
            return decoder(source) as! T
@@ -100,14 +100,15 @@ class Decoders {
             Decoders.decode(clazz: clazz, source: someSource)
         }
     }
-	
+
     static private func initialize() {
         dispatch_once(&once) {
             let formatters = [
                 "yyyy-MM-dd",
                 "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
                 "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ",
-                "yyyy-MM-dd'T'HH:mm:ss'Z'"
+                "yyyy-MM-dd'T'HH:mm:ss'Z'",
+                "yyyy-MM-dd'T'HH:mm:ss.SSS"
             ].map { (format: String) -> NSDateFormatter in
                 let formatter = NSDateFormatter()
                 formatter.dateFormat = format
@@ -121,7 +122,7 @@ class Decoders {
                             return date
                         }
                     }
-                
+
                 }
                 if let sourceInt = source as? Int {
                     // treat as a java date

From 7f2a16a78b8347b699621723219847f2a6e818cd Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alexander.fisher@ignitionone.com>
Date: Wed, 18 May 2016 17:49:23 -0400
Subject: [PATCH 034/139] Add ability to set useQuerystring on request globally
 for api.

---
 .../src/main/resources/typescript-node/api.mustache        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 00644f774015..2d1c16309bd6 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-node/api.mustache
@@ -111,6 +111,7 @@ export enum {{classname}}ApiKeys {
 export class {{classname}} {
     protected basePath = defaultBasePath;
     protected defaultHeaders : any = {};
+    protected _useQuerystring : boolean = false;
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
@@ -151,12 +152,15 @@ export class {{classname}} {
         }
     }
 
+    set useQuerystring(value: boolean) {
+        this._useQuerystring = value;
+    }
+
     public setApiKey(key: {{classname}}ApiKeys, value: string) {
         this.authentications[{{classname}}ApiKeys[key]].apiKey = value;
     }
 {{#authMethods}}
 {{#isBasic}}
-
     set username(username: string) {
         this.authentications.{{name}}.username = username;
     }
@@ -225,6 +229,7 @@ export class {{classname}} {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
 {{#bodyParam}}
             body: {{paramName}},

From 80944254739d8a1244a297d85dda25b9962f3e60 Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alexander.fisher@ignitionone.com>
Date: Wed, 18 May 2016 17:57:10 -0400
Subject: [PATCH 035/139] Run bash to generate new client.

---
 .../petstore/typescript-node/default/api.ts   | 45 ++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/samples/client/petstore/typescript-node/default/api.ts b/samples/client/petstore/typescript-node/default/api.ts
index 568335b5769a..2120b0b00882 100644
--- a/samples/client/petstore/typescript-node/default/api.ts
+++ b/samples/client/petstore/typescript-node/default/api.ts
@@ -128,11 +128,12 @@ export enum PetApiApiKeys {
 export class PetApi {
     protected basePath = defaultBasePath;
     protected defaultHeaders : any = {};
+    protected _useQuerystring : boolean = false;
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'api_key': new ApiKeyAuth('header', 'api_key'),
         'petstore_auth': new OAuth(),
+        'api_key': new ApiKeyAuth('header', 'api_key'),
     }
 
     constructor(basePath?: string);
@@ -148,6 +149,10 @@ export class PetApi {
         }
     }
 
+    set useQuerystring(value: boolean) {
+        this._useQuerystring = value;
+    }
+
     public setApiKey(key: PetApiApiKeys, value: string) {
         this.authentications[PetApiApiKeys[key]].apiKey = value;
     }
@@ -183,6 +188,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -240,6 +246,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -291,6 +298,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -342,6 +350,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -395,13 +404,14 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
-        this.authentications.api_key.applyToRequest(requestOptions);
-
         this.authentications.petstore_auth.applyToRequest(requestOptions);
 
+        this.authentications.api_key.applyToRequest(requestOptions);
+
         this.authentications.default.applyToRequest(requestOptions);
 
         if (Object.keys(formParams).length) {
@@ -444,6 +454,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -508,6 +519,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -572,6 +584,7 @@ export class PetApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -607,11 +620,12 @@ export enum StoreApiApiKeys {
 export class StoreApi {
     protected basePath = defaultBasePath;
     protected defaultHeaders : any = {};
+    protected _useQuerystring : boolean = false;
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'api_key': new ApiKeyAuth('header', 'api_key'),
         'petstore_auth': new OAuth(),
+        'api_key': new ApiKeyAuth('header', 'api_key'),
     }
 
     constructor(basePath?: string);
@@ -627,6 +641,10 @@ export class StoreApi {
         }
     }
 
+    set useQuerystring(value: boolean) {
+        this._useQuerystring = value;
+    }
+
     public setApiKey(key: StoreApiApiKeys, value: string) {
         this.authentications[StoreApiApiKeys[key]].apiKey = value;
     }
@@ -668,6 +686,7 @@ export class StoreApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -712,6 +731,7 @@ export class StoreApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -765,6 +785,7 @@ export class StoreApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -810,6 +831,7 @@ export class StoreApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -844,11 +866,12 @@ export enum UserApiApiKeys {
 export class UserApi {
     protected basePath = defaultBasePath;
     protected defaultHeaders : any = {};
+    protected _useQuerystring : boolean = false;
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'api_key': new ApiKeyAuth('header', 'api_key'),
         'petstore_auth': new OAuth(),
+        'api_key': new ApiKeyAuth('header', 'api_key'),
     }
 
     constructor(basePath?: string);
@@ -864,6 +887,10 @@ export class UserApi {
         }
     }
 
+    set useQuerystring(value: boolean) {
+        this._useQuerystring = value;
+    }
+
     public setApiKey(key: UserApiApiKeys, value: string) {
         this.authentications[UserApiApiKeys[key]].apiKey = value;
     }
@@ -899,6 +926,7 @@ export class UserApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -945,6 +973,7 @@ export class UserApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -991,6 +1020,7 @@ export class UserApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -1043,6 +1073,7 @@ export class UserApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -1094,6 +1125,7 @@ export class UserApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -1148,6 +1180,7 @@ export class UserApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -1192,6 +1225,7 @@ export class UserApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -1244,6 +1278,7 @@ export class UserApi {
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };

From 23c9a17b6b1a9f80082e53361aaaa76429dbe923 Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alexander.fisher@ignitionone.com>
Date: Tue, 24 May 2016 16:10:47 -0400
Subject: [PATCH 036/139] Update typings to not use globals/ambients. Update
 tsconfig to use exclude rather than files. Add gitignore for output files.

---
 samples/client/petstore/typescript-node/npm/.gitignore |  2 ++
 .../client/petstore/typescript-node/npm/tsconfig.json  |  8 ++++----
 .../client/petstore/typescript-node/npm/typings.json   | 10 ++++------
 3 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 samples/client/petstore/typescript-node/npm/.gitignore

diff --git a/samples/client/petstore/typescript-node/npm/.gitignore b/samples/client/petstore/typescript-node/npm/.gitignore
new file mode 100644
index 000000000000..69a24fb7446b
--- /dev/null
+++ b/samples/client/petstore/typescript-node/npm/.gitignore
@@ -0,0 +1,2 @@
+*.js
+*.map
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/npm/tsconfig.json b/samples/client/petstore/typescript-node/npm/tsconfig.json
index 49dcbb6d5112..9a007e9f866b 100644
--- a/samples/client/petstore/typescript-node/npm/tsconfig.json
+++ b/samples/client/petstore/typescript-node/npm/tsconfig.json
@@ -10,10 +10,10 @@
         "noLib": false,
         "declaration": true
     },
-    "files": [
-        "api.ts",
-        "client.ts",
-        "typings/main.d.ts"
+    "exclude": [
+        "node_modules",
+        "typings/browser",
+        "typings/browser.d.ts"
     ]
 }
 
diff --git a/samples/client/petstore/typescript-node/npm/typings.json b/samples/client/petstore/typescript-node/npm/typings.json
index 76c4cc8e6af3..838d139e080b 100644
--- a/samples/client/petstore/typescript-node/npm/typings.json
+++ b/samples/client/petstore/typescript-node/npm/typings.json
@@ -1,10 +1,8 @@
 {
-    "ambientDependencies": {
-        "bluebird": "registry:dt/bluebird#2.0.0+20160319051630",
-        "core-js": "registry:dt/core-js#0.0.0+20160317120654",
-        "node": "registry:dt/node#4.0.0+20160423143914"
-    },
     "dependencies": {
+        "core-js": "registry:dt/core-js#0.0.0+20160317120654",
+        "node": "registry:dt/node#4.0.0+20160423143914",
+        "bluebird": "registry:npm/bluebird#3.3.4+20160515010139",
         "request": "registry:npm/request#2.69.0+20160304121250"
     }
-}
\ No newline at end of file
+}

From b3d5271582f875b5c9a2d3498722f8d5b905400f Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alexander.fisher@ignitionone.com>
Date: Tue, 24 May 2016 16:14:54 -0400
Subject: [PATCH 037/139] Honor gitignore in npm folder.

---
 .../petstore/typescript-node/npm/api.js       | 1071 -----------------
 .../petstore/typescript-node/npm/api.js.map   |    1 -
 .../petstore/typescript-node/npm/client.js    |   53 -
 .../typescript-node/npm/client.js.map         |    1 -
 4 files changed, 1126 deletions(-)
 delete mode 100644 samples/client/petstore/typescript-node/npm/api.js
 delete mode 100644 samples/client/petstore/typescript-node/npm/api.js.map
 delete mode 100644 samples/client/petstore/typescript-node/npm/client.js
 delete mode 100644 samples/client/petstore/typescript-node/npm/client.js.map

diff --git a/samples/client/petstore/typescript-node/npm/api.js b/samples/client/petstore/typescript-node/npm/api.js
deleted file mode 100644
index 2d6be920707b..000000000000
--- a/samples/client/petstore/typescript-node/npm/api.js
+++ /dev/null
@@ -1,1071 +0,0 @@
-"use strict";
-var request = require('request');
-var promise = require('bluebird');
-var defaultBasePath = 'http://petstore.swagger.io/v2';
-var Category = (function () {
-    function Category() {
-    }
-    return Category;
-}());
-exports.Category = Category;
-var Order = (function () {
-    function Order() {
-    }
-    return Order;
-}());
-exports.Order = Order;
-var Order;
-(function (Order) {
-    (function (StatusEnum) {
-        StatusEnum[StatusEnum["StatusEnum_placed"] = 'placed'] = "StatusEnum_placed";
-        StatusEnum[StatusEnum["StatusEnum_approved"] = 'approved'] = "StatusEnum_approved";
-        StatusEnum[StatusEnum["StatusEnum_delivered"] = 'delivered'] = "StatusEnum_delivered";
-    })(Order.StatusEnum || (Order.StatusEnum = {}));
-    var StatusEnum = Order.StatusEnum;
-})(Order = exports.Order || (exports.Order = {}));
-var Pet = (function () {
-    function Pet() {
-    }
-    return Pet;
-}());
-exports.Pet = Pet;
-var Pet;
-(function (Pet) {
-    (function (StatusEnum) {
-        StatusEnum[StatusEnum["StatusEnum_available"] = 'available'] = "StatusEnum_available";
-        StatusEnum[StatusEnum["StatusEnum_pending"] = 'pending'] = "StatusEnum_pending";
-        StatusEnum[StatusEnum["StatusEnum_sold"] = 'sold'] = "StatusEnum_sold";
-    })(Pet.StatusEnum || (Pet.StatusEnum = {}));
-    var StatusEnum = Pet.StatusEnum;
-})(Pet = exports.Pet || (exports.Pet = {}));
-var Tag = (function () {
-    function Tag() {
-    }
-    return Tag;
-}());
-exports.Tag = Tag;
-var User = (function () {
-    function User() {
-    }
-    return User;
-}());
-exports.User = User;
-var HttpBasicAuth = (function () {
-    function HttpBasicAuth() {
-    }
-    HttpBasicAuth.prototype.applyToRequest = function (requestOptions) {
-        requestOptions.auth = {
-            username: this.username, password: this.password
-        };
-    };
-    return HttpBasicAuth;
-}());
-exports.HttpBasicAuth = HttpBasicAuth;
-var ApiKeyAuth = (function () {
-    function ApiKeyAuth(location, paramName) {
-        this.location = location;
-        this.paramName = paramName;
-    }
-    ApiKeyAuth.prototype.applyToRequest = function (requestOptions) {
-        if (this.location == "query") {
-            requestOptions.qs[this.paramName] = this.apiKey;
-        }
-        else if (this.location == "header") {
-            requestOptions.headers[this.paramName] = this.apiKey;
-        }
-    };
-    return ApiKeyAuth;
-}());
-exports.ApiKeyAuth = ApiKeyAuth;
-var OAuth = (function () {
-    function OAuth() {
-    }
-    OAuth.prototype.applyToRequest = function (requestOptions) {
-        requestOptions.headers["Authorization"] = "Bearer " + this.accessToken;
-    };
-    return OAuth;
-}());
-exports.OAuth = OAuth;
-var VoidAuth = (function () {
-    function VoidAuth() {
-    }
-    VoidAuth.prototype.applyToRequest = function (requestOptions) {
-    };
-    return VoidAuth;
-}());
-exports.VoidAuth = VoidAuth;
-(function (PetApiApiKeys) {
-    PetApiApiKeys[PetApiApiKeys["api_key"] = 0] = "api_key";
-})(exports.PetApiApiKeys || (exports.PetApiApiKeys = {}));
-var PetApiApiKeys = exports.PetApiApiKeys;
-var PetApi = (function () {
-    function PetApi(basePathOrUsername, password, basePath) {
-        this.basePath = defaultBasePath;
-        this.defaultHeaders = {};
-        this.authentications = {
-            'default': new VoidAuth(),
-            'petstore_auth': new OAuth(),
-            'api_key': new ApiKeyAuth('header', 'api_key'),
-        };
-        if (password) {
-            if (basePath) {
-                this.basePath = basePath;
-            }
-        }
-        else {
-            if (basePathOrUsername) {
-                this.basePath = basePathOrUsername;
-            }
-        }
-    }
-    PetApi.prototype.setApiKey = function (key, value) {
-        this.authentications[PetApiApiKeys[key]].apiKey = value;
-    };
-    Object.defineProperty(PetApi.prototype, "accessToken", {
-        set: function (token) {
-            this.authentications.petstore_auth.accessToken = token;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    PetApi.prototype.extendObj = function (objA, objB) {
-        for (var key in objB) {
-            if (objB.hasOwnProperty(key)) {
-                objA[key] = objB[key];
-            }
-        }
-        return objA;
-    };
-    PetApi.prototype.addPet = function (body) {
-        var localVarPath = this.basePath + '/pet';
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'POST',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-            body: body,
-        };
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    PetApi.prototype.deletePet = function (petId, apiKey) {
-        var localVarPath = this.basePath + '/pet/{petId}'
-            .replace('{' + 'petId' + '}', String(petId));
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (petId === null || petId === undefined) {
-            throw new Error('Required parameter petId was null or undefined when calling deletePet.');
-        }
-        headerParams['api_key'] = apiKey;
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'DELETE',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    PetApi.prototype.findPetsByStatus = function (status) {
-        var localVarPath = this.basePath + '/pet/findByStatus';
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (status !== undefined) {
-            queryParameters['status'] = status;
-        }
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'GET',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    PetApi.prototype.findPetsByTags = function (tags) {
-        var localVarPath = this.basePath + '/pet/findByTags';
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (tags !== undefined) {
-            queryParameters['tags'] = tags;
-        }
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'GET',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    PetApi.prototype.getPetById = function (petId) {
-        var localVarPath = this.basePath + '/pet/{petId}'
-            .replace('{' + 'petId' + '}', String(petId));
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (petId === null || petId === undefined) {
-            throw new Error('Required parameter petId was null or undefined when calling getPetById.');
-        }
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'GET',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-        this.authentications.api_key.applyToRequest(requestOptions);
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    PetApi.prototype.updatePet = function (body) {
-        var localVarPath = this.basePath + '/pet';
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'PUT',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-            body: body,
-        };
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    PetApi.prototype.updatePetWithForm = function (petId, name, status) {
-        var localVarPath = this.basePath + '/pet/{petId}'
-            .replace('{' + 'petId' + '}', String(petId));
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (petId === null || petId === undefined) {
-            throw new Error('Required parameter petId was null or undefined when calling updatePetWithForm.');
-        }
-        var useFormData = false;
-        if (name !== undefined) {
-            formParams['name'] = name;
-        }
-        if (status !== undefined) {
-            formParams['status'] = status;
-        }
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'POST',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    PetApi.prototype.uploadFile = function (petId, additionalMetadata, file) {
-        var localVarPath = this.basePath + '/pet/{petId}/uploadImage'
-            .replace('{' + 'petId' + '}', String(petId));
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (petId === null || petId === undefined) {
-            throw new Error('Required parameter petId was null or undefined when calling uploadFile.');
-        }
-        var useFormData = false;
-        if (additionalMetadata !== undefined) {
-            formParams['additionalMetadata'] = additionalMetadata;
-        }
-        if (file !== undefined) {
-            formParams['file'] = file;
-        }
-        useFormData = true;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'POST',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    return PetApi;
-}());
-exports.PetApi = PetApi;
-(function (StoreApiApiKeys) {
-    StoreApiApiKeys[StoreApiApiKeys["api_key"] = 0] = "api_key";
-})(exports.StoreApiApiKeys || (exports.StoreApiApiKeys = {}));
-var StoreApiApiKeys = exports.StoreApiApiKeys;
-var StoreApi = (function () {
-    function StoreApi(basePathOrUsername, password, basePath) {
-        this.basePath = defaultBasePath;
-        this.defaultHeaders = {};
-        this.authentications = {
-            'default': new VoidAuth(),
-            'petstore_auth': new OAuth(),
-            'api_key': new ApiKeyAuth('header', 'api_key'),
-        };
-        if (password) {
-            if (basePath) {
-                this.basePath = basePath;
-            }
-        }
-        else {
-            if (basePathOrUsername) {
-                this.basePath = basePathOrUsername;
-            }
-        }
-    }
-    StoreApi.prototype.setApiKey = function (key, value) {
-        this.authentications[StoreApiApiKeys[key]].apiKey = value;
-    };
-    Object.defineProperty(StoreApi.prototype, "accessToken", {
-        set: function (token) {
-            this.authentications.petstore_auth.accessToken = token;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    StoreApi.prototype.extendObj = function (objA, objB) {
-        for (var key in objB) {
-            if (objB.hasOwnProperty(key)) {
-                objA[key] = objB[key];
-            }
-        }
-        return objA;
-    };
-    StoreApi.prototype.deleteOrder = function (orderId) {
-        var localVarPath = this.basePath + '/store/order/{orderId}'
-            .replace('{' + 'orderId' + '}', String(orderId));
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (orderId === null || orderId === undefined) {
-            throw new Error('Required parameter orderId was null or undefined when calling deleteOrder.');
-        }
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'DELETE',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    StoreApi.prototype.getInventory = function () {
-        var localVarPath = this.basePath + '/store/inventory';
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'GET',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.api_key.applyToRequest(requestOptions);
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    StoreApi.prototype.getOrderById = function (orderId) {
-        var localVarPath = this.basePath + '/store/order/{orderId}'
-            .replace('{' + 'orderId' + '}', String(orderId));
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (orderId === null || orderId === undefined) {
-            throw new Error('Required parameter orderId was null or undefined when calling getOrderById.');
-        }
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'GET',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    StoreApi.prototype.placeOrder = function (body) {
-        var localVarPath = this.basePath + '/store/order';
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'POST',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-            body: body,
-        };
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    return StoreApi;
-}());
-exports.StoreApi = StoreApi;
-(function (UserApiApiKeys) {
-    UserApiApiKeys[UserApiApiKeys["api_key"] = 0] = "api_key";
-})(exports.UserApiApiKeys || (exports.UserApiApiKeys = {}));
-var UserApiApiKeys = exports.UserApiApiKeys;
-var UserApi = (function () {
-    function UserApi(basePathOrUsername, password, basePath) {
-        this.basePath = defaultBasePath;
-        this.defaultHeaders = {};
-        this.authentications = {
-            'default': new VoidAuth(),
-            'petstore_auth': new OAuth(),
-            'api_key': new ApiKeyAuth('header', 'api_key'),
-        };
-        if (password) {
-            if (basePath) {
-                this.basePath = basePath;
-            }
-        }
-        else {
-            if (basePathOrUsername) {
-                this.basePath = basePathOrUsername;
-            }
-        }
-    }
-    UserApi.prototype.setApiKey = function (key, value) {
-        this.authentications[UserApiApiKeys[key]].apiKey = value;
-    };
-    Object.defineProperty(UserApi.prototype, "accessToken", {
-        set: function (token) {
-            this.authentications.petstore_auth.accessToken = token;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    UserApi.prototype.extendObj = function (objA, objB) {
-        for (var key in objB) {
-            if (objB.hasOwnProperty(key)) {
-                objA[key] = objB[key];
-            }
-        }
-        return objA;
-    };
-    UserApi.prototype.createUser = function (body) {
-        var localVarPath = this.basePath + '/user';
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'POST',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-            body: body,
-        };
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    UserApi.prototype.createUsersWithArrayInput = function (body) {
-        var localVarPath = this.basePath + '/user/createWithArray';
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'POST',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-            body: body,
-        };
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    UserApi.prototype.createUsersWithListInput = function (body) {
-        var localVarPath = this.basePath + '/user/createWithList';
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'POST',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-            body: body,
-        };
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    UserApi.prototype.deleteUser = function (username) {
-        var localVarPath = this.basePath + '/user/{username}'
-            .replace('{' + 'username' + '}', String(username));
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (username === null || username === undefined) {
-            throw new Error('Required parameter username was null or undefined when calling deleteUser.');
-        }
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'DELETE',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    UserApi.prototype.getUserByName = function (username) {
-        var localVarPath = this.basePath + '/user/{username}'
-            .replace('{' + 'username' + '}', String(username));
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (username === null || username === undefined) {
-            throw new Error('Required parameter username was null or undefined when calling getUserByName.');
-        }
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'GET',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    UserApi.prototype.loginUser = function (username, password) {
-        var localVarPath = this.basePath + '/user/login';
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (username !== undefined) {
-            queryParameters['username'] = username;
-        }
-        if (password !== undefined) {
-            queryParameters['password'] = password;
-        }
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'GET',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    UserApi.prototype.logoutUser = function () {
-        var localVarPath = this.basePath + '/user/logout';
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'GET',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-        };
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    UserApi.prototype.updateUser = function (username, body) {
-        var localVarPath = this.basePath + '/user/{username}'
-            .replace('{' + 'username' + '}', String(username));
-        var queryParameters = {};
-        var headerParams = this.extendObj({}, this.defaultHeaders);
-        var formParams = {};
-        if (username === null || username === undefined) {
-            throw new Error('Required parameter username was null or undefined when calling updateUser.');
-        }
-        var useFormData = false;
-        var localVarDeferred = promise.defer();
-        var requestOptions = {
-            method: 'PUT',
-            qs: queryParameters,
-            headers: headerParams,
-            uri: localVarPath,
-            json: true,
-            body: body,
-        };
-        this.authentications.default.applyToRequest(requestOptions);
-        if (Object.keys(formParams).length) {
-            if (useFormData) {
-                requestOptions.formData = formParams;
-            }
-            else {
-                requestOptions.form = formParams;
-            }
-        }
-        request(requestOptions, function (error, response, body) {
-            if (error) {
-                localVarDeferred.reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
-                }
-                else {
-                    localVarDeferred.reject({ response: response, body: body });
-                }
-            }
-        });
-        return localVarDeferred.promise;
-    };
-    return UserApi;
-}());
-exports.UserApi = UserApi;
-//# sourceMappingURL=api.js.map
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/npm/api.js.map b/samples/client/petstore/typescript-node/npm/api.js.map
deleted file mode 100644
index efe25d6e4b23..000000000000
--- a/samples/client/petstore/typescript-node/npm/api.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["api.ts"],"names":[],"mappings":";AAAA,IAAO,OAAO,WAAW,SAAS,CAAC,CAAC;AAEpC,IAAO,OAAO,WAAW,UAAU,CAAC,CAAC;AAErC,IAAI,eAAe,GAAG,+BAA+B,CAAC;AAQtD;IAAA;IAGA,CAAC;IAAD,eAAC;AAAD,CAAC,AAHD,IAGC;AAHY,gBAAQ,WAGpB,CAAA;AAED;IAAA;IAUA,CAAC;IAAD,YAAC;AAAD,CAAC,AAVD,IAUC;AAVY,aAAK,QAUjB,CAAA;AAED,IAAiB,KAAK,CAMrB;AAND,WAAiB,KAAK,EAAC,CAAC;IACpB,WAAY,UAAU;QAClB,6CAA0B,QAAQ,uBAAA,CAAA;QAClC,+CAA4B,UAAU,yBAAA,CAAA;QACtC,gDAA6B,WAAW,0BAAA,CAAA;IAC5C,CAAC,EAJW,gBAAU,KAAV,gBAAU,QAIrB;IAJD,IAAY,UAAU,GAAV,gBAIX,CAAA;AACL,CAAC,EANgB,KAAK,GAAL,aAAK,KAAL,aAAK,QAMrB;AACD;IAAA;IAUA,CAAC;IAAD,UAAC;AAAD,CAAC,AAVD,IAUC;AAVY,WAAG,MAUf,CAAA;AAED,IAAiB,GAAG,CAMnB;AAND,WAAiB,GAAG,EAAC,CAAC;IAClB,WAAY,UAAU;QAClB,gDAA6B,WAAW,0BAAA,CAAA;QACxC,8CAA2B,SAAS,wBAAA,CAAA;QACpC,2CAAwB,MAAM,qBAAA,CAAA;IAClC,CAAC,EAJW,cAAU,KAAV,cAAU,QAIrB;IAJD,IAAY,UAAU,GAAV,cAIX,CAAA;AACL,CAAC,EANgB,GAAG,GAAH,WAAG,KAAH,WAAG,QAMnB;AACD;IAAA;IAGA,CAAC;IAAD,UAAC;AAAD,CAAC,AAHD,IAGC;AAHY,WAAG,MAGf,CAAA;AAED;IAAA;IAYA,CAAC;IAAD,WAAC;AAAD,CAAC,AAZD,IAYC;AAZY,YAAI,OAYhB,CAAA;AAUD;IAAA;IAQA,CAAC;IALG,sCAAc,GAAd,UAAe,cAA+B;QAC1C,cAAc,CAAC,IAAI,GAAG;YAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACnD,CAAA;IACL,CAAC;IACL,oBAAC;AAAD,CAAC,AARD,IAQC;AARY,qBAAa,gBAQzB,CAAA;AAED;IAGI,oBAAoB,QAAgB,EAAU,SAAiB;QAA3C,aAAQ,GAAR,QAAQ,CAAQ;QAAU,cAAS,GAAT,SAAS,CAAQ;IAC/D,CAAC;IAED,mCAAc,GAAd,UAAe,cAA+B;QAC1C,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC;YACrB,cAAc,CAAC,EAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3D,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC;YACnC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QACzD,CAAC;IACL,CAAC;IACL,iBAAC;AAAD,CAAC,AAbD,IAaC;AAbY,kBAAU,aAatB,CAAA;AAED;IAAA;IAMA,CAAC;IAHG,8BAAc,GAAd,UAAe,cAA+B;QAC1C,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC;IAC3E,CAAC;IACL,YAAC;AAAD,CAAC,AAND,IAMC;AANY,aAAK,QAMjB,CAAA;AAED;IAAA;IAMA,CAAC;IAHG,iCAAc,GAAd,UAAe,cAA+B;IAE9C,CAAC;IACL,eAAC;AAAD,CAAC,AAND,IAMC;AANY,gBAAQ,WAMpB,CAAA;AAED,WAAY,aAAa;IACrB,uDAAO,CAAA;AACX,CAAC,EAFW,qBAAa,KAAb,qBAAa,QAExB;AAFD,IAAY,aAAa,GAAb,qBAEX,CAAA;AAED;IAWI,gBAAY,kBAA0B,EAAE,QAAiB,EAAE,QAAiB;QAVlE,aAAQ,GAAG,eAAe,CAAC;QAC3B,mBAAc,GAAS,EAAE,CAAC;QAE1B,oBAAe,GAAG;YACxB,SAAS,EAAkB,IAAI,QAAQ,EAAE;YACzC,eAAe,EAAE,IAAI,KAAK,EAAE;YAC5B,SAAS,EAAE,IAAI,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC;SACjD,CAAA;QAIG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACX,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACX,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC7B,CAAC;QACL,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,EAAE,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBACrB,IAAI,CAAC,QAAQ,GAAG,kBAAkB,CAAA;YACtC,CAAC;QACL,CAAC;IACL,CAAC;IAEM,0BAAS,GAAhB,UAAiB,GAAkB,EAAE,KAAa;QAC9C,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC;IAC5D,CAAC;IAED,sBAAI,+BAAW;aAAf,UAAgB,KAAa;YACzB,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,WAAW,GAAG,KAAK,CAAC;QAC3D,CAAC;;;OAAA;IACO,0BAAS,GAAjB,UAAyB,IAAQ,EAAE,IAAQ;QACvC,GAAG,CAAA,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAA,CAAC;YACjB,EAAE,CAAA,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAA,CAAC;gBACzB,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;QACL,CAAC;QACD,MAAM,CAAQ,IAAI,CAAC;IACvB,CAAC;IAMM,uBAAM,GAAb,UAAe,IAAU;QACrB,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;QAC5C,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAGzB,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,MAAM;YACd,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAElE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAOM,0BAAS,GAAhB,UAAkB,KAAa,EAAE,MAAe;QAC5C,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,cAAc;aAC9C,OAAO,CAAC,GAAG,GAAG,OAAO,GAAG,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAIzB,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;QAC9F,CAAC;QAED,YAAY,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;QAEjC,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,QAAQ;YAChB,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAElE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAMM,iCAAgB,GAAvB,UAAyB,MAAsB;QAC3C,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,mBAAmB,CAAC;QACzD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAGzB,EAAE,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC;YACvB,eAAe,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;QACvC,CAAC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAyD,CAAC;QAC9F,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,KAAK;YACb,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAElE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAMM,+BAAc,GAArB,UAAuB,IAAoB;QACvC,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC;QACvD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAGzB,EAAE,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC;YACrB,eAAe,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;QACnC,CAAC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAyD,CAAC;QAC9F,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,KAAK;YACb,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAElE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAMM,2BAAU,GAAjB,UAAmB,KAAa;QAC5B,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,cAAc;aAC9C,OAAO,CAAC,GAAG,GAAG,OAAO,GAAG,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAIzB,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;QAC/F,CAAC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAkD,CAAC;QACvF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,KAAK;YACb,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAElE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAMM,0BAAS,GAAhB,UAAkB,IAAU;QACxB,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;QAC5C,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAGzB,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,KAAK;YACb,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAElE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAQM,kCAAiB,GAAxB,UAA0B,KAAa,EAAE,IAAa,EAAE,MAAe;QACnE,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,cAAc;aAC9C,OAAO,CAAC,GAAG,GAAG,OAAO,GAAG,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAIzB,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAC;QACtG,CAAC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,EAAE,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC;YACrB,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;QAC9B,CAAC;QAED,EAAE,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC;YACvB,UAAU,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;QAClC,CAAC;QAED,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,MAAM;YACd,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAElE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAQM,2BAAU,GAAjB,UAAmB,KAAa,EAAE,kBAA2B,EAAE,IAAU;QACrE,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,0BAA0B;aAC1D,OAAO,CAAC,GAAG,GAAG,OAAO,GAAG,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAIzB,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;QAC/F,CAAC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,EAAE,CAAC,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC;YACnC,UAAU,CAAC,oBAAoB,CAAC,GAAG,kBAAkB,CAAC;QAC1D,CAAC;QAED,EAAE,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC;YACrB,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,WAAW,GAAG,IAAI,CAAC;QAEnB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,MAAM;YACd,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAElE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IACL,aAAC;AAAD,CAAC,AA1dD,IA0dC;AA1dY,cAAM,SA0dlB,CAAA;AACD,WAAY,eAAe;IACvB,2DAAO,CAAA;AACX,CAAC,EAFW,uBAAe,KAAf,uBAAe,QAE1B;AAFD,IAAY,eAAe,GAAf,uBAEX,CAAA;AAED;IAWI,kBAAY,kBAA0B,EAAE,QAAiB,EAAE,QAAiB;QAVlE,aAAQ,GAAG,eAAe,CAAC;QAC3B,mBAAc,GAAS,EAAE,CAAC;QAE1B,oBAAe,GAAG;YACxB,SAAS,EAAkB,IAAI,QAAQ,EAAE;YACzC,eAAe,EAAE,IAAI,KAAK,EAAE;YAC5B,SAAS,EAAE,IAAI,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC;SACjD,CAAA;QAIG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACX,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACX,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC7B,CAAC;QACL,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,EAAE,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBACrB,IAAI,CAAC,QAAQ,GAAG,kBAAkB,CAAA;YACtC,CAAC;QACL,CAAC;IACL,CAAC;IAEM,4BAAS,GAAhB,UAAiB,GAAoB,EAAE,KAAa;QAChD,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC;IAC9D,CAAC;IAED,sBAAI,iCAAW;aAAf,UAAgB,KAAa;YACzB,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,WAAW,GAAG,KAAK,CAAC;QAC3D,CAAC;;;OAAA;IACO,4BAAS,GAAjB,UAAyB,IAAQ,EAAE,IAAQ;QACvC,GAAG,CAAA,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAA,CAAC;YACjB,EAAE,CAAA,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAA,CAAC;gBACzB,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;QACL,CAAC;QACD,MAAM,CAAQ,IAAI,CAAC;IACvB,CAAC;IAMM,8BAAW,GAAlB,UAAoB,OAAe;QAC/B,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,wBAAwB;aACxD,OAAO,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QACrD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAIzB,EAAE,CAAC,CAAC,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAClG,CAAC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,QAAQ;YAChB,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAKM,+BAAY,GAAnB;QACI,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,kBAAkB,CAAC;QACxD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAGzB,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAyE,CAAC;QAC9G,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,KAAK;YACb,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAMM,+BAAY,GAAnB,UAAqB,OAAe;QAChC,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,wBAAwB;aACxD,OAAO,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QACrD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAIzB,EAAE,CAAC,CAAC,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;QACnG,CAAC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAoD,CAAC;QACzF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,KAAK;YACb,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAMM,6BAAU,GAAjB,UAAmB,IAAY;QAC3B,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;QACpD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAGzB,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAoD,CAAC;QACzF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,MAAM;YACd,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IACL,eAAC;AAAD,CAAC,AAxOD,IAwOC;AAxOY,gBAAQ,WAwOpB,CAAA;AACD,WAAY,cAAc;IACtB,yDAAO,CAAA;AACX,CAAC,EAFW,sBAAc,KAAd,sBAAc,QAEzB;AAFD,IAAY,cAAc,GAAd,sBAEX,CAAA;AAED;IAWI,iBAAY,kBAA0B,EAAE,QAAiB,EAAE,QAAiB;QAVlE,aAAQ,GAAG,eAAe,CAAC;QAC3B,mBAAc,GAAS,EAAE,CAAC;QAE1B,oBAAe,GAAG;YACxB,SAAS,EAAkB,IAAI,QAAQ,EAAE;YACzC,eAAe,EAAE,IAAI,KAAK,EAAE;YAC5B,SAAS,EAAE,IAAI,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC;SACjD,CAAA;QAIG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACX,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACX,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC7B,CAAC;QACL,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,EAAE,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBACrB,IAAI,CAAC,QAAQ,GAAG,kBAAkB,CAAA;YACtC,CAAC;QACL,CAAC;IACL,CAAC;IAEM,2BAAS,GAAhB,UAAiB,GAAmB,EAAE,KAAa;QAC/C,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC;IAC7D,CAAC;IAED,sBAAI,gCAAW;aAAf,UAAgB,KAAa;YACzB,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,WAAW,GAAG,KAAK,CAAC;QAC3D,CAAC;;;OAAA;IACO,2BAAS,GAAjB,UAAyB,IAAQ,EAAE,IAAQ;QACvC,GAAG,CAAA,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAA,CAAC;YACjB,EAAE,CAAA,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAA,CAAC;gBACzB,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;QACL,CAAC;QACD,MAAM,CAAQ,IAAI,CAAC;IACvB,CAAC;IAMM,4BAAU,GAAjB,UAAmB,IAAW;QAC1B,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAC7C,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAGzB,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,MAAM;YACd,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAMM,2CAAyB,GAAhC,UAAkC,IAAkB;QAChD,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,uBAAuB,CAAC;QAC7D,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAGzB,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,MAAM;YACd,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAMM,0CAAwB,GAA/B,UAAiC,IAAkB;QAC/C,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,sBAAsB,CAAC;QAC5D,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAGzB,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,MAAM;YACd,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAMM,4BAAU,GAAjB,UAAmB,QAAgB;QAC/B,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,kBAAkB;aAClD,OAAO,CAAC,GAAG,GAAG,UAAU,GAAG,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACvD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAIzB,EAAE,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAClG,CAAC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,QAAQ;YAChB,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAMM,+BAAa,GAApB,UAAsB,QAAgB;QAClC,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,kBAAkB;aAClD,OAAO,CAAC,GAAG,GAAG,UAAU,GAAG,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACvD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAIzB,EAAE,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC;QACrG,CAAC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,KAAK;YACb,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAOM,2BAAS,GAAhB,UAAkB,QAAiB,EAAE,QAAiB;QAClD,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,aAAa,CAAC;QACnD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAGzB,EAAE,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC;YACzB,eAAe,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;QAC3C,CAAC;QAED,EAAE,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC;YACzB,eAAe,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;QAC3C,CAAC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAqD,CAAC;QAC1F,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,KAAK;YACb,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAKM,4BAAU,GAAjB;QACI,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;QACpD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAGzB,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,KAAK;YACb,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IAOM,4BAAU,GAAjB,UAAmB,QAAgB,EAAE,IAAW;QAC5C,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,GAAG,kBAAkB;aAClD,OAAO,CAAC,GAAG,GAAG,UAAU,GAAG,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACvD,IAAI,eAAe,GAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAQ,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,EAAE,CAAC;QAIzB,EAAE,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAClG,CAAC;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAmD,CAAC;QACxF,IAAI,cAAc,GAAoB;YAClC,MAAM,EAAE,KAAK;YACb,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACb,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAE5D,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACR,cAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;YAChD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC;YACrC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAC,KAAK,EAAE,QAAQ,EAAE,IAAI;YAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACR,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;oBAC3D,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACpC,CAAC;IACL,cAAC;AAAD,CAAC,AA7aD,IA6aC;AA7aY,eAAO,UA6anB,CAAA"}
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/npm/client.js b/samples/client/petstore/typescript-node/npm/client.js
deleted file mode 100644
index 5a7e0380af9c..000000000000
--- a/samples/client/petstore/typescript-node/npm/client.js
+++ /dev/null
@@ -1,53 +0,0 @@
-"use strict";
-var api = require('./api');
-var fs = require('fs');
-var petApi = new api.PetApi();
-petApi.setApiKey(api.PetApiApiKeys.api_key, 'special-key');
-var tag1 = new api.Tag();
-tag1.id = 18291;
-tag1.name = 'TS tag 1';
-var pet = new api.Pet();
-pet.name = 'TypeScriptDoggie';
-pet.id = 18291;
-pet.photoUrls = ["http://url1", "http://url2"];
-pet.tags = [tag1];
-var petId;
-var exitCode = 0;
-petApi.addPet(pet)
-    .then(function (res) {
-    var newPet = res.body;
-    petId = newPet.id;
-    console.log("Created pet with ID " + petId);
-    newPet.status = api.Pet.StatusEnum.StatusEnum_available;
-    return petApi.updatePet(newPet);
-})
-    .then(function (res) {
-    console.log('Updated pet using POST body');
-    return petApi.updatePetWithForm(petId, undefined, "pending");
-})
-    .then(function (res) {
-    console.log('Updated pet using POST form');
-    return petApi.uploadFile(petId, undefined, fs.createReadStream('sample.png'));
-})
-    .then(function (res) {
-    console.log('Uploaded image');
-    return petApi.getPetById(petId);
-})
-    .then(function (res) {
-    console.log('Got pet by ID: ' + JSON.stringify(res.body));
-    if (res.body.status != api.Pet.StatusEnum.StatusEnum_pending) {
-        throw new Error("Unexpected pet status");
-    }
-})
-    .catch(function (err) {
-    console.error(err);
-    exitCode = 1;
-})
-    .finally(function () {
-    return petApi.deletePet(petId);
-})
-    .then(function (res) {
-    console.log('Deleted pet');
-    process.exit(exitCode);
-});
-//# sourceMappingURL=client.js.map
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/npm/client.js.map b/samples/client/petstore/typescript-node/npm/client.js.map
deleted file mode 100644
index 1773f17002ba..000000000000
--- a/samples/client/petstore/typescript-node/npm/client.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["client.ts"],"names":[],"mappings":";AAAA,IAAO,GAAG,WAAW,OAAO,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,IAAI,CAAC,CAAC;AAE1B,IAAI,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;AAC9B,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAG3D,IAAI,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;AACzB,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC;AAChB,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;AAEvB,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;AACxB,GAAG,CAAC,IAAI,GAAG,kBAAkB,CAAC;AAC9B,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC;AACf,GAAG,CAAC,SAAS,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;AAC/C,GAAG,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;AAElB,IAAI,KAAU,CAAC;AAEf,IAAI,QAAQ,GAAG,CAAC,CAAC;AAGjB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;KACb,IAAI,CAAC,UAAC,GAAG;IACN,IAAI,MAAM,GAAY,GAAG,CAAC,IAAI,CAAC;IAC/B,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,yBAAuB,KAAO,CAAC,CAAC;IAC5C,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC;IACxD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CAAC;KACD,IAAI,CAAC,UAAC,GAAG;IACN,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;IAC3C,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AACjE,CAAC,CAAC;KACD,IAAI,CAAC,UAAC,GAAG;IACN,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;IAC3C,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAAC;AAClF,CAAC,CAAC;KACD,IAAI,CAAC,UAAC,GAAG;IACN,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC9B,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC;KACD,IAAI,CAAC,UAAC,GAAG;IACN,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC3D,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC7C,CAAC;AACL,CAAC,CAAC;KACD,KAAK,CAAC,UAAC,GAAQ;IACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,QAAQ,GAAG,CAAC,CAAC;AACjB,CAAC,CAAC;KACD,OAAO,CAAC;IACL,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACnC,CAAC,CAAC;KACD,IAAI,CAAC,UAAC,GAAG;IACN,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC3B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC"}
\ No newline at end of file

From abf28797a48dd35bf3defaff537fa10d938041a2 Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alexander.fisher@ignitionone.com>
Date: Tue, 24 May 2016 16:35:44 -0400
Subject: [PATCH 038/139] Add node and corejs to ambient typings since they
 represent native types. Update client to not use finally since this doesn't
 exist on a node js Promise.

---
 samples/client/petstore/typescript-node/npm/client.ts    | 2 +-
 samples/client/petstore/typescript-node/npm/package.json | 5 +++--
 samples/client/petstore/typescript-node/npm/typings.json | 6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/samples/client/petstore/typescript-node/npm/client.ts b/samples/client/petstore/typescript-node/npm/client.ts
index e7408dc1785c..488057b95003 100644
--- a/samples/client/petstore/typescript-node/npm/client.ts
+++ b/samples/client/petstore/typescript-node/npm/client.ts
@@ -50,7 +50,7 @@ petApi.addPet(pet)
         console.error(err);
         exitCode = 1;
     })
-    .finally(() => {
+    .then(() => {
         return petApi.deletePet(petId);
     })
     .then((res) => {
diff --git a/samples/client/petstore/typescript-node/npm/package.json b/samples/client/petstore/typescript-node/npm/package.json
index e07e1bfbbf51..823a37ae4f09 100644
--- a/samples/client/petstore/typescript-node/npm/package.json
+++ b/samples/client/petstore/typescript-node/npm/package.json
@@ -5,9 +5,10 @@
     "repository": "GIT_USER_ID/GIT_REPO_ID",
     "main": "api.js",
     "scripts": {
+        "postinstall": "typings install",
         "clean": "rm -Rf node_modules/ typings/ *.js",
-        "build": "typings install && tsc",
-        "test": "tsc && node client.js"
+        "build": "tsc",
+        "test": "npm run build && node client.js"
     },
     "author": "Swagger Codegen Contributors",
     "license": "Apache-2.0",
diff --git a/samples/client/petstore/typescript-node/npm/typings.json b/samples/client/petstore/typescript-node/npm/typings.json
index 838d139e080b..00749fcdc071 100644
--- a/samples/client/petstore/typescript-node/npm/typings.json
+++ b/samples/client/petstore/typescript-node/npm/typings.json
@@ -1,7 +1,9 @@
 {
-    "dependencies": {
+    "ambientDependencies": {
         "core-js": "registry:dt/core-js#0.0.0+20160317120654",
-        "node": "registry:dt/node#4.0.0+20160423143914",
+        "node": "registry:dt/node#4.0.0+20160423143914"
+    },
+    "dependencies": {
         "bluebird": "registry:npm/bluebird#3.3.4+20160515010139",
         "request": "registry:npm/request#2.69.0+20160304121250"
     }

From 449e74b87337f7559f41c79c9a058500ce646f3b Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alexander.fisher@ignitionone.com>
Date: Tue, 24 May 2016 16:59:07 -0400
Subject: [PATCH 039/139] Move changes to samples to source code. Build, run,
 test.

---
 .../typescript-node/package.mustache          |   4 +-
 .../typescript-node/tsconfig.mustache         |   7 +-
 .../typescript-node/typings.mustache          |   2 +-
 .../petstore/typescript-node/npm/api.d.ts     |   7 +
 .../petstore/typescript-node/npm/api.ts       | 447 ++++++++++--------
 .../petstore/typescript-node/npm/package.json |   2 +-
 .../petstore/typescript-node/npm/typings.json |   2 +-
 7 files changed, 258 insertions(+), 213 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/typescript-node/package.mustache b/modules/swagger-codegen/src/main/resources/typescript-node/package.mustache
index 0d419996ed6e..d7b5a8142a41 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-node/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-node/package.mustache
@@ -5,8 +5,10 @@
     "repository": "{{gitUserId}}/{{gitRepoId}}",
     "main": "api.js",
     "scripts": {
+        "postinstall": "typings install",
         "clean": "rm -Rf node_modules/ typings/ *.js",
-        "build": "typings install && tsc"
+        "build": "tsc",
+        "test": "npm run build && node client.js"
     },
     "author": "Swagger Codegen Contributors",
     "license": "Apache-2.0",
diff --git a/modules/swagger-codegen/src/main/resources/typescript-node/tsconfig.mustache b/modules/swagger-codegen/src/main/resources/typescript-node/tsconfig.mustache
index 1a3bd00183a3..e47082e11e92 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-node/tsconfig.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-node/tsconfig.mustache
@@ -10,9 +10,10 @@
         "noLib": false,
         "declaration": true
     },
-    "files": [
-        "api.ts",
-        "typings/main.d.ts"
+    "exclude": [
+        "node_modules",
+        "typings/browser",
+        "typings/browser.d.ts"
     ]
 }
 
diff --git a/modules/swagger-codegen/src/main/resources/typescript-node/typings.mustache b/modules/swagger-codegen/src/main/resources/typescript-node/typings.mustache
index 76c4cc8e6af3..22fcebdc2313 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-node/typings.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-node/typings.mustache
@@ -1,10 +1,10 @@
 {
     "ambientDependencies": {
-        "bluebird": "registry:dt/bluebird#2.0.0+20160319051630",
         "core-js": "registry:dt/core-js#0.0.0+20160317120654",
         "node": "registry:dt/node#4.0.0+20160423143914"
     },
     "dependencies": {
+        "bluebird": "registry:npm/bluebird#3.3.4+20160515010139",
         "request": "registry:npm/request#2.69.0+20160304121250"
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/npm/api.d.ts b/samples/client/petstore/typescript-node/npm/api.d.ts
index 78c0d3195fb5..8d1bd4acbb59 100644
--- a/samples/client/petstore/typescript-node/npm/api.d.ts
+++ b/samples/client/petstore/typescript-node/npm/api.d.ts
@@ -1,5 +1,6 @@
 import request = require('request');
 import http = require('http');
+import Promise = require('bluebird');
 export declare class Category {
     'id': number;
     'name': string;
@@ -78,12 +79,14 @@ export declare enum PetApiApiKeys {
 export declare class PetApi {
     protected basePath: string;
     protected defaultHeaders: any;
+    protected _useQuerystring: boolean;
     protected authentications: {
         'default': Authentication;
         'petstore_auth': OAuth;
         'api_key': ApiKeyAuth;
     };
     constructor(basePath?: string);
+    useQuerystring: boolean;
     setApiKey(key: PetApiApiKeys, value: string): void;
     accessToken: string;
     private extendObj<T1, T2>(objA, objB);
@@ -126,12 +129,14 @@ export declare enum StoreApiApiKeys {
 export declare class StoreApi {
     protected basePath: string;
     protected defaultHeaders: any;
+    protected _useQuerystring: boolean;
     protected authentications: {
         'default': Authentication;
         'petstore_auth': OAuth;
         'api_key': ApiKeyAuth;
     };
     constructor(basePath?: string);
+    useQuerystring: boolean;
     setApiKey(key: StoreApiApiKeys, value: string): void;
     accessToken: string;
     private extendObj<T1, T2>(objA, objB);
@@ -160,12 +165,14 @@ export declare enum UserApiApiKeys {
 export declare class UserApi {
     protected basePath: string;
     protected defaultHeaders: any;
+    protected _useQuerystring: boolean;
     protected authentications: {
         'default': Authentication;
         'petstore_auth': OAuth;
         'api_key': ApiKeyAuth;
     };
     constructor(basePath?: string);
+    useQuerystring: boolean;
     setApiKey(key: UserApiApiKeys, value: string): void;
     accessToken: string;
     private extendObj<T1, T2>(objA, objB);
diff --git a/samples/client/petstore/typescript-node/npm/api.ts b/samples/client/petstore/typescript-node/npm/api.ts
index 568335b5769a..aa5775593160 100644
--- a/samples/client/petstore/typescript-node/npm/api.ts
+++ b/samples/client/petstore/typescript-node/npm/api.ts
@@ -1,6 +1,6 @@
 import request = require('request');
 import http = require('http');
-import promise = require('bluebird');
+import Promise = require('bluebird');
 
 let defaultBasePath = 'http://petstore.swagger.io/v2';
 
@@ -128,11 +128,12 @@ export enum PetApiApiKeys {
 export class PetApi {
     protected basePath = defaultBasePath;
     protected defaultHeaders : any = {};
+    protected _useQuerystring : boolean = false;
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'api_key': new ApiKeyAuth('header', 'api_key'),
         'petstore_auth': new OAuth(),
+        'api_key': new ApiKeyAuth('header', 'api_key'),
     }
 
     constructor(basePath?: string);
@@ -148,6 +149,10 @@ export class PetApi {
         }
     }
 
+    set useQuerystring(value: boolean) {
+        this._useQuerystring = value;
+    }
+
     public setApiKey(key: PetApiApiKeys, value: string) {
         this.authentications[PetApiApiKeys[key]].apiKey = value;
     }
@@ -177,12 +182,12 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -198,18 +203,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Deletes a pet
@@ -234,12 +240,12 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'DELETE',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -254,18 +260,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Finds Pets by status
@@ -285,12 +292,12 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -305,18 +312,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Finds Pets by tags
@@ -336,12 +344,12 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -356,18 +364,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Find pet by ID
@@ -389,19 +398,19 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Pet;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
-        this.authentications.api_key.applyToRequest(requestOptions);
-
         this.authentications.petstore_auth.applyToRequest(requestOptions);
 
+        this.authentications.api_key.applyToRequest(requestOptions);
+
         this.authentications.default.applyToRequest(requestOptions);
 
         if (Object.keys(formParams).length) {
@@ -411,18 +420,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: Pet;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Update an existing pet
@@ -438,12 +448,12 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'PUT',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -459,18 +469,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Updates a pet in the store with form data
@@ -502,12 +513,12 @@ export class PetApi {
             formParams['status'] = status;
         }
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -522,18 +533,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * uploads an image
@@ -566,12 +578,12 @@ export class PetApi {
         }
         useFormData = true;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -586,18 +598,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
 }
 export enum StoreApiApiKeys {
@@ -607,11 +620,12 @@ export enum StoreApiApiKeys {
 export class StoreApi {
     protected basePath = defaultBasePath;
     protected defaultHeaders : any = {};
+    protected _useQuerystring : boolean = false;
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'api_key': new ApiKeyAuth('header', 'api_key'),
         'petstore_auth': new OAuth(),
+        'api_key': new ApiKeyAuth('header', 'api_key'),
     }
 
     constructor(basePath?: string);
@@ -627,6 +641,10 @@ export class StoreApi {
         }
     }
 
+    set useQuerystring(value: boolean) {
+        this._useQuerystring = value;
+    }
+
     public setApiKey(key: StoreApiApiKeys, value: string) {
         this.authentications[StoreApiApiKeys[key]].apiKey = value;
     }
@@ -662,12 +680,12 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'DELETE',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -680,18 +698,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Returns pet inventories by status
@@ -706,12 +725,12 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; };  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -726,18 +745,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: { [key: string]: number; };  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Find purchase order by ID
@@ -759,12 +779,12 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -777,18 +797,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Place an order for a pet
@@ -804,12 +825,12 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -823,18 +844,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
 }
 export enum UserApiApiKeys {
@@ -844,11 +866,12 @@ export enum UserApiApiKeys {
 export class UserApi {
     protected basePath = defaultBasePath;
     protected defaultHeaders : any = {};
+    protected _useQuerystring : boolean = false;
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'api_key': new ApiKeyAuth('header', 'api_key'),
         'petstore_auth': new OAuth(),
+        'api_key': new ApiKeyAuth('header', 'api_key'),
     }
 
     constructor(basePath?: string);
@@ -864,6 +887,10 @@ export class UserApi {
         }
     }
 
+    set useQuerystring(value: boolean) {
+        this._useQuerystring = value;
+    }
+
     public setApiKey(key: UserApiApiKeys, value: string) {
         this.authentications[UserApiApiKeys[key]].apiKey = value;
     }
@@ -893,12 +920,12 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -912,18 +939,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Creates list of users with given input array
@@ -939,12 +967,12 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -958,18 +986,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Creates list of users with given input array
@@ -985,12 +1014,12 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -1004,18 +1033,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Delete user
@@ -1037,12 +1067,12 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'DELETE',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -1055,18 +1085,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Get user by user name
@@ -1088,12 +1119,12 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: User;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -1106,18 +1137,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: User;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Logs user into the system
@@ -1142,12 +1174,12 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: string;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -1160,18 +1192,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: string;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Logs out current logged in user session
@@ -1186,12 +1219,12 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
         };
 
@@ -1204,18 +1237,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Updated user
@@ -1238,12 +1272,12 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'PUT',
             qs: queryParameters,
             headers: headerParams,
             uri: localVarPath,
+            useQuerystring: this._useQuerystring,
             json: true,
             body: body,
         };
@@ -1257,17 +1291,18 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
 }
diff --git a/samples/client/petstore/typescript-node/npm/package.json b/samples/client/petstore/typescript-node/npm/package.json
index 823a37ae4f09..a07adba556e6 100644
--- a/samples/client/petstore/typescript-node/npm/package.json
+++ b/samples/client/petstore/typescript-node/npm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@swagger/angular2-typescript-petstore",
-    "version": "0.0.1-SNAPSHOT.201605191812",
+    "version": "0.0.1-SNAPSHOT.201605241654",
     "description": "NodeJS client for @swagger/angular2-typescript-petstore",
     "repository": "GIT_USER_ID/GIT_REPO_ID",
     "main": "api.js",
diff --git a/samples/client/petstore/typescript-node/npm/typings.json b/samples/client/petstore/typescript-node/npm/typings.json
index 00749fcdc071..22fcebdc2313 100644
--- a/samples/client/petstore/typescript-node/npm/typings.json
+++ b/samples/client/petstore/typescript-node/npm/typings.json
@@ -7,4 +7,4 @@
         "bluebird": "registry:npm/bluebird#3.3.4+20160515010139",
         "request": "registry:npm/request#2.69.0+20160304121250"
     }
-}
+}
\ No newline at end of file

From eccd4d524522f4c889948cdcb6e71d13e6538970 Mon Sep 17 00:00:00 2001
From: Jim Schubert <james.schubert@gmail.com>
Date: Sat, 28 May 2016 15:09:43 -0400
Subject: [PATCH 040/139] [csharp] map number/no format to Decimal

---
 .../io/swagger/codegen/languages/AbstractCSharpCodegen.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 128686b615b1..386e37e3f0df 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
@@ -77,6 +77,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                         "string",
                         "bool?",
                         "double?",
+                        "decimal?",
                         "int?",
                         "long?",
                         "float?",
@@ -112,7 +113,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
         typeMapping.put("float", "float?");
         typeMapping.put("long", "long?");
         typeMapping.put("double", "double?");
-        typeMapping.put("number", "double?");
+        typeMapping.put("number", "decimal?");
         typeMapping.put("datetime", "DateTime?");
         typeMapping.put("date", "DateTime?");
         typeMapping.put("file", "System.IO.Stream");

From d172de260da8d5477e05dcba85548306189ede36 Mon Sep 17 00:00:00 2001
From: Jim Schubert <james.schubert@gmail.com>
Date: Sat, 28 May 2016 22:25:45 -0400
Subject: [PATCH 041/139] [codegen ignore] Add tests, fix two minor issues

Tests are create to act on actual files to gauarantee functionality of
.swagger-codegen-ignore processing. Found two minor issues, one with
directory processing of files below the directory and another with
filename.* patterns reversing as *filename. for the pattern.

Added documentation to the README about .swagger-codegen-ignore file
support and syntax.
---
 README.md                                     |  38 ++++++
 .../codegen/ignore/rules/DirectoryRule.java   |  17 ++-
 .../ignore/rules/IgnoreLineParser.java        |   7 ++
 .../ignore/CodegenIgnoreProcessorTest.java    | 114 ++++++++++++++++--
 4 files changed, 164 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 6f10731e9986..4e575f6f4ad2 100644
--- a/README.md
+++ b/README.md
@@ -408,6 +408,44 @@ java -Dapis -DmodelTests=false {opts}
 
 When using selective generation, _only_ the templates needed for the specific generation will be used.
 
+### Ignore file format
+
+Swagger codegen supports a `.swagger-codegen-ignore` file, similar to `.gitignore` or `.dockerignore` you're probably already familiar with.
+
+The ignore file allows for better control over overwriting existing files than the `--skip-overwrite` flag. With the ignore file, you can specify individual files or directories can be ignored. This can be useful, for example if you only want a subset of the generated code.
+
+Examples:
+
+```
+# Swagger Codegen Ignore
+# Lines beginning with a # are comments
+
+# This should match build.sh located anywhere.
+build.sh
+
+# Matches build.sh in the root
+/build.sh
+
+# Exclude all recursively
+docs/**
+
+# Explicitly allow files excluded by other rules
+!docs/UserApi.md
+
+# Recursively exclude directories named Api
+# You can't negate files below this directory.
+src/**/Api/
+
+# When this file is nested under /Api (excluded above),
+# this rule is ignored because parent directory is excluded by previous rule.
+!src/**/PetApiTests.cs
+
+# Exclude a single, nested file explicitly
+src/IO.Swagger.Test/Model/AnimalFarmTests.cs
+```
+
+The `.swagger-codegen-ignore` file must exist in the root of the output directory.
+
 ### Customizing the generator
 
 There are different aspects of customizing the code generator beyond just creating or modifying templates.  Each language has a supporting configuration file to handle different type mappings, etc:
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ignore/rules/DirectoryRule.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ignore/rules/DirectoryRule.java
index 2619f1f1c388..235d34d3f96f 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ignore/rules/DirectoryRule.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ignore/rules/DirectoryRule.java
@@ -1,20 +1,27 @@
 package io.swagger.codegen.ignore.rules;
 
-import java.nio.file.FileSystems;
-import java.nio.file.PathMatcher;
+import java.nio.file.*;
 import java.util.List;
 
 public class DirectoryRule extends FileRule {
 
-    private PathMatcher matcher = null;
+    private PathMatcher directoryMatcher = null;
+    private PathMatcher contentsMatcher = null;
 
     DirectoryRule(List<Part> syntax, String definition) {
         super(syntax, definition);
-        matcher = FileSystems.getDefault().getPathMatcher("glob:**/"+this.getPattern());
+        String pattern = this.getPattern();
+        StringBuilder sb = new StringBuilder();
+        sb.append("glob:");
+        sb.append(pattern);
+        if(!pattern.endsWith("/")) sb.append("/");
+        directoryMatcher = FileSystems.getDefault().getPathMatcher(sb.toString());
+        sb.append("**");
+        contentsMatcher = FileSystems.getDefault().getPathMatcher(sb.toString());
     }
 
     @Override
     public Boolean matches(String relativePath) {
-        return matcher.matches(FileSystems.getDefault().getPath(relativePath));
+        return contentsMatcher.matches(FileSystems.getDefault().getPath(relativePath)) || directoryMatcher.matches(FileSystems.getDefault().getPath(relativePath));
     }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ignore/rules/IgnoreLineParser.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ignore/rules/IgnoreLineParser.java
index d79bc03ae15c..2d3fbdd29943 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ignore/rules/IgnoreLineParser.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/ignore/rules/IgnoreLineParser.java
@@ -78,6 +78,13 @@ public class IgnoreLineParser {
                     i++;
                     continue;
                 } else {
+
+                    if (sb.length() > 0) {
+                        // A MATCH_ANY may commonly follow a filename or some other character. Dump that to results before the MATCH_ANY.
+                        parts.add(new Part(Token.TEXT, sb.toString()));
+                        sb.delete(0, sb.length());
+                    }
+
                     parts.add(new Part(Token.MATCH_ANY));
                     continue;
                 }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java
index a9fe89214d50..5789cb6e32ff 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java
@@ -1,21 +1,121 @@
 package io.swagger.codegen.ignore;
 
-import org.testng.annotations.Test;
+import org.apache.commons.io.FileUtils;
+import org.testng.annotations.*;
+import static org.testng.Assert.*;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 public class CodegenIgnoreProcessorTest {
-    @Test
-    public void loadCodegenRules() throws Exception {
 
+    private Boolean allowed;
+    private final String description;
+    private String outputDir;
+    private File target;
+    private Path temp;
+
+    private CodegenIgnoreProcessorTest(String filename, String ignoreDefinition, String description) throws IOException {
+        this.description = description;
+
+        temp = Files.createTempDirectory(null);
+        this.outputDir = temp.toFile().getAbsolutePath();
+
+        target = new File(this.outputDir, filename);
+
+        boolean mkdirs = target.getParentFile().mkdirs();
+        if(!mkdirs) {
+            throw new IOException("Failed to create parent directories for CodegenIgnoreProcessorTest test file.");
+        }
+
+        Path created = Files.createFile(target.toPath());
+        if(!created.toFile().exists()) {
+            throw new IOException("Failed to write CodegenIgnoreProcessorTest test file.");
+        }
+
+        // System.out.print(String.format("Created codegen ignore processor test file: %s\n", created.toAbsolutePath()));
+        File ignoreFile = new File(this.outputDir, ".swagger-codegen-ignore");
+        try (FileOutputStream stream = new FileOutputStream(ignoreFile)) {
+            stream.write(ignoreDefinition.getBytes());
+        }
+    }
+
+    CodegenIgnoreProcessorTest allowed() {
+        this.allowed = true;
+        return this;
+    }
+
+    CodegenIgnoreProcessorTest ignored() {
+        this.allowed = false;
+        return this;
+    }
+
+    @AfterClass
+    public void afterClass() throws IOException {
+        FileUtils.deleteDirectory(temp.toFile());
     }
 
     @Test
-    public void getInclusionRules() throws Exception {
+    public void evaluate() {
+        // Arrange
+        CodegenIgnoreProcessor processor = new CodegenIgnoreProcessor(outputDir);
+        Boolean actual = null;
 
+        // Act
+        actual = processor.allowsFile(target);
+
+        // Assert
+        assertEquals(actual, this.allowed, this.description);
     }
 
-    @Test
-    public void getExclusionRules() throws Exception {
+    @Factory
+    public static Object[] factoryMethod() throws IOException {
+        return new Object[] {
+                // Matching filenames
+                new CodegenIgnoreProcessorTest("build.sh", "build.sh", "A file when matching should ignore.").ignored(),
+                new CodegenIgnoreProcessorTest("src/build.sh", "**/build.sh", "A file when matching nested files should ignore.").ignored(),
+                new CodegenIgnoreProcessorTest("Build.sh", "build.sh", "A file when non-matching should allow.").allowed(),
+                new CodegenIgnoreProcessorTest("build.sh", "/build.sh", "A rooted file when matching should ignore.").ignored(),
+                new CodegenIgnoreProcessorTest("nested/build.sh", "/build.sh", "A rooted file definition when non-matching should allow.").allowed(),
+                new CodegenIgnoreProcessorTest("src/IO.Swagger.Test/Model/AnimalFarmTests.cs", "src/IO.Swagger.Test/Model/AnimalFarmTests.cs", "A file when matching exactly should ignore.").ignored(),
 
+                // Matching spaces in filenames
+                new CodegenIgnoreProcessorTest("src/properly escaped.txt", "**/properly escaped.txt", "A file when matching nested files with spaces in the name should ignore.").ignored(),
+                new CodegenIgnoreProcessorTest("src/improperly escaped.txt", "**/improperly\\ escaped.txt", "A file when matching nested files with spaces in the name (improperly escaped rule) should allow.").allowed(),
+
+                // Match All
+                new CodegenIgnoreProcessorTest("docs/somefile.md", "docs/**", "A recursive file (0 level) when matching should ignore.").ignored(),
+                new CodegenIgnoreProcessorTest("docs/1/somefile.md", "docs/**", "A recursive file (1 level) when matching should ignore.").ignored(),
+                new CodegenIgnoreProcessorTest("docs/1/2/3/somefile.md", "docs/**", "A recursive file (n level) when matching should ignore.").ignored(),
+
+                // Match Any
+                new CodegenIgnoreProcessorTest("docs/1/2/3/somefile.md", "docs/**/somefile.*", "A recursive file with match-any extension when matching should ignore.").ignored(),
+                new CodegenIgnoreProcessorTest("docs/1/2/3/somefile.java", "docs/**/*.java", "A recursive file with match-any file name when matching should ignore.").ignored(),
+                new CodegenIgnoreProcessorTest("docs/1/2/3/4/somefile.md", "docs/**/*", "A recursive file with match-any file name when matching should ignore.").ignored(),
+                new CodegenIgnoreProcessorTest("docs/1/2/3/4/5/somefile.md", "docs/**/anyfile.*", "A recursive file with match-any extension when non-matching should allow.").allowed(),
+
+                // Directory matches
+                new CodegenIgnoreProcessorTest("docs/1/Users/a", "docs/**/Users/", "A directory rule when matching should be ignored.").ignored(),
+                new CodegenIgnoreProcessorTest("docs/1/Users1/a", "docs/**/Users/", "A directory rule when non-matching should be allowed.").allowed(),
+
+                // Negation of excluded recursive files
+                new CodegenIgnoreProcessorTest("docs/UserApi.md", "docs/**\n!docs/UserApi.md", "A pattern negating a previous ignore FILE rule should be allowed.").allowed(),
+
+                // Negation of excluded directories
+                new CodegenIgnoreProcessorTest("docs/1/Users/UserApi.md", "docs/**/Users/\n!docs/1/Users/UserApi.md", "A pattern negating a previous ignore DIRECTORY rule should be ignored.").ignored(),
+
+                // Other matches which may not be parsed for correctness, but are free because of PathMatcher
+                new CodegenIgnoreProcessorTest("docs/1/2/3/Some99File.md", "**/*[0-9]*", "A file when matching against simple regex patterns when matching should be ignored.").ignored(),
+                new CodegenIgnoreProcessorTest("docs/1/2/3/SomeFile.md", "**/*.{java,md}", "A file when matching against grouped subpatterns for extension when matching (md) should be ignored.").ignored(),
+                new CodegenIgnoreProcessorTest("docs/1/2/3/SomeFile.java", "**/*.{java,md}", "A file when matching against grouped subpatterns for extension when matching (java) should be ignored.").ignored(),
+                new CodegenIgnoreProcessorTest("docs/1/2/3/SomeFile.txt", "**/*.{java,md}", "A file when matching against grouped subpatterns for extension when non-matching should be allowed.").allowed(),
+
+                new CodegenIgnoreProcessorTest("docs/1/2/3/foo.c", "**/*.?", "A file when matching against required single-character extension when matching should be ignored.").ignored(),
+                new CodegenIgnoreProcessorTest("docs/1/2/3/foo.cc", "**/*.?", "A file when matching against required single-character extension when non-matching should be allowed.").allowed()
+
+        };
     }
-
 }
\ No newline at end of file

From 4b74f6ccef8984aee39e108630697ac34c1d907b Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sun, 29 May 2016 15:02:06 +0800
Subject: [PATCH 042/139] add defaulat license (apache2.0) to all generators

---
 .../io/swagger/codegen/DefaultGenerator.java  |  13 ++
 .../petstore/sinatra/.swagger-codegen-ignore  |  23 +++
 samples/server/petstore/sinatra/LICENSE       | 176 ++++++++++++++++++
 .../petstore/slim/.swagger-codegen-ignore     |  23 +++
 samples/server/petstore/slim/LICENSE          | 176 ++++++++++++++++++
 5 files changed, 411 insertions(+)
 create mode 100644 samples/server/petstore/sinatra/.swagger-codegen-ignore
 create mode 100644 samples/server/petstore/sinatra/LICENSE
 create mode 100644 samples/server/petstore/slim/.swagger-codegen-ignore
 create mode 100644 samples/server/petstore/slim/LICENSE

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
index 231cf496d05c..6a489e45e52c 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -608,6 +608,19 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                 }
                 files.add(ignoreFile);
             }
+
+            // Add default LICENSE (Apache-2.0) for all generators
+            final String apache2License = "LICENSE";
+            String licenseFileNameTarget = config.outputFolder() + File.separator + apache2License;
+            File licenseFile = new File(licenseFileNameTarget);
+            String licenseFileNameSource = File.separator + config.getCommonTemplateDir() + File.separator + apache2License;
+            String licenseFileContents = readResourceContents(licenseFileNameSource);
+            try {
+                writeToFile(licenseFileNameTarget, licenseFileContents);
+            } catch (IOException e) {
+                throw new RuntimeException("Could not generate LICENSE file '" + apache2License + "'", e);
+            }
+            files.add(licenseFile);
         }
         config.processSwagger(swagger);
         return files;
diff --git a/samples/server/petstore/sinatra/.swagger-codegen-ignore b/samples/server/petstore/sinatra/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/server/petstore/sinatra/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/server/petstore/sinatra/LICENSE b/samples/server/petstore/sinatra/LICENSE
new file mode 100644
index 000000000000..d9a10c0d8e86
--- /dev/null
+++ b/samples/server/petstore/sinatra/LICENSE
@@ -0,0 +1,176 @@
+                                 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
diff --git a/samples/server/petstore/slim/.swagger-codegen-ignore b/samples/server/petstore/slim/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/server/petstore/slim/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/server/petstore/slim/LICENSE b/samples/server/petstore/slim/LICENSE
new file mode 100644
index 000000000000..d9a10c0d8e86
--- /dev/null
+++ b/samples/server/petstore/slim/LICENSE
@@ -0,0 +1,176 @@
+                                 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

From 6d1fd2c78d5c5c8ecdccced097df729d3cfce3d3 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sun, 29 May 2016 17:28:33 +0800
Subject: [PATCH 043/139] fix spec for map and array

---
 ...ith-fake-endpoints-models-for-testing.yaml | 47 +++++++++++-------
 .../csharp/SwaggerClient/IO.Swagger.sln       | 10 ++--
 .../petstore/csharp/SwaggerClient/README.md   |  2 +-
 .../docs/AdditionalPropertiesClass.md         |  2 +
 .../csharp/SwaggerClient/docs/ArrayTest.md    |  3 ++
 ...dPropertiesAndAdditionalPropertiesClass.md |  1 +
 .../IO.Swagger.Test/IO.Swagger.Test.csproj    | 42 ++++++++--------
 .../src/IO.Swagger/IO.Swagger.csproj          |  2 +-
 .../Model/AdditionalPropertiesClass.cs        | 38 ++++++++++++--
 .../src/IO.Swagger/Model/ArrayTest.cs         | 49 ++++++++++++++++++-
 ...dPropertiesAndAdditionalPropertiesClass.cs | 21 ++++++--
 11 files changed, 161 insertions(+), 56 deletions(-)

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
index d1181a53ead0..ee4c0bfbcc98 100644
--- 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
@@ -949,8 +949,17 @@ definitions:
           - -1.2
   AdditionalPropertiesClass:
     type: object
-    additionalProperties:
-      type: string
+    properties:
+      map_property:
+        type: object
+        additionalProperties:
+          type: string
+      map_of_map_property:
+        type: object
+        additionalProperties:
+          type: object
+          additionalProperties:
+            type: string
   MixedPropertiesAndAdditionalPropertiesClass:
     type: object
     properties:
@@ -960,9 +969,10 @@ definitions:
       dateTime:
         type: string
         format: date-time
-    additionalProperties:
-      type: string
-      $ref: '#/definitions/Animal'
+      map: 
+        type: object
+        additionalProperties:
+          $ref: '#/definitions/Animal'
   ReadOnlyFirst:
     type: object
     properties:
@@ -973,23 +983,24 @@ definitions:
         type: string
   ArrayTest:
     type: object
-    array_of_string:
-      type: array
-      items:
-        type: string
-    array_array_of_integer:
-      type: array
-      items:
+    properties:
+      array_of_string:
         type: array
         items:
-          type: integer
-          format: int64
-    array_array_of_model:
-      type: array
-      items:
+          type: string
+      array_array_of_integer:
         type: array
         items:
-          $ref: '#/definitions/ReadOnlyFirst'
+          type: array
+          items:
+            type: integer
+            format: int64
+      array_array_of_model:
+        type: array
+        items:
+          type: array
+          items:
+            $ref: '#/definitions/ReadOnlyFirst'
 externalDocs:
   description: Find out more about Swagger
   url: 'http://swagger.io'
diff --git a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
index f3e0be76b476..c0a42faae525 100644
--- a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
+++ b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 VisualStudioVersion = 12.0.0.0
 MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{C81D6286-7BA5-4920-8591-F59169CCE4A4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger.Test", "src\IO.Swagger.Test\IO.Swagger.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
 EndProject
@@ -12,10 +12,10 @@ Debug|Any CPU = Debug|Any CPU
 Release|Any CPU = Release|Any CPU
 EndGlobalSection
 GlobalSection(ProjectConfigurationPlatforms) = postSolution
-{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}.Release|Any CPU.Build.0 = Release|Any CPU
+{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Release|Any CPU.Build.0 = Release|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/samples/client/petstore/csharp/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClient/README.md
index e4677b09503f..d9dcb59b2da6 100644
--- a/samples/client/petstore/csharp/SwaggerClient/README.md
+++ b/samples/client/petstore/csharp/SwaggerClient/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build date: 2016-05-25T14:35:23.891+08:00
+- Build date: 2016-05-29T17:27:36.037+08:00
 - Build package: class io.swagger.codegen.languages.CSharpClientCodegen
 
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp/SwaggerClient/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/SwaggerClient/docs/AdditionalPropertiesClass.md
index e9922fe6e913..ac4f9d10798e 100644
--- a/samples/client/petstore/csharp/SwaggerClient/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp/SwaggerClient/docs/AdditionalPropertiesClass.md
@@ -3,6 +3,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**MapProperty** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfMapProperty** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [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/csharp/SwaggerClient/docs/ArrayTest.md b/samples/client/petstore/csharp/SwaggerClient/docs/ArrayTest.md
index 8f9cff9e9cf3..37fb2788b77f 100644
--- a/samples/client/petstore/csharp/SwaggerClient/docs/ArrayTest.md
+++ b/samples/client/petstore/csharp/SwaggerClient/docs/ArrayTest.md
@@ -3,6 +3,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**ArrayOfString** | **List&lt;string&gt;** |  | [optional] 
+**ArrayArrayOfInteger** | **List&lt;List&lt;long?&gt;&gt;** |  | [optional] 
+**ArrayArrayOfModel** | **List&lt;List&lt;ReadOnlyFirst&gt;&gt;** |  | [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/csharp/SwaggerClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/SwaggerClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 0db3f9ee52d3..e2c978f9ab12 100644
--- a/samples/client/petstore/csharp/SwaggerClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp/SwaggerClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Uuid** | **Guid?** |  | [optional] 
 **DateTime** | **DateTime?** |  | [optional] 
+**Map** | [**Dictionary&lt;string, Animal&gt;**](Animal.md) |  | [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/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
index f101ec8e2066..4e4b161e2558 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
@@ -20,7 +20,7 @@ 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.
 -->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -59,38 +59,36 @@ limitations under the License.
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="**\*.cs" />
+    <Compile Include="**\*.cs"/>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+      <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\IO.Swagger\IO.Swagger.csproj">
-      <Project>{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}</Project>
-      <Name>IO.Swagger</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="swagger-logo.png" />
+      <ProjectReference Include="..\IO.Swagger\IO.Swagger.csproj">
+          <Project>{C81D6286-7BA5-4920-8591-F59169CCE4A4}</Project>
+          <Name>IO.Swagger</Name>
+      </ProjectReference>
   </ItemGroup>
 </Project>
+
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
index 93ba033f6ad9..20fdb3385e16 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
@@ -24,7 +24,7 @@ limitations under the License.
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}</ProjectGuid>
+    <ProjectGuid>{C81D6286-7BA5-4920-8591-F59169CCE4A4}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swagger Library</RootNamespace>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/AdditionalPropertiesClass.cs
index b442c5e87915..db9ac4006b77 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/AdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/AdditionalPropertiesClass.cs
@@ -37,15 +37,29 @@ namespace IO.Swagger.Model
     /// AdditionalPropertiesClass
     /// </summary>
     [DataContract]
-    public partial class AdditionalPropertiesClass : Dictionary<String, string>,  IEquatable<AdditionalPropertiesClass>
+    public partial class AdditionalPropertiesClass :  IEquatable<AdditionalPropertiesClass>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AdditionalPropertiesClass" /> class.
         /// </summary>
-        public AdditionalPropertiesClass()
+        /// <param name="MapProperty">MapProperty.</param>
+        /// <param name="MapOfMapProperty">MapOfMapProperty.</param>
+        public AdditionalPropertiesClass(Dictionary<string, string> MapProperty = null, Dictionary<string, Dictionary<string, string>> MapOfMapProperty = null)
         {
+            this.MapProperty = MapProperty;
+            this.MapOfMapProperty = MapOfMapProperty;
         }
         
+        /// <summary>
+        /// Gets or Sets MapProperty
+        /// </summary>
+        [DataMember(Name="map_property", EmitDefaultValue=false)]
+        public Dictionary<string, string> MapProperty { get; set; }
+        /// <summary>
+        /// Gets or Sets MapOfMapProperty
+        /// </summary>
+        [DataMember(Name="map_of_map_property", EmitDefaultValue=false)]
+        public Dictionary<string, Dictionary<string, string>> MapOfMapProperty { get; set; }
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -54,6 +68,8 @@ namespace IO.Swagger.Model
         {
             var sb = new StringBuilder();
             sb.Append("class AdditionalPropertiesClass {\n");
+            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -62,7 +78,7 @@ namespace IO.Swagger.Model
         /// Returns the JSON string presentation of the object
         /// </summary>
         /// <returns>JSON string presentation of the object</returns>
-        public  new string ToJson()
+        public string ToJson()
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented);
         }
@@ -89,7 +105,17 @@ namespace IO.Swagger.Model
             if (other == null)
                 return false;
 
-            return false;
+            return 
+                (
+                    this.MapProperty == other.MapProperty ||
+                    this.MapProperty != null &&
+                    this.MapProperty.SequenceEqual(other.MapProperty)
+                ) && 
+                (
+                    this.MapOfMapProperty == other.MapOfMapProperty ||
+                    this.MapOfMapProperty != null &&
+                    this.MapOfMapProperty.SequenceEqual(other.MapOfMapProperty)
+                );
         }
 
         /// <summary>
@@ -103,6 +129,10 @@ namespace IO.Swagger.Model
             {
                 int hash = 41;
                 // Suitable nullity checks etc, of course :)
+                if (this.MapProperty != null)
+                    hash = hash * 59 + this.MapProperty.GetHashCode();
+                if (this.MapOfMapProperty != null)
+                    hash = hash * 59 + this.MapOfMapProperty.GetHashCode();
                 return hash;
             }
         }
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/ArrayTest.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/ArrayTest.cs
index 9521ae2e3ae9..b80118c790fc 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/ArrayTest.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/ArrayTest.cs
@@ -42,10 +42,31 @@ namespace IO.Swagger.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayTest" /> class.
         /// </summary>
-        public ArrayTest()
+        /// <param name="ArrayOfString">ArrayOfString.</param>
+        /// <param name="ArrayArrayOfInteger">ArrayArrayOfInteger.</param>
+        /// <param name="ArrayArrayOfModel">ArrayArrayOfModel.</param>
+        public ArrayTest(List<string> ArrayOfString = null, List<List<long?>> ArrayArrayOfInteger = null, List<List<ReadOnlyFirst>> ArrayArrayOfModel = null)
         {
+            this.ArrayOfString = ArrayOfString;
+            this.ArrayArrayOfInteger = ArrayArrayOfInteger;
+            this.ArrayArrayOfModel = ArrayArrayOfModel;
         }
         
+        /// <summary>
+        /// Gets or Sets ArrayOfString
+        /// </summary>
+        [DataMember(Name="array_of_string", EmitDefaultValue=false)]
+        public List<string> ArrayOfString { get; set; }
+        /// <summary>
+        /// Gets or Sets ArrayArrayOfInteger
+        /// </summary>
+        [DataMember(Name="array_array_of_integer", EmitDefaultValue=false)]
+        public List<List<long?>> ArrayArrayOfInteger { get; set; }
+        /// <summary>
+        /// Gets or Sets ArrayArrayOfModel
+        /// </summary>
+        [DataMember(Name="array_array_of_model", EmitDefaultValue=false)]
+        public List<List<ReadOnlyFirst>> ArrayArrayOfModel { get; set; }
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -54,6 +75,9 @@ namespace IO.Swagger.Model
         {
             var sb = new StringBuilder();
             sb.Append("class ArrayTest {\n");
+            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
+            sb.Append("  ArrayArrayOfInteger: ").Append(ArrayArrayOfInteger).Append("\n");
+            sb.Append("  ArrayArrayOfModel: ").Append(ArrayArrayOfModel).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -89,7 +113,22 @@ namespace IO.Swagger.Model
             if (other == null)
                 return false;
 
-            return false;
+            return 
+                (
+                    this.ArrayOfString == other.ArrayOfString ||
+                    this.ArrayOfString != null &&
+                    this.ArrayOfString.SequenceEqual(other.ArrayOfString)
+                ) && 
+                (
+                    this.ArrayArrayOfInteger == other.ArrayArrayOfInteger ||
+                    this.ArrayArrayOfInteger != null &&
+                    this.ArrayArrayOfInteger.SequenceEqual(other.ArrayArrayOfInteger)
+                ) && 
+                (
+                    this.ArrayArrayOfModel == other.ArrayArrayOfModel ||
+                    this.ArrayArrayOfModel != null &&
+                    this.ArrayArrayOfModel.SequenceEqual(other.ArrayArrayOfModel)
+                );
         }
 
         /// <summary>
@@ -103,6 +142,12 @@ namespace IO.Swagger.Model
             {
                 int hash = 41;
                 // Suitable nullity checks etc, of course :)
+                if (this.ArrayOfString != null)
+                    hash = hash * 59 + this.ArrayOfString.GetHashCode();
+                if (this.ArrayArrayOfInteger != null)
+                    hash = hash * 59 + this.ArrayArrayOfInteger.GetHashCode();
+                if (this.ArrayArrayOfModel != null)
+                    hash = hash * 59 + this.ArrayArrayOfModel.GetHashCode();
                 return hash;
             }
         }
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
index d66f758575a2..ea20988a1ecf 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
@@ -37,17 +37,19 @@ namespace IO.Swagger.Model
     /// MixedPropertiesAndAdditionalPropertiesClass
     /// </summary>
     [DataContract]
-    public partial class MixedPropertiesAndAdditionalPropertiesClass : Dictionary<String, Animal>,  IEquatable<MixedPropertiesAndAdditionalPropertiesClass>
+    public partial class MixedPropertiesAndAdditionalPropertiesClass :  IEquatable<MixedPropertiesAndAdditionalPropertiesClass>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MixedPropertiesAndAdditionalPropertiesClass" /> class.
         /// </summary>
         /// <param name="Uuid">Uuid.</param>
         /// <param name="DateTime">DateTime.</param>
-        public MixedPropertiesAndAdditionalPropertiesClass(Guid? Uuid = null, DateTime? DateTime = null)
+        /// <param name="Map">Map.</param>
+        public MixedPropertiesAndAdditionalPropertiesClass(Guid? Uuid = null, DateTime? DateTime = null, Dictionary<string, Animal> Map = null)
         {
             this.Uuid = Uuid;
             this.DateTime = DateTime;
+            this.Map = Map;
         }
         
         /// <summary>
@@ -61,6 +63,11 @@ namespace IO.Swagger.Model
         [DataMember(Name="dateTime", EmitDefaultValue=false)]
         public DateTime? DateTime { get; set; }
         /// <summary>
+        /// Gets or Sets Map
+        /// </summary>
+        [DataMember(Name="map", EmitDefaultValue=false)]
+        public Dictionary<string, Animal> Map { get; set; }
+        /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
         /// <returns>String presentation of the object</returns>
@@ -70,6 +77,7 @@ namespace IO.Swagger.Model
             sb.Append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
             sb.Append("  Uuid: ").Append(Uuid).Append("\n");
             sb.Append("  DateTime: ").Append(DateTime).Append("\n");
+            sb.Append("  Map: ").Append(Map).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -78,7 +86,7 @@ namespace IO.Swagger.Model
         /// Returns the JSON string presentation of the object
         /// </summary>
         /// <returns>JSON string presentation of the object</returns>
-        public  new string ToJson()
+        public string ToJson()
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented);
         }
@@ -115,6 +123,11 @@ namespace IO.Swagger.Model
                     this.DateTime == other.DateTime ||
                     this.DateTime != null &&
                     this.DateTime.Equals(other.DateTime)
+                ) && 
+                (
+                    this.Map == other.Map ||
+                    this.Map != null &&
+                    this.Map.SequenceEqual(other.Map)
                 );
         }
 
@@ -133,6 +146,8 @@ namespace IO.Swagger.Model
                     hash = hash * 59 + this.Uuid.GetHashCode();
                 if (this.DateTime != null)
                     hash = hash * 59 + this.DateTime.GetHashCode();
+                if (this.Map != null)
+                    hash = hash * 59 + this.Map.GetHashCode();
                 return hash;
             }
         }

From a27cda68ce3ebcb4b6f9c25731df67e75d84bc3b Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sun, 29 May 2016 18:08:32 +0800
Subject: [PATCH 044/139] update nodejs/ts package license to use Apache-2.0

---
 .../TypeScriptNodeClientCodegen.java          |   1 -
 .../resources/Javascript/package.mustache     |   4 +-
 .../TypeScript-Fetch/package.json.mustache    |   3 +-
 .../main/resources/nodejs/package.mustache    |   2 +-
 .../resources/swagger-static/package.mustache |   2 +-
 .../typescript-angular2/package.mustache      |   2 +-
 .../package.json                              |   2 +-
 .../array-and-object-expected/package.json    |   2 +-
 .../typescript/node-es5-expected/package.json |   2 +-
 samples/client/petstore/javascript/README.md  |  22 +-
 .../client/petstore/javascript/docs/Animal.md |   1 +
 .../petstore/javascript/docs/FakeApi.md       |  10 +-
 .../client/petstore/javascript/docs/Name.md   |   1 +
 .../client/petstore/javascript/package.json   |   4 +-
 .../petstore/javascript/src/ApiClient.js      |   4 +-
 .../petstore/javascript/src/api/FakeApi.js    |   8 +-
 .../client/petstore/javascript/src/index.js   |  28 +-
 .../petstore/javascript/src/model/Animal.js   |   9 +
 .../petstore/javascript/src/model/Name.js     |   8 +
 .../petstore/typescript-node/default/api.ts   | 412 +++++++++---------
 .../petstore/typescript-node/npm/api.ts       |  10 +-
 .../server/petstore/nodejs/api/swagger.yaml   |   8 +-
 .../petstore/nodejs/controllers/PetService.js |  58 +--
 .../nodejs/controllers/StoreService.js        |  16 +-
 .../nodejs/controllers/UserService.js         |  12 +-
 samples/server/petstore/nodejs/package.json   |   2 +-
 26 files changed, 338 insertions(+), 295 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java
index d4207f09cc83..516d34b9810b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptNodeClientCodegen.java
@@ -42,7 +42,6 @@ public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen
         supportingFiles.add(new SupportingFile("api.mustache", null, "api.ts"));
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
 
-        LOGGER.warn("check additionals: " + additionalProperties.get(NPM_NAME));
         if(additionalProperties.containsKey(NPM_NAME)) {
             addNpmPackageGeneration();
         }
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/package.mustache b/modules/swagger-codegen/src/main/resources/Javascript/package.mustache
index ca84decf9d39..915c99e8d400 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/package.mustache
@@ -1,8 +1,8 @@
 {
   "name": "{{{projectName}}}",
   "version": "{{{projectVersion}}}",
-  "description": "{{{projectDescription}}}",{{#projectLicenseName}}
-  "license": "{{{projectLicenseName}}}",{{/projectLicenseName}}
+  "description": "{{{projectDescription}}}",
+  "license": "Apache-2.0",
   "main": "{{sourceFolder}}{{#invokerPackage}}/{{invokerPackage}}{{/invokerPackage}}/index.js",
   "scripts": {
     "test": "./node_modules/mocha/bin/mocha --recursive"
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache
index 62a598d536bd..5a195c346ff7 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache
@@ -1,6 +1,7 @@
 {
   "name": "{{#npmName}}{{{npmName}}}{{/npmName}}{{^npmName}}typescript-fetch-api{{/npmName}}",
   "version": "{{#npmVersion}}{{{npmVersion}}}{{/npmVersion}}{{^npmVersion}}0.0.0{{/npmVersion}}",
+  "license": "Apache-2.0",
   "main": "./dist/api.js",
   "browser": "./dist/api.js",
   "typings": "./dist/api.d.ts",
@@ -15,4 +16,4 @@
     "typescript": "^1.8.10",
     "typings": "^0.8.1"
   }
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/main/resources/nodejs/package.mustache b/modules/swagger-codegen/src/main/resources/nodejs/package.mustache
index 2d2b917c4b25..5496ee06f807 100644
--- a/modules/swagger-codegen/src/main/resources/nodejs/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/nodejs/package.mustache
@@ -6,7 +6,7 @@
   "keywords": [
     "swagger"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "private": true,
   "dependencies": {
     "connect": "^3.2.0",
diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/package.mustache b/modules/swagger-codegen/src/main/resources/swagger-static/package.mustache
index d728e9f00639..637b12bccc01 100644
--- a/modules/swagger-codegen/src/main/resources/swagger-static/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/swagger-static/package.mustache
@@ -8,5 +8,5 @@
   "dependencies": {
     "express": "3.x"
   },
-  "license": "apache 2.0"
+  "license": "Apache-2.0"
 }
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
index 28a18bfb91b4..70cb98cce7ef 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache
@@ -6,7 +6,7 @@
   "keywords": [
     "swagger-client"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "files": [
     "lib"
   ],
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json
index 36ec153321d9..bdd490f27b90 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json
@@ -6,7 +6,7 @@
   "keywords": [
     "swagger-client"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "files": [
     "lib"
   ],
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json
index 83a9a586ab97..adc902b36106 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json
@@ -6,7 +6,7 @@
   "keywords": [
     "swagger-client"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "files": [
     "lib"
   ],
diff --git a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/package.json b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/package.json
index 960338ff787d..fba3fa017f95 100644
--- a/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/package.json
+++ b/modules/swagger-codegen/src/test/resources/integrationtests/typescript/node-es5-expected/package.json
@@ -7,7 +7,7 @@
         "build": "typings install && tsc"
     },
     "author": "Swagger Codegen Contributors",
-    "license": "MIT",
+    "license": "Apache-2.0",
     "dependencies": {
         "bluebird": "^3.3.5",
         "request": "^2.72.0"
diff --git a/samples/client/petstore/javascript/README.md b/samples/client/petstore/javascript/README.md
index 1bf60abb9c32..a2ad690d6f7b 100644
--- a/samples/client/petstore/javascript/README.md
+++ b/samples/client/petstore/javascript/README.md
@@ -1,12 +1,12 @@
 # swagger-petstore
 
 SwaggerPetstore - JavaScript client for 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 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-05-06T18:34:50.267+08:00
+- Build date: 2016-05-29T18:06:05.597+08:00
 - Build package: class io.swagger.codegen.languages.JavascriptClientCodegen
 
 ## Installation
@@ -91,7 +91,7 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*SwaggerPetstore.FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters
+*SwaggerPetstore.FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 *SwaggerPetstore.PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add 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
@@ -116,20 +116,24 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [SwaggerPetstore.AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
  - [SwaggerPetstore.Animal](docs/Animal.md)
  - [SwaggerPetstore.AnimalFarm](docs/AnimalFarm.md)
  - [SwaggerPetstore.ApiResponse](docs/ApiResponse.md)
+ - [SwaggerPetstore.ArrayTest](docs/ArrayTest.md)
  - [SwaggerPetstore.Cat](docs/Cat.md)
  - [SwaggerPetstore.Category](docs/Category.md)
  - [SwaggerPetstore.Dog](docs/Dog.md)
  - [SwaggerPetstore.EnumClass](docs/EnumClass.md)
  - [SwaggerPetstore.EnumTest](docs/EnumTest.md)
  - [SwaggerPetstore.FormatTest](docs/FormatTest.md)
+ - [SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [SwaggerPetstore.Model200Response](docs/Model200Response.md)
  - [SwaggerPetstore.ModelReturn](docs/ModelReturn.md)
  - [SwaggerPetstore.Name](docs/Name.md)
  - [SwaggerPetstore.Order](docs/Order.md)
  - [SwaggerPetstore.Pet](docs/Pet.md)
+ - [SwaggerPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SwaggerPetstore.SpecialModelName](docs/SpecialModelName.md)
  - [SwaggerPetstore.Tag](docs/Tag.md)
  - [SwaggerPetstore.User](docs/User.md)
@@ -138,6 +142,12 @@ Class | Method | HTTP request | Description
 ## Documentation for Authorization
 
 
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
 ### petstore_auth
 
 - **Type**: OAuth
@@ -147,9 +157,3 @@ Class | Method | HTTP request | Description
   - 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
-
diff --git a/samples/client/petstore/javascript/docs/Animal.md b/samples/client/petstore/javascript/docs/Animal.md
index c37d95695a01..3ae52d9db17c 100644
--- a/samples/client/petstore/javascript/docs/Animal.md
+++ b/samples/client/petstore/javascript/docs/Animal.md
@@ -4,5 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **String** |  | 
+**color** | **String** |  | [optional] [default to &#39;red&#39;]
 
 
diff --git a/samples/client/petstore/javascript/docs/FakeApi.md b/samples/client/petstore/javascript/docs/FakeApi.md
index 121056d1c568..6eba9c1b0237 100644
--- a/samples/client/petstore/javascript/docs/FakeApi.md
+++ b/samples/client/petstore/javascript/docs/FakeApi.md
@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
 
 <a name="testEndpointParameters"></a>
 # **testEndpointParameters**
 > testEndpointParameters(_number, _double, _string, _byte, opts)
 
-Fake endpoint for testing various parameters
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
-Fake endpoint for testing various parameters
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
 ### Example
 ```javascript
@@ -77,6 +77,6 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
+ - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
 
diff --git a/samples/client/petstore/javascript/docs/Name.md b/samples/client/petstore/javascript/docs/Name.md
index 3bdb76be0859..6c47d402743f 100644
--- a/samples/client/petstore/javascript/docs/Name.md
+++ b/samples/client/petstore/javascript/docs/Name.md
@@ -6,5 +6,6 @@ Name | Type | Description | Notes
 **name** | **Integer** |  | 
 **snakeCase** | **Integer** |  | [optional] 
 **property** | **String** |  | [optional] 
+**_123Number** | **Integer** |  | [optional] 
 
 
diff --git a/samples/client/petstore/javascript/package.json b/samples/client/petstore/javascript/package.json
index 8ff02a78ae3f..53ea2d8faf91 100644
--- a/samples/client/petstore/javascript/package.json
+++ b/samples/client/petstore/javascript/package.json
@@ -1,8 +1,8 @@
 {
   "name": "swagger-petstore",
   "version": "1.0.0",
-  "description": "This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.",
-  "license": "Apache 2.0",
+  "description": "This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ ",
+  "license": "Apache-2.0",
   "main": "src/index.js",
   "scripts": {
     "test": "./node_modules/mocha/bin/mocha --recursive"
diff --git a/samples/client/petstore/javascript/src/ApiClient.js b/samples/client/petstore/javascript/src/ApiClient.js
index 2598dd8d9ea9..d45704dcdac9 100644
--- a/samples/client/petstore/javascript/src/ApiClient.js
+++ b/samples/client/petstore/javascript/src/ApiClient.js
@@ -40,8 +40,8 @@
      * @type {Array.<String>}
      */
     this.authentications = {
-      'petstore_auth': {type: 'oauth2'},
-      'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'}
+      'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'},
+      'petstore_auth': {type: 'oauth2'}
     };
     /**
      * The default HTTP headers to be included for all API calls.
diff --git a/samples/client/petstore/javascript/src/api/FakeApi.js b/samples/client/petstore/javascript/src/api/FakeApi.js
index f75b8f558906..9db45d334f51 100644
--- a/samples/client/petstore/javascript/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript/src/api/FakeApi.js
@@ -41,8 +41,8 @@
      */
 
     /**
-     * Fake endpoint for testing various parameters
-     * Fake endpoint for testing various parameters
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * @param {Number} _number None
      * @param {Number} _double None
      * @param {String} _string None
@@ -105,8 +105,8 @@
       };
 
       var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
+      var contentTypes = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
+      var accepts = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
       var returnType = null;
 
       return this.apiClient.callApi(
diff --git a/samples/client/petstore/javascript/src/index.js b/samples/client/petstore/javascript/src/index.js
index 727b4782f458..2c3e34b4efdc 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/AnimalFarm', 'model/ApiResponse', 'model/Cat', 'model/Category', 'model/Dog', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/Order', 'model/Pet', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
+    define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayTest', 'model/Cat', 'model/Category', 'model/Dog', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/Order', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'api/FakeApi', '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/AnimalFarm'), require('./model/ApiResponse'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), 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/FakeApi'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
+    module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayTest'), require('./model/Cat'), require('./model/Category'), require('./model/Dog'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/Order'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./api/FakeApi'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
   }
-}(function(ApiClient, Animal, AnimalFarm, ApiResponse, Cat, Category, Dog, EnumClass, EnumTest, FormatTest, Model200Response, ModelReturn, Name, Order, Pet, SpecialModelName, Tag, User, FakeApi, PetApi, StoreApi, UserApi) {
+}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayTest, Cat, Category, Dog, EnumClass, EnumTest, FormatTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, Order, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, FakeApi, PetApi, StoreApi, UserApi) {
   'use strict';
 
   /**
-   * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose..<br>
+   * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \&quot; \\ .<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:
@@ -46,6 +46,11 @@
      * @property {module:ApiClient}
      */
     ApiClient: ApiClient,
+    /**
+     * The AdditionalPropertiesClass model constructor.
+     * @property {module:model/AdditionalPropertiesClass}
+     */
+    AdditionalPropertiesClass: AdditionalPropertiesClass,
     /**
      * The Animal model constructor.
      * @property {module:model/Animal}
@@ -61,6 +66,11 @@
      * @property {module:model/ApiResponse}
      */
     ApiResponse: ApiResponse,
+    /**
+     * The ArrayTest model constructor.
+     * @property {module:model/ArrayTest}
+     */
+    ArrayTest: ArrayTest,
     /**
      * The Cat model constructor.
      * @property {module:model/Cat}
@@ -91,6 +101,11 @@
      * @property {module:model/FormatTest}
      */
     FormatTest: FormatTest,
+    /**
+     * The MixedPropertiesAndAdditionalPropertiesClass model constructor.
+     * @property {module:model/MixedPropertiesAndAdditionalPropertiesClass}
+     */
+    MixedPropertiesAndAdditionalPropertiesClass: MixedPropertiesAndAdditionalPropertiesClass,
     /**
      * The Model200Response model constructor.
      * @property {module:model/Model200Response}
@@ -116,6 +131,11 @@
      * @property {module:model/Pet}
      */
     Pet: Pet,
+    /**
+     * The ReadOnlyFirst model constructor.
+     * @property {module:model/ReadOnlyFirst}
+     */
+    ReadOnlyFirst: ReadOnlyFirst,
     /**
      * The SpecialModelName model constructor.
      * @property {module:model/SpecialModelName}
diff --git a/samples/client/petstore/javascript/src/model/Animal.js b/samples/client/petstore/javascript/src/model/Animal.js
index e42874c669b8..28e5904e8403 100644
--- a/samples/client/petstore/javascript/src/model/Animal.js
+++ b/samples/client/petstore/javascript/src/model/Animal.js
@@ -34,6 +34,7 @@
     var _this = this;
 
     _this['className'] = className;
+
   };
 
   /**
@@ -50,6 +51,9 @@
       if (data.hasOwnProperty('className')) {
         obj['className'] = ApiClient.convertToType(data['className'], 'String');
       }
+      if (data.hasOwnProperty('color')) {
+        obj['color'] = ApiClient.convertToType(data['color'], 'String');
+      }
     }
     return obj;
   }
@@ -58,6 +62,11 @@
    * @member {String} className
    */
   exports.prototype['className'] = undefined;
+  /**
+   * @member {String} color
+   * @default 'red'
+   */
+  exports.prototype['color'] = 'red';
 
 
 
diff --git a/samples/client/petstore/javascript/src/model/Name.js b/samples/client/petstore/javascript/src/model/Name.js
index 93d1d55deb27..f8c24ef770ce 100644
--- a/samples/client/petstore/javascript/src/model/Name.js
+++ b/samples/client/petstore/javascript/src/model/Name.js
@@ -37,6 +37,7 @@
     _this['name'] = name;
 
 
+
   };
 
   /**
@@ -59,6 +60,9 @@
       if (data.hasOwnProperty('property')) {
         obj['property'] = ApiClient.convertToType(data['property'], 'String');
       }
+      if (data.hasOwnProperty('123Number')) {
+        obj['123Number'] = ApiClient.convertToType(data['123Number'], 'Integer');
+      }
     }
     return obj;
   }
@@ -75,6 +79,10 @@
    * @member {String} property
    */
   exports.prototype['property'] = undefined;
+  /**
+   * @member {Integer} 123Number
+   */
+  exports.prototype['123Number'] = undefined;
 
 
 
diff --git a/samples/client/petstore/typescript-node/default/api.ts b/samples/client/petstore/typescript-node/default/api.ts
index 2120b0b00882..6eaa16cfd97b 100644
--- a/samples/client/petstore/typescript-node/default/api.ts
+++ b/samples/client/petstore/typescript-node/default/api.ts
@@ -1,6 +1,6 @@
 import request = require('request');
 import http = require('http');
-import promise = require('bluebird');
+import Promise = require('bluebird');
 
 let defaultBasePath = 'http://petstore.swagger.io/v2';
 
@@ -132,8 +132,8 @@ export class PetApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
@@ -182,7 +182,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -204,18 +203,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Deletes a pet
@@ -240,7 +240,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'DELETE',
             qs: queryParameters,
@@ -261,18 +260,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Finds Pets by status
@@ -292,7 +292,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -313,18 +312,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Finds Pets by tags
@@ -344,7 +344,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Array<Pet>;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -365,18 +364,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Find pet by ID
@@ -398,7 +398,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Pet;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -408,10 +407,10 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-
         this.authentications.api_key.applyToRequest(requestOptions);
 
+        this.authentications.petstore_auth.applyToRequest(requestOptions);
+
         this.authentications.default.applyToRequest(requestOptions);
 
         if (Object.keys(formParams).length) {
@@ -421,18 +420,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: Pet;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Update an existing pet
@@ -448,7 +448,6 @@ export class PetApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'PUT',
             qs: queryParameters,
@@ -470,18 +469,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Updates a pet in the store with form data
@@ -513,7 +513,6 @@ export class PetApi {
             formParams['status'] = status;
         }
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -534,18 +533,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * uploads an image
@@ -578,7 +578,6 @@ export class PetApi {
         }
         useFormData = true;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -599,18 +598,19 @@ export class PetApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
 }
 export enum StoreApiApiKeys {
@@ -624,8 +624,8 @@ export class StoreApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
@@ -680,7 +680,6 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'DELETE',
             qs: queryParameters,
@@ -699,18 +698,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Returns pet inventories by status
@@ -725,7 +725,6 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; };  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -746,18 +745,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: { [key: string]: number; };  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Find purchase order by ID
@@ -779,7 +779,6 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -798,18 +797,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Place an order for a pet
@@ -825,7 +825,6 @@ export class StoreApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -845,18 +844,19 @@ export class StoreApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
 }
 export enum UserApiApiKeys {
@@ -870,8 +870,8 @@ export class UserApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
@@ -920,7 +920,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -940,18 +939,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Creates list of users with given input array
@@ -967,7 +967,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -987,18 +986,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Creates list of users with given input array
@@ -1014,7 +1014,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'POST',
             qs: queryParameters,
@@ -1034,18 +1033,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Delete user
@@ -1067,7 +1067,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'DELETE',
             qs: queryParameters,
@@ -1086,18 +1085,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Get user by user name
@@ -1119,7 +1119,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: User;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -1138,18 +1137,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: User;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Logs user into the system
@@ -1174,7 +1174,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body: string;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -1193,18 +1192,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body: string;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Logs out current logged in user session
@@ -1219,7 +1219,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'GET',
             qs: queryParameters,
@@ -1238,18 +1237,19 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
     /**
      * Updated user
@@ -1272,7 +1272,6 @@ export class UserApi {
 
         let useFormData = false;
 
-        let localVarDeferred = promise.defer<{ response: http.ClientResponse; body?: any;  }>();
         let requestOptions: request.Options = {
             method: 'PUT',
             qs: queryParameters,
@@ -1292,17 +1291,18 @@ export class UserApi {
                 requestOptions.form = formParams;
             }
         }
-        request(requestOptions, (error, response, body) => {
-            if (error) {
-                localVarDeferred.reject(error);
-            } else {
-                if (response.statusCode >= 200 && response.statusCode <= 299) {
-                    localVarDeferred.resolve({ response: response, body: body });
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            request(requestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
                 } else {
-                    localVarDeferred.reject({ response: response, body: body });
+                    if (response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
                 }
-            }
+            });
         });
-        return localVarDeferred.promise;
     }
 }
diff --git a/samples/client/petstore/typescript-node/npm/api.ts b/samples/client/petstore/typescript-node/npm/api.ts
index aa5775593160..6eaa16cfd97b 100644
--- a/samples/client/petstore/typescript-node/npm/api.ts
+++ b/samples/client/petstore/typescript-node/npm/api.ts
@@ -132,8 +132,8 @@ export class PetApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
@@ -407,10 +407,10 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(requestOptions);
-
         this.authentications.api_key.applyToRequest(requestOptions);
 
+        this.authentications.petstore_auth.applyToRequest(requestOptions);
+
         this.authentications.default.applyToRequest(requestOptions);
 
         if (Object.keys(formParams).length) {
@@ -624,8 +624,8 @@ export class StoreApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
@@ -870,8 +870,8 @@ export class UserApi {
 
     protected authentications = {
         'default': <Authentication>new VoidAuth(),
-        'petstore_auth': new OAuth(),
         'api_key': new ApiKeyAuth('header', 'api_key'),
+        'petstore_auth': new OAuth(),
     }
 
     constructor(basePath?: string);
diff --git a/samples/server/petstore/nodejs/api/swagger.yaml b/samples/server/petstore/nodejs/api/swagger.yaml
index f6987daa9156..1aad0a1d4f44 100644
--- a/samples/server/petstore/nodejs/api/swagger.yaml
+++ b/samples/server/petstore/nodejs/api/swagger.yaml
@@ -587,6 +587,10 @@ paths:
           description: "User not found"
       x-swagger-router-controller: "User"
 securityDefinitions:
+  api_key:
+    type: "apiKey"
+    name: "api_key"
+    in: "header"
   petstore_auth:
     type: "oauth2"
     authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
@@ -594,10 +598,6 @@ securityDefinitions:
     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"
diff --git a/samples/server/petstore/nodejs/controllers/PetService.js b/samples/server/petstore/nodejs/controllers/PetService.js
index 2c464714aa71..55a4bf2b896c 100644
--- a/samples/server/petstore/nodejs/controllers/PetService.js
+++ b/samples/server/petstore/nodejs/controllers/PetService.js
@@ -26,18 +26,18 @@ exports.findPetsByStatus = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = [ {
-  "photoUrls" : [ "aeiou" ],
-  "name" : "doggie",
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
   "id" : 123456789,
   "category" : {
-    "name" : "aeiou",
-    "id" : 123456789
+    "id" : 123456789,
+    "name" : "aeiou"
   },
-  "tags" : [ {
-    "name" : "aeiou",
-    "id" : 123456789
-  } ],
-  "status" : "aeiou"
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
 } ];
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
@@ -56,18 +56,18 @@ exports.findPetsByTags = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = [ {
-  "photoUrls" : [ "aeiou" ],
-  "name" : "doggie",
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
   "id" : 123456789,
   "category" : {
-    "name" : "aeiou",
-    "id" : 123456789
+    "id" : 123456789,
+    "name" : "aeiou"
   },
-  "tags" : [ {
-    "name" : "aeiou",
-    "id" : 123456789
-  } ],
-  "status" : "aeiou"
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
 } ];
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
@@ -86,18 +86,18 @@ exports.getPetById = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = {
-  "photoUrls" : [ "aeiou" ],
-  "name" : "doggie",
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
   "id" : 123456789,
   "category" : {
-    "name" : "aeiou",
-    "id" : 123456789
+    "id" : 123456789,
+    "name" : "aeiou"
   },
-  "tags" : [ {
-    "name" : "aeiou",
-    "id" : 123456789
-  } ],
-  "status" : "aeiou"
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
 };
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
@@ -138,9 +138,9 @@ exports.uploadFile = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = {
+  "message" : "aeiou",
   "code" : 123,
-  "type" : "aeiou",
-  "message" : "aeiou"
+  "type" : "aeiou"
 };
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
diff --git a/samples/server/petstore/nodejs/controllers/StoreService.js b/samples/server/petstore/nodejs/controllers/StoreService.js
index d20619ceb9b0..01759173bd4a 100644
--- a/samples/server/petstore/nodejs/controllers/StoreService.js
+++ b/samples/server/petstore/nodejs/controllers/StoreService.js
@@ -34,12 +34,12 @@ exports.getOrderById = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = {
-  "petId" : 123456789,
-  "quantity" : 123,
   "id" : 123456789,
-  "shipDate" : "2000-01-23T04:56:07.000+0000",
+  "petId" : 123456789,
   "complete" : true,
-  "status" : "aeiou"
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
 };
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
@@ -58,12 +58,12 @@ exports.placeOrder = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = {
-  "petId" : 123456789,
-  "quantity" : 123,
   "id" : 123456789,
-  "shipDate" : "2000-01-23T04:56:07.000+0000",
+  "petId" : 123456789,
   "complete" : true,
-  "status" : "aeiou"
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
 };
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
diff --git a/samples/server/petstore/nodejs/controllers/UserService.js b/samples/server/petstore/nodejs/controllers/UserService.js
index 3a62feeaf3fa..69fc1a813911 100644
--- a/samples/server/petstore/nodejs/controllers/UserService.js
+++ b/samples/server/petstore/nodejs/controllers/UserService.js
@@ -43,14 +43,14 @@ exports.getUserByName = function(args, res, next) {
   **/
     var examples = {};
   examples['application/json'] = {
-  "firstName" : "aeiou",
-  "lastName" : "aeiou",
-  "password" : "aeiou",
-  "userStatus" : 123,
-  "phone" : "aeiou",
   "id" : 123456789,
+  "lastName" : "aeiou",
+  "phone" : "aeiou",
+  "username" : "aeiou",
   "email" : "aeiou",
-  "username" : "aeiou"
+  "userStatus" : 123,
+  "firstName" : "aeiou",
+  "password" : "aeiou"
 };
   if(Object.keys(examples).length > 0) {
     res.setHeader('Content-Type', 'application/json');
diff --git a/samples/server/petstore/nodejs/package.json b/samples/server/petstore/nodejs/package.json
index c5884b196b9d..0238a86860a0 100644
--- a/samples/server/petstore/nodejs/package.json
+++ b/samples/server/petstore/nodejs/package.json
@@ -6,7 +6,7 @@
   "keywords": [
     "swagger"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "private": true,
   "dependencies": {
     "connect": "^3.2.0",

From a566b086cf0525c800977d8c9b35c2e3ce878d57 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sun, 29 May 2016 20:54:43 +0800
Subject: [PATCH 045/139] add new files for JS client

---
 .../javascript/.swagger-codegen-ignore        |  23 +++
 samples/client/petstore/javascript/LICENSE    | 176 ++++++++++++++++++
 samples/client/petstore/javascript/README.md  |   2 +-
 .../docs/AdditionalPropertiesClass.md         |   7 +
 .../petstore/javascript/docs/ArrayTest.md     |   7 +
 ...dPropertiesAndAdditionalPropertiesClass.md |   9 +
 .../petstore/javascript/docs/ReadOnlyFirst.md |   9 +
 .../src/model/AdditionalPropertiesClass.js    |  62 ++++++
 .../javascript/src/model/ArrayTest.js         |  59 ++++++
 ...dPropertiesAndAdditionalPropertiesClass.js |  78 ++++++++
 .../javascript/src/model/ReadOnlyFirst.js     |  75 ++++++++
 11 files changed, 506 insertions(+), 1 deletion(-)
 create mode 100644 samples/client/petstore/javascript/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/javascript/LICENSE
 create mode 100644 samples/client/petstore/javascript/docs/AdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/javascript/docs/ArrayTest.md
 create mode 100644 samples/client/petstore/javascript/docs/MixedPropertiesAndAdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/javascript/docs/ReadOnlyFirst.md
 create mode 100644 samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
 create mode 100644 samples/client/petstore/javascript/src/model/ArrayTest.js
 create mode 100644 samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
 create mode 100644 samples/client/petstore/javascript/src/model/ReadOnlyFirst.js

diff --git a/samples/client/petstore/javascript/.swagger-codegen-ignore b/samples/client/petstore/javascript/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/javascript/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/javascript/LICENSE b/samples/client/petstore/javascript/LICENSE
new file mode 100644
index 000000000000..d9a10c0d8e86
--- /dev/null
+++ b/samples/client/petstore/javascript/LICENSE
@@ -0,0 +1,176 @@
+                                 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
diff --git a/samples/client/petstore/javascript/README.md b/samples/client/petstore/javascript/README.md
index a2ad690d6f7b..dfc15cba3f99 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-05-29T18:06:05.597+08:00
+- Build date: 2016-05-29T20:52:27.873+08:00
 - Build package: class io.swagger.codegen.languages.JavascriptClientCodegen
 
 ## Installation
diff --git a/samples/client/petstore/javascript/docs/AdditionalPropertiesClass.md b/samples/client/petstore/javascript/docs/AdditionalPropertiesClass.md
new file mode 100644
index 000000000000..f25c4fceec7f
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/AdditionalPropertiesClass.md
@@ -0,0 +1,7 @@
+# SwaggerPetstore.AdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
diff --git a/samples/client/petstore/javascript/docs/ArrayTest.md b/samples/client/petstore/javascript/docs/ArrayTest.md
new file mode 100644
index 000000000000..2e0561720233
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/ArrayTest.md
@@ -0,0 +1,7 @@
+# SwaggerPetstore.ArrayTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
diff --git a/samples/client/petstore/javascript/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/javascript/docs/MixedPropertiesAndAdditionalPropertiesClass.md
new file mode 100644
index 000000000000..cecc4a1156a5
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -0,0 +1,9 @@
+# SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**uuid** | **String** |  | [optional] 
+**dateTime** | **Date** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/docs/ReadOnlyFirst.md b/samples/client/petstore/javascript/docs/ReadOnlyFirst.md
new file mode 100644
index 000000000000..5a16f8acce0d
--- /dev/null
+++ b/samples/client/petstore/javascript/docs/ReadOnlyFirst.md
@@ -0,0 +1,9 @@
+# SwaggerPetstore.ReadOnlyFirst
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**bar** | **String** |  | [optional] 
+**baz** | **String** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
new file mode 100644
index 000000000000..8dd4d1c9795f
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js
@@ -0,0 +1,62 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['ApiClient'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.AdditionalPropertiesClass = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+
+
+
+  /**
+   * The AdditionalPropertiesClass model module.
+   * @module model/AdditionalPropertiesClass
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>AdditionalPropertiesClass</code>.
+   * @alias module:model/AdditionalPropertiesClass
+   * @class
+   * @extends Object
+   */
+  var exports = function() {
+    var _this = this;
+
+    return _this;
+  };
+
+  /**
+   * Constructs a <code>AdditionalPropertiesClass</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/AdditionalPropertiesClass} obj Optional instance to populate.
+   * @return {module:model/AdditionalPropertiesClass} The populated <code>AdditionalPropertiesClass</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) {
+      obj = obj || new exports();
+      ApiClient.constructFromObject(data, obj, String);
+
+    }
+    return obj;
+  }
+
+
+
+
+
+  return exports;
+}));
+
+
diff --git a/samples/client/petstore/javascript/src/model/ArrayTest.js b/samples/client/petstore/javascript/src/model/ArrayTest.js
new file mode 100644
index 000000000000..5a11c6a47bf4
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/ArrayTest.js
@@ -0,0 +1,59 @@
+(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.ArrayTest = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+
+
+
+  /**
+   * The ArrayTest model module.
+   * @module model/ArrayTest
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>ArrayTest</code>.
+   * @alias module:model/ArrayTest
+   * @class
+   */
+  var exports = function() {
+    var _this = this;
+
+  };
+
+  /**
+   * Constructs a <code>ArrayTest</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/ArrayTest} obj Optional instance to populate.
+   * @return {module:model/ArrayTest} The populated <code>ArrayTest</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) {
+      obj = obj || new exports();
+
+    }
+    return obj;
+  }
+
+
+
+
+
+  return exports;
+}));
+
+
diff --git a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
new file mode 100644
index 000000000000..1d51ce6c3f8f
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -0,0 +1,78 @@
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['ApiClient', 'model/Animal'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    module.exports = factory(require('../ApiClient'), require('./Animal'));
+  } else {
+    // Browser globals (root is window)
+    if (!root.SwaggerPetstore) {
+      root.SwaggerPetstore = {};
+    }
+    root.SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
+  }
+}(this, function(ApiClient, Animal) {
+  'use strict';
+
+
+
+
+  /**
+   * The MixedPropertiesAndAdditionalPropertiesClass model module.
+   * @module model/MixedPropertiesAndAdditionalPropertiesClass
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>MixedPropertiesAndAdditionalPropertiesClass</code>.
+   * @alias module:model/MixedPropertiesAndAdditionalPropertiesClass
+   * @class
+   * @extends Object
+   */
+  var exports = function() {
+    var _this = this;
+
+
+
+    return _this;
+  };
+
+  /**
+   * Constructs a <code>MixedPropertiesAndAdditionalPropertiesClass</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/MixedPropertiesAndAdditionalPropertiesClass} obj Optional instance to populate.
+   * @return {module:model/MixedPropertiesAndAdditionalPropertiesClass} The populated <code>MixedPropertiesAndAdditionalPropertiesClass</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) {
+      obj = obj || new exports();
+      ApiClient.constructFromObject(data, obj, Animal);
+
+      if (data.hasOwnProperty('uuid')) {
+        obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
+      }
+      if (data.hasOwnProperty('dateTime')) {
+        obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
+      }
+    }
+    return obj;
+  }
+
+  /**
+   * @member {String} uuid
+   */
+  exports.prototype['uuid'] = undefined;
+  /**
+   * @member {Date} dateTime
+   */
+  exports.prototype['dateTime'] = undefined;
+
+
+
+
+  return exports;
+}));
+
+
diff --git a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
new file mode 100644
index 000000000000..394af906e730
--- /dev/null
+++ b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js
@@ -0,0 +1,75 @@
+(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.ReadOnlyFirst = factory(root.SwaggerPetstore.ApiClient);
+  }
+}(this, function(ApiClient) {
+  'use strict';
+
+
+
+
+  /**
+   * The ReadOnlyFirst model module.
+   * @module model/ReadOnlyFirst
+   * @version 1.0.0
+   */
+
+  /**
+   * Constructs a new <code>ReadOnlyFirst</code>.
+   * @alias module:model/ReadOnlyFirst
+   * @class
+   */
+  var exports = function() {
+    var _this = this;
+
+
+
+  };
+
+  /**
+   * Constructs a <code>ReadOnlyFirst</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/ReadOnlyFirst} obj Optional instance to populate.
+   * @return {module:model/ReadOnlyFirst} The populated <code>ReadOnlyFirst</code> instance.
+   */
+  exports.constructFromObject = function(data, obj) {
+    if (data) {
+      obj = obj || new exports();
+
+      if (data.hasOwnProperty('bar')) {
+        obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
+      }
+      if (data.hasOwnProperty('baz')) {
+        obj['baz'] = ApiClient.convertToType(data['baz'], 'String');
+      }
+    }
+    return obj;
+  }
+
+  /**
+   * @member {String} bar
+   */
+  exports.prototype['bar'] = undefined;
+  /**
+   * @member {String} baz
+   */
+  exports.prototype['baz'] = undefined;
+
+
+
+
+  return exports;
+}));
+
+

From e0c3aa276d1806d421d3b55714342ba53a4d729b Mon Sep 17 00:00:00 2001
From: Jim Schubert <james.schubert@gmail.com>
Date: Sun, 29 May 2016 09:47:47 -0400
Subject: [PATCH 046/139] [codegen ignore] Lazy test setup

Moved temp directory preparation to occur at the start of tests and
added temp directory prefix to help avoid conflicts with other tests.
---
 .../ignore/CodegenIgnoreProcessorTest.java    | 68 ++++++++++++-------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java
index 5789cb6e32ff..784fcfe84809 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java
@@ -1,6 +1,8 @@
 package io.swagger.codegen.ignore;
 
 import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testng.annotations.*;
 import static org.testng.Assert.*;
 
@@ -12,35 +14,20 @@ import java.nio.file.Path;
 
 public class CodegenIgnoreProcessorTest {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(CodegenIgnoreProcessorTest.class);
+
     private Boolean allowed;
+    private final String filename;
+    private final String ignoreDefinition;
     private final String description;
     private String outputDir;
     private File target;
     private Path temp;
 
     private CodegenIgnoreProcessorTest(String filename, String ignoreDefinition, String description) throws IOException {
+        this.filename = filename;
+        this.ignoreDefinition = ignoreDefinition;
         this.description = description;
-
-        temp = Files.createTempDirectory(null);
-        this.outputDir = temp.toFile().getAbsolutePath();
-
-        target = new File(this.outputDir, filename);
-
-        boolean mkdirs = target.getParentFile().mkdirs();
-        if(!mkdirs) {
-            throw new IOException("Failed to create parent directories for CodegenIgnoreProcessorTest test file.");
-        }
-
-        Path created = Files.createFile(target.toPath());
-        if(!created.toFile().exists()) {
-            throw new IOException("Failed to write CodegenIgnoreProcessorTest test file.");
-        }
-
-        // System.out.print(String.format("Created codegen ignore processor test file: %s\n", created.toAbsolutePath()));
-        File ignoreFile = new File(this.outputDir, ".swagger-codegen-ignore");
-        try (FileOutputStream stream = new FileOutputStream(ignoreFile)) {
-            stream.write(ignoreDefinition.getBytes());
-        }
     }
 
     CodegenIgnoreProcessorTest allowed() {
@@ -53,14 +40,47 @@ public class CodegenIgnoreProcessorTest {
         return this;
     }
 
-    @AfterClass
-    public void afterClass() throws IOException {
-        FileUtils.deleteDirectory(temp.toFile());
+    private void prepareTestFiles() throws IOException {
+        // NOTE: Each test needs its own directory because .swagger-codegen-ignore needs to exist at the root.
+        temp = Files.createTempDirectory(getClass().getSimpleName());
+        this.outputDir = temp.toFile().getAbsolutePath();
+
+        target = new File(this.outputDir, this.filename);
+
+        boolean mkdirs = target.getParentFile().mkdirs();
+        if(!mkdirs) {
+            LOGGER.warn("Failed to create directories for CodegenIgnoreProcessorTest test file. Directory may already exist.");
+        }
+
+        Path created = Files.createFile(target.toPath());
+        if(!created.toFile().exists()) {
+            throw new IOException("Failed to write CodegenIgnoreProcessorTest test file.");
+        }
+
+        // System.out.print(String.format("Created codegen ignore processor test file: %s\n", created.toAbsolutePath()));
+        File ignoreFile = new File(this.outputDir, ".swagger-codegen-ignore");
+        try (FileOutputStream stream = new FileOutputStream(ignoreFile)) {
+            stream.write(this.ignoreDefinition.getBytes());
+        }
+    }
+
+    @AfterTest
+    public void afterTest() throws IOException {
+        if(temp != null && temp.toFile().exists() && temp.toFile().isDirectory()) {
+            FileUtils.deleteDirectory(temp.toFile());
+        }
     }
 
     @Test
     public void evaluate() {
         // Arrange
+        try {
+            // Lazily setup files to avoid conflicts and creation when these tests may not even run.
+            prepareTestFiles();
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail("Failed to prepare test files. " + e.getMessage());
+        }
         CodegenIgnoreProcessor processor = new CodegenIgnoreProcessor(outputDir);
         Boolean actual = null;
 

From 8a403a06e363e45ef9c488f08d279a7faa804294 Mon Sep 17 00:00:00 2001
From: Darrell King <kingdarrella@gmail.com>
Date: Fri, 27 May 2016 18:56:17 +0100
Subject: [PATCH 047/139] 2983: Java Feign client generator:  HTTP header name
 should be named Accept not Accepts

---
 .../Java/libraries/feign/api.mustache         |   2 +-
 .../java/feign/.swagger-codegen-ignore        |  23 +++
 samples/client/petstore/java/feign/LICENSE    | 176 ++++++++++++++++++
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 .../io/swagger/client/FormAwareEncoder.java   |   2 +-
 .../java/io/swagger/client/StringUtil.java    |   2 +-
 .../java/io/swagger/client/api/FakeApi.java   |   6 +-
 .../java/io/swagger/client/api/PetApi.java    |  18 +-
 .../java/io/swagger/client/api/StoreApi.java  |  10 +-
 .../java/io/swagger/client/api/UserApi.java   |  18 +-
 .../model/AdditionalPropertiesClass.java      |  97 ++++++++++
 .../java/io/swagger/client/model/Animal.java  |   2 +-
 .../io/swagger/client/model/AnimalFarm.java   |   2 +-
 .../io/swagger/client/model/ArrayTest.java    | 116 ++++++++++++
 .../java/io/swagger/client/model/Cat.java     |   2 +-
 .../io/swagger/client/model/Category.java     |   2 +-
 .../java/io/swagger/client/model/Dog.java     |   2 +-
 .../io/swagger/client/model/EnumTest.java     |   2 +-
 .../io/swagger/client/model/FormatTest.java   |   2 +-
 ...ropertiesAndAdditionalPropertiesClass.java | 119 ++++++++++++
 .../client/model/Model200Response.java        |   2 +-
 .../client/model/ModelApiResponse.java        |   2 +-
 .../io/swagger/client/model/ModelReturn.java  |   2 +-
 .../java/io/swagger/client/model/Name.java    |   2 +-
 .../java/io/swagger/client/model/Order.java   |   2 +-
 .../java/io/swagger/client/model/Pet.java     |   2 +-
 .../swagger/client/model/ReadOnlyFirst.java   |  84 +++++++++
 .../client/model/SpecialModelName.java        |   2 +-
 .../java/io/swagger/client/model/Tag.java     |   2 +-
 .../java/io/swagger/client/model/User.java    |   2 +-
 30 files changed, 661 insertions(+), 46 deletions(-)
 create mode 100644 samples/client/petstore/java/feign/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/java/feign/LICENSE
 create mode 100644 samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
 create mode 100644 samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
index fae7a93303d1..c9d756d33ec2 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
@@ -26,7 +26,7 @@ public interface {{classname}} extends ApiClient.Api {
   @RequestLine("{{httpMethod}} {{{path}}}{{#hasQueryParams}}?{{/hasQueryParams}}{{#queryParams}}{{baseName}}={{=<% %>=}}{<%paramName%>}<%={{ }}=%>{{#hasMore}}&{{/hasMore}}{{/queryParams}}")
   @Headers({
     "Content-type: {{vendorExtensions.x-contentType}}",
-    "Accepts: {{vendorExtensions.x-accepts}}",{{#headerParams}}
+    "Accept: {{vendorExtensions.x-accepts}}",{{#headerParams}}
     "{{paramName}}: {{=<% %>=}}{<%paramName%>}<%={{ }}=%>"{{#hasMore}},
     {{/hasMore}}{{/headerParams}}
   })
diff --git a/samples/client/petstore/java/feign/.swagger-codegen-ignore b/samples/client/petstore/java/feign/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/java/feign/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/java/feign/LICENSE b/samples/client/petstore/java/feign/LICENSE
new file mode 100644
index 000000000000..d9a10c0d8e86
--- /dev/null
+++ b/samples/client/petstore/java/feign/LICENSE
@@ -0,0 +1,176 @@
+                                 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
diff --git a/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.properties
index 5c639c12740d..b7a364739551 100644
--- a/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue May 17 23:03:29 CST 2016
+#Tue May 17 23:08:05 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
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 70505097dfac..f652b7870f8a 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-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01: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 47bb5836fa52..25b1f52d7f53 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-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01: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/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
index 1231d3f3e0a0..02e35d2d89a0 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public interface FakeApi extends ApiClient.Api {
 
 
@@ -34,8 +34,8 @@ public interface FakeApi extends ApiClient.Api {
    */
   @RequestLine("POST /fake")
   @Headers({
-    "Content-type: application/x-www-form-urlencoded",
-    "Accepts: application/json",
+    "Content-type: application/xml; charset&#x3D;utf-8",
+    "Accept: application/xml; charset&#x3D;utf-8,application/json; charset&#x3D;utf-8",
   })
   void testEndpointParameters(@Param("number") BigDecimal number, @Param("_double") Double _double, @Param("string") String string, @Param("_byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("_float") Float _float, @Param("binary") byte[] binary, @Param("date") Date date, @Param("dateTime") Date dateTime, @Param("password") String password);
 }
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 3b50531c6070..99ca8dfaa71a 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
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public interface PetApi extends ApiClient.Api {
 
 
@@ -25,7 +25,7 @@ public interface PetApi extends ApiClient.Api {
   @RequestLine("POST /pet")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   void addPet(Pet body);
 
@@ -39,7 +39,7 @@ public interface PetApi extends ApiClient.Api {
   @RequestLine("DELETE /pet/{petId}")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
     "apiKey: {apiKey}"
   })
   void deletePet(@Param("petId") Long petId, @Param("apiKey") String apiKey);
@@ -53,7 +53,7 @@ public interface PetApi extends ApiClient.Api {
   @RequestLine("GET /pet/findByStatus?status={status}")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   List<Pet> findPetsByStatus(@Param("status") List<String> status);
 
@@ -66,7 +66,7 @@ public interface PetApi extends ApiClient.Api {
   @RequestLine("GET /pet/findByTags?tags={tags}")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   List<Pet> findPetsByTags(@Param("tags") List<String> tags);
 
@@ -79,7 +79,7 @@ public interface PetApi extends ApiClient.Api {
   @RequestLine("GET /pet/{petId}")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   Pet getPetById(@Param("petId") Long petId);
 
@@ -92,7 +92,7 @@ public interface PetApi extends ApiClient.Api {
   @RequestLine("PUT /pet")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   void updatePet(Pet body);
 
@@ -107,7 +107,7 @@ public interface PetApi extends ApiClient.Api {
   @RequestLine("POST /pet/{petId}")
   @Headers({
     "Content-type: application/x-www-form-urlencoded",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   void updatePetWithForm(@Param("petId") Long petId, @Param("name") String name, @Param("status") String status);
 
@@ -122,7 +122,7 @@ public interface PetApi extends ApiClient.Api {
   @RequestLine("POST /pet/{petId}/uploadImage")
   @Headers({
     "Content-type: multipart/form-data",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   ModelApiResponse 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 7bf3a3b44c5a..2649a4b300d5 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public interface StoreApi extends ApiClient.Api {
 
 
@@ -23,7 +23,7 @@ public interface StoreApi extends ApiClient.Api {
   @RequestLine("DELETE /store/order/{orderId}")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   void deleteOrder(@Param("orderId") String orderId);
 
@@ -35,7 +35,7 @@ public interface StoreApi extends ApiClient.Api {
   @RequestLine("GET /store/inventory")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   Map<String, Integer> getInventory();
 
@@ -48,7 +48,7 @@ public interface StoreApi extends ApiClient.Api {
   @RequestLine("GET /store/order/{orderId}")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   Order getOrderById(@Param("orderId") Long orderId);
 
@@ -61,7 +61,7 @@ public interface StoreApi extends ApiClient.Api {
   @RequestLine("POST /store/order")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: 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 51e47cb6e339..33140fb4364b 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public interface UserApi extends ApiClient.Api {
 
 
@@ -23,7 +23,7 @@ public interface UserApi extends ApiClient.Api {
   @RequestLine("POST /user")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   void createUser(User body);
 
@@ -36,7 +36,7 @@ public interface UserApi extends ApiClient.Api {
   @RequestLine("POST /user/createWithArray")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   void createUsersWithArrayInput(List<User> body);
 
@@ -49,7 +49,7 @@ public interface UserApi extends ApiClient.Api {
   @RequestLine("POST /user/createWithList")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   void createUsersWithListInput(List<User> body);
 
@@ -62,7 +62,7 @@ public interface UserApi extends ApiClient.Api {
   @RequestLine("DELETE /user/{username}")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   void deleteUser(@Param("username") String username);
 
@@ -75,7 +75,7 @@ public interface UserApi extends ApiClient.Api {
   @RequestLine("GET /user/{username}")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   User getUserByName(@Param("username") String username);
 
@@ -89,7 +89,7 @@ public interface UserApi extends ApiClient.Api {
   @RequestLine("GET /user/login?username={username}&password={password}")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   String loginUser(@Param("username") String username, @Param("password") String password);
 
@@ -101,7 +101,7 @@ public interface UserApi extends ApiClient.Api {
   @RequestLine("GET /user/logout")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: application/json",
   })
   void logoutUser();
 
@@ -115,7 +115,7 @@ public interface UserApi extends ApiClient.Api {
   @RequestLine("PUT /user/{username}")
   @Headers({
     "Content-type: application/json",
-    "Accepts: application/json",
+    "Accept: 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/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
new file mode 100644
index 000000000000..2569b542c27b
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -0,0 +1,97 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * AdditionalPropertiesClass
+ */
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+public class AdditionalPropertiesClass   {
+  
+  private Map<String, String> mapProperty = new HashMap<String, String>();
+  private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();
+
+  
+  /**
+   **/
+  public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
+    this.mapProperty = mapProperty;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("map_property")
+  public Map<String, String> getMapProperty() {
+    return mapProperty;
+  }
+  public void setMapProperty(Map<String, String> mapProperty) {
+    this.mapProperty = mapProperty;
+  }
+
+
+  /**
+   **/
+  public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
+    this.mapOfMapProperty = mapOfMapProperty;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("map_of_map_property")
+  public Map<String, Map<String, String>> getMapOfMapProperty() {
+    return mapOfMapProperty;
+  }
+  public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
+    this.mapOfMapProperty = mapOfMapProperty;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+    return Objects.equals(this.mapProperty, additionalPropertiesClass.mapProperty) &&
+        Objects.equals(this.mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapProperty, mapOfMapProperty);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesClass {\n");
+    
+    sb.append("    mapProperty: ").append(toIndentedString(mapProperty)).append("\n");
+    sb.append("    mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).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/Animal.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java
index 2722d7bf0d34..9400f85e9942 100644
--- 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Animal
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class Animal   {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
index 29d71fb86048..4e817de24432 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * AnimalFarm
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class AnimalFarm extends ArrayList<Animal>  {
   
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
new file mode 100644
index 000000000000..28b8cde7a9a3
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -0,0 +1,116 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * ArrayTest
+ */
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+public class ArrayTest   {
+  
+  private List<String> arrayOfString = new ArrayList<String>();
+  private List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+
+  
+  /**
+   **/
+  public ArrayTest arrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("array_of_string")
+  public List<String> getArrayOfString() {
+    return arrayOfString;
+  }
+  public void setArrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+  }
+
+
+  /**
+   **/
+  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("array_array_of_integer")
+  public List<List<Long>> getArrayArrayOfInteger() {
+    return arrayArrayOfInteger;
+  }
+  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+  }
+
+
+  /**
+   **/
+  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("array_array_of_model")
+  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+    return arrayArrayOfModel;
+  }
+  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayTest arrayTest = (ArrayTest) o;
+    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
+        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
+        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayTest {\n");
+    
+    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).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
index b84e83dc9fb6..e8914f543abb 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Cat
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class Cat extends Animal  {
   
   private String className = null;
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 d0579ee435fd..9e72fbaf7c9f 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Category
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class Category   {
   
   private Long id = null;
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
index 5a7162dce4df..8e79b2ebbaa6 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Dog
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class Dog extends Animal  {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
index 6ef0a34b1f9d..725d74152db1 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * EnumTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class EnumTest   {
   
 
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
index cea8883add4c..e583011c39cd 100644
--- 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
@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * FormatTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class FormatTest   {
   
   private Integer integer = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
new file mode 100644
index 000000000000..256aea8cd1ec
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -0,0 +1,119 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+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;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * MixedPropertiesAndAdditionalPropertiesClass
+ */
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+public class MixedPropertiesAndAdditionalPropertiesClass   {
+  
+  private String uuid = null;
+  private Date dateTime = null;
+  private Map<String, Animal> map = new HashMap<String, Animal>();
+
+  
+  /**
+   **/
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+    this.uuid = uuid;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("uuid")
+  public String getUuid() {
+    return uuid;
+  }
+  public void setUuid(String uuid) {
+    this.uuid = uuid;
+  }
+
+
+  /**
+   **/
+  public MixedPropertiesAndAdditionalPropertiesClass 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 MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+    this.map = map;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("map")
+  public Map<String, Animal> getMap() {
+    return map;
+  }
+  public void setMap(Map<String, Animal> map) {
+    this.map = map;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
+        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid, dateTime, map);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+    
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
index a2bee4c634ec..2eca6522c5fd 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 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.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class Model200Response   {
   
   private Integer name = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 3d4cf0bfc968..e16d627e18fc 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ModelApiResponse
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class ModelApiResponse   {
   
   private Integer code = null;
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 d3fdac81f3d4..074c294cd5ad 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class ModelReturn   {
   
   private Integer _return = null;
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 7a0af5046430..6f3353dba6e2 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
@@ -11,7 +11,7 @@ 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")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class Name   {
   
   private Integer name = null;
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 2ca9531a8af9..fdcf2a4251dd 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
@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * Order
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class Order   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
index bd9248120e83..e4b00973d795 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
@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * Pet
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class Pet   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
new file mode 100644
index 000000000000..43733beba93e
--- /dev/null
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -0,0 +1,84 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**
+ * ReadOnlyFirst
+ */
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+public class ReadOnlyFirst   {
+  
+  private String bar = null;
+  private String baz = null;
+
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("bar")
+  public String getBar() {
+    return bar;
+  }
+
+
+  /**
+   **/
+  public ReadOnlyFirst baz(String baz) {
+    this.baz = baz;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("baz")
+  public String getBaz() {
+    return baz;
+  }
+  public void setBaz(String baz) {
+    this.baz = baz;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+    return Objects.equals(this.bar, readOnlyFirst.bar) &&
+        Objects.equals(this.baz, readOnlyFirst.baz);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, baz);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ReadOnlyFirst {\n");
+    
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    baz: ").append(toIndentedString(baz)).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/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
index 58df0f961f05..c58343e8271b 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * SpecialModelName
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
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 24d51b8e59e0..b9b7991f621b 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Tag
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class Tag   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
index 450f177103d3..a03f29c20f18 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * User
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-13T16:29:08.210Z")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
 public class User   {
   
   private Long id = null;

From 535a7822397f498a9ee82bc7f37af39e5a0ea0d9 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Mon, 30 May 2016 11:01:32 +0800
Subject: [PATCH 048/139] add [Kabuku](http://www.kabuku.co.jp/en)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6f10731e9986..fde531929755 100644
--- a/README.md
+++ b/README.md
@@ -825,6 +825,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you
 - [Interactive Intelligence](http://developer.mypurecloud.com/)
 - [LANDR Audio](https://www.landr.com/)
 - [LiveAgent](https://www.ladesk.com/)
+- [Kabuku](http://www.kabuku.co.jp/en)
 - [Kuary](https://kuary.com/)
 - [nViso](http://www.nviso.ch/)
 - [Okiok](https://www.okiok.com)

From 8369bae08a6c818a2a91ae538be7078be23eb9ac Mon Sep 17 00:00:00 2001
From: Mikolaj Przybysz <mikolaj.przybysz@home24.de>
Date: Mon, 30 May 2016 15:01:53 +0200
Subject: [PATCH 049/139] Improved formatting

---
 .../swagger-codegen/src/main/resources/php/README.mustache  | 6 ++++--
 .../src/main/resources/php/composer.mustache                | 6 ++++--
 .../src/main/resources/php/configuration.mustache           | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/README.mustache b/modules/swagger-codegen/src/main/resources/php/README.mustache
index 125f4212dd43..aa1ace039731 100644
--- a/modules/swagger-codegen/src/main/resources/php/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/README.mustache
@@ -6,8 +6,10 @@
 This PHP package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: {{appVersion}}
-{{#artifactVersion}}- Package version: {{artifactVersion}}
-{{/artifactVersion}}- Build date: {{generatedDate}}
+{{#artifactVersion}}
+- Package version: {{artifactVersion}}
+{{/artifactVersion}}
+- Build date: {{generatedDate}}
 - Build package: {{generatorClass}}
 {{#infoUrl}}
 For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
diff --git a/modules/swagger-codegen/src/main/resources/php/composer.mustache b/modules/swagger-codegen/src/main/resources/php/composer.mustache
index c52052346e83..477e0819324c 100644
--- a/modules/swagger-codegen/src/main/resources/php/composer.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/composer.mustache
@@ -1,6 +1,8 @@
 {
-    "name": "{{#composerVendorName}}{{.}}{{/composerVendorName}}{{^composerVendorName}}{{gitUserId}}{{/composerVendorName}}/{{#composerProjectName}}{{.}}{{/composerProjectName}}{{^composerProjectName}}{{gitRepoId}}{{/composerProjectName}}",{{#artifactVersion}}
-    "version": "{{artifactVersion}}",{{/artifactVersion}}
+    "name": "{{#composerVendorName}}{{.}}{{/composerVendorName}}{{^composerVendorName}}{{gitUserId}}{{/composerVendorName}}/{{#composerProjectName}}{{.}}{{/composerProjectName}}{{^composerProjectName}}{{gitRepoId}}{{/composerProjectName}}",
+    {{#artifactVersion}}
+    "version": "{{artifactVersion}}",
+    {{/artifactVersion}}
     "description": "{{description}}",
     "keywords": [
         "swagger",
diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index b5fc7f739feb..b6e49fb50f9f 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -516,8 +516,10 @@ class Configuration
         $report  = 'PHP SDK ({{invokerPackage}}) Debug Report:'."\n";
         $report .= "    OS: ".php_uname()."\n";
         $report .= "    PHP Version: ".phpversion()."\n";
-        $report .= "    OpenAPI Spec Version: {{version}}\n";{{#artifactVersion}}
-        $report .= "    SDK Package Version: {{artifactVersion}}\n";{{/artifactVersion}}
+        $report .= "    OpenAPI Spec Version: {{version}}\n";
+        {{#artifactVersion}}
+        $report .= "    SDK Package Version: {{artifactVersion}}\n";
+        {{/artifactVersion}}
         $report .= "    Temp Folder Path: ".self::getDefaultConfiguration()->getTempFolderPath()."\n";
 
         return $report;

From b6595f7a1c3ba44e0b567882cf189ddc5f6175e7 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Mon, 30 May 2016 21:23:12 +0800
Subject: [PATCH 050/139] add appendix to license

---
 .../src/main/resources/_common/LICENSE        | 25 +++++++++++++++++++
 samples/server/petstore/sinatra/LICENSE       | 25 +++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/modules/swagger-codegen/src/main/resources/_common/LICENSE b/modules/swagger-codegen/src/main/resources/_common/LICENSE
index d9a10c0d8e86..8dada3edaf50 100644
--- a/modules/swagger-codegen/src/main/resources/_common/LICENSE
+++ b/modules/swagger-codegen/src/main/resources/_common/LICENSE
@@ -174,3 +174,28 @@
       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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/server/petstore/sinatra/LICENSE b/samples/server/petstore/sinatra/LICENSE
index d9a10c0d8e86..8dada3edaf50 100644
--- a/samples/server/petstore/sinatra/LICENSE
+++ b/samples/server/petstore/sinatra/LICENSE
@@ -174,3 +174,28 @@
       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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

From e7baa17ba0e6927ac3fef9cf79219c30d1d4887d Mon Sep 17 00:00:00 2001
From: Newell Zhu <zlx.star@gmail.com>
Date: Mon, 30 May 2016 21:38:59 +0800
Subject: [PATCH 051/139] Add LICENSE into rails5

---
 .../main/resources/rails5/controller.mustache |   3 +
 .../src/main/resources/rails5/info.mustache   |  23 ++
 .../src/main/resources/rails5/routes.mustache |   3 +
 .../petstore/rails5/.swagger-codegen-ignore   |  23 ++
 samples/server/petstore/rails5/LICENSE        | 201 ++++++++++++++++++
 .../rails5/app/controllers/pet_controllers.rb |  22 ++
 .../app/controllers/store_controllers.rb      |  22 ++
 .../app/controllers/user_controllers.rb       |  22 ++
 .../server/petstore/rails5/config/routes.rb   |  22 ++
 9 files changed, 341 insertions(+)
 create mode 100644 modules/swagger-codegen/src/main/resources/rails5/info.mustache
 create mode 100644 samples/server/petstore/rails5/.swagger-codegen-ignore
 create mode 100644 samples/server/petstore/rails5/LICENSE

diff --git a/modules/swagger-codegen/src/main/resources/rails5/controller.mustache b/modules/swagger-codegen/src/main/resources/rails5/controller.mustache
index 321960875d8d..d4c44d54d26f 100644
--- a/modules/swagger-codegen/src/main/resources/rails5/controller.mustache
+++ b/modules/swagger-codegen/src/main/resources/rails5/controller.mustache
@@ -1,3 +1,6 @@
+=begin
+{{> info}}
+=end
 class {{classname}} < ApplicationController
 {{#operations}}
 {{#operation}}
diff --git a/modules/swagger-codegen/src/main/resources/rails5/info.mustache b/modules/swagger-codegen/src/main/resources/rails5/info.mustache
new file mode 100644
index 000000000000..44d38c5cfadf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/rails5/info.mustache
@@ -0,0 +1,23 @@
+{{#appName}}
+{{{appName}}}
+
+{{/appName}}
+{{#appDescription}}
+{{{appDescription}}}
+
+{{/appDescription}}
+{{#version}}OpenAPI spec version: {{version}}{{/version}}
+{{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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/rails5/routes.mustache b/modules/swagger-codegen/src/main/resources/rails5/routes.mustache
index 6ebc0d4965df..76d745d3606f 100644
--- a/modules/swagger-codegen/src/main/resources/rails5/routes.mustache
+++ b/modules/swagger-codegen/src/main/resources/rails5/routes.mustache
@@ -1,3 +1,6 @@
+=begin
+{{> info}}
+=end
 Rails.application.routes.draw do
 
   def add_swagger_route http_method, path, opts = {}
diff --git a/samples/server/petstore/rails5/.swagger-codegen-ignore b/samples/server/petstore/rails5/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/server/petstore/rails5/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/server/petstore/rails5/LICENSE b/samples/server/petstore/rails5/LICENSE
new file mode 100644
index 000000000000..309973afd74f
--- /dev/null
+++ b/samples/server/petstore/rails5/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
diff --git a/samples/server/petstore/rails5/app/controllers/pet_controllers.rb b/samples/server/petstore/rails5/app/controllers/pet_controllers.rb
index fa7e25579471..de0ce998eeba 100644
--- a/samples/server/petstore/rails5/app/controllers/pet_controllers.rb
+++ b/samples/server/petstore/rails5/app/controllers/pet_controllers.rb
@@ -1,3 +1,25 @@
+=begin
+Swagger Petstore
+
+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.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end
 class PetController < ApplicationController
 
   def create
diff --git a/samples/server/petstore/rails5/app/controllers/store_controllers.rb b/samples/server/petstore/rails5/app/controllers/store_controllers.rb
index 71fef4d92f87..3c59b24f7119 100644
--- a/samples/server/petstore/rails5/app/controllers/store_controllers.rb
+++ b/samples/server/petstore/rails5/app/controllers/store_controllers.rb
@@ -1,3 +1,25 @@
+=begin
+Swagger Petstore
+
+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.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end
 class StoreController < ApplicationController
 
   def delete_order
diff --git a/samples/server/petstore/rails5/app/controllers/user_controllers.rb b/samples/server/petstore/rails5/app/controllers/user_controllers.rb
index b8b2ce93634a..d9e20f887b61 100644
--- a/samples/server/petstore/rails5/app/controllers/user_controllers.rb
+++ b/samples/server/petstore/rails5/app/controllers/user_controllers.rb
@@ -1,3 +1,25 @@
+=begin
+Swagger Petstore
+
+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.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end
 class UserController < ApplicationController
 
   def create
diff --git a/samples/server/petstore/rails5/config/routes.rb b/samples/server/petstore/rails5/config/routes.rb
index de0b1f61035e..f396a612ec2b 100644
--- a/samples/server/petstore/rails5/config/routes.rb
+++ b/samples/server/petstore/rails5/config/routes.rb
@@ -1,3 +1,25 @@
+=begin
+Swagger Petstore
+
+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.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end
 Rails.application.routes.draw do
 
   def add_swagger_route http_method, path, opts = {}

From ceda86b9c32cbc21117949468ecab0261a37ce78 Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Mon, 23 May 2016 22:36:07 +0200
Subject: [PATCH 052/139] [Objc] Basic Core data support

---
 bin/objc-petstore.sh                          |   2 +-
 .../codegen/languages/ObjcClientCodegen.java  | 123 ++++++++++++++++--
 .../objc/JSONResponseSerializer-body.mustache |  20 +--
 .../resources/objc/Model.xcdatamodel.mustache |   9 ++
 .../objc/NSManagedObject-body.mustache        |  18 +++
 .../objc/NSManagedObject-header.mustache      |  31 +++++
 .../objc/NSManagedObjectBuilder-body.mustache |  76 +++++++++++
 .../NSManagedObjectBuilder-header.mustache    |  35 +++++
 .../main/resources/objc/model-body.mustache   |  10 +-
 .../src/main/resources/objc/podspec.mustache  |   7 +-
 .../resources/objc/xccurrentversion.mustache  |   8 ++
 .../options/ObjcClientOptionsProvider.java    |   2 +
 .../petstore/objc/SwaggerClient.podspec       |   7 +-
 .../Core/SWGJSONResponseSerializer.m          |  20 +--
 .../objc/SwaggerClient/Model/SWGCategory.m    |   1 -
 .../Model/SWGCategoryManagedObject.h          |  20 +++
 .../Model/SWGCategoryManagedObject.m          |  13 ++
 .../Model/SWGCategoryManagedObjectBuilder.h   |  28 ++++
 .../Model/SWGCategoryManagedObjectBuilder.m   |  53 ++++++++
 .../SWGModel.xcdatamodeld/.xccurrentversion   |   8 ++
 .../SWGModel.xcdatamodel/contents             |  39 ++++++
 .../objc/SwaggerClient/Model/SWGOrder.m       |   1 -
 .../Model/SWGOrderManagedObject.h             |  29 +++++
 .../Model/SWGOrderManagedObject.m             |  17 +++
 .../Model/SWGOrderManagedObjectBuilder.h      |  28 ++++
 .../Model/SWGOrderManagedObjectBuilder.m      |  61 +++++++++
 .../objc/SwaggerClient/Model/SWGPet.m         |   1 -
 .../SwaggerClient/Model/SWGPetManagedObject.h |  35 +++++
 .../SwaggerClient/Model/SWGPetManagedObject.m |  17 +++
 .../Model/SWGPetManagedObjectBuilder.h        |  32 +++++
 .../Model/SWGPetManagedObjectBuilder.m        |  83 ++++++++++++
 .../objc/SwaggerClient/Model/SWGTag.m         |   1 -
 .../SwaggerClient/Model/SWGTagManagedObject.h |  20 +++
 .../SwaggerClient/Model/SWGTagManagedObject.m |  13 ++
 .../Model/SWGTagManagedObjectBuilder.h        |  28 ++++
 .../Model/SWGTagManagedObjectBuilder.m        |  53 ++++++++
 .../objc/SwaggerClient/Model/SWGUser.m        |   1 -
 .../Model/SWGUserManagedObject.h              |  33 +++++
 .../Model/SWGUserManagedObject.m              |  19 +++
 .../Model/SWGUserManagedObjectBuilder.h       |  28 ++++
 .../Model/SWGUserManagedObjectBuilder.m       |  65 +++++++++
 .../SwaggerClient.xcodeproj/project.pbxproj   |  18 +++
 .../SwaggerClientTests/Tests/BuildersTest.m   |  68 ++++++++++
 .../Tests/Helpers/DatabaseHelper.h            |  14 ++
 .../Tests/Helpers/DatabaseHelper.m            |  42 ++++++
 45 files changed, 1185 insertions(+), 52 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/objc/Model.xcdatamodel.mustache
 create mode 100644 modules/swagger-codegen/src/main/resources/objc/NSManagedObject-body.mustache
 create mode 100644 modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
 create mode 100644 modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-body.mustache
 create mode 100644 modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-header.mustache
 create mode 100644 modules/swagger-codegen/src/main/resources/objc/xccurrentversion.mustache
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.m
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.m
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/.xccurrentversion
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.m
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.m
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.m
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.h
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.m
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.m
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.h
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.m
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.m
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.h
 create mode 100644 samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.m
 create mode 100644 samples/client/petstore/objc/SwaggerClientTests/Tests/BuildersTest.m
 create mode 100644 samples/client/petstore/objc/SwaggerClientTests/Tests/Helpers/DatabaseHelper.h
 create mode 100644 samples/client/petstore/objc/SwaggerClientTests/Tests/Helpers/DatabaseHelper.m

diff --git a/bin/objc-petstore.sh b/bin/objc-petstore.sh
index 513b7535786e..d4df6924bf86 100755
--- a/bin/objc-petstore.sh
+++ b/bin/objc-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/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc --additional-properties coreData=y"
 
 java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
index 0a2a812ab0e5..68ba63a93822 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
@@ -1,14 +1,7 @@
 package io.swagger.codegen.languages;
 
-import io.swagger.codegen.CliOption;
-import io.swagger.codegen.CodegenConfig;
-import io.swagger.codegen.CodegenConstants;
-import io.swagger.codegen.CodegenOperation;
-import io.swagger.codegen.CodegenParameter;
-import io.swagger.codegen.CodegenProperty;
-import io.swagger.codegen.CodegenType;
-import io.swagger.codegen.DefaultCodegen;
-import io.swagger.codegen.SupportingFile;
+import io.swagger.codegen.*;
+import io.swagger.models.Model;
 import io.swagger.models.properties.*;
 
 import java.io.File;
@@ -28,9 +21,8 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     public static final String AUTHOR_EMAIL = "authorEmail";
     public static final String LICENSE = "license";
     public static final String GIT_REPO_URL = "gitRepoURL";
-
     public static final String DEFAULT_LICENSE = "Apache License, Version 2.0";
-
+    public static final String CORE_DATA = "coreData";
     public static final String BinaryDataType = "ObjcClientCodegenBinaryData";
     
     protected Set<String> foundationClasses = new HashSet<String>();
@@ -47,6 +39,8 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String modelFilesPath = "Model/";
     protected String coreFilesPath = "Core/";
     protected String apiFilesPath = "Api/";
+
+    protected boolean generateCoreData = false;
     
     protected Set<String> advancedMapingTypes = new HashSet<String>();
 
@@ -75,6 +69,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         defaultIncludes.add("NSDictionary");
         defaultIncludes.add("NSMutableArray");
         defaultIncludes.add("NSMutableDictionary");
+        defaultIncludes.add("NSManagedObject");
 
         defaultIncludes.add(BinaryDataType);
 
@@ -156,6 +151,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         instantiationTypes.put("map", "NSMutableDictionary");
 
         cliOptions.clear();
+        cliOptions.add(new CliOption(CORE_DATA, "Should generate core data models").defaultValue("n"));
         cliOptions.add(new CliOption(CLASS_PREFIX, "prefix for generated classes (convention: Abbreviation of pod name e.g. `HN` for `HackerNews`).`")
                 .defaultValue("SWG"));
         cliOptions.add(new CliOption(POD_NAME, "cocoapods package name (convention: CameCase).")
@@ -195,6 +191,12 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
             setPodVersion((String) additionalProperties.get(CodegenConstants.POD_VERSION));
         }
 
+        if (additionalProperties.containsKey(CORE_DATA)) {
+            Object coreData = additionalProperties.get(CORE_DATA);
+            if(((String)coreData).equalsIgnoreCase("y")) {
+                generateCoreData = true;
+            }
+        }
         if (additionalProperties.containsKey(CLASS_PREFIX)) {
             setClassPrefix((String) additionalProperties.get(CLASS_PREFIX));
         }
@@ -211,6 +213,13 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
             setGitRepoURL((String) additionalProperties.get(GIT_REPO_URL));
         }
 
+        if(generateCoreData) {
+            modelTemplateFiles.put("NSManagedObject-header.mustache", "ManagedObject.h");
+            modelTemplateFiles.put("NSManagedObject-body.mustache", "ManagedObject.m");
+            modelTemplateFiles.put("NSManagedObjectBuilder-header.mustache", "ManagedObjectBuilder.h");
+            modelTemplateFiles.put("NSManagedObjectBuilder-body.mustache", "ManagedObjectBuilder.m");
+        }
+
         additionalProperties.put(POD_NAME, podName);
         additionalProperties.put(CodegenConstants.POD_VERSION, podVersion);
         additionalProperties.put(CLASS_PREFIX, classPrefix);
@@ -222,6 +231,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         // make api and model doc path available in mustache template
         additionalProperties.put("apiDocPath", apiDocPath);
         additionalProperties.put("modelDocPath", modelDocPath);
+        additionalProperties.put("useCoreData", generateCoreData);
 
         modelPackage = podName;
         apiPackage = podName;
@@ -251,6 +261,11 @@ public class ObjcClientCodegen 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"));
+
+        if(generateCoreData) {
+            supportingFiles.add(new SupportingFile("xccurrentversion.mustache", (modelPackage() + "/" + modelFilesPath + "/").replace("/", File.separator) + classPrefix + "Model.xcdatamodeld", ".xccurrentversion"));
+            supportingFiles.add(new SupportingFile("Model.xcdatamodel.mustache",(modelPackage() + "/" + modelFilesPath + "/").replace("/", File.separator) + classPrefix + "Model.xcdatamodeld" + File.separator + classPrefix + "Model.xcdatamodel", "contents"));
+        }
     }
 
     @Override
@@ -288,6 +303,15 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         return toModelNameWithoutReservedWordCheck(type);
     }
 
+    public CodegenProperty coreDatafromProperty(String name, Property p) {
+        CodegenProperty property = fromProperty(name, p);
+        if(!generateCoreData) {
+            return property;
+        }
+        property.baseType = getTypeCoreDataDeclaration(p);
+        return property;
+    }
+
     @Override
     public String getTypeDeclaration(Property p) {
         if (p instanceof ArrayProperty) {
@@ -359,6 +383,77 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         }
     }
 
+
+    public String getTypeCoreDataDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            String innerType = getSwaggerType(inner);
+
+            String innerTypeDeclaration = getTypeDeclaration(inner);
+            if (innerTypeDeclaration.endsWith("*")) {
+                innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1);
+            }
+
+            if(innerTypeDeclaration.equalsIgnoreCase(BinaryDataType)) {
+                return "NSData*";
+            }
+            // In this codition, type of property p is array of primitive,
+            // return container type with pointer, e.g. `NSArray*<NSString*>*'
+            if (languageSpecificPrimitives.contains(innerTypeDeclaration)) {
+                return getSwaggerType(p) +  "<" + innerTypeDeclaration + "*>*";
+            }
+            // In this codition, type of property p is array of model,
+            // return container type combine inner type with pointer, e.g. `NSArray<SWGTag>*'
+            else {
+                for (String sd : advancedMapingTypes) {
+                    if(innerTypeDeclaration.startsWith(sd)) {
+                        return getSwaggerType(p) + "<" + innerTypeDeclaration + "*>*";
+                    }
+                }
+                return getSwaggerType(p) + "<" + innerTypeDeclaration + ">*";
+            }
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            String innerTypeDeclaration = getTypeDeclaration(inner);
+
+            if (innerTypeDeclaration.endsWith("*")) {
+                innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1);
+            }
+            if (languageSpecificPrimitives.contains(innerTypeDeclaration)) {
+                return getSwaggerType(p) +  "<NSString*, " + innerTypeDeclaration + "*>*";
+            } else {
+                for (String s : advancedMapingTypes) {
+                    if(innerTypeDeclaration.startsWith(s)) {
+                        return getSwaggerType(p) + "<NSString*, " + innerTypeDeclaration + "*>*";
+                    }
+                }
+                return getSwaggerType(p) + "<NSString*, " + innerTypeDeclaration + ">*";
+            }
+        } else {
+            String swaggerType = getSwaggerType(p);
+
+            // In this codition, type of p is objective-c primitive type, e.g. `NSSNumber',
+            // return type of p with pointer, e.g. `NSNumber*'
+            if (languageSpecificPrimitives.contains(swaggerType) &&
+                    foundationClasses.contains(swaggerType)) {
+                return swaggerType + "*";
+            }
+            // In this codition, type of p is c primitive type, e.g. `bool',
+            // return type of p, e.g. `bool'
+            else if (languageSpecificPrimitives.contains(swaggerType)) {
+                return swaggerType;
+            }
+            // In this codition, type of p is objective-c object type, e.g. `SWGPet',
+            // return type of p with pointer, e.g. `SWGPet*'
+            else {
+                return swaggerType + "*";
+            }
+        }
+    }
+
     @Override
     public String toModelName(String type) {
         // model name cannot use reserved keyword
@@ -579,6 +674,12 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         return objs;
     }
 
+    @Override
+    public void postProcessModelProperty(CodegenModel model, CodegenProperty property){
+        super.postProcessModelProperty(model,property);
+        property.vendorExtensions.put("x-uppercaseName", camelize(property.name));
+    }
+
     /**
      * Return the default value of the property
      *
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-body.mustache b/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-body.mustache
index 3a19dd1ca4e7..7fa5e7b19e02 100644
--- a/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONResponseSerializer-body.mustache
@@ -1,13 +1,5 @@
 #import "{{classPrefix}}JSONResponseSerializer.h"
 
-static BOOL JSONParseError(NSError *error) {
-    if ([error.domain isEqualToString:NSCocoaErrorDomain] && error.code == 3840) {
-        return YES;
-    }
-    
-    return NO;
-}
-
 @implementation {{classPrefix}}JSONResponseSerializer
 
 ///
@@ -17,7 +9,7 @@ static BOOL JSONParseError(NSError *error) {
 ///
 /// @param response The response to be processed.
 /// @param data     The response data to be decoded.
-/// @param error    The error that occurred while attempting to decode the respnse data.
+/// @param error    The error that occurred while attempting to decode the response data.
 ///
 /// @return The object decoded from the specified response data.
 ///
@@ -27,7 +19,7 @@ static BOOL JSONParseError(NSError *error) {
     NSDictionary *responseJson = [super responseObjectForResponse:response data:data error:error];
 
     // if response data is not a valid json, return string of data.
-    if (JSONParseError(*error)) {
+    if ([self isParseError:*error]) {
         *error = nil;
         NSString *responseString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
         return responseString;
@@ -36,4 +28,12 @@ static BOOL JSONParseError(NSError *error) {
     return responseJson;
 }
 
+-(BOOL)isParseError:(NSError *)error {
+    return [error.domain isEqualToString:NSCocoaErrorDomain] && error.code == 3840;
+}
+
++ (instancetype)serializer {
+    return [self serializerWithReadingOptions:NSJSONReadingAllowFragments];
+}
+
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/Model.xcdatamodel.mustache b/modules/swagger-codegen/src/main/resources/objc/Model.xcdatamodel.mustache
new file mode 100644
index 000000000000..bc391cbd0ad5
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/Model.xcdatamodel.mustache
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9525" systemVersion="15D21" minimumToolsVersion="Xcode 7.0">
+
+    {{#models}}{{#model}}<entity name="{{{classname}}}ManagedObject" representedClassName="{{{classname}}}ManagedObject" syncable="YES">
+{{#vars}}{{#complexType}}       <relationship name="{{name}}" {{^required}}optional="YES"{{/required}} {{#isListContainer}}toMany="YES"{{/isListContainer}}{{^isListContainer}}maxCount="1"{{/isListContainer}} deletionRule="Cascade" destinationEntity="{{{complexType}}}ManagedObject" syncable="YES"/>{{/complexType}}{{^complexType}}       <attribute name="{{name}}" {{^required}}optional="YES"{{/required}} attributeType="{{#isString}}String{{/isString}}{{#isInteger}}Integer 16{{/isInteger}}{{#isLong}}Double{{/isLong}}{{#isDouble}}Double{{/isDouble}}{{#isFloat}}Float{{/isFloat}}{{#isByteArray}}Binary{{/isByteArray}}{{#isBinary}}Binary{{/isBinary}}{{#isListContainer}}Transformable{{/isListContainer}}{{#isMapContainer}}Transformable{{/isMapContainer}}{{#isBoolean}}Boolean{{/isBoolean}}{{#isDate}}Date{{/isDate}}{{#isDateTime}}Date{{/isDateTime}}" syncable="YES"/>{{/complexType}}
+{{/vars}}
+    </entity>
+    {{/model}}{{/models}}
+</model>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-body.mustache b/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-body.mustache
new file mode 100644
index 000000000000..c8e563e75e85
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-body.mustache
@@ -0,0 +1,18 @@
+{{#models}}
+{{#model}}
+#import "{{classname}}ManagedObject.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+@implementation {{classname}}ManagedObject
+
+{{#vars}}
+@dynamic {{name}};
+{{/vars}}
+
+{{/model}}
+@end
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache b/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
new file mode 100644
index 000000000000..2001f6c227cc
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
@@ -0,0 +1,31 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+{{#imports}}#import "{{import}}ManagedObject.h"
+{{/imports}}
+{{newline}}
+{{#models}}
+{{#model}}
+
+@interface {{classname}}ManagedObject : {{#parent}}{{{parent}}}{{/parent}}{{^parent}}NSManagedObject{{/parent}}
+
+{{#vars}}
+{{#description}}/* {{{description}}} {{^required}}[optional]{{/required}}
+ */{{/description}}
+@property (nullable, nonatomic, retain) {{^complexType}}{{{ datatype }}}{{/complexType}}{{#complexType}}{{#isListContainer}}NSSet*{{/isListContainer}}{{^isListContainer}}{{{complexType}}}ManagedObject*{{/isListContainer}}{{/complexType}} {{name}};
+{{/vars}}
+
+{{#vars}}{{#isListContainer}}{{#complexType}}- (void)add{{vendorExtensions.x-uppercaseName}}Object:({{complexType}}ManagedObject *)value;
+- (void)remove{{vendorExtensions.x-uppercaseName}}Object:({{complexType}}ManagedObject *)value;
+- (void)add{{vendorExtensions.x-uppercaseName}}:(NSSet *)values;
+- (void)remove{{vendorExtensions.x-uppercaseName}}:(NSSet *)values;
+{{/complexType}}{{/isListContainer}}{{/vars}}
+@end
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-body.mustache b/modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-body.mustache
new file mode 100644
index 000000000000..70f97418eede
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-body.mustache
@@ -0,0 +1,76 @@
+
+{{#models}}{{#model}}
+#import "{{classname}}ManagedObjectBuilder.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+
+@implementation {{classname}}ManagedObjectBuilder
+
+-(instancetype)init {
+    self = [super init];
+    if (self != nil) {
+{{#vars}}{{#complexType}}       _{{name}}Builder = [[{{complexType}}ManagedObjectBuilder alloc] init];
+{{/complexType}}{{/vars}}   }
+    return self;
+}
+
+-({{classname}}ManagedObject*)createNew{{classname}}ManagedObjectInContext:(NSManagedObjectContext*)context {
+    {{classname}}ManagedObject *managedObject = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass([{{classname}}ManagedObject class]) inManagedObjectContext:context];
+    return managedObject;
+}
+
+-({{classname}}ManagedObject*){{classname}}ManagedObjectFrom{{classname}}:({{classname}}*){{name}} context:(NSManagedObjectContext*)context {
+    {{classname}}ManagedObject* new{{classname}} = [self createNew{{{classname}}}ManagedObjectInContext:context];
+    [self update{{classname}}ManagedObject:new{{classname}} with{{classname}}:{{name}}];
+    return new{{classname}};
+}
+
+-(void)update{{classname}}ManagedObject:({{classname}}ManagedObject*)managedObject with{{classname}}:({{classname}}*)object {
+    if(!managedObject || !object) {
+        return;
+    }
+{{#vars}}{{^complexType}}    managedObject.{{name}} = [object.{{name}} copy];{{/complexType}}{{#complexType}}{{#isListContainer}}    if(object.{{name}}) {
+        NSMutableSet * convertedObjs = [NSMutableSet set];
+        for (id innerObject in object.{{name}}) {
+            id convertedObj = [self.{{name}}Builder {{complexType}}ManagedObjectFrom{{complexType}}:innerObject context:managedObject.managedObjectContext];
+            [convertedObjs addObject:convertedObj];
+        }
+        managedObject.{{name}} = convertedObjs;
+    }{{/isListContainer}}{{^isListContainer}}
+    if(!managedObject.{{name}}) {
+        managedObject.{{name}} = [self.{{name}}Builder {{complexType}}ManagedObjectFrom{{complexType}}:object.{{name}} context:managedObject.managedObjectContext];
+    } else {
+        [self.{{name}}Builder update{{complexType}}ManagedObject:managedObject.{{name}} with{{complexType}}:object.{{name}}];
+    }{{/isListContainer}}{{/complexType}}
+    {{/vars}}
+}
+
+-({{classname}}*){{classname}}From{{classname}}ManagedObject:({{classname}}ManagedObject*)obj {
+    if(!obj) {
+        return nil;
+    }
+    {{classname}}* new{{classname}} = [[{{classname}} alloc] init];
+    [self update{{classname}}:new{{classname}} with{{classname}}ManagedObject:obj];
+    return new{{classname}};
+}
+
+-(void)update{{classname}}:({{classname}}*)new{{classname}} with{{classname}}ManagedObject:({{classname}}ManagedObject*)obj {
+{{#vars}}{{^complexType}}    new{{classname}}.{{name}} = [obj.{{name}} copy];{{/complexType}}{{#complexType}}{{#isListContainer}}    if(obj.{{name}} != nil) {
+        NSMutableArray* convertedObjs = [NSMutableArray array];
+        for (id innerObject in obj.{{name}}) {
+            id convertedObj = [self.{{name}}Builder {{complexType}}From{{complexType}}ManagedObject:innerObject];
+            [convertedObjs addObject:convertedObj];
+        }
+        new{{classname}}.{{name}} = ({{{ datatype }}})convertedObjs;
+    }
+    {{/isListContainer}}{{^isListContainer}}    new{{classname}}.{{name}} = [self.{{name}}Builder {{complexType}}From{{complexType}}ManagedObject:obj.{{name}}];{{/isListContainer}}{{/complexType}}
+    {{/vars}}
+}
+
+@end
+{{/model}}
+{{/models}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-header.mustache b/modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-header.mustache
new file mode 100644
index 000000000000..6a7033bf19a9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-header.mustache
@@ -0,0 +1,35 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+{{#imports}}#import "{{import}}ManagedObjectBuilder.h"
+{{/imports}}
+{{#models}}
+{{#model}}
+
+#import "{{classPrefix}}{{name}}ManagedObject.h"
+#import "{{classPrefix}}{{name}}.h"
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+@interface {{classname}}ManagedObjectBuilder : NSObject
+
+{{#vars}}{{#complexType}}@property (nonatomic, strong) {{complexType}}ManagedObjectBuilder * {{name}}Builder;
+{{/complexType}}{{/vars}}
+
+-({{classname}}ManagedObject*)createNew{{classname}}ManagedObjectInContext:(NSManagedObjectContext*)context;
+
+-({{classname}}ManagedObject*){{classname}}ManagedObjectFrom{{classname}}:({{classname}}*){{name}} context:(NSManagedObjectContext*)context;
+
+-(void)update{{classname}}ManagedObject:({{classname}}ManagedObject*){{name}} with{{classname}}:({{classname}}*){{name}}2;
+
+-({{classname}}*){{classname}}From{{classname}}ManagedObject:({{classname}}ManagedObject*)obj;
+
+-(void)update{{classname}}:({{classname}}*){{name}} with{{classname}}ManagedObject:({{classname}}ManagedObject*){{name}}2;
+
+@end
+{{/model}}
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
index 6f15d3b6c5bb..ae4e66fba69c 100644
--- a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
@@ -16,25 +16,18 @@
 
 {{#discriminator}}
 /**
- Maps "discriminator" value to the sub-class name, so that inheritance is supported.
+ * Maps "discriminator" value to the sub-class name, so that inheritance is supported.
  */
 - (id)initWithDictionary:(NSDictionary *)dict error:(NSError *__autoreleasing *)err {
-
     NSString * discriminatedClassName = [dict valueForKey:@"{{discriminator}}"];
-
     if(discriminatedClassName == nil ){
          return [super initWithDictionary:dict error:err];
     }
-
     Class class = NSClassFromString([@"{{classPrefix}}" stringByAppendingString:discriminatedClassName]);
-
     if([self class ] == class) {
         return [super initWithDictionary:dict error:err];
     }
-
-
     return [[class alloc] initWithDictionary:dict error: err];
-
 }
 {{/discriminator}}
 
@@ -55,7 +48,6 @@
 
   NSArray *optionalProperties = @[{{#vars}}{{^required}}@"{{name}}"{{#hasMore}}, {{/hasMore}}{{/required}}{{/vars}}];
   return [optionalProperties containsObject:propertyName];
-
 }
 
 {{/model}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/podspec.mustache b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
index 706a583454fe..e4c4fe45dcb7 100644
--- a/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
@@ -19,15 +19,16 @@ Pod::Spec.new do |s|
     s.platform     = :ios, '7.0'
     s.requires_arc = true
 
-    s.framework    = 'SystemConfiguration'
-    
+    {{^useCoreData}}s.framework    = 'SystemConfiguration'{{/useCoreData}}{{#useCoreData}}s.frameworks = 'SystemConfiguration', 'CoreData'{{/useCoreData}}
+
     s.homepage     = "{{gitRepoURL}}"
     s.license      = "{{#license}}{{license}}{{/license}}{{^license}}Apache License, Version 2.0{{/license}}"
     s.source       = { :git => "{{gitRepoURL}}.git", :tag => "#{s.version}" }
     s.author       = { "{{authorName}}" => "{{authorEmail}}" }
 
-    s.source_files = '{{podName}}/**/*'
+    s.source_files = '{{podName}}/**/*.{m,h}'
     s.public_header_files = '{{podName}}/**/*.h'
+    s.resources      = '{{podName}}/**/*.{xcdatamodeld,xcdatamodel}'
 
     s.dependency 'AFNetworking', '~> 3'
     s.dependency 'JSONModel', '~> 1.2'
diff --git a/modules/swagger-codegen/src/main/resources/objc/xccurrentversion.mustache b/modules/swagger-codegen/src/main/resources/objc/xccurrentversion.mustache
new file mode 100644
index 000000000000..528b389e3efa
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/xccurrentversion.mustache
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>_XCCurrentVersionName</key>
+	<string>{{classPrefix}}Model.xcdatamodel</string>
+</dict>
+</plist>
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java
index 5057dd3b4ff2..4df5c5e1db6b 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java
@@ -9,6 +9,7 @@ import java.util.Map;
 
 public class ObjcClientOptionsProvider implements OptionsProvider {
     public static final String CLASS_PREFIX_VALUE = "SWGObjc";
+    public static final String CORE_DATA_VALUE = "n";
     public static final String POD_NAME_VALUE = "SwaggerClientObjc";
     public static final String POD_VERSION_VALUE = "1.0.0-SNAPSHOT";
     public static final String AUTHOR_NAME_VALUE = "SwaggerObjc";
@@ -29,6 +30,7 @@ public class ObjcClientOptionsProvider implements OptionsProvider {
                 .put(ObjcClientCodegen.AUTHOR_NAME, AUTHOR_NAME_VALUE)
                 .put(ObjcClientCodegen.AUTHOR_EMAIL, AUTHOR_EMAIL_VALUE)
                 .put(ObjcClientCodegen.GIT_REPO_URL, GIT_REPO_URL_VALUE)
+                .put(ObjcClientCodegen.CORE_DATA, CORE_DATA_VALUE)
                 .build();
     }
 
diff --git a/samples/client/petstore/objc/SwaggerClient.podspec b/samples/client/petstore/objc/SwaggerClient.podspec
index 3c8e0e795163..eab61d4dc328 100644
--- a/samples/client/petstore/objc/SwaggerClient.podspec
+++ b/samples/client/petstore/objc/SwaggerClient.podspec
@@ -19,15 +19,16 @@ Pod::Spec.new do |s|
     s.platform     = :ios, '7.0'
     s.requires_arc = true
 
-    s.framework    = 'SystemConfiguration'
-    
+    s.frameworks = 'SystemConfiguration', 'CoreData'
+
     s.homepage     = "https://github.com/swagger-api/swagger-codegen"
     s.license      = "Apache License, Version 2.0"
     s.source       = { :git => "https://github.com/swagger-api/swagger-codegen.git", :tag => "#{s.version}" }
     s.author       = { "Swagger" => "apiteam@swagger.io" }
 
-    s.source_files = 'SwaggerClient/**/*'
+    s.source_files = 'SwaggerClient/**/*.{m,h}'
     s.public_header_files = 'SwaggerClient/**/*.h'
+    s.resources      = 'SwaggerClient/**/*.{xcdatamodeld,xcdatamodel}'
 
     s.dependency 'AFNetworking', '~> 3'
     s.dependency 'JSONModel', '~> 1.2'
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.m b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.m
index a2dd21bcf5d0..73c696d341a3 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.m
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONResponseSerializer.m
@@ -1,13 +1,5 @@
 #import "SWGJSONResponseSerializer.h"
 
-static BOOL JSONParseError(NSError *error) {
-    if ([error.domain isEqualToString:NSCocoaErrorDomain] && error.code == 3840) {
-        return YES;
-    }
-    
-    return NO;
-}
-
 @implementation SWGJSONResponseSerializer
 
 ///
@@ -17,7 +9,7 @@ static BOOL JSONParseError(NSError *error) {
 ///
 /// @param response The response to be processed.
 /// @param data     The response data to be decoded.
-/// @param error    The error that occurred while attempting to decode the respnse data.
+/// @param error    The error that occurred while attempting to decode the response data.
 ///
 /// @return The object decoded from the specified response data.
 ///
@@ -27,7 +19,7 @@ static BOOL JSONParseError(NSError *error) {
     NSDictionary *responseJson = [super responseObjectForResponse:response data:data error:error];
 
     // if response data is not a valid json, return string of data.
-    if (JSONParseError(*error)) {
+    if ([self isParseError:*error]) {
         *error = nil;
         NSString *responseString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
         return responseString;
@@ -36,4 +28,12 @@ static BOOL JSONParseError(NSError *error) {
     return responseJson;
 }
 
+-(BOOL)isParseError:(NSError *)error {
+    return [error.domain isEqualToString:NSCocoaErrorDomain] && error.code == 3840;
+}
+
++ (instancetype)serializer {
+    return [self serializerWithReadingOptions:NSJSONReadingAllowFragments];
+}
+
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m
index 85297c56d782..00745d1f4990 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategory.m
@@ -29,7 +29,6 @@
 
   NSArray *optionalProperties = @[@"_id", @"name"];
   return [optionalProperties containsObject:propertyName];
-
 }
 
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h
new file mode 100644
index 000000000000..82ec1e716518
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h
@@ -0,0 +1,20 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+
+
+@interface SWGCategoryManagedObject : NSManagedObject
+
+
+@property (nullable, nonatomic, retain) NSNumber* _id;
+
+@property (nullable, nonatomic, retain) NSString* name;
+
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.m
new file mode 100644
index 000000000000..aa4d5f4b8220
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.m
@@ -0,0 +1,13 @@
+#import "SWGCategoryManagedObject.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+@implementation SWGCategoryManagedObject
+
+@dynamic _id;
+@dynamic name;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h
new file mode 100644
index 000000000000..9ee59f638623
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h
@@ -0,0 +1,28 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+
+#import "SWGCategoryManagedObject.h"
+#import "SWGCategory.h"
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+@interface SWGCategoryManagedObjectBuilder : NSObject
+
+
+
+-(SWGCategoryManagedObject*)createNewSWGCategoryManagedObjectInContext:(NSManagedObjectContext*)context;
+
+-(SWGCategoryManagedObject*)SWGCategoryManagedObjectFromSWGCategory:(SWGCategory*)Category context:(NSManagedObjectContext*)context;
+
+-(void)updateSWGCategoryManagedObject:(SWGCategoryManagedObject*)Category withSWGCategory:(SWGCategory*)Category2;
+
+-(SWGCategory*)SWGCategoryFromSWGCategoryManagedObject:(SWGCategoryManagedObject*)obj;
+
+-(void)updateSWGCategory:(SWGCategory*)Category withSWGCategoryManagedObject:(SWGCategoryManagedObject*)Category2;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.m
new file mode 100644
index 000000000000..6c895a4c0d60
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.m
@@ -0,0 +1,53 @@
+
+
+#import "SWGCategoryManagedObjectBuilder.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+
+@implementation SWGCategoryManagedObjectBuilder
+
+-(instancetype)init {
+    self = [super init];
+    if (self != nil) {
+   }
+    return self;
+}
+
+-(SWGCategoryManagedObject*)createNewSWGCategoryManagedObjectInContext:(NSManagedObjectContext*)context {
+    SWGCategoryManagedObject *managedObject = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass([SWGCategoryManagedObject class]) inManagedObjectContext:context];
+    return managedObject;
+}
+
+-(SWGCategoryManagedObject*)SWGCategoryManagedObjectFromSWGCategory:(SWGCategory*)Category context:(NSManagedObjectContext*)context {
+    SWGCategoryManagedObject* newSWGCategory = [self createNewSWGCategoryManagedObjectInContext:context];
+    [self updateSWGCategoryManagedObject:newSWGCategory withSWGCategory:Category];
+    return newSWGCategory;
+}
+
+-(void)updateSWGCategoryManagedObject:(SWGCategoryManagedObject*)managedObject withSWGCategory:(SWGCategory*)object {
+    if(!managedObject || !object) {
+        return;
+    }
+    managedObject._id = [object._id copy];
+    managedObject.name = [object.name copy];
+}
+
+-(SWGCategory*)SWGCategoryFromSWGCategoryManagedObject:(SWGCategoryManagedObject*)obj {
+    if(!obj) {
+        return nil;
+    }
+    SWGCategory* newSWGCategory = [[SWGCategory alloc] init];
+    [self updateSWGCategory:newSWGCategory withSWGCategoryManagedObject:obj];
+    return newSWGCategory;
+}
+
+-(void)updateSWGCategory:(SWGCategory*)newSWGCategory withSWGCategoryManagedObject:(SWGCategoryManagedObject*)obj {
+    newSWGCategory._id = [obj._id copy];
+    newSWGCategory.name = [obj.name copy];
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/.xccurrentversion b/samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/.xccurrentversion
new file mode 100644
index 000000000000..c38112b62d2c
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/.xccurrentversion
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>_XCCurrentVersionName</key>
+	<string>SWGModel.xcdatamodel</string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents b/samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
new file mode 100644
index 000000000000..d6c893f1d25d
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9525" systemVersion="15D21" minimumToolsVersion="Xcode 7.0">
+
+    <entity name="SWGCategoryManagedObject" representedClassName="SWGCategoryManagedObject" syncable="YES">
+       <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
+       <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="SWGOrderManagedObject" representedClassName="SWGOrderManagedObject" syncable="YES">
+       <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
+       <attribute name="petId" optional="YES" attributeType="Double" syncable="YES"/>
+       <attribute name="quantity" optional="YES" attributeType="Integer 16" syncable="YES"/>
+       <attribute name="shipDate" optional="YES" attributeType="Date" syncable="YES"/>
+       <attribute name="status" optional="YES" attributeType="String" syncable="YES"/>
+       <attribute name="complete" optional="YES" attributeType="Boolean" syncable="YES"/>
+    </entity>
+    <entity name="SWGPetManagedObject" representedClassName="SWGPetManagedObject" syncable="YES">
+       <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
+       <relationship name="category" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SWGCategoryManagedObject" syncable="YES"/>
+       <attribute name="name"  attributeType="String" syncable="YES"/>
+       <attribute name="photoUrls"  attributeType="Transformable" syncable="YES"/>
+       <relationship name="tags" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="SWGTagManagedObject" syncable="YES"/>
+       <attribute name="status" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="SWGTagManagedObject" representedClassName="SWGTagManagedObject" syncable="YES">
+       <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
+       <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="SWGUserManagedObject" representedClassName="SWGUserManagedObject" syncable="YES">
+       <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
+       <attribute name="username" optional="YES" attributeType="String" syncable="YES"/>
+       <attribute name="firstName" optional="YES" attributeType="String" syncable="YES"/>
+       <attribute name="lastName" optional="YES" attributeType="String" syncable="YES"/>
+       <attribute name="email" optional="YES" attributeType="String" syncable="YES"/>
+       <attribute name="password" optional="YES" attributeType="String" syncable="YES"/>
+       <attribute name="phone" optional="YES" attributeType="String" syncable="YES"/>
+       <attribute name="userStatus" optional="YES" attributeType="Integer 16" syncable="YES"/>
+    </entity>
+    
+</model>
\ No newline at end of file
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m
index 299385f616f9..e0b44e06954b 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrder.m
@@ -29,7 +29,6 @@
 
   NSArray *optionalProperties = @[@"_id", @"petId", @"quantity", @"shipDate", @"status", @"complete"];
   return [optionalProperties containsObject:propertyName];
-
 }
 
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h
new file mode 100644
index 000000000000..d0d8b5d2c6b3
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h
@@ -0,0 +1,29 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+
+
+@interface SWGOrderManagedObject : NSManagedObject
+
+
+@property (nullable, nonatomic, retain) NSNumber* _id;
+
+@property (nullable, nonatomic, retain) NSNumber* petId;
+
+@property (nullable, nonatomic, retain) NSNumber* quantity;
+
+@property (nullable, nonatomic, retain) NSDate* shipDate;
+/* Order Status [optional]
+ */
+@property (nullable, nonatomic, retain) NSString* status;
+
+@property (nullable, nonatomic, retain) NSNumber* complete;
+
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.m
new file mode 100644
index 000000000000..7a1b9298a954
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.m
@@ -0,0 +1,17 @@
+#import "SWGOrderManagedObject.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+@implementation SWGOrderManagedObject
+
+@dynamic _id;
+@dynamic petId;
+@dynamic quantity;
+@dynamic shipDate;
+@dynamic status;
+@dynamic complete;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h
new file mode 100644
index 000000000000..bac7b6601579
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h
@@ -0,0 +1,28 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+
+#import "SWGOrderManagedObject.h"
+#import "SWGOrder.h"
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+@interface SWGOrderManagedObjectBuilder : NSObject
+
+
+
+-(SWGOrderManagedObject*)createNewSWGOrderManagedObjectInContext:(NSManagedObjectContext*)context;
+
+-(SWGOrderManagedObject*)SWGOrderManagedObjectFromSWGOrder:(SWGOrder*)Order context:(NSManagedObjectContext*)context;
+
+-(void)updateSWGOrderManagedObject:(SWGOrderManagedObject*)Order withSWGOrder:(SWGOrder*)Order2;
+
+-(SWGOrder*)SWGOrderFromSWGOrderManagedObject:(SWGOrderManagedObject*)obj;
+
+-(void)updateSWGOrder:(SWGOrder*)Order withSWGOrderManagedObject:(SWGOrderManagedObject*)Order2;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.m
new file mode 100644
index 000000000000..ce1c6352b112
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.m
@@ -0,0 +1,61 @@
+
+
+#import "SWGOrderManagedObjectBuilder.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+
+@implementation SWGOrderManagedObjectBuilder
+
+-(instancetype)init {
+    self = [super init];
+    if (self != nil) {
+   }
+    return self;
+}
+
+-(SWGOrderManagedObject*)createNewSWGOrderManagedObjectInContext:(NSManagedObjectContext*)context {
+    SWGOrderManagedObject *managedObject = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass([SWGOrderManagedObject class]) inManagedObjectContext:context];
+    return managedObject;
+}
+
+-(SWGOrderManagedObject*)SWGOrderManagedObjectFromSWGOrder:(SWGOrder*)Order context:(NSManagedObjectContext*)context {
+    SWGOrderManagedObject* newSWGOrder = [self createNewSWGOrderManagedObjectInContext:context];
+    [self updateSWGOrderManagedObject:newSWGOrder withSWGOrder:Order];
+    return newSWGOrder;
+}
+
+-(void)updateSWGOrderManagedObject:(SWGOrderManagedObject*)managedObject withSWGOrder:(SWGOrder*)object {
+    if(!managedObject || !object) {
+        return;
+    }
+    managedObject._id = [object._id copy];
+    managedObject.petId = [object.petId copy];
+    managedObject.quantity = [object.quantity copy];
+    managedObject.shipDate = [object.shipDate copy];
+    managedObject.status = [object.status copy];
+    managedObject.complete = [object.complete copy];
+}
+
+-(SWGOrder*)SWGOrderFromSWGOrderManagedObject:(SWGOrderManagedObject*)obj {
+    if(!obj) {
+        return nil;
+    }
+    SWGOrder* newSWGOrder = [[SWGOrder alloc] init];
+    [self updateSWGOrder:newSWGOrder withSWGOrderManagedObject:obj];
+    return newSWGOrder;
+}
+
+-(void)updateSWGOrder:(SWGOrder*)newSWGOrder withSWGOrderManagedObject:(SWGOrderManagedObject*)obj {
+    newSWGOrder._id = [obj._id copy];
+    newSWGOrder.petId = [obj.petId copy];
+    newSWGOrder.quantity = [obj.quantity copy];
+    newSWGOrder.shipDate = [obj.shipDate copy];
+    newSWGOrder.status = [obj.status copy];
+    newSWGOrder.complete = [obj.complete copy];
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m
index 0518c3118506..a1c63520dc44 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPet.m
@@ -29,7 +29,6 @@
 
   NSArray *optionalProperties = @[@"_id", @"category", @"tags", @"status"];
   return [optionalProperties containsObject:propertyName];
-
 }
 
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
new file mode 100644
index 000000000000..f45d879bcbf8
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
@@ -0,0 +1,35 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+#import "SWGCategoryManagedObject.h"
+#import "SWGTagManagedObject.h"
+
+
+@interface SWGPetManagedObject : NSManagedObject
+
+
+@property (nullable, nonatomic, retain) NSNumber* _id;
+
+@property (nullable, nonatomic, retain) SWGCategoryManagedObject* category;
+
+@property (nullable, nonatomic, retain) NSString* name;
+
+@property (nullable, nonatomic, retain) NSArray<NSString*>* photoUrls;
+
+@property (nullable, nonatomic, retain) NSSet* tags;
+/* pet status in the store [optional]
+ */
+@property (nullable, nonatomic, retain) NSString* status;
+
+- (void)addTagsObject:(SWGTagManagedObject *)value;
+- (void)removeTagsObject:(SWGTagManagedObject *)value;
+- (void)addTags:(NSSet *)values;
+- (void)removeTags:(NSSet *)values;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.m
new file mode 100644
index 000000000000..7526628c42b0
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.m
@@ -0,0 +1,17 @@
+#import "SWGPetManagedObject.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+@implementation SWGPetManagedObject
+
+@dynamic _id;
+@dynamic category;
+@dynamic name;
+@dynamic photoUrls;
+@dynamic tags;
+@dynamic status;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.h
new file mode 100644
index 000000000000..83877706ff60
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.h
@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+#import "SWGCategoryManagedObjectBuilder.h"
+#import "SWGTagManagedObjectBuilder.h"
+
+#import "SWGPetManagedObject.h"
+#import "SWGPet.h"
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+@interface SWGPetManagedObjectBuilder : NSObject
+
+@property (nonatomic, strong) SWGCategoryManagedObjectBuilder * categoryBuilder;
+@property (nonatomic, strong) SWGTagManagedObjectBuilder * tagsBuilder;
+
+
+-(SWGPetManagedObject*)createNewSWGPetManagedObjectInContext:(NSManagedObjectContext*)context;
+
+-(SWGPetManagedObject*)SWGPetManagedObjectFromSWGPet:(SWGPet*)Pet context:(NSManagedObjectContext*)context;
+
+-(void)updateSWGPetManagedObject:(SWGPetManagedObject*)Pet withSWGPet:(SWGPet*)Pet2;
+
+-(SWGPet*)SWGPetFromSWGPetManagedObject:(SWGPetManagedObject*)obj;
+
+-(void)updateSWGPet:(SWGPet*)Pet withSWGPetManagedObject:(SWGPetManagedObject*)Pet2;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.m
new file mode 100644
index 000000000000..84a3463ea78b
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.m
@@ -0,0 +1,83 @@
+
+
+#import "SWGPetManagedObjectBuilder.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+
+@implementation SWGPetManagedObjectBuilder
+
+-(instancetype)init {
+    self = [super init];
+    if (self != nil) {
+       _categoryBuilder = [[SWGCategoryManagedObjectBuilder alloc] init];
+       _tagsBuilder = [[SWGTagManagedObjectBuilder alloc] init];
+   }
+    return self;
+}
+
+-(SWGPetManagedObject*)createNewSWGPetManagedObjectInContext:(NSManagedObjectContext*)context {
+    SWGPetManagedObject *managedObject = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass([SWGPetManagedObject class]) inManagedObjectContext:context];
+    return managedObject;
+}
+
+-(SWGPetManagedObject*)SWGPetManagedObjectFromSWGPet:(SWGPet*)Pet context:(NSManagedObjectContext*)context {
+    SWGPetManagedObject* newSWGPet = [self createNewSWGPetManagedObjectInContext:context];
+    [self updateSWGPetManagedObject:newSWGPet withSWGPet:Pet];
+    return newSWGPet;
+}
+
+-(void)updateSWGPetManagedObject:(SWGPetManagedObject*)managedObject withSWGPet:(SWGPet*)object {
+    if(!managedObject || !object) {
+        return;
+    }
+    managedObject._id = [object._id copy];
+
+    if(!managedObject.category) {
+        managedObject.category = [self.categoryBuilder SWGCategoryManagedObjectFromSWGCategory:object.category context:managedObject.managedObjectContext];
+    } else {
+        [self.categoryBuilder updateSWGCategoryManagedObject:managedObject.category withSWGCategory:object.category];
+    }
+    managedObject.name = [object.name copy];
+    managedObject.photoUrls = [object.photoUrls copy];
+    if(object.tags) {
+        NSMutableSet * convertedObjs = [NSMutableSet set];
+        for (id innerObject in object.tags) {
+            id convertedObj = [self.tagsBuilder SWGTagManagedObjectFromSWGTag:innerObject context:managedObject.managedObjectContext];
+            [convertedObjs addObject:convertedObj];
+        }
+        managedObject.tags = convertedObjs;
+    }
+    managedObject.status = [object.status copy];
+}
+
+-(SWGPet*)SWGPetFromSWGPetManagedObject:(SWGPetManagedObject*)obj {
+    if(!obj) {
+        return nil;
+    }
+    SWGPet* newSWGPet = [[SWGPet alloc] init];
+    [self updateSWGPet:newSWGPet withSWGPetManagedObject:obj];
+    return newSWGPet;
+}
+
+-(void)updateSWGPet:(SWGPet*)newSWGPet withSWGPetManagedObject:(SWGPetManagedObject*)obj {
+    newSWGPet._id = [obj._id copy];
+    newSWGPet.category = [self.categoryBuilder SWGCategoryFromSWGCategoryManagedObject:obj.category];
+    newSWGPet.name = [obj.name copy];
+    newSWGPet.photoUrls = [obj.photoUrls copy];
+    if(obj.tags != nil) {
+        NSMutableArray* convertedObjs = [NSMutableArray array];
+        for (id innerObject in obj.tags) {
+            id convertedObj = [self.tagsBuilder SWGTagFromSWGTagManagedObject:innerObject];
+            [convertedObjs addObject:convertedObj];
+        }
+        newSWGPet.tags = (NSArray<SWGTag>*)convertedObjs;
+    }
+    
+    newSWGPet.status = [obj.status copy];
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m
index 2b720d287e11..e71829873d11 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTag.m
@@ -29,7 +29,6 @@
 
   NSArray *optionalProperties = @[@"_id", @"name"];
   return [optionalProperties containsObject:propertyName];
-
 }
 
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h
new file mode 100644
index 000000000000..1d95aa5930cc
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h
@@ -0,0 +1,20 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+
+
+@interface SWGTagManagedObject : NSManagedObject
+
+
+@property (nullable, nonatomic, retain) NSNumber* _id;
+
+@property (nullable, nonatomic, retain) NSString* name;
+
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.m
new file mode 100644
index 000000000000..9f616af1ea8c
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.m
@@ -0,0 +1,13 @@
+#import "SWGTagManagedObject.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+@implementation SWGTagManagedObject
+
+@dynamic _id;
+@dynamic name;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.h
new file mode 100644
index 000000000000..6895f09262c4
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.h
@@ -0,0 +1,28 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+
+#import "SWGTagManagedObject.h"
+#import "SWGTag.h"
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+@interface SWGTagManagedObjectBuilder : NSObject
+
+
+
+-(SWGTagManagedObject*)createNewSWGTagManagedObjectInContext:(NSManagedObjectContext*)context;
+
+-(SWGTagManagedObject*)SWGTagManagedObjectFromSWGTag:(SWGTag*)Tag context:(NSManagedObjectContext*)context;
+
+-(void)updateSWGTagManagedObject:(SWGTagManagedObject*)Tag withSWGTag:(SWGTag*)Tag2;
+
+-(SWGTag*)SWGTagFromSWGTagManagedObject:(SWGTagManagedObject*)obj;
+
+-(void)updateSWGTag:(SWGTag*)Tag withSWGTagManagedObject:(SWGTagManagedObject*)Tag2;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.m
new file mode 100644
index 000000000000..2e26bfc555c7
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.m
@@ -0,0 +1,53 @@
+
+
+#import "SWGTagManagedObjectBuilder.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+
+@implementation SWGTagManagedObjectBuilder
+
+-(instancetype)init {
+    self = [super init];
+    if (self != nil) {
+   }
+    return self;
+}
+
+-(SWGTagManagedObject*)createNewSWGTagManagedObjectInContext:(NSManagedObjectContext*)context {
+    SWGTagManagedObject *managedObject = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass([SWGTagManagedObject class]) inManagedObjectContext:context];
+    return managedObject;
+}
+
+-(SWGTagManagedObject*)SWGTagManagedObjectFromSWGTag:(SWGTag*)Tag context:(NSManagedObjectContext*)context {
+    SWGTagManagedObject* newSWGTag = [self createNewSWGTagManagedObjectInContext:context];
+    [self updateSWGTagManagedObject:newSWGTag withSWGTag:Tag];
+    return newSWGTag;
+}
+
+-(void)updateSWGTagManagedObject:(SWGTagManagedObject*)managedObject withSWGTag:(SWGTag*)object {
+    if(!managedObject || !object) {
+        return;
+    }
+    managedObject._id = [object._id copy];
+    managedObject.name = [object.name copy];
+}
+
+-(SWGTag*)SWGTagFromSWGTagManagedObject:(SWGTagManagedObject*)obj {
+    if(!obj) {
+        return nil;
+    }
+    SWGTag* newSWGTag = [[SWGTag alloc] init];
+    [self updateSWGTag:newSWGTag withSWGTagManagedObject:obj];
+    return newSWGTag;
+}
+
+-(void)updateSWGTag:(SWGTag*)newSWGTag withSWGTagManagedObject:(SWGTagManagedObject*)obj {
+    newSWGTag._id = [obj._id copy];
+    newSWGTag.name = [obj.name copy];
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m
index 7aed8343af9b..c8195660df63 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUser.m
@@ -29,7 +29,6 @@
 
   NSArray *optionalProperties = @[@"_id", @"username", @"firstName", @"lastName", @"email", @"password", @"phone", @"userStatus"];
   return [optionalProperties containsObject:propertyName];
-
 }
 
 @end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h
new file mode 100644
index 000000000000..ddfde6dc1cf9
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h
@@ -0,0 +1,33 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+
+
+@interface SWGUserManagedObject : NSManagedObject
+
+
+@property (nullable, nonatomic, retain) NSNumber* _id;
+
+@property (nullable, nonatomic, retain) NSString* username;
+
+@property (nullable, nonatomic, retain) NSString* firstName;
+
+@property (nullable, nonatomic, retain) NSString* lastName;
+
+@property (nullable, nonatomic, retain) NSString* email;
+
+@property (nullable, nonatomic, retain) NSString* password;
+
+@property (nullable, nonatomic, retain) NSString* phone;
+/* User Status [optional]
+ */
+@property (nullable, nonatomic, retain) NSNumber* userStatus;
+
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.m
new file mode 100644
index 000000000000..f67797158586
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.m
@@ -0,0 +1,19 @@
+#import "SWGUserManagedObject.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+@implementation SWGUserManagedObject
+
+@dynamic _id;
+@dynamic username;
+@dynamic firstName;
+@dynamic lastName;
+@dynamic email;
+@dynamic password;
+@dynamic phone;
+@dynamic userStatus;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.h
new file mode 100644
index 000000000000..d62b03d8c87c
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.h
@@ -0,0 +1,28 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+
+#import "SWGUserManagedObject.h"
+#import "SWGUser.h"
+
+/**
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen
+ * Do not edit the class manually.
+ */
+
+@interface SWGUserManagedObjectBuilder : NSObject
+
+
+
+-(SWGUserManagedObject*)createNewSWGUserManagedObjectInContext:(NSManagedObjectContext*)context;
+
+-(SWGUserManagedObject*)SWGUserManagedObjectFromSWGUser:(SWGUser*)User context:(NSManagedObjectContext*)context;
+
+-(void)updateSWGUserManagedObject:(SWGUserManagedObject*)User withSWGUser:(SWGUser*)User2;
+
+-(SWGUser*)SWGUserFromSWGUserManagedObject:(SWGUserManagedObject*)obj;
+
+-(void)updateSWGUser:(SWGUser*)User withSWGUserManagedObject:(SWGUserManagedObject*)User2;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.m b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.m
new file mode 100644
index 000000000000..8086e6a20e65
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.m
@@ -0,0 +1,65 @@
+
+
+#import "SWGUserManagedObjectBuilder.h"
+
+/**
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen
+* Do not edit the class manually.
+*/
+
+@implementation SWGUserManagedObjectBuilder
+
+-(instancetype)init {
+    self = [super init];
+    if (self != nil) {
+   }
+    return self;
+}
+
+-(SWGUserManagedObject*)createNewSWGUserManagedObjectInContext:(NSManagedObjectContext*)context {
+    SWGUserManagedObject *managedObject = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass([SWGUserManagedObject class]) inManagedObjectContext:context];
+    return managedObject;
+}
+
+-(SWGUserManagedObject*)SWGUserManagedObjectFromSWGUser:(SWGUser*)User context:(NSManagedObjectContext*)context {
+    SWGUserManagedObject* newSWGUser = [self createNewSWGUserManagedObjectInContext:context];
+    [self updateSWGUserManagedObject:newSWGUser withSWGUser:User];
+    return newSWGUser;
+}
+
+-(void)updateSWGUserManagedObject:(SWGUserManagedObject*)managedObject withSWGUser:(SWGUser*)object {
+    if(!managedObject || !object) {
+        return;
+    }
+    managedObject._id = [object._id copy];
+    managedObject.username = [object.username copy];
+    managedObject.firstName = [object.firstName copy];
+    managedObject.lastName = [object.lastName copy];
+    managedObject.email = [object.email copy];
+    managedObject.password = [object.password copy];
+    managedObject.phone = [object.phone copy];
+    managedObject.userStatus = [object.userStatus copy];
+}
+
+-(SWGUser*)SWGUserFromSWGUserManagedObject:(SWGUserManagedObject*)obj {
+    if(!obj) {
+        return nil;
+    }
+    SWGUser* newSWGUser = [[SWGUser alloc] init];
+    [self updateSWGUser:newSWGUser withSWGUserManagedObject:obj];
+    return newSWGUser;
+}
+
+-(void)updateSWGUser:(SWGUser*)newSWGUser withSWGUserManagedObject:(SWGUserManagedObject*)obj {
+    newSWGUser._id = [obj._id copy];
+    newSWGUser.username = [obj.username copy];
+    newSWGUser.firstName = [obj.firstName copy];
+    newSWGUser.lastName = [obj.lastName copy];
+    newSWGUser.email = [obj.email copy];
+    newSWGUser.password = [obj.password copy];
+    newSWGUser.phone = [obj.phone copy];
+    newSWGUser.userStatus = [obj.userStatus copy];
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
index f7274144997a..1a8aa88ce424 100644
--- a/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
@@ -21,8 +21,10 @@
 		6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
 		6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
 		94BE6BE84795B5034A811E61 /* libPods-SwaggerClient_Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D46325ECAD48245C07F6733 /* libPods-SwaggerClient_Example.a */; };
+		B2ADC0B1C8A60A05C48B4DF7 /* DatabaseHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = B2ADC55130D5E329ED945E8F /* DatabaseHelper.m */; };
 		B2ADC17C287DCABF329BA8AC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B2ADC7027D4B025ABCA7999F /* Main.storyboard */; };
 		B2ADC2D632658A5F73C6CE66 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2ADC65E342ADA697322D68C /* Images.xcassets */; };
+		B2ADC3C7634D15595DD14814 /* BuildersTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B2ADC838FCC22F4BC6C41106 /* BuildersTest.m */; };
 		B2ADC56977372855A63F4E4D /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B2ADC084A2C0BDF217832B03 /* Launch Screen.storyboard */; };
 		CF0ADB481B5F95D6008A2729 /* PetTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CF0ADB471B5F95D6008A2729 /* PetTest.m */; };
 		CF8F71391B5F73AC00162980 /* DeserializationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CF8F71381B5F73AC00162980 /* DeserializationTest.m */; };
@@ -66,8 +68,11 @@
 		73CCD82196AABD64F2807C7B /* Pods-SwaggerClient_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwaggerClient_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SwaggerClient_Tests/Pods-SwaggerClient_Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		8D46325ECAD48245C07F6733 /* libPods-SwaggerClient_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SwaggerClient_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B2ADC084A2C0BDF217832B03 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "Launch Screen.storyboard"; path = "SwaggerClient/Launch Screen.storyboard"; sourceTree = "<group>"; };
+		B2ADC2F3483B3117A00FA91C /* DatabaseHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseHelper.h; sourceTree = "<group>"; };
+		B2ADC55130D5E329ED945E8F /* DatabaseHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DatabaseHelper.m; sourceTree = "<group>"; };
 		B2ADC65E342ADA697322D68C /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = SwaggerClient/Images.xcassets; sourceTree = "<group>"; };
 		B2ADC7027D4B025ABCA7999F /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Main.storyboard; path = SwaggerClient/Main.storyboard; sourceTree = "<group>"; };
+		B2ADC838FCC22F4BC6C41106 /* BuildersTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BuildersTest.m; sourceTree = "<group>"; };
 		BFB4BE760737508B3CFC23B2 /* Pods-SwaggerClient_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwaggerClient_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-SwaggerClient_Example/Pods-SwaggerClient_Example.release.xcconfig"; sourceTree = "<group>"; };
 		CF0ADB471B5F95D6008A2729 /* PetTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PetTest.m; sourceTree = "<group>"; };
 		CF8F71381B5F73AC00162980 /* DeserializationTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeserializationTest.m; sourceTree = "<group>"; };
@@ -176,6 +181,8 @@
 				CFDFB40D1B3CFEC3009739C5 /* UserApiTest.m */,
 				6003F5BB195388D20070C39A /* Tests.m */,
 				6003F5B6195388D20070C39A /* Supporting Files */,
+				B2ADC838FCC22F4BC6C41106 /* BuildersTest.m */,
+				B2ADCA62DE4AC0F5BAB42208 /* Helpers */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
@@ -201,6 +208,15 @@
 			name = "Podspec Metadata";
 			sourceTree = "<group>";
 		};
+		B2ADCA62DE4AC0F5BAB42208 /* Helpers */ = {
+			isa = PBXGroup;
+			children = (
+				B2ADC2F3483B3117A00FA91C /* DatabaseHelper.h */,
+				B2ADC55130D5E329ED945E8F /* DatabaseHelper.m */,
+			);
+			path = Helpers;
+			sourceTree = "<group>";
+		};
 		CCE77F10C6D41F74B075ECD0 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -422,6 +438,8 @@
 				CFDFB4151B3D000B009739C5 /* SWGApiClientTest.m in Sources */,
 				CFDFB4121B3CFFA8009739C5 /* UserApiTest.m in Sources */,
 				CF8F71391B5F73AC00162980 /* DeserializationTest.m in Sources */,
+				B2ADC3C7634D15595DD14814 /* BuildersTest.m in Sources */,
+				B2ADC0B1C8A60A05C48B4DF7 /* DatabaseHelper.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/BuildersTest.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/BuildersTest.m
new file mode 100644
index 000000000000..be027cc9deee
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/BuildersTest.m
@@ -0,0 +1,68 @@
+//
+//  BuildersTest.m
+//  SwaggerClient
+//
+//  Created by mmackowiak on 16.05.2016.
+//  Copyright (c) 2016 geekerzp. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import <SwaggerClient/SWGPet.h>
+#import "SWGPetManagedObject.h"
+#import "SWGPetManagedObjectBuilder.h"
+#import "DatabaseHelper.h"
+
+@interface BuildersTest : XCTestCase {
+    SWGPet *pet;
+    SWGPetManagedObjectBuilder* builder;
+    NSManagedObjectContext *context;
+}
+
+@end
+
+@implementation BuildersTest
+
+- (void)setUp {
+    [super setUp];
+
+    NSDictionary *petDict = @{ @"id": @1, @"name": @"test pet",
+            @"status": @"sold",
+            @"photoUrls": @[@"string"],
+            @"category": @{ @"id": @1, @"name": @"test category" },
+            @"tags": @[ @{ @"id": @1, @"name": @"test tag" }],
+            };
+    pet = [[SWGPet alloc] initWithDictionary:petDict error:nil];
+
+    context = [DatabaseHelper createContextWithModelName:@"SWGModel"];
+
+    builder = [[SWGPetManagedObjectBuilder alloc] init];
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+    [super tearDown];
+}
+
+- (void)testExample {
+    SWGPetManagedObject * managedObject = [builder SWGPetManagedObjectFromSWGPet:pet context:context];
+    SWGPet *pet2 = [builder SWGPetFromSWGPetManagedObject:managedObject];
+    [context deleteObject:managedObject];
+    SWGTag * tag = [pet.tags firstObject];
+    SWGTag * tag2 = [pet2.tags firstObject];
+    XCTAssertEqualObjects(tag._id, tag2._id);
+    XCTAssertEqualObjects(tag.name, tag2.name);
+
+    SWGCategory * category = pet.category;
+    SWGCategory * category2 = pet2.category;
+
+    XCTAssertEqualObjects(category._id, category2._id);
+    XCTAssertEqualObjects(category.name, category2.name);
+
+    XCTAssertEqualObjects(pet.status,pet2.status);
+    XCTAssertEqualObjects(pet.photoUrls,pet2.photoUrls);
+    XCTAssertEqualObjects(pet.name,pet2.name);
+    XCTAssertEqualObjects(pet._id,pet2._id);
+
+}
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/Helpers/DatabaseHelper.h b/samples/client/petstore/objc/SwaggerClientTests/Tests/Helpers/DatabaseHelper.h
new file mode 100644
index 000000000000..8216e012a32a
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/Helpers/DatabaseHelper.h
@@ -0,0 +1,14 @@
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+@interface DatabaseHelper : NSObject
+
++ (NSManagedObjectContext *)createContextWithModelName:(NSString *)mName;
+
++ (void)clearContext:(NSManagedObjectContext *)ctx fromEntitiesWithName:(NSString *)entityName;
+
++ (NSManagedObjectModel *)createModelWithModelName:(NSString *)mName;
+
++ (NSManagedObjectContext *)createDatabaseWithModel:(NSManagedObjectModel*)model;
+
+@end
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/Helpers/DatabaseHelper.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/Helpers/DatabaseHelper.m
new file mode 100644
index 000000000000..3433ac19ddbf
--- /dev/null
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/Helpers/DatabaseHelper.m
@@ -0,0 +1,42 @@
+#import "DatabaseHelper.h"
+
+@implementation DatabaseHelper
+
+
++ (NSManagedObjectContext *)createContextWithModelName:(NSString *)mName {
+    NSManagedObjectModel *model = [self createModelWithModelName:mName];
+    return [self createDatabaseWithModel:model];
+}
+
++ (NSManagedObjectContext *)createDatabaseWithModel:(NSManagedObjectModel*)model {
+    NSPersistentStoreCoordinator *coordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model];
+    [coordinator addPersistentStoreWithType:NSInMemoryStoreType configuration:nil URL:nil options:nil error:nil];
+
+    NSManagedObjectContext *testingContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
+    [testingContext setPersistentStoreCoordinator:coordinator];
+    [testingContext setMergePolicy:NSMergeByPropertyObjectTrumpMergePolicy];
+    return testingContext;
+}
+
++ (NSManagedObjectModel *)createModelWithModelName:(NSString *)mName {
+    NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+    NSString *path = [bundle pathForResource:mName ofType:@"momd"];
+    NSAssert(path, @"Missing Model for name: %@",mName);
+    NSURL *modURL = [NSURL fileURLWithPath:path];
+    return [[NSManagedObjectModel alloc] initWithContentsOfURL:modURL];
+}
+
++ (void)clearContext:(NSManagedObjectContext *)ctx fromEntitiesWithName:(NSString *)entityName {
+    NSFetchRequest *fetch = [[NSFetchRequest alloc] init];
+    [fetch setEntity:[NSEntityDescription entityForName:entityName inManagedObjectContext:ctx]];
+    NSError *error = nil;
+    NSArray *result = [ctx executeFetchRequest:fetch error:&error];
+    if (error) {
+        NSLog(@"Failed clearing context from entities with name [%@]", error);
+    }
+    for (id basket in result) {
+        [ctx deleteObject:basket];
+    }
+}
+
+@end

From 5145beea059d88befa3ebe52be5c9af5787a9b11 Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Fri, 27 May 2016 14:04:35 +0200
Subject: [PATCH 053/139] [Objc] coraData cli option changed from y/n to true
 false

---
 bin/objc-petstore.sh                                          | 2 +-
 .../java/io/swagger/codegen/languages/ObjcClientCodegen.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/objc-petstore.sh b/bin/objc-petstore.sh
index d4df6924bf86..df22ea3b595b 100755
--- a/bin/objc-petstore.sh
+++ b/bin/objc-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/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc --additional-properties coreData=y"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc --additional-properties coreData=true"
 
 java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
index 68ba63a93822..67cf272c0ba9 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
@@ -151,7 +151,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         instantiationTypes.put("map", "NSMutableDictionary");
 
         cliOptions.clear();
-        cliOptions.add(new CliOption(CORE_DATA, "Should generate core data models").defaultValue("n"));
+        cliOptions.add(new CliOption(CORE_DATA, "Should generate core data models").defaultValue("false"));
         cliOptions.add(new CliOption(CLASS_PREFIX, "prefix for generated classes (convention: Abbreviation of pod name e.g. `HN` for `HackerNews`).`")
                 .defaultValue("SWG"));
         cliOptions.add(new CliOption(POD_NAME, "cocoapods package name (convention: CameCase).")
@@ -193,7 +193,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
 
         if (additionalProperties.containsKey(CORE_DATA)) {
             Object coreData = additionalProperties.get(CORE_DATA);
-            if(((String)coreData).equalsIgnoreCase("y")) {
+            if(((String)coreData).equalsIgnoreCase("true")) {
                 generateCoreData = true;
             }
         }

From bfd71c1e297b37902c3995ffbf07efa12e49fa8e Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Fri, 27 May 2016 15:51:32 +0200
Subject: [PATCH 054/139] [Objc] CoreData added test

---
 .../objc/NSManagedObject-header.mustache      |  6 +-
 .../SwaggerClient/Model/SWGPetManagedObject.h |  6 +-
 .../SwaggerClientTests/Tests/BuildersTest.m   | 89 ++++++++++++++-----
 3 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache b/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
index 2001f6c227cc..2b557251d3a6 100644
--- a/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
@@ -18,13 +18,13 @@
 {{#vars}}
 {{#description}}/* {{{description}}} {{^required}}[optional]{{/required}}
  */{{/description}}
-@property (nullable, nonatomic, retain) {{^complexType}}{{{ datatype }}}{{/complexType}}{{#complexType}}{{#isListContainer}}NSSet*{{/isListContainer}}{{^isListContainer}}{{{complexType}}}ManagedObject*{{/isListContainer}}{{/complexType}} {{name}};
+@property (nullable, nonatomic, retain) {{^complexType}}{{{ datatype }}}{{/complexType}}{{#complexType}}{{#isListContainer}}NSSet<{{{complexType}}}ManagedObject*>*{{/isListContainer}}{{^isListContainer}}{{{complexType}}}ManagedObject*{{/isListContainer}}{{/complexType}} {{name}};
 {{/vars}}
 
 {{#vars}}{{#isListContainer}}{{#complexType}}- (void)add{{vendorExtensions.x-uppercaseName}}Object:({{complexType}}ManagedObject *)value;
 - (void)remove{{vendorExtensions.x-uppercaseName}}Object:({{complexType}}ManagedObject *)value;
-- (void)add{{vendorExtensions.x-uppercaseName}}:(NSSet *)values;
-- (void)remove{{vendorExtensions.x-uppercaseName}}:(NSSet *)values;
+- (void)add{{vendorExtensions.x-uppercaseName}}:(NSSet<{{{complexType}}}ManagedObject*> *)values;
+- (void)remove{{vendorExtensions.x-uppercaseName}}:(NSSet<{{{complexType}}}ManagedObject*> *)values;
 {{/complexType}}{{/isListContainer}}{{/vars}}
 @end
 {{/model}}
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
index f45d879bcbf8..6d74e63762c4 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
@@ -22,14 +22,14 @@
 
 @property (nullable, nonatomic, retain) NSArray<NSString*>* photoUrls;
 
-@property (nullable, nonatomic, retain) NSSet* tags;
+@property (nullable, nonatomic, retain) NSSet<SWGTagManagedObject*>* tags;
 /* pet status in the store [optional]
  */
 @property (nullable, nonatomic, retain) NSString* status;
 
 - (void)addTagsObject:(SWGTagManagedObject *)value;
 - (void)removeTagsObject:(SWGTagManagedObject *)value;
-- (void)addTags:(NSSet *)values;
-- (void)removeTags:(NSSet *)values;
+- (void)addTags:(NSSet<SWGTagManagedObject*> *)values;
+- (void)removeTags:(NSSet<SWGTagManagedObject*> *)values;
 
 @end
diff --git a/samples/client/petstore/objc/SwaggerClientTests/Tests/BuildersTest.m b/samples/client/petstore/objc/SwaggerClientTests/Tests/BuildersTest.m
index be027cc9deee..c822d59d7996 100644
--- a/samples/client/petstore/objc/SwaggerClientTests/Tests/BuildersTest.m
+++ b/samples/client/petstore/objc/SwaggerClientTests/Tests/BuildersTest.m
@@ -11,10 +11,14 @@
 #import "SWGPetManagedObject.h"
 #import "SWGPetManagedObjectBuilder.h"
 #import "DatabaseHelper.h"
+#import "SWGUserManagedObject.h"
+#import "SWGUserManagedObjectBuilder.h"
+#import "SWGOrderManagedObjectBuilder.h"
 
 @interface BuildersTest : XCTestCase {
     SWGPet *pet;
-    SWGPetManagedObjectBuilder* builder;
+    SWGUser* user;
+    SWGOrder *order;
     NSManagedObjectContext *context;
 }
 
@@ -31,37 +35,82 @@
             @"category": @{ @"id": @1, @"name": @"test category" },
             @"tags": @[ @{ @"id": @1, @"name": @"test tag" }],
             };
-    pet = [[SWGPet alloc] initWithDictionary:petDict error:nil];
+    NSError * error;
+    pet = [[SWGPet alloc] initWithDictionary:petDict error:&error];
+    XCTAssertNil(error);
+
+    NSDictionary *userDict = @{
+            @"id": @1,
+            @"email": @"test@test.com",
+            @"firstName": @"firstName",
+            @"lastName": @"lastName",
+            @"password": @"password",
+            @"username": @"username",
+            @"phone": @"57676767",
+    };
+    error = nil;
+    user = [[SWGUser alloc] initWithDictionary:userDict error:&error];
+    XCTAssertNil(error);
+
+    NSDictionary *orderDict = @{
+            @"id": @324,
+            @"petId": @234,
+            @"quantity": @12,
+            @"shipDate": @"1997-07-16T19:20:30+00:00",
+            @"status": @"status",
+            @"complete": @1,
+    };
+    error = nil;
+    order = [[SWGOrder alloc]  initWithDictionary:orderDict error:&error];
+    XCTAssertNil(error);
 
     context = [DatabaseHelper createContextWithModelName:@"SWGModel"];
 
-    builder = [[SWGPetManagedObjectBuilder alloc] init];
+
 }
 
-- (void)tearDown {
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
+- (void)testSWGPetExample {
+    SWGPetManagedObjectBuilder* builder = [[SWGPetManagedObjectBuilder alloc] init];
 
-- (void)testExample {
     SWGPetManagedObject * managedObject = [builder SWGPetManagedObjectFromSWGPet:pet context:context];
     SWGPet *pet2 = [builder SWGPetFromSWGPetManagedObject:managedObject];
+    NSError * error;
+    XCTAssertTrue([context save:&error]);
+    XCTAssertNil(error);
     [context deleteObject:managedObject];
-    SWGTag * tag = [pet.tags firstObject];
-    SWGTag * tag2 = [pet2.tags firstObject];
-    XCTAssertEqualObjects(tag._id, tag2._id);
-    XCTAssertEqualObjects(tag.name, tag2.name);
+    XCTAssertTrue([context save:&error]);
+    XCTAssertNil(error);
+    XCTAssertEqualObjects(pet.description,pet2.description);
 
-    SWGCategory * category = pet.category;
-    SWGCategory * category2 = pet2.category;
+}
 
-    XCTAssertEqualObjects(category._id, category2._id);
-    XCTAssertEqualObjects(category.name, category2.name);
 
-    XCTAssertEqualObjects(pet.status,pet2.status);
-    XCTAssertEqualObjects(pet.photoUrls,pet2.photoUrls);
-    XCTAssertEqualObjects(pet.name,pet2.name);
-    XCTAssertEqualObjects(pet._id,pet2._id);
+- (void)testSWGUserExample {
+    SWGUserManagedObjectBuilder * builder = [[SWGUserManagedObjectBuilder alloc] init];
+    SWGUserManagedObject * managedObject = [builder SWGUserManagedObjectFromSWGUser:user context:context];
+    SWGUser *user2 = [builder SWGUserFromSWGUserManagedObject:managedObject];
+    NSError * error;
+    XCTAssertTrue([context save:&error]);
+    XCTAssertNil(error);
+    [context deleteObject:managedObject];
+    XCTAssertTrue([context save:&error]);
+    XCTAssertNil(error);
+    XCTAssertEqualObjects(user.description,user2.description);
+
+}
+
+- (void)testSWGOrderExample {
+    SWGOrderManagedObjectBuilder * builder = [[SWGOrderManagedObjectBuilder alloc] init];
+    SWGOrderManagedObject * managedObject = [builder SWGOrderManagedObjectFromSWGOrder:order context:context];
+    SWGOrder *order2 = [builder SWGOrderFromSWGOrderManagedObject:managedObject];
+    NSError * error;
+    XCTAssertTrue([context save:&error]);
+    XCTAssertNil(error);
+    [context deleteObject:managedObject];
+    XCTAssertTrue([context save:&error]);
+    XCTAssertNil(error);
+
+    XCTAssertEqualObjects(order.description,order2.description);
 
 }
 

From 8aa777405a4d71098e9496217d164521cfff7d3d Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Sat, 28 May 2016 10:04:41 +0200
Subject: [PATCH 055/139] [Objc] CoreData pod spec add resources only if
 useCoreData is on

---
 .../swagger-codegen/src/main/resources/objc/podspec.mustache    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/resources/objc/podspec.mustache b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
index e4c4fe45dcb7..bd0bd9f328ee 100644
--- a/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
 
     s.source_files = '{{podName}}/**/*.{m,h}'
     s.public_header_files = '{{podName}}/**/*.h'
-    s.resources      = '{{podName}}/**/*.{xcdatamodeld,xcdatamodel}'
+{{#useCoreData}}    s.resources      = '{{podName}}/**/*.{xcdatamodeld,xcdatamodel}'{{/useCoreData}}
 
     s.dependency 'AFNetworking', '~> 3'
     s.dependency 'JSONModel', '~> 1.2'

From a8daf94831024254395e10c1e7a956f4c01172cd Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Wed, 25 May 2016 17:08:58 +0200
Subject: [PATCH 056/139] Remove nullability warnings

---
 .../main/resources/objc/NSManagedObject-header.mustache   | 8 ++++++++
 .../objc/SwaggerClient/Model/SWGCategoryManagedObject.h   | 8 ++++++++
 .../objc/SwaggerClient/Model/SWGOrderManagedObject.h      | 8 ++++++++
 .../objc/SwaggerClient/Model/SWGPetManagedObject.h        | 8 ++++++++
 .../objc/SwaggerClient/Model/SWGTagManagedObject.h        | 8 ++++++++
 .../objc/SwaggerClient/Model/SWGUserManagedObject.h       | 8 ++++++++
 6 files changed, 48 insertions(+)

diff --git a/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache b/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
index 2b557251d3a6..07092d287622 100644
--- a/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
@@ -13,6 +13,8 @@
 {{#models}}
 {{#model}}
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface {{classname}}ManagedObject : {{#parent}}{{{parent}}}{{/parent}}{{^parent}}NSManagedObject{{/parent}}
 
 {{#vars}}
@@ -21,6 +23,10 @@
 @property (nullable, nonatomic, retain) {{^complexType}}{{{ datatype }}}{{/complexType}}{{#complexType}}{{#isListContainer}}NSSet<{{{complexType}}}ManagedObject*>*{{/isListContainer}}{{^isListContainer}}{{{complexType}}}ManagedObject*{{/isListContainer}}{{/complexType}} {{name}};
 {{/vars}}
 
+@end
+
+@interface {{classname}}ManagedObject (GeneratedAccessors)
+
 {{#vars}}{{#isListContainer}}{{#complexType}}- (void)add{{vendorExtensions.x-uppercaseName}}Object:({{complexType}}ManagedObject *)value;
 - (void)remove{{vendorExtensions.x-uppercaseName}}Object:({{complexType}}ManagedObject *)value;
 - (void)add{{vendorExtensions.x-uppercaseName}}:(NSSet<{{{complexType}}}ManagedObject*> *)values;
@@ -29,3 +35,5 @@
 @end
 {{/model}}
 {{/models}}
+
+NS_ASSUME_NONNULL_END
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h
index 82ec1e716518..535c2329b95d 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h
@@ -9,6 +9,8 @@
 
 
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface SWGCategoryManagedObject : NSManagedObject
 
 
@@ -16,5 +18,11 @@
 
 @property (nullable, nonatomic, retain) NSString* name;
 
+@end
+
+@interface SWGCategoryManagedObject (GeneratedAccessors)
+
 
 @end
+
+NS_ASSUME_NONNULL_END
\ No newline at end of file
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h
index d0d8b5d2c6b3..0ec4c858ca01 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h
@@ -9,6 +9,8 @@
 
 
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface SWGOrderManagedObject : NSManagedObject
 
 
@@ -25,5 +27,11 @@
 
 @property (nullable, nonatomic, retain) NSNumber* complete;
 
+@end
+
+@interface SWGOrderManagedObject (GeneratedAccessors)
+
 
 @end
+
+NS_ASSUME_NONNULL_END
\ No newline at end of file
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
index 6d74e63762c4..d526d962324b 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
@@ -11,6 +11,8 @@
 #import "SWGTagManagedObject.h"
 
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface SWGPetManagedObject : NSManagedObject
 
 
@@ -27,9 +29,15 @@
  */
 @property (nullable, nonatomic, retain) NSString* status;
 
+@end
+
+@interface SWGPetManagedObject (GeneratedAccessors)
+
 - (void)addTagsObject:(SWGTagManagedObject *)value;
 - (void)removeTagsObject:(SWGTagManagedObject *)value;
 - (void)addTags:(NSSet<SWGTagManagedObject*> *)values;
 - (void)removeTags:(NSSet<SWGTagManagedObject*> *)values;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h
index 1d95aa5930cc..d5e881e8191a 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h
@@ -9,6 +9,8 @@
 
 
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface SWGTagManagedObject : NSManagedObject
 
 
@@ -16,5 +18,11 @@
 
 @property (nullable, nonatomic, retain) NSString* name;
 
+@end
+
+@interface SWGTagManagedObject (GeneratedAccessors)
+
 
 @end
+
+NS_ASSUME_NONNULL_END
\ No newline at end of file
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h
index ddfde6dc1cf9..20fd2e336d24 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h
@@ -9,6 +9,8 @@
 
 
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface SWGUserManagedObject : NSManagedObject
 
 
@@ -29,5 +31,11 @@
  */
 @property (nullable, nonatomic, retain) NSNumber* userStatus;
 
+@end
+
+@interface SWGUserManagedObject (GeneratedAccessors)
+
 
 @end
+
+NS_ASSUME_NONNULL_END
\ No newline at end of file

From 7719cafb946fd2381ed29a050a40fd028e435143 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Mon, 30 May 2016 21:52:18 +0800
Subject: [PATCH 057/139] fix CI issue

---
 .../Classes/Swaggers/APIs/PetAPI.swift        | 106 +++++++++---------
 .../Classes/Swaggers/APIs/StoreAPI.swift      |  64 +++++------
 .../Classes/Swaggers/APIs/UserAPI.swift       |  40 +++----
 3 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
index 27000da54170..c7e5a6402b5f 100644
--- a/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
@@ -160,13 +160,13 @@ public class PetAPI: APIBase {
      - OAuth:
        - type: oauth2
        - name: petstore_auth
-     - examples: [{contentType=application/json, example={
+     - examples: [{example={
   "name" : "Puma",
   "type" : "Dog",
   "color" : "Black",
   "gender" : "Female",
   "breed" : "Mixed"
-}}]
+}, contentType=application/json}]
      
      - parameter status: (query) Status values that need to be considered for filter (optional, default to available)
 
@@ -226,20 +226,20 @@ public class PetAPI: APIBase {
      - OAuth:
        - type: oauth2
        - name: petstore_auth
-     - examples: [{contentType=application/json, example=[ {
-  "photoUrls" : [ "aeiou" ],
-  "name" : "doggie",
+     - examples: [{example=[ {
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
   "id" : 123456789,
   "category" : {
-    "name" : "aeiou",
-    "id" : 123456789
+    "id" : 123456789,
+    "name" : "aeiou"
   },
-  "tags" : [ {
-    "name" : "aeiou",
-    "id" : 123456789
-  } ],
-  "status" : "aeiou"
-} ]}, {contentType=application/xml, example=<Pet>
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+} ], contentType=application/json}, {example=<Pet>
   <id>123456</id>
   <name>doggie</name>
   <photoUrls>
@@ -248,21 +248,21 @@ public class PetAPI: APIBase {
   <tags>
   </tags>
   <status>string</status>
-</Pet>}]
-     - examples: [{contentType=application/json, example=[ {
-  "photoUrls" : [ "aeiou" ],
-  "name" : "doggie",
+</Pet>, contentType=application/xml}]
+     - examples: [{example=[ {
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
   "id" : 123456789,
   "category" : {
-    "name" : "aeiou",
-    "id" : 123456789
+    "id" : 123456789,
+    "name" : "aeiou"
   },
-  "tags" : [ {
-    "name" : "aeiou",
-    "id" : 123456789
-  } ],
-  "status" : "aeiou"
-} ]}, {contentType=application/xml, example=<Pet>
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+} ], contentType=application/json}, {example=<Pet>
   <id>123456</id>
   <name>doggie</name>
   <photoUrls>
@@ -271,7 +271,7 @@ public class PetAPI: APIBase {
   <tags>
   </tags>
   <status>string</status>
-</Pet>}]
+</Pet>, contentType=application/xml}]
      
      - parameter tags: (query) Tags to filter by (optional)
 
@@ -328,26 +328,26 @@ 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:
-       - type: oauth2
-       - name: petstore_auth
      - API Key:
        - type: apiKey api_key 
        - name: api_key
-     - examples: [{contentType=application/json, example={
-  "photoUrls" : [ "aeiou" ],
-  "name" : "doggie",
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     - examples: [{example={
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
   "id" : 123456789,
   "category" : {
-    "name" : "aeiou",
-    "id" : 123456789
+    "id" : 123456789,
+    "name" : "aeiou"
   },
-  "tags" : [ {
-    "name" : "aeiou",
-    "id" : 123456789
-  } ],
-  "status" : "aeiou"
-}}, {contentType=application/xml, example=<Pet>
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+}, contentType=application/json}, {example=<Pet>
   <id>123456</id>
   <name>doggie</name>
   <photoUrls>
@@ -356,21 +356,21 @@ public class PetAPI: APIBase {
   <tags>
   </tags>
   <status>string</status>
-</Pet>}]
-     - examples: [{contentType=application/json, example={
-  "photoUrls" : [ "aeiou" ],
-  "name" : "doggie",
+</Pet>, contentType=application/xml}]
+     - examples: [{example={
+  "tags" : [ {
+    "id" : 123456789,
+    "name" : "aeiou"
+  } ],
   "id" : 123456789,
   "category" : {
-    "name" : "aeiou",
-    "id" : 123456789
+    "id" : 123456789,
+    "name" : "aeiou"
   },
-  "tags" : [ {
-    "name" : "aeiou",
-    "id" : 123456789
-  } ],
-  "status" : "aeiou"
-}}, {contentType=application/xml, example=<Pet>
+  "status" : "aeiou",
+  "name" : "doggie",
+  "photoUrls" : [ "aeiou" ]
+}, contentType=application/json}, {example=<Pet>
   <id>123456</id>
   <name>doggie</name>
   <photoUrls>
@@ -379,7 +379,7 @@ public class PetAPI: APIBase {
   <tags>
   </tags>
   <status>string</status>
-</Pet>}]
+</Pet>, contentType=application/xml}]
      
      - parameter petId: (path) ID of pet that needs to be fetched 
 
diff --git a/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
index da40486b292b..be7d36b91f36 100644
--- a/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
@@ -101,12 +101,12 @@ public class StoreAPI: APIBase {
      - API Key:
        - type: apiKey api_key 
        - name: api_key
-     - examples: [{contentType=application/json, example={
+     - examples: [{example={
   "key" : 123
-}}, {contentType=application/xml, example=not implemented io.swagger.models.properties.MapProperty@d1e580af}]
-     - examples: [{contentType=application/json, example={
+}, contentType=application/json}, {example=not implemented io.swagger.models.properties.MapProperty@d1e580af, contentType=application/xml}]
+     - examples: [{example={
   "key" : 123
-}}, {contentType=application/xml, example=not implemented io.swagger.models.properties.MapProperty@d1e580af}]
+}, contentType=application/json}, {example=not implemented io.swagger.models.properties.MapProperty@d1e580af, contentType=application/xml}]
 
      - returns: RequestBuilder<[String:Int32]> 
      */
@@ -159,36 +159,36 @@ 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
-     - examples: [{contentType=application/json, example={
-  "petId" : 123456789,
-  "quantity" : 123,
+     - examples: [{example={
   "id" : 123456789,
-  "shipDate" : "2000-01-23T04:56:07.000+0000",
+  "petId" : 123456789,
   "complete" : true,
-  "status" : "aeiou"
-}}, {contentType=application/xml, example=<Order>
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
+}, contentType=application/json}, {example=<Order>
   <id>123456</id>
   <petId>123456</petId>
   <quantity>0</quantity>
   <shipDate>2000-01-23T04:56:07.000Z</shipDate>
   <status>string</status>
   <complete>true</complete>
-</Order>}]
-     - examples: [{contentType=application/json, example={
-  "petId" : 123456789,
-  "quantity" : 123,
+</Order>, contentType=application/xml}]
+     - examples: [{example={
   "id" : 123456789,
-  "shipDate" : "2000-01-23T04:56:07.000+0000",
+  "petId" : 123456789,
   "complete" : true,
-  "status" : "aeiou"
-}}, {contentType=application/xml, example=<Order>
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
+}, contentType=application/json}, {example=<Order>
   <id>123456</id>
   <petId>123456</petId>
   <quantity>0</quantity>
   <shipDate>2000-01-23T04:56:07.000Z</shipDate>
   <status>string</status>
   <complete>true</complete>
-</Order>}]
+</Order>, contentType=application/xml}]
      
      - parameter orderId: (path) ID of pet that needs to be fetched 
 
@@ -244,36 +244,36 @@ public class StoreAPI: APIBase {
      Place an order for a pet
      - POST /store/order
      - 
-     - examples: [{contentType=application/json, example={
-  "petId" : 123456789,
-  "quantity" : 123,
+     - examples: [{example={
   "id" : 123456789,
-  "shipDate" : "2000-01-23T04:56:07.000+0000",
+  "petId" : 123456789,
   "complete" : true,
-  "status" : "aeiou"
-}}, {contentType=application/xml, example=<Order>
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
+}, contentType=application/json}, {example=<Order>
   <id>123456</id>
   <petId>123456</petId>
   <quantity>0</quantity>
   <shipDate>2000-01-23T04:56:07.000Z</shipDate>
   <status>string</status>
   <complete>true</complete>
-</Order>}]
-     - examples: [{contentType=application/json, example={
-  "petId" : 123456789,
-  "quantity" : 123,
+</Order>, contentType=application/xml}]
+     - examples: [{example={
   "id" : 123456789,
-  "shipDate" : "2000-01-23T04:56:07.000+0000",
+  "petId" : 123456789,
   "complete" : true,
-  "status" : "aeiou"
-}}, {contentType=application/xml, example=<Order>
+  "status" : "aeiou",
+  "quantity" : 123,
+  "shipDate" : "2000-01-23T04:56:07.000+0000"
+}, contentType=application/json}, {example=<Order>
   <id>123456</id>
   <petId>123456</petId>
   <quantity>0</quantity>
   <shipDate>2000-01-23T04:56:07.000Z</shipDate>
   <status>string</status>
   <complete>true</complete>
-</Order>}]
+</Order>, contentType=application/xml}]
      
      - parameter body: (body) order placed for purchasing the pet (optional)
 
diff --git a/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
index 98afec0c80ad..1b5ada9da67f 100644
--- a/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
@@ -253,16 +253,16 @@ public class UserAPI: APIBase {
      Get user by user name
      - GET /user/{username}
      - 
-     - examples: [{contentType=application/json, example={
-  "firstName" : "aeiou",
-  "lastName" : "aeiou",
-  "password" : "aeiou",
-  "userStatus" : 123,
-  "phone" : "aeiou",
+     - examples: [{example={
   "id" : 123456789,
+  "lastName" : "aeiou",
+  "phone" : "aeiou",
+  "username" : "aeiou",
   "email" : "aeiou",
-  "username" : "aeiou"
-}}, {contentType=application/xml, example=<User>
+  "userStatus" : 123,
+  "firstName" : "aeiou",
+  "password" : "aeiou"
+}, contentType=application/json}, {example=<User>
   <id>123456</id>
   <username>string</username>
   <firstName>string</firstName>
@@ -271,17 +271,17 @@ public class UserAPI: APIBase {
   <password>string</password>
   <phone>string</phone>
   <userStatus>0</userStatus>
-</User>}]
-     - examples: [{contentType=application/json, example={
-  "firstName" : "aeiou",
-  "lastName" : "aeiou",
-  "password" : "aeiou",
-  "userStatus" : 123,
-  "phone" : "aeiou",
+</User>, contentType=application/xml}]
+     - examples: [{example={
   "id" : 123456789,
+  "lastName" : "aeiou",
+  "phone" : "aeiou",
+  "username" : "aeiou",
   "email" : "aeiou",
-  "username" : "aeiou"
-}}, {contentType=application/xml, example=<User>
+  "userStatus" : 123,
+  "firstName" : "aeiou",
+  "password" : "aeiou"
+}, contentType=application/json}, {example=<User>
   <id>123456</id>
   <username>string</username>
   <firstName>string</firstName>
@@ -290,7 +290,7 @@ public class UserAPI: APIBase {
   <password>string</password>
   <phone>string</phone>
   <userStatus>0</userStatus>
-</User>}]
+</User>, contentType=application/xml}]
      
      - parameter username: (path) The name that needs to be fetched. Use user1 for testing.  
 
@@ -348,8 +348,8 @@ public class UserAPI: APIBase {
      Logs user into the system
      - GET /user/login
      - 
-     - examples: [{contentType=application/json, example="aeiou"}, {contentType=application/xml, example=string}]
-     - examples: [{contentType=application/json, example="aeiou"}, {contentType=application/xml, example=string}]
+     - examples: [{example="aeiou", contentType=application/json}, {example=string, contentType=application/xml}]
+     - examples: [{example="aeiou", contentType=application/json}, {example=string, contentType=application/xml}]
      
      - parameter username: (query) The user name for login (optional)
      - parameter password: (query) The password for login in clear text (optional)

From 50a346ca9167b8f759fcda1035bc1b48a7ed665d Mon Sep 17 00:00:00 2001
From: "Pablo Gra\\~na" <pablo.pg@gmail.com>
Date: Thu, 26 May 2016 09:58:43 -0300
Subject: [PATCH 058/139] Remove unnecessary 2nd call to SwaggerParser.

Both CodeGenMojo and CodegenConfigurator where parsing the swagger input.
The result in CodeGenMojo was discarded. I simply removed the line in
CodeGenMojo.
---
 .../src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
index 79a100bba216..261d539e2e56 100644
--- a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
+++ b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
@@ -163,8 +163,6 @@ public class CodeGenMojo extends AbstractMojo {
     @Override
     public void execute() throws MojoExecutionException {
 
-        Swagger swagger = new SwaggerParser().read(inputSpec);
-
         //attempt to read from config file
         CodegenConfigurator configurator = CodegenConfigurator.fromFile(configurationFile);
 

From a223dcd7c572a55f6059e9e7ecc63b57c2e6bae3 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Tue, 31 May 2016 21:35:19 +0800
Subject: [PATCH 059/139] add Avenida Compras S.A

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 37c12afe0eb6..2c427298c0b5 100644
--- a/README.md
+++ b/README.md
@@ -847,6 +847,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you
 - [Activehours](https://www.activehours.com/)
 - [Acunetix](https://www.acunetix.com/)
 - [Atlassian](https://www.atlassian.com/)
+- [Avenida Compras S.A.](https://www.avenida.com.ar)
 - [beemo](http://www.beemo.eu)
 - [bitly](https://bitly.com)
 - [Cachet Financial](http://www.cachetfinancial.com/)

From 73ab94dfbff0bb908f95a486346d3abaf234291e Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Tue, 31 May 2016 22:22:54 +0800
Subject: [PATCH 060/139] fix sbt build for okhttp-gson

---
 .../libraries/okhttp-gson/build.sbt.mustache  |   2 +-
 .../java/okhttp-gson/.swagger-codegen-ignore  |  23 ++
 .../client/petstore/java/okhttp-gson/LICENSE  | 201 ++++++++++++++++++
 .../petstore/java/okhttp-gson/build.sbt       |   2 +-
 .../docs/AdditionalPropertiesClass.md         |  11 +
 .../petstore/java/okhttp-gson/docs/Animal.md  |   1 +
 .../java/okhttp-gson/docs/ArrayTest.md        |  12 ++
 .../petstore/java/okhttp-gson/docs/Cat.md     |   1 +
 .../petstore/java/okhttp-gson/docs/Dog.md     |   1 +
 .../petstore/java/okhttp-gson/docs/FakeApi.md |  10 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |  12 ++
 .../petstore/java/okhttp-gson/docs/Name.md    |   1 +
 .../java/okhttp-gson/docs/ReadOnlyFirst.md    |  11 +
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 .../client/petstore/java/okhttp-gson/pom.xml  |  21 ++
 .../java/io/swagger/client/ApiException.java  |   2 +-
 .../java/io/swagger/client/Configuration.java |   2 +-
 .../src/main/java/io/swagger/client/Pair.java |   2 +-
 .../java/io/swagger/client/StringUtil.java    |   2 +-
 .../java/io/swagger/client/api/FakeApi.java   |  18 +-
 .../io/swagger/client/auth/ApiKeyAuth.java    |   2 +-
 .../java/io/swagger/client/auth/OAuth.java    |   2 +-
 .../model/AdditionalPropertiesClass.java      |  85 ++++++++
 .../java/io/swagger/client/model/Animal.java  |  19 +-
 .../io/swagger/client/model/ArrayTest.java    |  99 +++++++++
 .../java/io/swagger/client/model/Cat.java     |  17 +-
 .../java/io/swagger/client/model/Dog.java     |  17 +-
 ...ropertiesAndAdditionalPropertiesClass.java | 102 +++++++++
 .../java/io/swagger/client/model/Name.java    |  16 +-
 .../swagger/client/model/ReadOnlyFirst.java   |  79 +++++++
 30 files changed, 746 insertions(+), 29 deletions(-)
 create mode 100644 samples/client/petstore/java/okhttp-gson/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/java/okhttp-gson/LICENSE
 create mode 100644 samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/okhttp-gson/docs/ArrayTest.md
 create mode 100644 samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/okhttp-gson/docs/ReadOnlyFirst.md
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
index bee8e03fa0ef..c1d931bbc8bc 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
@@ -13,6 +13,6 @@ lazy val root = (project in file(".")).
       "com.squareup.okhttp" % "okhttp" % "2.7.5",
       "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
       "com.google.code.gson" % "gson" % "2.6.2",
-      "junit" % "junit" % "4.12.0" % "test"
+      "junit" % "junit" % "4.12" % "test"
     )
   )
diff --git a/samples/client/petstore/java/okhttp-gson/.swagger-codegen-ignore b/samples/client/petstore/java/okhttp-gson/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/java/okhttp-gson/LICENSE b/samples/client/petstore/java/okhttp-gson/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt
index 1be5d0b6f4d8..13e459a4b264 100644
--- a/samples/client/petstore/java/okhttp-gson/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson/build.sbt
@@ -13,6 +13,6 @@ lazy val root = (project in file(".")).
       "com.squareup.okhttp" % "okhttp" % "2.7.5",
       "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
       "com.google.code.gson" % "gson" % "2.6.2",
-      "junit" % "junit" % "4.12.0" % "test"
+      "junit" % "junit" % "4.12" % "test"
     )
   )
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesClass.md
new file mode 100644
index 000000000000..0437c4dd8cc7
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesClass.md
@@ -0,0 +1,11 @@
+
+# AdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**mapProperty** | **Map&lt;String, String&gt;** |  |  [optional]
+**mapOfMapProperty** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Animal.md b/samples/client/petstore/java/okhttp-gson/docs/Animal.md
index 3ecb7f991f38..b3f325c3524d 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Animal.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Animal.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **String** |  | 
+**color** | **String** |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/ArrayTest.md b/samples/client/petstore/java/okhttp-gson/docs/ArrayTest.md
new file mode 100644
index 000000000000..9feee16427fb
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/docs/ArrayTest.md
@@ -0,0 +1,12 @@
+
+# ArrayTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**arrayOfString** | **List&lt;String&gt;** |  |  [optional]
+**arrayArrayOfInteger** | [**List&lt;List&lt;Long&gt;&gt;**](List.md) |  |  [optional]
+**arrayArrayOfModel** | [**List&lt;List&lt;ReadOnlyFirst&gt;&gt;**](List.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Cat.md b/samples/client/petstore/java/okhttp-gson/docs/Cat.md
index 373af540c416..be6e56fa8ce3 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Cat.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Cat.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **String** |  | 
+**color** | **String** |  |  [optional]
 **declawed** | **Boolean** |  |  [optional]
 
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Dog.md b/samples/client/petstore/java/okhttp-gson/docs/Dog.md
index a1d638d3badd..71a7dbe809e2 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Dog.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Dog.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **String** |  | 
+**color** | **String** |  |  [optional]
 **breed** | **String** |  |  [optional]
 
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
index c1fdd3103218..8e15d4d1f690 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
 
 <a name="testEndpointParameters"></a>
 # **testEndpointParameters**
 > testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password)
 
-Fake endpoint for testing various parameters
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
-Fake endpoint for testing various parameters
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
 ### Example
 ```java
@@ -70,6 +70,6 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
+ - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
new file mode 100644
index 000000000000..00cc10ca9b3d
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -0,0 +1,12 @@
+
+# MixedPropertiesAndAdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**uuid** | **String** |  |  [optional]
+**dateTime** | [**Date**](Date.md) |  |  [optional]
+**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Name.md b/samples/client/petstore/java/okhttp-gson/docs/Name.md
index 5390a15e9cd7..ce2fb4dee50c 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Name.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Name.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **name** | **Integer** |  | 
 **snakeCase** | **Integer** |  |  [optional]
 **property** | **String** |  |  [optional]
+**_123Number** | **Integer** |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/ReadOnlyFirst.md b/samples/client/petstore/java/okhttp-gson/docs/ReadOnlyFirst.md
new file mode 100644
index 000000000000..426b7cde95ab
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/docs/ReadOnlyFirst.md
@@ -0,0 +1,11 @@
+
+# ReadOnlyFirst
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**bar** | **String** |  |  [optional]
+**baz** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/okhttp-gson/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/okhttp-gson/gradle/wrapper/gradle-wrapper.properties
index 6b40dc13def9..b7a364739551 100644
--- a/samples/client/petstore/java/okhttp-gson/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/client/petstore/java/okhttp-gson/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue May 17 23:04:14 CST 2016
+#Tue May 17 23:08:05 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index 6b5fb468d621..c3b5fe9ac46b 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -125,6 +125,27 @@
           </execution>
         </executions>
       </plugin>
+      <!-- For testing build.sbt -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>sbt-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>sbt</executable>
+              <arguments>
+                <argument>publishLocal</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
     </plugins>
   </build>
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 7c440acc914d..974c3becece7 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-04-28T16:09:59.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T22:17:12.179+08:00")
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
index 3bb31938c36f..46a1778050a0 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-04-28T16:09:59.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T22:17:12.179+08:00")
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
index ff86c29b167f..e3848de9f9e2 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-04-28T16:09:59.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T22:17:12.179+08:00")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
index 67f661726b18..fe552d7ae8de 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-04-28T16:09:59.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T22:17:12.179+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
index e021970cdb72..8f8debd6d684 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
@@ -17,8 +17,8 @@ import com.squareup.okhttp.Response;
 
 import java.io.IOException;
 
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -104,13 +104,13 @@ public class FakeApi {
       localVarFormParams.put("password", password);
 
     final String[] localVarAccepts = {
-      "application/xml", "application/json"
+      "application/xml; charset=utf-8", "application/json; charset=utf-8"
     };
     final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
     if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
     final String[] localVarContentTypes = {
-      
+      "application/xml; charset=utf-8", "application/json; charset=utf-8"
     };
     final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
     localVarHeaderParams.put("Content-Type", localVarContentType);
@@ -132,8 +132,8 @@ public class FakeApi {
   }
 
   /**
-   * Fake endpoint for testing various parameters
-   * Fake endpoint for testing various parameters
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
    * @param number None (required)
    * @param _double None (required)
    * @param string None (required)
@@ -153,8 +153,8 @@ public class FakeApi {
   }
 
   /**
-   * Fake endpoint for testing various parameters
-   * Fake endpoint for testing various parameters
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
    * @param number None (required)
    * @param _double None (required)
    * @param string None (required)
@@ -176,8 +176,8 @@ public class FakeApi {
   }
 
   /**
-   * Fake endpoint for testing various parameters (asynchronously)
-   * Fake endpoint for testing various parameters
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  (asynchronously)
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
    * @param number None (required)
    * @param _double None (required)
    * @param string None (required)
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 c4e0be3e7118..6b157ac6601c 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-04-28T16:09:59.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T22:17:12.179+08:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
index e05568f8f383..c097462f5cd8 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-04-28T16:09:59.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T22:17:12.179+08:00")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
new file mode 100644
index 000000000000..ab464f65259a
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -0,0 +1,85 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.SerializedName;
+
+
+/**
+ * AdditionalPropertiesClass
+ */
+public class AdditionalPropertiesClass   {
+  
+  @SerializedName("map_property")
+  private Map<String, String> mapProperty = new HashMap<String, String>();
+
+  @SerializedName("map_of_map_property")
+  private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, String> getMapProperty() {
+    return mapProperty;
+  }
+  public void setMapProperty(Map<String, String> mapProperty) {
+    this.mapProperty = mapProperty;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, Map<String, String>> getMapOfMapProperty() {
+    return mapOfMapProperty;
+  }
+  public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
+    this.mapOfMapProperty = mapOfMapProperty;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+    return Objects.equals(this.mapProperty, additionalPropertiesClass.mapProperty) &&
+        Objects.equals(this.mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapProperty, mapOfMapProperty);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesClass {\n");
+    
+    sb.append("    mapProperty: ").append(toIndentedString(mapProperty)).append("\n");
+    sb.append("    mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).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/Animal.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Animal.java
index 328f71b7123e..b83bc63db0e9 100644
--- 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
@@ -15,6 +15,9 @@ public class Animal   {
   @SerializedName("className")
   private String className = null;
 
+  @SerializedName("color")
+  private String color = "red";
+
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -25,6 +28,16 @@ public class Animal   {
     this.className = className;
   }
 
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -35,12 +48,13 @@ public class Animal   {
       return false;
     }
     Animal animal = (Animal) o;
-    return Objects.equals(this.className, animal.className);
+    return Objects.equals(this.className, animal.className) &&
+        Objects.equals(this.color, animal.color);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className);
+    return Objects.hash(className, color);
   }
 
   @Override
@@ -49,6 +63,7 @@ public class Animal   {
     sb.append("class Animal {\n");
     
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
new file mode 100644
index 000000000000..19ad5d374995
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -0,0 +1,99 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.annotations.SerializedName;
+
+
+/**
+ * ArrayTest
+ */
+public class ArrayTest   {
+  
+  @SerializedName("array_of_string")
+  private List<String> arrayOfString = new ArrayList<String>();
+
+  @SerializedName("array_array_of_integer")
+  private List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
+
+  @SerializedName("array_array_of_model")
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getArrayOfString() {
+    return arrayOfString;
+  }
+  public void setArrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<List<Long>> getArrayArrayOfInteger() {
+    return arrayArrayOfInteger;
+  }
+  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+    return arrayArrayOfModel;
+  }
+  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayTest arrayTest = (ArrayTest) o;
+    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
+        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
+        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayTest {\n");
+    
+    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).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
index 9ca891410331..7d190d48425c 100644
--- 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
@@ -16,6 +16,9 @@ public class Cat extends Animal  {
   @SerializedName("className")
   private String className = null;
 
+  @SerializedName("color")
+  private String color = "red";
+
   @SerializedName("declawed")
   private Boolean declawed = null;
 
@@ -29,6 +32,16 @@ public class Cat extends Animal  {
     this.className = className;
   }
 
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
   /**
    **/
   @ApiModelProperty(value = "")
@@ -50,13 +63,14 @@ public class Cat extends Animal  {
     }
     Cat cat = (Cat) o;
     return Objects.equals(this.className, cat.className) &&
+        Objects.equals(this.color, cat.color) &&
         Objects.equals(this.declawed, cat.declawed) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className, declawed, super.hashCode());
+    return Objects.hash(className, color, declawed, super.hashCode());
   }
 
   @Override
@@ -65,6 +79,7 @@ public class Cat extends Animal  {
     sb.append("class Cat {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
     sb.append("}");
     return sb.toString();
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
index 2fa478001b17..ba9f5ac58583 100644
--- 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
@@ -16,6 +16,9 @@ public class Dog extends Animal  {
   @SerializedName("className")
   private String className = null;
 
+  @SerializedName("color")
+  private String color = "red";
+
   @SerializedName("breed")
   private String breed = null;
 
@@ -29,6 +32,16 @@ public class Dog extends Animal  {
     this.className = className;
   }
 
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
   /**
    **/
   @ApiModelProperty(value = "")
@@ -50,13 +63,14 @@ public class Dog extends Animal  {
     }
     Dog dog = (Dog) o;
     return Objects.equals(this.className, dog.className) &&
+        Objects.equals(this.color, dog.color) &&
         Objects.equals(this.breed, dog.breed) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className, breed, super.hashCode());
+    return Objects.hash(className, color, breed, super.hashCode());
   }
 
   @Override
@@ -65,6 +79,7 @@ public class Dog extends Animal  {
     sb.append("class Dog {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
     sb.append("}");
     return sb.toString();
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
new file mode 100644
index 000000000000..5748d6731cfd
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -0,0 +1,102 @@
+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 java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.SerializedName;
+
+
+/**
+ * MixedPropertiesAndAdditionalPropertiesClass
+ */
+public class MixedPropertiesAndAdditionalPropertiesClass   {
+  
+  @SerializedName("uuid")
+  private String uuid = null;
+
+  @SerializedName("dateTime")
+  private Date dateTime = null;
+
+  @SerializedName("map")
+  private Map<String, Animal> map = new HashMap<String, Animal>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getUuid() {
+    return uuid;
+  }
+  public void setUuid(String uuid) {
+    this.uuid = uuid;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, Animal> getMap() {
+    return map;
+  }
+  public void setMap(Map<String, Animal> map) {
+    this.map = map;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
+        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid, dateTime, map);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+    
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
index b9cc8170969c..e471107b3dc9 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
@@ -22,6 +22,9 @@ public class Name   {
   @SerializedName("property")
   private String property = null;
 
+  @SerializedName("123Number")
+  private Integer _123Number = null;
+
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -49,6 +52,13 @@ public class Name   {
     this.property = property;
   }
 
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer get123Number() {
+    return _123Number;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -61,12 +71,13 @@ public class Name   {
     Name name = (Name) o;
     return Objects.equals(this.name, name.name) &&
         Objects.equals(this.snakeCase, name.snakeCase) &&
-        Objects.equals(this.property, name.property);
+        Objects.equals(this.property, name.property) &&
+        Objects.equals(this._123Number, name._123Number);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, snakeCase, property);
+    return Objects.hash(name, snakeCase, property, _123Number);
   }
 
   @Override
@@ -77,6 +88,7 @@ public class Name   {
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
     sb.append("    property: ").append(toIndentedString(property)).append("\n");
+    sb.append("    _123Number: ").append(toIndentedString(_123Number)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
new file mode 100644
index 000000000000..2e6c3c4f7ffb
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -0,0 +1,79 @@
+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;
+
+
+/**
+ * ReadOnlyFirst
+ */
+public class ReadOnlyFirst   {
+  
+  @SerializedName("bar")
+  private String bar = null;
+
+  @SerializedName("baz")
+  private String baz = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBar() {
+    return bar;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBaz() {
+    return baz;
+  }
+  public void setBaz(String baz) {
+    this.baz = baz;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+    return Objects.equals(this.bar, readOnlyFirst.bar) &&
+        Objects.equals(this.baz, readOnlyFirst.baz);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, baz);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ReadOnlyFirst {\n");
+    
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    baz: ").append(toIndentedString(baz)).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    ");
+  }
+}
+

From fbd8deef46b9722595e4e8d21912dbd26b71e369 Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Tue, 31 May 2016 18:27:34 +0200
Subject: [PATCH 061/139] [Objc] core data objc update license

---
 .../objc/NSManagedObject-header.mustache      |  6 +---
 .../NSManagedObjectBuilder-header.mustache    |  6 +---
 samples/client/petstore/objc/LICENSE          | 25 +++++++++++++++++
 .../Model/SWGCategoryManagedObject.h          | 28 +++++++++++++++----
 .../Model/SWGCategoryManagedObjectBuilder.h   | 26 ++++++++++++++---
 .../Model/SWGOrderManagedObject.h             | 28 +++++++++++++++----
 .../Model/SWGOrderManagedObjectBuilder.h      | 26 ++++++++++++++---
 .../SwaggerClient/Model/SWGPetManagedObject.h | 26 ++++++++++++++---
 .../Model/SWGPetManagedObjectBuilder.h        | 26 ++++++++++++++---
 .../SwaggerClient/Model/SWGTagManagedObject.h | 28 +++++++++++++++----
 .../Model/SWGTagManagedObjectBuilder.h        | 26 ++++++++++++++---
 .../Model/SWGUserManagedObject.h              | 28 +++++++++++++++----
 .../Model/SWGUserManagedObjectBuilder.h       | 26 ++++++++++++++---
 13 files changed, 251 insertions(+), 54 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache b/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
index 07092d287622..e25dad5795c7 100644
--- a/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/NSManagedObject-header.mustache
@@ -1,11 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 {{#imports}}#import "{{import}}ManagedObject.h"
 {{/imports}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-header.mustache b/modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-header.mustache
index 6a7033bf19a9..f462a1f09501 100644
--- a/modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/NSManagedObjectBuilder-header.mustache
@@ -9,11 +9,7 @@
 #import "{{classPrefix}}{{name}}ManagedObject.h"
 #import "{{classPrefix}}{{name}}.h"
 
-/**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+{{>licenceInfo}}
 
 @interface {{classname}}ManagedObjectBuilder : NSObject
 
diff --git a/samples/client/petstore/objc/LICENSE b/samples/client/petstore/objc/LICENSE
index d9a10c0d8e86..8dada3edaf50 100644
--- a/samples/client/petstore/objc/LICENSE
+++ b/samples/client/petstore/objc/LICENSE
@@ -174,3 +174,28 @@
       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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h
index 535c2329b95d..021af11ec8db 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObject.h
@@ -2,10 +2,28 @@
 #import <CoreData/CoreData.h>
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 
 
@@ -25,4 +43,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
\ No newline at end of file
+NS_ASSUME_NONNULL_END
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h
index 9ee59f638623..51452aa5c89e 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGCategoryManagedObjectBuilder.h
@@ -6,10 +6,28 @@
 #import "SWGCategory.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 @interface SWGCategoryManagedObjectBuilder : NSObject
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h
index 0ec4c858ca01..c0d9d471bacf 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObject.h
@@ -2,10 +2,28 @@
 #import <CoreData/CoreData.h>
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 
 
@@ -34,4 +52,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
\ No newline at end of file
+NS_ASSUME_NONNULL_END
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h
index bac7b6601579..fbabfedb4049 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGOrderManagedObjectBuilder.h
@@ -6,10 +6,28 @@
 #import "SWGOrder.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 @interface SWGOrderManagedObjectBuilder : NSObject
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
index d526d962324b..1f1c5d3cadb8 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObject.h
@@ -2,10 +2,28 @@
 #import <CoreData/CoreData.h>
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 #import "SWGCategoryManagedObject.h"
 #import "SWGTagManagedObject.h"
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.h
index 83877706ff60..09161aca3d71 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGPetManagedObjectBuilder.h
@@ -8,10 +8,28 @@
 #import "SWGPet.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 @interface SWGPetManagedObjectBuilder : NSObject
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h
index d5e881e8191a..cca64c327af1 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObject.h
@@ -2,10 +2,28 @@
 #import <CoreData/CoreData.h>
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 
 
@@ -25,4 +43,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
\ No newline at end of file
+NS_ASSUME_NONNULL_END
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.h
index 6895f09262c4..3c54b8f0660b 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGTagManagedObjectBuilder.h
@@ -6,10 +6,28 @@
 #import "SWGTag.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 @interface SWGTagManagedObjectBuilder : NSObject
 
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h
index 20fd2e336d24..30405f3658a2 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObject.h
@@ -2,10 +2,28 @@
 #import <CoreData/CoreData.h>
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 
 
@@ -38,4 +56,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
\ No newline at end of file
+NS_ASSUME_NONNULL_END
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.h b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.h
index d62b03d8c87c..1c39fa6de5b9 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.h
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGUserManagedObjectBuilder.h
@@ -6,10 +6,28 @@
 #import "SWGUser.h"
 
 /**
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen
- * Do not edit the class manually.
- */
+* Swagger Petstore
+* This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@wordnik.com
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* 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.
+*/
 
 @interface SWGUserManagedObjectBuilder : NSObject
 

From 5740de9cc756800e277f2256468e8aa786b55756 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9da=20Housni=20Alaoui?= <reda.housnialaoui@gmail.com>
Date: Tue, 31 May 2016 18:51:11 +0200
Subject: [PATCH 062/139] Feign: disable FAIL_ON_UNKNOWN_PROPERTIES by default

---
 .../Java/libraries/feign/ApiClient.mustache   |  7 +++++-
 samples/client/petstore/java/feign/LICENSE    | 25 +++++++++++++++++++
 .../io/swagger/client/FormAwareEncoder.java   |  2 +-
 .../java/io/swagger/client/StringUtil.java    |  2 +-
 .../java/io/swagger/client/api/FakeApi.java   |  2 +-
 .../java/io/swagger/client/api/PetApi.java    |  2 +-
 .../java/io/swagger/client/api/StoreApi.java  |  2 +-
 .../java/io/swagger/client/api/UserApi.java   |  2 +-
 .../model/AdditionalPropertiesClass.java      |  2 +-
 .../java/io/swagger/client/model/Animal.java  |  2 +-
 .../io/swagger/client/model/AnimalFarm.java   |  2 +-
 .../io/swagger/client/model/ArrayTest.java    |  2 +-
 .../java/io/swagger/client/model/Cat.java     |  2 +-
 .../io/swagger/client/model/Category.java     |  2 +-
 .../java/io/swagger/client/model/Dog.java     |  2 +-
 .../io/swagger/client/model/EnumTest.java     |  2 +-
 .../io/swagger/client/model/FormatTest.java   |  2 +-
 ...ropertiesAndAdditionalPropertiesClass.java |  2 +-
 .../client/model/Model200Response.java        |  2 +-
 .../client/model/ModelApiResponse.java        |  2 +-
 .../io/swagger/client/model/ModelReturn.java  |  2 +-
 .../java/io/swagger/client/model/Name.java    |  2 +-
 .../java/io/swagger/client/model/Order.java   |  2 +-
 .../java/io/swagger/client/model/Pet.java     |  2 +-
 .../swagger/client/model/ReadOnlyFirst.java   |  2 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../java/io/swagger/client/model/Tag.java     |  2 +-
 .../java/io/swagger/client/model/User.java    |  2 +-
 28 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache
index 2d9fa23cf04f..61781ac9b705 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache
@@ -22,7 +22,7 @@ import {{invokerPackage}}.auth.OAuth.AccessTokenListener;
 public class ApiClient {
   public interface Api {}
 
-  private ObjectMapper objectMapper;
+  protected ObjectMapper objectMapper;
   private String basePath = "{{basePath}}";
   private Map<String, RequestInterceptor> apiAuthorizations;
   private Feign.Builder feignBuilder;
@@ -128,6 +128,11 @@ public class ApiClient {
     ObjectMapper objectMapper = new ObjectMapper();
     objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
     objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+    objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    return objectMapper;
+  }
+
+  public ObjectMapper getObjectMapper(){
     return objectMapper;
   }
 
diff --git a/samples/client/petstore/java/feign/LICENSE b/samples/client/petstore/java/feign/LICENSE
index d9a10c0d8e86..8dada3edaf50 100644
--- a/samples/client/petstore/java/feign/LICENSE
+++ b/samples/client/petstore/java/feign/LICENSE
@@ -174,3 +174,28 @@
       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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/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 f652b7870f8a..0ed60ea489ab 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-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+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 25b1f52d7f53..6c316df35167 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-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+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/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
index 02e35d2d89a0..4874476628b4 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public interface FakeApi extends ApiClient.Api {
 
 
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 99ca8dfaa71a..330838eb0a08 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
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public interface PetApi extends ApiClient.Api {
 
 
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 2649a4b300d5..2ff088ba096c 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public interface StoreApi extends ApiClient.Api {
 
 
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 33140fb4364b..c2e63a1a48c7 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public interface UserApi extends ApiClient.Api {
 
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 2569b542c27b..4a7155f2b6a3 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -13,7 +13,7 @@ import java.util.Map;
 /**
  * AdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class AdditionalPropertiesClass   {
   
   private Map<String, String> mapProperty = new HashMap<String, String>();
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
index 9400f85e9942..1b350d588c96 100644
--- 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Animal
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class Animal   {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
index 4e817de24432..e1ded2993733 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * AnimalFarm
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class AnimalFarm extends ArrayList<Animal>  {
   
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
index 28b8cde7a9a3..79b7694b6d3f 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * ArrayTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class ArrayTest   {
   
   private List<String> arrayOfString = new ArrayList<String>();
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
index e8914f543abb..4302c3b25ea6 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Cat
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class Cat extends Animal  {
   
   private String className = null;
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 9e72fbaf7c9f..f87abb520f45 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Category
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class Category   {
   
   private Long id = null;
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
index 8e79b2ebbaa6..84f5e7027971 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Dog
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class Dog extends Animal  {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
index 725d74152db1..8d11a05968f8 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * EnumTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class EnumTest   {
   
 
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
index e583011c39cd..c4d9d9d32796 100644
--- 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
@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * FormatTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class FormatTest   {
   
   private Integer integer = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 256aea8cd1ec..598ed2ccce35 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   
   private String uuid = null;
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 2eca6522c5fd..59aa3011fb9f 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 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.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class Model200Response   {
   
   private Integer name = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
index e16d627e18fc..1927555c00b0 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ModelApiResponse
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class ModelApiResponse   {
   
   private Integer code = null;
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 074c294cd5ad..843c2262bd27 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class ModelReturn   {
   
   private Integer _return = null;
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 6f3353dba6e2..2d5b16efdb5f 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
@@ -11,7 +11,7 @@ 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")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class Name   {
   
   private Integer name = null;
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 fdcf2a4251dd..9715dc583ca7 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
@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * Order
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class Order   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
index e4b00973d795..b6062e49c379 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
@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * Pet
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class Pet   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 43733beba93e..8afaf45f4a27 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ReadOnlyFirst
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class ReadOnlyFirst   {
   
   private String bar = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
index c58343e8271b..b29b9777a828 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * SpecialModelName
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
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 b9b7991f621b..d661146dd86d 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Tag
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class Tag   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
index a03f29c20f18..695c4053ff64 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * User
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-29T21:13:47.191+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
 public class User   {
   
   private Long id = null;

From 147497ae3448c0508147cc225b11bfc001999905 Mon Sep 17 00:00:00 2001
From: David Biesack <David.Biesack@sas.com>
Date: Tue, 31 May 2016 15:57:40 -0400
Subject: [PATCH 063/139] use {{name}} not {{classname}} in HTML seaction
 head/anchors

---
 .../src/main/resources/htmlDocs/index.mustache                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
index ad22284d4e45..26f7f564ff57 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
@@ -156,7 +156,7 @@
   <ol>
   {{#models}}
   {{#model}}
-    <li><a href="#{{classname}}"><code>{{classname}}</code></a></li>
+    <li><a href="#{{name}}"><code>{{name}}</code></a></li>
   {{/model}}
   {{/models}}
   </ol>
@@ -164,7 +164,7 @@
   {{#models}}
   {{#model}}
   <div class="model">
-    <h3 class="field-label"><a name="{{classname}}">{{classname}}</a> <a class="up" href="#__Models">Up</a></h3>
+    <h3 class="field-label"><a name="{{name}}">{{name}}</a> <a class="up" href="#__Models">Up</a></h3>
     <div class="field-items">
       {{#vars}}<div class="param">{{name}} {{^required}}(optional){{/required}}</div><div class="param-desc"><span class="param-type">{{^isPrimitiveType}}<a href="#{{complexType}}">{{datatype}}</a>{{/isPrimitiveType}}</span> {{description}}</div>
       {{#isEnum}}

From ce2e994306680ac40fdd9ee51d33c7f9c7f6d242 Mon Sep 17 00:00:00 2001
From: Mikolaj Przybysz <mikolaj.przybysz@home24.de>
Date: Tue, 24 May 2016 12:17:57 +0200
Subject: [PATCH 064/139] Removed printing artifactVersion if it is not set

---
 .../swagger-codegen/src/main/resources/php/README.mustache    | 4 ++--
 .../src/main/resources/php/configuration.mustache             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/README.mustache b/modules/swagger-codegen/src/main/resources/php/README.mustache
index 16694d0dad76..cc2cd21bbfdc 100644
--- a/modules/swagger-codegen/src/main/resources/php/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/README.mustache
@@ -6,8 +6,8 @@
 This PHP package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: {{appVersion}}
-- Package version: {{artifactVersion}}
-- Build date: {{generatedDate}}
+{{#artifactVersion}}- Package version: {{artifactVersion}}
+{{/artifactVersion}}- Build date: {{generatedDate}}
 - Build package: {{generatorClass}}
 {{#infoUrl}}
 For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index da21523cfa59..b84b3ee9a034 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -95,7 +95,7 @@ class Configuration
      *
      * @var string
      */
-    protected $userAgent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{artifactVersion}}}/php{{/httpUserAgent}}";
+    protected $userAgent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen{{#artifactVersion}}/{{{.}}}{{/artifactVersion}}/php{{/httpUserAgent}}";
 
     /**
      * Debug switch (default set to false)

From 37264b0bcf0ccfda34db9bfe459f17d2f5ce192d Mon Sep 17 00:00:00 2001
From: Mikolaj Przybysz <mikolaj.przybysz@home24.de>
Date: Tue, 24 May 2016 14:02:41 +0200
Subject: [PATCH 065/139] Removed printing artifactVersion if it is not set
 from debug information

---
 .../src/main/resources/php/configuration.mustache             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index b84b3ee9a034..a97358665e33 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -95,7 +95,7 @@ class Configuration
      *
      * @var string
      */
-    protected $userAgent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen{{#artifactVersion}}/{{{.}}}{{/artifactVersion}}/php{{/httpUserAgent}}";
+    protected $userAgent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{#artifactVersion}}{{{.}}}{{/artifactVersion}}{{^artifactVersion}}1.0.0{{/artifactVersion}}/php{{/httpUserAgent}}";
 
     /**
      * Debug switch (default set to false)
@@ -502,7 +502,9 @@ class Configuration
         $report .= "    OS: ".php_uname().PHP_EOL;
         $report .= "    PHP Version: ".phpversion().PHP_EOL;
         $report .= "    OpenAPI Spec Version: {{version}}".PHP_EOL;
+	{{#artifactVersion}}
         $report .= "    SDK Package Version: {{artifactVersion}}".PHP_EOL;
+	{{/artifactVersion}}
         $report .= "    Temp Folder Path: ".self::getDefaultConfiguration()->getTempFolderPath().PHP_EOL;
 
         return $report;

From 4f54e5cdc77ecad80bd337653421449f739c862d Mon Sep 17 00:00:00 2001
From: Mikolaj Przybysz <mikolaj.przybysz@home24.de>
Date: Mon, 30 May 2016 15:01:53 +0200
Subject: [PATCH 066/139] Improved formatting

---
 .../swagger-codegen/src/main/resources/php/README.mustache  | 6 ++++--
 .../src/main/resources/php/composer.mustache                | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/README.mustache b/modules/swagger-codegen/src/main/resources/php/README.mustache
index cc2cd21bbfdc..4186ed0ea999 100644
--- a/modules/swagger-codegen/src/main/resources/php/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/README.mustache
@@ -6,8 +6,10 @@
 This PHP package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
 - API version: {{appVersion}}
-{{#artifactVersion}}- Package version: {{artifactVersion}}
-{{/artifactVersion}}- Build date: {{generatedDate}}
+{{#artifactVersion}}
+- Package version: {{artifactVersion}}
+{{/artifactVersion}}
+- Build date: {{generatedDate}}
 - Build package: {{generatorClass}}
 {{#infoUrl}}
 For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
diff --git a/modules/swagger-codegen/src/main/resources/php/composer.mustache b/modules/swagger-codegen/src/main/resources/php/composer.mustache
index c52052346e83..477e0819324c 100644
--- a/modules/swagger-codegen/src/main/resources/php/composer.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/composer.mustache
@@ -1,6 +1,8 @@
 {
-    "name": "{{#composerVendorName}}{{.}}{{/composerVendorName}}{{^composerVendorName}}{{gitUserId}}{{/composerVendorName}}/{{#composerProjectName}}{{.}}{{/composerProjectName}}{{^composerProjectName}}{{gitRepoId}}{{/composerProjectName}}",{{#artifactVersion}}
-    "version": "{{artifactVersion}}",{{/artifactVersion}}
+    "name": "{{#composerVendorName}}{{.}}{{/composerVendorName}}{{^composerVendorName}}{{gitUserId}}{{/composerVendorName}}/{{#composerProjectName}}{{.}}{{/composerProjectName}}{{^composerProjectName}}{{gitRepoId}}{{/composerProjectName}}",
+    {{#artifactVersion}}
+    "version": "{{artifactVersion}}",
+    {{/artifactVersion}}
     "description": "{{description}}",
     "keywords": [
         "swagger",

From 47576471e288a02cd44ded8f973fe3685ac3bb6a Mon Sep 17 00:00:00 2001
From: Mikolaj Przybysz <mikolaj.przybysz@home24.de>
Date: Wed, 1 Jun 2016 10:57:20 +0200
Subject: [PATCH 067/139] Replaced double quotes with singles

---
 .../main/resources/php/configuration.mustache    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/php/configuration.mustache b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
index a97358665e33..7e3883cf9c43 100644
--- a/modules/swagger-codegen/src/main/resources/php/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/configuration.mustache
@@ -498,14 +498,14 @@ class Configuration
      */
     public static function toDebugReport()
     {
-        $report  = "PHP SDK ({{invokerPackage}}) Debug Report:".PHP_EOL;
-        $report .= "    OS: ".php_uname().PHP_EOL;
-        $report .= "    PHP Version: ".phpversion().PHP_EOL;
-        $report .= "    OpenAPI Spec Version: {{version}}".PHP_EOL;
-	{{#artifactVersion}}
-        $report .= "    SDK Package Version: {{artifactVersion}}".PHP_EOL;
-	{{/artifactVersion}}
-        $report .= "    Temp Folder Path: ".self::getDefaultConfiguration()->getTempFolderPath().PHP_EOL;
+        $report  = 'PHP SDK ({{invokerPackage}}) Debug Report:' . PHP_EOL;
+        $report .= '    OS: ' . php_uname() . PHP_EOL;
+        $report .= '    PHP Version: ' . phpversion() . PHP_EOL;
+        $report .= '    OpenAPI Spec Version: {{version}}' . PHP_EOL;
+	    {{#artifactVersion}}
+        $report .= '    SDK Package Version: {{artifactVersion}}' . PHP_EOL;
+    	{{/artifactVersion}}
+        $report .= '    Temp Folder Path: ' . self::getDefaultConfiguration()->getTempFolderPath() . PHP_EOL;
 
         return $report;
     }

From 2ead00c96d9d24372e6b827c6f1e1e2a3414fd8c Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Wed, 1 Jun 2016 15:51:52 +0200
Subject: [PATCH 068/139] [Objc] Add customizable user-agent #2715

---
 .../src/main/resources/objc/Configuration-body.mustache        | 3 ++-
 .../client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache b/modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache
index e37551bf8a1c..1aeca25dd3e4 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache
@@ -10,7 +10,7 @@
 
 @implementation {{classPrefix}}Configuration
 
-#pragma mark - Singletion Methods
+#pragma mark - Singleton Methods
 
 + (instancetype) sharedConfig {
     static {{classPrefix}}Configuration *shardConfig = nil;
@@ -35,6 +35,7 @@
         self.mutableApiKey = [NSMutableDictionary dictionary];
         self.mutableApiKeyPrefix = [NSMutableDictionary dictionary];
         self.mutableDefaultHeaders = [NSMutableDictionary dictionary];
+        self.mutableDefaultHeaders[@"User-Agent"] = {{#httpUserAgent}}@"{{httpUserAgent}}"{{/httpUserAgent}}{{^httpUserAgent}}[NSString stringWithFormat:@"Swagger-Codegen/{{version}}/objc (%@; iOS %@; Scale/%0.2f)",[[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion], [[UIScreen mainScreen] scale]]{{/httpUserAgent}};
         self.logger = [{{classPrefix}}Logger sharedLogger];
     }
     return self;
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m b/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m
index cd8d6e7aeef7..24172638bba6 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGConfiguration.m
@@ -10,7 +10,7 @@
 
 @implementation SWGConfiguration
 
-#pragma mark - Singletion Methods
+#pragma mark - Singleton Methods
 
 + (instancetype) sharedConfig {
     static SWGConfiguration *shardConfig = nil;
@@ -35,6 +35,7 @@
         self.mutableApiKey = [NSMutableDictionary dictionary];
         self.mutableApiKeyPrefix = [NSMutableDictionary dictionary];
         self.mutableDefaultHeaders = [NSMutableDictionary dictionary];
+        self.mutableDefaultHeaders[@"User-Agent"] = [NSString stringWithFormat:@"Swagger-Codegen/1.0.0/objc (%@; iOS %@; Scale/%0.2f)",[[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion], [[UIScreen mainScreen] scale]];
         self.logger = [SWGLogger sharedLogger];
     }
     return self;

From 7a87746af1bc1962730314594a6c4cb8395d6c77 Mon Sep 17 00:00:00 2001
From: Mateusz Mackowiak <mmackowiak@mobiltek.pl>
Date: Wed, 1 Jun 2016 16:01:03 +0200
Subject: [PATCH 069/139] [Objc] Proper binary data handle

---
 .../io/swagger/codegen/DefaultCodegen.java    | 10 ++++--
 .../codegen/languages/ObjcClientCodegen.java  | 27 +++++++---------
 .../resources/objc/ApiClient-body.mustache    |  5 ++-
 .../objc/JSONRequestSerializer-body.mustache  | 18 ++++++-----
 .../swagger/codegen/objc/ObjcModelTest.java   | 32 ++++++++++---------
 .../objc/SwaggerClient/Core/SWGApiClient.m    |  5 ++-
 .../Core/SWGJSONRequestSerializer.m           | 18 ++++++-----
 7 files changed, 63 insertions(+), 52 deletions(-)

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 fceb69ac8db3..39729dd14e10 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
@@ -1960,7 +1960,7 @@ public class DefaultCodegen {
                 }
             }
             r.dataType = cm.datatype;
-            r.isBinary = cm.datatype.toLowerCase().startsWith("byte");
+            r.isBinary = isDataTypeBinary(cm.datatype);
             if (cm.isContainer != null) {
                 r.simpleType = false;
                 r.containerType = cm.containerType;
@@ -2129,7 +2129,7 @@ public class DefaultCodegen {
                         p.baseType = cp.baseType;
                         p.dataType = cp.datatype;
                         p.isPrimitiveType = cp.isPrimitiveType;
-                        p.isBinary = cp.datatype.toLowerCase().startsWith("byte");
+                        p.isBinary = isDataTypeBinary(cp.datatype);
                     }
 
                     // set boolean flag (e.g. isString)
@@ -2226,7 +2226,7 @@ public class DefaultCodegen {
             p.isCookieParam = true;
         } else if (param instanceof BodyParameter) {
             p.isBodyParam = true;
-            p.isBinary = p.dataType.toLowerCase().startsWith("byte");
+            p.isBinary = isDataTypeBinary(p.dataType);
         } else if (param instanceof FormParameter) {
             if ("file".equalsIgnoreCase(((FormParameter) param).getType())) {
                 p.isFile = true;
@@ -2242,6 +2242,10 @@ public class DefaultCodegen {
         return p;
     }
 
+    public boolean isDataTypeBinary(String dataType) {
+        return dataType.toLowerCase().startsWith("byte");
+    }
+
     /**
      * Convert map of Swagger SecuritySchemeDefinition objects to a list of Codegen Security objects
      *
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
index 67cf272c0ba9..cc1e77649e58 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java
@@ -23,7 +23,6 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     public static final String GIT_REPO_URL = "gitRepoURL";
     public static final String DEFAULT_LICENSE = "Apache License, Version 2.0";
     public static final String CORE_DATA = "coreData";
-    public static final String BinaryDataType = "ObjcClientCodegenBinaryData";
     
     protected Set<String> foundationClasses = new HashSet<String>();
     protected String podName = "SwaggerClient";
@@ -70,8 +69,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         defaultIncludes.add("NSMutableArray");
         defaultIncludes.add("NSMutableDictionary");
         defaultIncludes.add("NSManagedObject");
-
-        defaultIncludes.add(BinaryDataType);
+        defaultIncludes.add("NSData");
 
         advancedMapingTypes.add("NSDictionary");
         advancedMapingTypes.add("NSArray");
@@ -88,6 +86,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         languageSpecificPrimitives.add("NSString");
         languageSpecificPrimitives.add("NSObject");
         languageSpecificPrimitives.add("NSDate");
+        languageSpecificPrimitives.add("NSData");
         languageSpecificPrimitives.add("NSURL");
         languageSpecificPrimitives.add("bool");
         languageSpecificPrimitives.add("BOOL");
@@ -109,8 +108,9 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("List", "NSArray");
         typeMapping.put("object", "NSObject");
         typeMapping.put("file", "NSURL");
-        typeMapping.put("binary", BinaryDataType);
-        typeMapping.put("ByteArray", BinaryDataType);
+        typeMapping.put("binary", "NSData");
+        typeMapping.put("ByteArray", "NSData");
+        typeMapping.put("byte", "NSData");
 
         // ref: http://www.tutorialspoint.com/objective_c/objective_c_basic_syntax.htm
         setReservedWordsLowerCase(
@@ -143,6 +143,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
                         "NSObject",
                         "NSString",
                         "NSDate",
+                        "NSData",
                         "NSURL",
                         "NSDictionary")
         );
@@ -317,16 +318,10 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         if (p instanceof ArrayProperty) {
             ArrayProperty ap = (ArrayProperty) p;
             Property inner = ap.getItems();
-            String innerType = getSwaggerType(inner);
-
             String innerTypeDeclaration = getTypeDeclaration(inner);
             if (innerTypeDeclaration.endsWith("*")) {
                 innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1);
             }
-            
-            if(innerTypeDeclaration.equalsIgnoreCase(BinaryDataType)) {
-                return "NSData*";
-            }
             // In this condition, type of property p is array of primitive,
             // return container type with pointer, e.g. `NSArray*<NSString*>*'
             if (languageSpecificPrimitives.contains(innerTypeDeclaration)) {
@@ -363,7 +358,6 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
             }
         } else {
             String swaggerType = getSwaggerType(p);
-
             // In this condition, type of p is objective-c primitive type, e.g. `NSSNumber',
             // return type of p with pointer, e.g. `NSNumber*'
             if (languageSpecificPrimitives.contains(swaggerType) &&
@@ -394,10 +388,6 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
             if (innerTypeDeclaration.endsWith("*")) {
                 innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1);
             }
-
-            if(innerTypeDeclaration.equalsIgnoreCase(BinaryDataType)) {
-                return "NSData*";
-            }
             // In this codition, type of property p is array of primitive,
             // return container type with pointer, e.g. `NSArray*<NSString*>*'
             if (languageSpecificPrimitives.contains(innerTypeDeclaration)) {
@@ -454,6 +444,11 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         }
     }
 
+    @Override
+    public boolean isDataTypeBinary(String dataType) {
+        return dataType.toLowerCase().startsWith("nsdata");
+    }
+
     @Override
     public String toModelName(String type) {
         // model name cannot use reserved keyword
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
index f0f99bc96e2a..157f6999001e 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
@@ -259,6 +259,7 @@ static NSString * {{classPrefix}}__fileNameForResponse(NSURLResponse *response)
         self.requestSerializer = [AFHTTPRequestSerializer serializer];
     }
     else {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
         NSAssert(NO, @"Unsupported request type %@", requestContentType);
     }
 
@@ -274,7 +275,9 @@ static NSString * {{classPrefix}}__fileNameForResponse(NSURLResponse *response)
     queryParams = [self.sanitizer sanitizeForSerialization:queryParams];
     headerParams = [self.sanitizer sanitizeForSerialization:headerParams];
     formParams = [self.sanitizer sanitizeForSerialization:formParams];
-    body = [self.sanitizer sanitizeForSerialization:body];
+    if(![body isKindOfClass:[NSData class]]) {
+        body = [self.sanitizer sanitizeForSerialization:body];
+    }
 
     // auth setting
     [self updateHeaderParams:&headerParams queryParams:&queryParams WithAuthSettings:authSettings];
diff --git a/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-body.mustache b/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-body.mustache
index 78b1409b6b93..63513335d9ae 100644
--- a/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/JSONRequestSerializer-body.mustache
@@ -17,19 +17,21 @@
                                withParameters:(id)parameters
                                         error:(NSError *__autoreleasing *)error
 {
+    if (!parameters) {
+        return request;
+    }
     // If the body data which will be serialized isn't NSArray or NSDictionary
     // then put the data in the http request body directly.
     if ([parameters isKindOfClass:[NSArray class]] || [parameters isKindOfClass:[NSDictionary class]]) {
         return [super requestBySerializingRequest:request withParameters:parameters error:error];
-    } else {
-        NSMutableURLRequest *mutableRequest = [request mutableCopy];
-        
-        if (parameters) {
-            [mutableRequest setHTTPBody:[parameters dataUsingEncoding:self.stringEncoding]];
-        }
-        
-        return mutableRequest;
     }
+    NSMutableURLRequest *mutableRequest = [request mutableCopy];
+    if([parameters isKindOfClass:[NSData class]]) {
+        [mutableRequest setHTTPBody:parameters];
+    } else {
+        [mutableRequest setHTTPBody:[parameters dataUsingEncoding:self.stringEncoding]];
+    }
+    return mutableRequest;
 }
 
 @end
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java
index 84fb38d1dd3f..f3948b007815 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java
@@ -1,21 +1,9 @@
 package io.swagger.codegen.objc;
 
-import io.swagger.codegen.CodegenModel;
-import io.swagger.codegen.CodegenOperation;
-import io.swagger.codegen.CodegenProperty;
-import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.*;
 import io.swagger.codegen.languages.ObjcClientCodegen;
-import io.swagger.models.ArrayModel;
-import io.swagger.models.Model;
-import io.swagger.models.ModelImpl;
-import io.swagger.models.Path;
-import io.swagger.models.Swagger;
-import io.swagger.models.properties.ArrayProperty;
-import io.swagger.models.properties.DateTimeProperty;
-import io.swagger.models.properties.LongProperty;
-import io.swagger.models.properties.MapProperty;
-import io.swagger.models.properties.RefProperty;
-import io.swagger.models.properties.StringProperty;
+import io.swagger.models.*;
+import io.swagger.models.properties.*;
 import io.swagger.parser.SwaggerParser;
 
 import com.google.common.collect.Sets;
@@ -279,6 +267,20 @@ public class ObjcModelTest {
         Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("SWGChildren")).size(), 1);
     }
 
+    @Test(description = "test binary data")
+    public void binaryDataModelTest() {
+        final Swagger model =  new SwaggerParser().read("src/test/resources/2_0/binaryDataTest.json");
+        final DefaultCodegen codegen = new ObjcClientCodegen();
+        final String path = "/tests/binaryResponse";
+        final Operation p = model.getPaths().get(path).getPost();
+        final CodegenOperation op = codegen.fromOperation(path, "post", p, model.getDefinitions());
+
+        Assert.assertEquals(op.returnType, "NSData*");
+        Assert.assertEquals(op.bodyParam.dataType, "NSData*");
+        Assert.assertTrue(op.bodyParam.isBinary);
+        Assert.assertTrue(op.responses.get(0).isBinary);
+    }
+
     @Test(description = "create proper imports per #316")
     public void issue316Test() {
         final Swagger model = new SwaggerParser().read("src/test/resources/2_0/postBodyTest.json");
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.m b/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.m
index 18c3233c3312..66305707b17a 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.m
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.m
@@ -259,6 +259,7 @@ static NSString * SWG__fileNameForResponse(NSURLResponse *response) {
         self.requestSerializer = [AFHTTPRequestSerializer serializer];
     }
     else {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
         NSAssert(NO, @"Unsupported request type %@", requestContentType);
     }
 
@@ -274,7 +275,9 @@ static NSString * SWG__fileNameForResponse(NSURLResponse *response) {
     queryParams = [self.sanitizer sanitizeForSerialization:queryParams];
     headerParams = [self.sanitizer sanitizeForSerialization:headerParams];
     formParams = [self.sanitizer sanitizeForSerialization:formParams];
-    body = [self.sanitizer sanitizeForSerialization:body];
+    if(![body isKindOfClass:[NSData class]]) {
+        body = [self.sanitizer sanitizeForSerialization:body];
+    }
 
     // auth setting
     [self updateHeaderParams:&headerParams queryParams:&queryParams WithAuthSettings:authSettings];
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.m b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.m
index 631a20a5a6ee..221765e48397 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.m
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGJSONRequestSerializer.m
@@ -17,19 +17,21 @@
                                withParameters:(id)parameters
                                         error:(NSError *__autoreleasing *)error
 {
+    if (!parameters) {
+        return request;
+    }
     // If the body data which will be serialized isn't NSArray or NSDictionary
     // then put the data in the http request body directly.
     if ([parameters isKindOfClass:[NSArray class]] || [parameters isKindOfClass:[NSDictionary class]]) {
         return [super requestBySerializingRequest:request withParameters:parameters error:error];
-    } else {
-        NSMutableURLRequest *mutableRequest = [request mutableCopy];
-        
-        if (parameters) {
-            [mutableRequest setHTTPBody:[parameters dataUsingEncoding:self.stringEncoding]];
-        }
-        
-        return mutableRequest;
     }
+    NSMutableURLRequest *mutableRequest = [request mutableCopy];
+    if([parameters isKindOfClass:[NSData class]]) {
+        [mutableRequest setHTTPBody:parameters];
+    } else {
+        [mutableRequest setHTTPBody:[parameters dataUsingEncoding:self.stringEncoding]];
+    }
+    return mutableRequest;
 }
 
 @end

From 23d2c5609694a4cde1f91648a81bd2d2c598376c Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Thu, 2 Jun 2016 14:33:08 +0800
Subject: [PATCH 070/139] [JAX-RS] fix library setting "jersey2"  (#3016)

* to fix #2981

* update sample, update ci to include jaxrs (jersey1, 2)

* avoid duplicated artifactId in pom (jaxrs jersey1)

* update jetty dependency for jersey1 jaxrs

* update bin to set proper artifact-id

* fix jersey1 jaxrs pom.xml

* fix dependency in jaxrs jersey2 pom

* downgrade jetty plugin to 9.3.0.v20150612

* update petstore sample for jaxrs jersey 1

* restore jetty to previous version. update test order

* downgrade jetty maven plugin version

* restore original version of jetty plugin
---
 bin/jaxrs-jersey1-petstore-server.sh          |  31 +++
 bin/jaxrs-petstore-server.sh                  |   2 +-
 .../AbstractJavaJAXRSServerCodegen.java       |   8 +-
 .../languages/JavaJerseyServerCodegen.java    |  67 +++---
 .../jersey1}/ApiException.mustache            |   0
 .../jersey1}/ApiOriginFilter.mustache         |   0
 .../jersey1}/ApiResponseMessage.mustache      |   0
 .../jersey1}/JodaDateTimeProvider.mustache    |   0
 .../jersey1}/JodaLocalDateProvider.mustache   |   0
 .../jersey1}/LocalDateProvider.mustache       |   0
 .../jersey1}/LocalDateTimeProvider.mustache   |   0
 .../jersey1}/NotFoundException.mustache       |   0
 .../jersey1}/README.mustache                  |   0
 .../jersey1}/StringUtil.mustache              |   0
 .../jersey1}/allowableValues.mustache         |   0
 .../jersey1}/api.mustache                     |   0
 .../jersey1}/apiService.mustache              |   0
 .../jersey1}/apiServiceFactory.mustache       |   0
 .../jersey1}/apiServiceImpl.mustache          |   0
 .../jersey1}/bodyParams.mustache              |   0
 .../jersey1}/bootstrap.mustache               |   0
 .../jersey1}/enumClass.mustache               |   0
 .../jersey1}/enumOuterClass.mustache          |   0
 .../jersey1}/formParams.mustache              |   0
 .../jersey1}/generatedAnnotation.mustache     |   0
 .../jersey1}/headerParams.mustache            |   0
 .../jersey1}/jacksonJsonProvider.mustache     |   0
 .../jersey1}/model.mustache                   |   2 +
 .../jersey1}/pathParams.mustache              |   0
 .../jersey1}/pojo.mustache                    |   0
 .../jersey1}/pom.mustache                     |  11 +-
 .../jersey1}/project/build.properties         |   0
 .../jersey1}/project/plugins.sbt              |   0
 .../jersey1}/queryParams.mustache             |   0
 .../jersey1}/returnTypes.mustache             |   0
 .../jersey1}/serviceBodyParams.mustache       |   0
 .../jersey1}/serviceFormParams.mustache       |   0
 .../jersey1}/serviceHeaderParams.mustache     |   0
 .../jersey1}/servicePathParams.mustache       |   0
 .../jersey1}/serviceQueryParams.mustache      |   0
 .../jersey1}/web.mustache                     |   0
 .../jersey2/ApiException.mustache             |   0
 .../jersey2/ApiOriginFilter.mustache          |   0
 .../jersey2/ApiResponseMessage.mustache       |   0
 .../jersey2/JodaDateTimeProvider.mustache     |   0
 .../jersey2/JodaLocalDateProvider.mustache    |   0
 .../jersey2/LocalDateProvider.mustache        |   0
 .../jersey2/LocalDateTimeProvider.mustache    |   0
 .../jersey2/NotFoundException.mustache        |   0
 .../{ => libraries}/jersey2/README.mustache   |   0
 .../jersey2/StringUtil.mustache               |   0
 .../jersey2/allowableValues.mustache          |   0
 .../{ => libraries}/jersey2/api.mustache      |   0
 .../jersey2/apiService.mustache               |   0
 .../jersey2/apiServiceFactory.mustache        |   0
 .../jersey2/apiServiceImpl.mustache           |   0
 .../jersey2/bodyParams.mustache               |   0
 .../jersey2/bootstrap.mustache                |   0
 .../jersey2/enumClass.mustache                |   2 +-
 .../jersey2/enumOuterClass.mustache           |   0
 .../jersey2/formParams.mustache               |   0
 .../jersey2/generatedAnnotation.mustache      |   0
 .../jersey2/headerParams.mustache             |   0
 .../jersey2/jacksonJsonProvider.mustache      |   0
 .../jersey2}/model.mustache                   |   0
 .../jersey2/pathParams.mustache               |   0
 .../{ => libraries}/jersey2/pojo.mustache     |   0
 .../{ => libraries}/jersey2/pom.mustache      |  13 +-
 .../jersey2/project/build.properties          |   0
 .../jersey2/project/plugins.sbt               |   0
 .../jersey2/queryParams.mustache              |   0
 .../jersey2/returnTypes.mustache              |   0
 .../jersey2/serviceBodyParams.mustache        |   0
 .../jersey2/serviceFormParams.mustache        |   0
 .../jersey2/serviceHeaderParams.mustache      |   0
 .../jersey2/servicePathParams.mustache        |   0
 .../jersey2/serviceQueryParams.mustache       |   0
 .../{ => libraries}/jersey2/web.mustache      |   0
 .../java/jaxrs/AllowableValuesTest.java       |   2 +-
 .../codegen/jaxrs/JaxRSServerOptionsTest.java |   3 +-
 .../options/JaxRSServerOptionsProvider.java   |  45 +++-
 pom.xml                                       |  17 +-
 .../jaxrs/jersey1/.swagger-codegen-ignore     |  23 ++
 samples/server/petstore/jaxrs/jersey1/LICENSE | 201 ++++++++++++++++
 .../petstore/jaxrs/{ => jersey1}/README.md    |   0
 .../petstore/jaxrs/{ => jersey1}/pom.xml      |  15 +-
 .../gen/java/io/swagger/api/ApiException.java |   0
 .../java/io/swagger/api/ApiOriginFilter.java  |   0
 .../io/swagger/api/ApiResponseMessage.java    |   0
 .../io/swagger/api/JacksonJsonProvider.java   |   0
 .../io/swagger/api/NotFoundException.java     |   0
 .../src/gen/java/io/swagger/api/PetApi.java   |   0
 .../java/io/swagger/api/PetApiService.java    |   0
 .../src/gen/java/io/swagger/api/StoreApi.java |   0
 .../java/io/swagger/api/StoreApiService.java  |   0
 .../gen/java/io/swagger/api/StringUtil.java   |   0
 .../src/gen/java/io/swagger/api/UserApi.java  |   0
 .../java/io/swagger/api/UserApiService.java   |   0
 .../gen/java/io/swagger/model/Category.java   |  94 ++++++++
 .../io/swagger/model/ModelApiResponse.java}   |  19 +-
 .../src/gen/java/io/swagger/model/Order.java  |   0
 .../src/gen/java/io/swagger/model/Pet.java    |   0
 .../src/gen/java/io/swagger/model/Tag.java    |  94 ++++++++
 .../src/gen/java/io/swagger/model/User.java   | 215 ++++++++++++++++++
 .../main/java/io/swagger/api/Bootstrap.java   |   0
 .../api/factories/PetApiServiceFactory.java   |   2 +-
 .../api/factories/StoreApiServiceFactory.java |   2 +-
 .../api/factories/UserApiServiceFactory.java  |   2 +-
 .../swagger/api/impl/PetApiServiceImpl.java   |  13 +-
 .../swagger/api/impl/StoreApiServiceImpl.java |   7 +-
 .../swagger/api/impl/UserApiServiceImpl.java  |  11 +-
 .../src/main/webapp/WEB-INF/web.xml           |   0
 .../jaxrs/jersey2/.swagger-codegen-ignore     |  23 ++
 samples/server/petstore/jaxrs/jersey2/LICENSE | 201 ++++++++++++++++
 .../server/petstore/jaxrs/jersey2/README.md   |  23 ++
 samples/server/petstore/jaxrs/jersey2/pom.xml | 146 ++++++++++++
 .../gen/java/io/swagger/api/ApiException.java |  10 +
 .../java/io/swagger/api/ApiOriginFilter.java  |  22 ++
 .../io/swagger/api/ApiResponseMessage.java    |  69 ++++++
 .../io/swagger/api/JacksonJsonProvider.java   |  19 ++
 .../io/swagger/api/NotFoundException.java     |  10 +
 .../src/gen/java/io/swagger/api/PetApi.java   | 173 ++++++++++++++
 .../java/io/swagger/api/PetApiService.java    |  30 +++
 .../src/gen/java/io/swagger/api/StoreApi.java |  87 +++++++
 .../java/io/swagger/api/StoreApiService.java  |  25 ++
 .../gen/java/io/swagger/api/StringUtil.java   |  42 ++++
 .../src/gen/java/io/swagger/api/UserApi.java  | 131 +++++++++++
 .../java/io/swagger/api/UserApiService.java   |  29 +++
 .../gen/java/io/swagger/model/Category.java   |   0
 .../io/swagger/model/ModelApiResponse.java    |   0
 .../src/gen/java/io/swagger/model/Order.java  | 196 ++++++++++++++++
 .../src/gen/java/io/swagger/model/Pet.java    | 199 ++++++++++++++++
 .../src/gen/java/io/swagger/model/Tag.java    |   0
 .../src/gen/java/io/swagger/model/User.java   |   0
 .../main/java/io/swagger/api/Bootstrap.java   |  31 +++
 .../api/factories/PetApiServiceFactory.java   |  13 ++
 .../api/factories/StoreApiServiceFactory.java |  13 ++
 .../api/factories/UserApiServiceFactory.java  |  13 ++
 .../swagger/api/impl/PetApiServiceImpl.java   |  62 +++++
 .../swagger/api/impl/StoreApiServiceImpl.java |  41 ++++
 .../swagger/api/impl/UserApiServiceImpl.java  |  61 +++++
 .../jersey2/src/main/webapp/WEB-INF/web.xml   |  63 +++++
 142 files changed, 2520 insertions(+), 113 deletions(-)
 create mode 100755 bin/jaxrs-jersey1-petstore-server.sh
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/ApiException.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/ApiOriginFilter.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/ApiResponseMessage.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/JodaDateTimeProvider.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/JodaLocalDateProvider.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/LocalDateProvider.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/LocalDateTimeProvider.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/NotFoundException.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/README.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/StringUtil.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/allowableValues.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/api.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/apiService.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/apiServiceFactory.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/apiServiceImpl.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/bodyParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/bootstrap.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/enumClass.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/enumOuterClass.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/formParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/generatedAnnotation.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/headerParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/jacksonJsonProvider.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey2 => libraries/jersey1}/model.mustache (76%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/pathParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/pojo.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/pom.mustache (95%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/project/build.properties (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/project/plugins.sbt (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/queryParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/returnTypes.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/serviceBodyParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/serviceFormParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/serviceHeaderParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/servicePathParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/serviceQueryParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey1}/web.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/ApiException.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/ApiOriginFilter.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/ApiResponseMessage.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/JodaDateTimeProvider.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/JodaLocalDateProvider.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/LocalDateProvider.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/LocalDateTimeProvider.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/NotFoundException.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/README.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/StringUtil.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/allowableValues.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/api.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/apiService.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/apiServiceFactory.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/apiServiceImpl.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/bodyParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/bootstrap.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/enumClass.mustache (80%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/enumOuterClass.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/formParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/generatedAnnotation.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/headerParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/jacksonJsonProvider.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{jersey1_18 => libraries/jersey2}/model.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/pathParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/pojo.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/pom.mustache (93%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/project/build.properties (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/project/plugins.sbt (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/queryParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/returnTypes.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/serviceBodyParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/serviceFormParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/serviceHeaderParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/servicePathParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/serviceQueryParams.mustache (100%)
 rename modules/swagger-codegen/src/main/resources/JavaJaxRS/{ => libraries}/jersey2/web.mustache (100%)
 create mode 100644 samples/server/petstore/jaxrs/jersey1/.swagger-codegen-ignore
 create mode 100644 samples/server/petstore/jaxrs/jersey1/LICENSE
 rename samples/server/petstore/jaxrs/{ => jersey1}/README.md (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/pom.xml (93%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/ApiException.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/ApiOriginFilter.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/ApiResponseMessage.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/JacksonJsonProvider.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/NotFoundException.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/PetApi.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/PetApiService.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/StoreApi.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/StoreApiService.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/StringUtil.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/UserApi.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/api/UserApiService.java (100%)
 create mode 100644 samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java
 rename samples/server/petstore/jaxrs/{src/gen/java/io/swagger/model/ApiResponse.java => jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java} (79%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/model/Order.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/gen/java/io/swagger/model/Pet.java (100%)
 create mode 100644 samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java
 create mode 100644 samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/main/java/io/swagger/api/Bootstrap.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java (68%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java (69%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java (69%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java (92%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java (90%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java (93%)
 rename samples/server/petstore/jaxrs/{ => jersey1}/src/main/webapp/WEB-INF/web.xml (100%)
 create mode 100644 samples/server/petstore/jaxrs/jersey2/.swagger-codegen-ignore
 create mode 100644 samples/server/petstore/jaxrs/jersey2/LICENSE
 create mode 100644 samples/server/petstore/jaxrs/jersey2/README.md
 create mode 100644 samples/server/petstore/jaxrs/jersey2/pom.xml
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiException.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiOriginFilter.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiResponseMessage.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/JacksonJsonProvider.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/NotFoundException.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/PetApi.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/PetApiService.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/StoreApi.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/StoreApiService.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/StringUtil.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/UserApi.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/UserApiService.java
 rename samples/server/petstore/jaxrs/{ => jersey2}/src/gen/java/io/swagger/model/Category.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey2}/src/gen/java/io/swagger/model/ModelApiResponse.java (100%)
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Order.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Pet.java
 rename samples/server/petstore/jaxrs/{ => jersey2}/src/gen/java/io/swagger/model/Tag.java (100%)
 rename samples/server/petstore/jaxrs/{ => jersey2}/src/gen/java/io/swagger/model/User.java (100%)
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/Bootstrap.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
 create mode 100644 samples/server/petstore/jaxrs/jersey2/src/main/webapp/WEB-INF/web.xml

diff --git a/bin/jaxrs-jersey1-petstore-server.sh b/bin/jaxrs-jersey1-petstore-server.sh
new file mode 100755
index 000000000000..8195b02c72b5
--- /dev/null
+++ b/bin/jaxrs-jersey1-petstore-server.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs -o samples/server/petstore/jaxrs/jersey1 -DhideGenerationTimestamp=true --library=jersey1 --artifact-id=swagger-jaxrs-jersey1-server"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/jaxrs-petstore-server.sh b/bin/jaxrs-petstore-server.sh
index 6436c797e879..3c7e4af91a8a 100755
--- a/bin/jaxrs-petstore-server.sh
+++ b/bin/jaxrs-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs -o samples/server/petstore/jaxrs -DhideGenerationTimestamp=true"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs -o samples/server/petstore/jaxrs/jersey2 -DhideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java
index c09b4ac3019c..27f435250a0c 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java
@@ -8,10 +8,12 @@ import io.swagger.models.Operation;
 import io.swagger.models.Path;
 import io.swagger.models.Swagger;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.*;
 
-public abstract class AbstractJavaJAXRSServerCodegen extends JavaClientCodegen
-{
+public abstract class AbstractJavaJAXRSServerCodegen extends JavaClientCodegen {
     /**
      * Name of the sub-directory in "src/main/resource" where to find the
      * Mustache template for the JAX-RS Codegen.
@@ -19,6 +21,7 @@ public abstract class AbstractJavaJAXRSServerCodegen extends JavaClientCodegen
     protected static final String JAXRS_TEMPLATE_DIRECTORY_NAME = "JavaJaxRS";
     protected String implFolder = "src/main/java";
     protected String title = "Swagger Server";
+    static Logger LOGGER = LoggerFactory.getLogger(AbstractJavaJAXRSServerCodegen.class);
 
     public AbstractJavaJAXRSServerCodegen()
     {
@@ -199,4 +202,5 @@ public abstract class AbstractJavaJAXRSServerCodegen extends JavaClientCodegen
     public boolean shouldOverwrite(String filename) {
         return super.shouldOverwrite(filename) && !filename.endsWith("ServiceImpl.java") && !filename.endsWith("ServiceFactory.java");
     }
+
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyServerCodegen.java
index 52f3eb8d844a..72f969403bf5 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyServerCodegen.java
@@ -6,6 +6,8 @@ import io.swagger.models.Operation;
 import java.io.File;
 import java.util.*;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
     public JavaJerseyServerCodegen() {
         super();
@@ -26,7 +28,7 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
 
         additionalProperties.put("title", title);
 
-        embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "jersey1_18";
+        embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME;
 
         for ( int i = 0; i < cliOptions.size(); i++ ) {
             if ( CodegenConstants.LIBRARY.equals(cliOptions.get(i).getOpt()) ) {
@@ -36,13 +38,11 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
         }
 
         CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
-        library.setDefault(DEFAULT_LIBRARY);
 
-        Map<String, String> supportedLibraries = new LinkedHashMap<String, String>();
-
-        supportedLibraries.put(DEFAULT_LIBRARY, "Jersey core 1.18.1");
-        supportedLibraries.put("jersey2", "Jersey core 2.x");
+        supportedLibraries.put("jersey1", "Jersey core 1.x");
+        supportedLibraries.put("jersey2", "Jersey core 2.x (default)");
         library.setEnum(supportedLibraries);
+        library.setDefault("jersey1");
 
         cliOptions.add(library);
         cliOptions.add(new CliOption(CodegenConstants.IMPL_FOLDER, CodegenConstants.IMPL_FOLDER_DESC));
@@ -73,16 +73,35 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
     public void processOpts() {
         super.processOpts();
 
+        // set jersey2 as default
+        if (StringUtils.isEmpty(library)) {
+            setLibrary("jersey2");
+        }
+
+        supportingFiles.clear();
+
         // clear model and api doc template as this codegen 
         // does not support auto-generated markdown doc at the moment
         modelDocTemplateFiles.remove("model_doc.mustache");
         apiDocTemplateFiles.remove("api_doc.mustache");
 
-        if ( additionalProperties.containsKey(CodegenConstants.IMPL_FOLDER) ) {
+        if ( additionalProperties.containsKey(CodegenConstants.IMPL_FOLDER)) {
             implFolder = (String) additionalProperties.get(CodegenConstants.IMPL_FOLDER);
         }
 
-        supportingFiles.clear();
+        if (additionalProperties.containsKey("dateLibrary")) {
+            setDateLibrary(additionalProperties.get("dateLibrary").toString());
+            additionalProperties.put(dateLibrary, "true");
+        }
+
+        if ("joda".equals(dateLibrary)) {
+            supportingFiles.add(new SupportingFile("JodaDateTimeProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaDateTimeProvider.java"));
+            supportingFiles.add(new SupportingFile("JodaLocalDateProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaLocalDateProvider.java"));
+        } else if ( "java8".equals(dateLibrary) ) {
+            supportingFiles.add(new SupportingFile("LocalDateTimeProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "LocalDateTimeProvider.java"));
+            supportingFiles.add(new SupportingFile("LocalDateProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "LocalDateProvider.java"));
+        }
+
         writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
         writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("ApiException.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "ApiException.java"));
@@ -91,40 +110,8 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
         supportingFiles.add(new SupportingFile("NotFoundException.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "NotFoundException.java"));
         supportingFiles.add(new SupportingFile("jacksonJsonProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JacksonJsonProvider.java"));
         writeOptional(outputFolder, new SupportingFile("bootstrap.mustache", (implFolder + '/' + apiPackage).replace(".", "/"), "Bootstrap.java"));
-
         writeOptional(outputFolder, new SupportingFile("web.mustache", ("src/main/webapp/WEB-INF"), "web.xml"));
         supportingFiles.add(new SupportingFile("StringUtil.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "StringUtil.java"));
-
-        if ( additionalProperties.containsKey("dateLibrary") ) {
-            setDateLibrary(additionalProperties.get("dateLibrary").toString());
-            additionalProperties.put(dateLibrary, "true");
-        }
-        if(DEFAULT_LIBRARY.equals(library) || library == null) {
-            if(templateDir.startsWith(JAXRS_TEMPLATE_DIRECTORY_NAME)) {
-                // set to the default location
-                templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "jersey1_18";
-            }
-            else {
-                templateDir += File.separator + "jersey1_18";
-            }
-        }
-        if("jersey2".equals(library)) {
-            if(templateDir.startsWith(JAXRS_TEMPLATE_DIRECTORY_NAME)) {
-                // set to the default location
-                templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "jersey2";
-            }
-            else {
-                templateDir += File.separator + "jersey2";
-            }
-        }
-
-        if ( "joda".equals(dateLibrary) ) {
-            supportingFiles.add(new SupportingFile("JodaDateTimeProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaDateTimeProvider.java"));
-            supportingFiles.add(new SupportingFile("JodaLocalDateProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "JodaLocalDateProvider.java"));
-        } else if ( "java8".equals(dateLibrary) ) {
-            supportingFiles.add(new SupportingFile("LocalDateTimeProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "LocalDateTimeProvider.java"));
-            supportingFiles.add(new SupportingFile("LocalDateProvider.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "LocalDateProvider.java"));
-        }
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/ApiException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/ApiException.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/ApiException.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/ApiException.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/ApiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/ApiOriginFilter.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/ApiOriginFilter.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/ApiOriginFilter.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/ApiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/ApiResponseMessage.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/ApiResponseMessage.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/ApiResponseMessage.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/JodaDateTimeProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/JodaDateTimeProvider.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/JodaDateTimeProvider.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/JodaDateTimeProvider.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/JodaLocalDateProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/JodaLocalDateProvider.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/JodaLocalDateProvider.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/JodaLocalDateProvider.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/LocalDateProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/LocalDateProvider.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/LocalDateProvider.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/LocalDateProvider.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/LocalDateTimeProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/LocalDateTimeProvider.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/LocalDateTimeProvider.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/LocalDateTimeProvider.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/NotFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/NotFoundException.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/NotFoundException.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/NotFoundException.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/README.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/README.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/README.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/README.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/StringUtil.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/StringUtil.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/StringUtil.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/StringUtil.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/allowableValues.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/allowableValues.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/allowableValues.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/allowableValues.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/api.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/api.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/api.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/apiService.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/apiService.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/apiService.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/apiService.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/apiServiceFactory.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/apiServiceFactory.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/apiServiceFactory.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/apiServiceFactory.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/apiServiceImpl.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/apiServiceImpl.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/bodyParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/bodyParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/bodyParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/bootstrap.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/bootstrap.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/bootstrap.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/bootstrap.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/enumClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/enumClass.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/enumClass.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/enumClass.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/enumOuterClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/enumOuterClass.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/enumOuterClass.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/enumOuterClass.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/formParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/formParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/formParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/generatedAnnotation.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/generatedAnnotation.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/generatedAnnotation.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/headerParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/headerParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/headerParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/jacksonJsonProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/jacksonJsonProvider.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/jacksonJsonProvider.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/jacksonJsonProvider.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/model.mustache
similarity index 76%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/model.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/model.mustache
index b9512d2b83cb..738fe1c1440e 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/model.mustache
@@ -1,6 +1,8 @@
 package {{package}};
 
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
 {{#imports}}import {{import}};
 {{/imports}}
 
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pathParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pathParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pathParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pojo.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pojo.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pojo.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache
similarity index 95%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pom.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache
index 180450ce73f2..96e657cac2b3 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache
@@ -168,11 +168,12 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.8</swagger-core-version>
+    <swagger-core-version>1.5.9</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <jersey-version>1.18.1</jersey-version>
-    <slf4j-version>1.6.3</slf4j-version>
-    <junit-version>4.8.1</junit-version>
+    <jersey-version>1.19.1</jersey-version>
+    <slf4j-version>1.7.21</slf4j-version>
+    <junit-version>4.12</junit-version>
     <servlet-api-version>2.5</servlet-api-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/project/build.properties b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/project/build.properties
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/project/build.properties
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/project/build.properties
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/project/plugins.sbt b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/project/plugins.sbt
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/project/plugins.sbt
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/project/plugins.sbt
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/queryParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/queryParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/queryParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/returnTypes.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/returnTypes.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/returnTypes.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/returnTypes.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceBodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/serviceBodyParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceBodyParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/serviceBodyParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceFormParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/serviceFormParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceFormParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/serviceFormParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceHeaderParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/serviceHeaderParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceHeaderParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/serviceHeaderParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/servicePathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/servicePathParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/servicePathParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/servicePathParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceQueryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/serviceQueryParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/serviceQueryParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/serviceQueryParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/web.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/web.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/web.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/web.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/ApiException.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiException.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/ApiException.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/ApiOriginFilter.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiOriginFilter.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/ApiOriginFilter.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/ApiResponseMessage.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/ApiResponseMessage.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/ApiResponseMessage.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/JodaDateTimeProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/JodaDateTimeProvider.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/JodaDateTimeProvider.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/JodaDateTimeProvider.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/JodaLocalDateProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/JodaLocalDateProvider.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/JodaLocalDateProvider.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/JodaLocalDateProvider.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/LocalDateProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/LocalDateProvider.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/LocalDateProvider.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/LocalDateProvider.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/LocalDateTimeProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/LocalDateTimeProvider.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/LocalDateTimeProvider.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/LocalDateTimeProvider.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/NotFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/NotFoundException.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/NotFoundException.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/NotFoundException.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/README.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/README.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/README.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/README.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/StringUtil.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/StringUtil.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/StringUtil.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/StringUtil.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/allowableValues.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/allowableValues.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/allowableValues.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/allowableValues.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/api.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/api.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/api.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiService.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/apiService.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiService.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/apiService.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiServiceFactory.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/apiServiceFactory.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiServiceFactory.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/apiServiceFactory.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiServiceImpl.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/apiServiceImpl.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/apiServiceImpl.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/apiServiceImpl.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/bodyParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/bodyParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/bodyParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/bootstrap.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/bootstrap.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/bootstrap.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/bootstrap.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/enumClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/enumClass.mustache
similarity index 80%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/enumClass.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/enumClass.mustache
index 6010e26704f5..0867107d9930 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/enumClass.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/enumClass.mustache
@@ -1,6 +1,6 @@
 
   public enum {{{datatypeWithEnum}}} {
-    {{#allowableValues}}{{#enumVars}}{{{name}}}("{{{value}}}"){{^-last}},
+    {{#allowableValues}}{{#enumVars}}{{{name}}}({{{value}}}){{^-last}},
     {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
 
     private String value;
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/enumOuterClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/enumOuterClass.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/enumOuterClass.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/enumOuterClass.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/formParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/formParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/formParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/generatedAnnotation.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/generatedAnnotation.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/generatedAnnotation.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/headerParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/headerParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/headerParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/jacksonJsonProvider.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/jacksonJsonProvider.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/jacksonJsonProvider.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/jacksonJsonProvider.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/model.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/model.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/model.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/pathParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pathParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/pathParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/pojo.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pojo.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/pojo.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/pom.mustache
similarity index 93%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pom.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/pom.mustache
index a2f59b53fe7c..d69ff1632ec1 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/pom.mustache
@@ -134,12 +134,13 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.8</swagger-core-version>
+    <swagger-core-version>1.5.9</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <jersey2-version>2.6</jersey2-version>
-    <slf4j-version>1.6.3</slf4j-version>
-    <junit-version>4.8.1</junit-version>
-    <logback-version>1.0.1</logback-version>
+    <jersey2-version>2.22.2</jersey2-version>
+    <slf4j-version>1.7.21</slf4j-version>
+    <junit-version>4.12</junit-version>
+    <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/project/build.properties b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/project/build.properties
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/project/build.properties
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/project/build.properties
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/project/plugins.sbt b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/project/plugins.sbt
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/project/plugins.sbt
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/project/plugins.sbt
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/queryParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/queryParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/queryParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/returnTypes.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/returnTypes.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/returnTypes.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/returnTypes.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceBodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/serviceBodyParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceBodyParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/serviceBodyParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceFormParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/serviceFormParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceFormParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/serviceFormParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceHeaderParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/serviceHeaderParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceHeaderParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/serviceHeaderParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/servicePathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/servicePathParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/servicePathParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/servicePathParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceQueryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/serviceQueryParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/serviceQueryParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/serviceQueryParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/web.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/web.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey2/web.mustache
rename to modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey2/web.mustache
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java
index 4a4e6ff91802..6080860735f3 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java
@@ -17,7 +17,7 @@ import java.nio.charset.StandardCharsets;
 
 public class AllowableValuesTest {
 
-    private static final String TEMPLATE_FILE = "JavaJaxRS/jersey1_18/allowableValues.mustache";
+    private static final String TEMPLATE_FILE = "JavaJaxRS/libraries/jersey1/allowableValues.mustache";
     private static final String PROVIDER_NAME = "operations";
 
     private static String loadClassResource(Class<?> cls, String name) throws IOException {
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java
index ddc8f2af06fa..51dcd5fc90d7 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxRSServerOptionsTest.java
@@ -46,7 +46,8 @@ public class JaxRSServerOptionsTest extends JavaClientOptionsTest {
             times = 1;
             clientCodegen.setSerializableModel(Boolean.valueOf(JaxRSServerOptionsProvider.SERIALIZABLE_MODEL_VALUE));
             times = 1;
-            clientCodegen.setLibrary(JaxRSServerOptionsProvider.DEFAULT_LIBRARY_VALUE);
+            //clientCodegen.setLibrary(JaxRSServerOptionsProvider.JAXRS_LIBRARY_VALUE);
+            clientCodegen.setLibrary("jersey1");
             times = 1;
             clientCodegen.setFullJavaUtil(Boolean.valueOf(JaxRSServerOptionsProvider.FULL_JAVA_UTIL_VALUE));
             times = 1;
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java
index f2735614f193..3006ed396c95 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java
@@ -2,12 +2,27 @@ package io.swagger.codegen.options;
 
 import com.google.common.collect.ImmutableMap;
 import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.languages.JavaClientCodegen;
 
 import java.util.Map;
 
-public class JaxRSServerOptionsProvider extends JavaOptionsProvider {
+public class JaxRSServerOptionsProvider implements OptionsProvider {
+    public static final String ARTIFACT_ID_VALUE = "swagger-java-client-test";
+    public static final String MODEL_PACKAGE_VALUE = "package";
+    public static final String API_PACKAGE_VALUE = "apiPackage";
+    public static final String INVOKER_PACKAGE_VALUE = "io.swagger.client.test";
+    public static final String SORT_PARAMS_VALUE = "false";
+    public static final String GROUP_ID_VALUE = "io.swagger.test";
+    public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT";
+    public static final String SOURCE_FOLDER_VALUE = "src/main/java/test";
+    public static final String LOCAL_PREFIX_VALUE = "tst";
+    public static final String DEFAULT_LIBRARY_VALUE = "jersey2";
+    public static final String SERIALIZABLE_MODEL_VALUE = "false";
+    public static final String FULL_JAVA_UTIL_VALUE = "true";
+    public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
     public static final String JODA_DATE_LIBRARY = "joda";
-    public static final String IMPL_FOLDER_VALUE = "src/main/java/impl";	
+    public static final String IMPL_FOLDER_VALUE = "src/main/java/impl";
+    public static final String JAXRS_DEFAULT_LIBRARY_VALUE = "jersey1";
 
     @Override
     public boolean isServer() {
@@ -21,13 +36,27 @@ public class JaxRSServerOptionsProvider extends JavaOptionsProvider {
 
     @Override
     public Map<String, String> createOptions() {
-        Map<String, String> options = super.createOptions();
-
         ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
-        builder.putAll(options)
-            .put(CodegenConstants.IMPL_FOLDER, IMPL_FOLDER_VALUE)
-            //.put(JavaJaxRSJersey1ServerCodegen.DATE_LIBRARY, "joda") //java.lang.IllegalArgumentException: Multiple entries with same key: dateLibrary=joda and dateLibrary=joda
-            .put("title", "Test title");
+        builder.put(CodegenConstants.IMPL_FOLDER, IMPL_FOLDER_VALUE)
+            .put(JavaClientCodegen.DATE_LIBRARY, "joda") //java.lang.IllegalArgumentException: Multiple entries with same key: dateLibrary=joda and dateLibrary=joda
+            .put("title", "Test title")
+            .put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE)
+            .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE)
+            .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE)
+            .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
+            .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE)
+            .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE)
+            .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE)
+            .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE)
+            .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE)
+            .put(CodegenConstants.LOCAL_VARIABLE_PREFIX, LOCAL_PREFIX_VALUE)
+            .put(CodegenConstants.SERIALIZABLE_MODEL, SERIALIZABLE_MODEL_VALUE)
+            .put(JavaClientCodegen.FULL_JAVA_UTIL, FULL_JAVA_UTIL_VALUE)
+            .put(CodegenConstants.LIBRARY, JAXRS_DEFAULT_LIBRARY_VALUE)
+            .put(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, "true")
+            .put(JavaClientCodegen.USE_RX_JAVA, "false")
+            //.put(JavaClientCodegen.DATE_LIBRARY, "joda")
+            .put("hideGenerationTimestamp", "true");
 
         return builder.build();
     }
diff --git a/pom.xml b/pom.xml
index 2b6c45f8662c..af8c8544e817 100644
--- a/pom.xml
+++ b/pom.xml
@@ -435,7 +435,19 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/server/petstore/jaxrs</module>
+                <module>samples/server/petstore/jaxrs/jersey2</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>jaxrs-server-jersey1</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/server/petstore/jaxrs/jersey1</module>
             </modules>
         </profile>
         <profile>
@@ -564,7 +576,8 @@
                 <module>samples/client/petstore/javascript</module>
                 <module>samples/client/petstore/scala</module>
                 <module>samples/server/petstore/spring-mvc</module>
-                <module>samples/server/petstore/jaxrs</module>
+                <module>samples/server/petstore/jaxrs/jersey1</module>
+                <module>samples/server/petstore/jaxrs/jersey2</module>
                 <module>samples/server/petstore/jaxrs-resteasy</module>
                 <!--module>samples/client/petstore/objc/SwaggerClientTests</module-->
                 <!--module>samples/client/petstore/swift/SwaggerClientTests</module-->
diff --git a/samples/server/petstore/jaxrs/jersey1/.swagger-codegen-ignore b/samples/server/petstore/jaxrs/jersey1/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey1/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/server/petstore/jaxrs/jersey1/LICENSE b/samples/server/petstore/jaxrs/jersey1/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey1/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/server/petstore/jaxrs/README.md b/samples/server/petstore/jaxrs/jersey1/README.md
similarity index 100%
rename from samples/server/petstore/jaxrs/README.md
rename to samples/server/petstore/jaxrs/jersey1/README.md
diff --git a/samples/server/petstore/jaxrs/pom.xml b/samples/server/petstore/jaxrs/jersey1/pom.xml
similarity index 93%
rename from samples/server/petstore/jaxrs/pom.xml
rename to samples/server/petstore/jaxrs/jersey1/pom.xml
index 9064489b34d7..4fb015cf78c8 100644
--- a/samples/server/petstore/jaxrs/pom.xml
+++ b/samples/server/petstore/jaxrs/jersey1/pom.xml
@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.swagger</groupId>
-  <artifactId>swagger-jaxrs-server</artifactId>
+  <artifactId>swagger-jaxrs-jersey1-server</artifactId>
   <packaging>jar</packaging>
-  <name>swagger-jaxrs-server</name>
+  <name>swagger-jaxrs-jersey1-server</name>
   <version>1.0.0</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
@@ -168,11 +168,12 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.8</swagger-core-version>
+    <swagger-core-version>1.5.9</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <jersey-version>1.18.1</jersey-version>
-    <slf4j-version>1.6.3</slf4j-version>
-    <junit-version>4.8.1</junit-version>
+    <jersey-version>1.19.1</jersey-version>
+    <slf4j-version>1.7.21</slf4j-version>
+    <junit-version>4.12</junit-version>
     <servlet-api-version>2.5</servlet-api-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/ApiException.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiException.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/ApiException.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/ApiOriginFilter.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiOriginFilter.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/ApiOriginFilter.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/ApiResponseMessage.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/ApiResponseMessage.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/ApiResponseMessage.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/JacksonJsonProvider.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/JacksonJsonProvider.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/JacksonJsonProvider.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/JacksonJsonProvider.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/NotFoundException.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/NotFoundException.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/NotFoundException.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/PetApi.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/PetApi.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/PetApiService.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApiService.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/PetApiService.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/StoreApi.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/StoreApi.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/StoreApiService.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApiService.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/StoreApiService.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StringUtil.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/StringUtil.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StringUtil.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/StringUtil.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/UserApi.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/UserApi.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/UserApiService.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApiService.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/UserApiService.java
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java
new file mode 100644
index 000000000000..f76411d073a3
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java
@@ -0,0 +1,94 @@
+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;
+
+
+
+
+
+
+public class Category   {
+  
+  private Long id = null;
+  private String name = null;
+
+  /**
+   **/
+  public Category id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  public Category name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Category category = (Category) o;
+    return Objects.equals(id, category.id) &&
+        Objects.equals(name, category.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ApiResponse.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java
similarity index 79%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ApiResponse.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java
index ac9fb970f82b..9c61a7434e7c 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ApiResponse.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java
@@ -2,6 +2,7 @@ package io.swagger.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 
 
-public class ApiResponse   {
+public class ModelApiResponse   {
   
   private Integer code = null;
   private String type = null;
@@ -18,7 +19,7 @@ public class ApiResponse   {
 
   /**
    **/
-  public ApiResponse code(Integer code) {
+  public ModelApiResponse code(Integer code) {
     this.code = code;
     return this;
   }
@@ -35,7 +36,7 @@ public class ApiResponse   {
 
   /**
    **/
-  public ApiResponse type(String type) {
+  public ModelApiResponse type(String type) {
     this.type = type;
     return this;
   }
@@ -52,7 +53,7 @@ public class ApiResponse   {
 
   /**
    **/
-  public ApiResponse message(String message) {
+  public ModelApiResponse message(String message) {
     this.message = message;
     return this;
   }
@@ -76,10 +77,10 @@ public class ApiResponse   {
     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);
+    ModelApiResponse _apiResponse = (ModelApiResponse) o;
+    return Objects.equals(code, _apiResponse.code) &&
+        Objects.equals(type, _apiResponse.type) &&
+        Objects.equals(message, _apiResponse.message);
   }
 
   @Override
@@ -90,7 +91,7 @@ public class ApiResponse   {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class ApiResponse {\n");
+    sb.append("class ModelApiResponse {\n");
     
     sb.append("    code: ").append(toIndentedString(code)).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java
rename to samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java
new file mode 100644
index 000000000000..f203b01f55ba
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java
@@ -0,0 +1,94 @@
+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;
+
+
+
+
+
+
+public class Tag   {
+  
+  private Long id = null;
+  private String name = null;
+
+  /**
+   **/
+  public Tag id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  public Tag name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Tag tag = (Tag) o;
+    return Objects.equals(id, tag.id) &&
+        Objects.equals(name, tag.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java
new file mode 100644
index 000000000000..f239bb3febc8
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java
@@ -0,0 +1,215 @@
+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;
+
+
+
+
+
+
+public class User   {
+  
+  private Long id = null;
+  private String username = null;
+  private String firstName = null;
+  private String lastName = null;
+  private String email = null;
+  private String password = null;
+  private String phone = null;
+  private Integer userStatus = null;
+
+  /**
+   **/
+  public User id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  public User username(String username) {
+    this.username = username;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("username")
+  public String getUsername() {
+    return username;
+  }
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  /**
+   **/
+  public User firstName(String firstName) {
+    this.firstName = firstName;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
+  public String getFirstName() {
+    return firstName;
+  }
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  /**
+   **/
+  public User lastName(String lastName) {
+    this.lastName = lastName;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
+  public String getLastName() {
+    return lastName;
+  }
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  /**
+   **/
+  public User email(String email) {
+    this.email = email;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("email")
+  public String getEmail() {
+    return email;
+  }
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  /**
+   **/
+  public User password(String password) {
+    this.password = password;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("password")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  /**
+   **/
+  public User phone(String phone) {
+    this.phone = phone;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("phone")
+  public String getPhone() {
+    return phone;
+  }
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
+
+  /**
+   * User Status
+   **/
+  public User userStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
+  public Integer getUserStatus() {
+    return userStatus;
+  }
+  public void setUserStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    User user = (User) o;
+    return Objects.equals(id, user.id) &&
+        Objects.equals(username, user.username) &&
+        Objects.equals(firstName, user.firstName) &&
+        Objects.equals(lastName, user.lastName) &&
+        Objects.equals(email, user.email) &&
+        Objects.equals(password, user.password) &&
+        Objects.equals(phone, user.phone) &&
+        Objects.equals(userStatus, user.userStatus);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    username: ").append(toIndentedString(username)).append("\n");
+    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
+    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
+    sb.append("    email: ").append(toIndentedString(email)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
+    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/Bootstrap.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/Bootstrap.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/main/java/io/swagger/api/Bootstrap.java
rename to samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/Bootstrap.java
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
similarity index 68%
rename from samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
rename to samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
index 8a15fd9a8ade..54ae4b48435f 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
@@ -3,7 +3,7 @@ package io.swagger.api.factories;
 import io.swagger.api.PetApiService;
 import io.swagger.api.impl.PetApiServiceImpl;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
+
 public class PetApiServiceFactory {
 
    private final static PetApiService service = new PetApiServiceImpl();
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
similarity index 69%
rename from samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
rename to samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
index 4f83a413c6f8..79a403fee065 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
@@ -3,7 +3,7 @@ package io.swagger.api.factories;
 import io.swagger.api.StoreApiService;
 import io.swagger.api.impl.StoreApiServiceImpl;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
+
 public class StoreApiServiceFactory {
 
    private final static StoreApiService service = new StoreApiServiceImpl();
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
similarity index 69%
rename from samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
rename to samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
index 0ce96e28a306..2f1ae542f1ba 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
@@ -3,7 +3,7 @@ package io.swagger.api.factories;
 import io.swagger.api.UserApiService;
 import io.swagger.api.impl.UserApiServiceImpl;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
+
 public class UserApiServiceFactory {
 
    private final static UserApiService service = new UserApiServiceImpl();
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
similarity index 92%
rename from samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
rename to samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
index a61831902126..0dc50dd1fcc8 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
@@ -6,8 +6,8 @@ import io.swagger.model.*;
 import com.sun.jersey.multipart.FormDataParam;
 
 import io.swagger.model.Pet;
-import io.swagger.model.ApiResponse;
 import java.io.File;
+import io.swagger.model.ModelApiResponse;
 
 import java.util.List;
 import io.swagger.api.NotFoundException;
@@ -20,63 +20,54 @@ import com.sun.jersey.multipart.FormDataParam;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
+
 public class PetApiServiceImpl extends PetApiService {
-    
     @Override
     public Response addPet(Pet body, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response deletePet(Long petId, String apiKey, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response findPetsByStatus(List<String> status, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response findPetsByTags(List<String> tags, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response getPetById(Long petId, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response updatePet(Pet body, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response updatePetWithForm(Long petId, String name, String status, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response uploadFile(Long petId, String additionalMetadata, InputStream inputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
 }
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
similarity index 90%
rename from samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
rename to samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
index d347d2b8f1f0..2b00aa8fad0d 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
@@ -19,35 +19,30 @@ import com.sun.jersey.multipart.FormDataParam;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
+
 public class StoreApiServiceImpl extends StoreApiService {
-    
     @Override
     public Response deleteOrder(String orderId, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response getInventory(SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response getOrderById(Long orderId, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response placeOrder(Order body, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
 }
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
similarity index 93%
rename from samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
rename to samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
index 5a73ac74e73d..902658f35a84 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
@@ -19,63 +19,54 @@ import com.sun.jersey.multipart.FormDataParam;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-03T13:30:41.715-06:00")
+
 public class UserApiServiceImpl extends UserApiService {
-    
     @Override
     public Response createUser(User body, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response createUsersWithArrayInput(List<User> body, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response createUsersWithListInput(List<User> body, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response deleteUser(String username, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response getUserByName(String username, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response loginUser(String username, String password, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response logoutUser(SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
     @Override
     public Response updateUser(String username, User body, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
-    
 }
diff --git a/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/jaxrs/jersey1/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml
rename to samples/server/petstore/jaxrs/jersey1/src/main/webapp/WEB-INF/web.xml
diff --git a/samples/server/petstore/jaxrs/jersey2/.swagger-codegen-ignore b/samples/server/petstore/jaxrs/jersey2/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/server/petstore/jaxrs/jersey2/LICENSE b/samples/server/petstore/jaxrs/jersey2/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/server/petstore/jaxrs/jersey2/README.md b/samples/server/petstore/jaxrs/jersey2/README.md
new file mode 100644
index 000000000000..4e7da8b7f63b
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/README.md
@@ -0,0 +1,23 @@
+# Swagger Jersey 2 generated server
+
+## Overview
+This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the 
+[OpenAPI-Spec](https://github.com/swagger-api/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
+is an example of building a swagger-enabled JAX-RS server.
+
+This example uses the [JAX-RS](https://jax-rs-spec.java.net/) framework.
+
+To run the server, please execute the following:
+
+```
+mvn clean package jetty:run
+```
+
+You can then view the swagger listing here:
+
+```
+http://localhost:8080/v2/swagger.json
+```
+
+Note that if you have configured the `host` to be something other than localhost, the calls through
+swagger-ui will be directed to that host and not localhost!
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml
new file mode 100644
index 000000000000..d1772e4f5e70
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/pom.xml
@@ -0,0 +1,146 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.swagger</groupId>
+  <artifactId>swagger-jaxrs-server</artifactId>
+  <packaging>jar</packaging>
+  <name>swagger-jaxrs-server</name>
+  <version>1.0.0</version>
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.1.1</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>${jetty-version}</version>
+        <configuration>
+          <webApp>
+            <contextPath>/</contextPath>
+          </webApp>
+          <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
+          <stopPort>8079</stopPort>
+          <stopKey>stopit</stopKey>
+          <httpConnector>
+            <port>8080</port>
+            <idleTimeout>60000</idleTimeout>
+          </httpConnector>
+        </configuration>
+        <executions>
+          <execution>
+            <id>start-jetty</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+            <configuration>
+              <scanIntervalSeconds>0</scanIntervalSeconds>
+              <daemon>true</daemon>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9.1</version>
+        <executions>
+          <execution>
+            <id>add-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>src/gen/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-jersey2-jaxrs</artifactId>
+      <scope>compile</scope>
+      <version>${swagger-core-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet-api-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.containers</groupId>
+      <artifactId>jersey-container-servlet-core</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-multipart</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>sonatype-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+  <properties>
+    <swagger-core-version>1.5.9</swagger-core-version>
+    <jetty-version>9.2.9.v20150224</jetty-version>
+    <jersey2-version>2.22.2</jersey2-version>
+    <slf4j-version>1.7.21</slf4j-version>
+    <junit-version>4.12</junit-version>
+    <logback-version>1.1.7</logback-version>
+    <servlet-api-version>2.5</servlet-api-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+</project>
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiException.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiException.java
new file mode 100644
index 000000000000..97e535d3c219
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiException.java
@@ -0,0 +1,10 @@
+package io.swagger.api;
+
+
+public class ApiException extends Exception{
+    private int code;
+    public ApiException (int code, String msg) {
+        super(msg);
+        this.code = code;
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiOriginFilter.java
new file mode 100644
index 000000000000..38791eef046a
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiOriginFilter.java
@@ -0,0 +1,22 @@
+package io.swagger.api;
+
+import java.io.IOException;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletResponse;
+
+
+public class ApiOriginFilter implements javax.servlet.Filter {
+    public void doFilter(ServletRequest request, ServletResponse response,
+            FilterChain chain) throws IOException, ServletException {
+        HttpServletResponse res = (HttpServletResponse) response;
+        res.addHeader("Access-Control-Allow-Origin", "*");
+        res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
+        res.addHeader("Access-Control-Allow-Headers", "Content-Type");
+        chain.doFilter(request, response);
+    }
+
+    public void destroy() {}
+
+    public void init(FilterConfig filterConfig) throws ServletException {}
+}
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiResponseMessage.java
new file mode 100644
index 000000000000..87db95c10095
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/ApiResponseMessage.java
@@ -0,0 +1,69 @@
+package io.swagger.api;
+
+import javax.xml.bind.annotation.XmlTransient;
+
+@javax.xml.bind.annotation.XmlRootElement
+
+public class ApiResponseMessage {
+    public static final int ERROR = 1;
+    public static final int WARNING = 2;
+    public static final int INFO = 3;
+    public static final int OK = 4;
+    public static final int TOO_BUSY = 5;
+
+    int code;
+    String type;
+    String message;
+
+    public ApiResponseMessage(){}
+
+    public ApiResponseMessage(int code, String message){
+        this.code = code;
+        switch(code){
+        case ERROR:
+            setType("error");
+            break;
+        case WARNING:
+            setType("warning");
+            break;
+        case INFO:
+            setType("info");
+            break;
+        case OK:
+            setType("ok");
+            break;
+        case TOO_BUSY:
+            setType("too busy");
+            break;
+        default:
+            setType("unknown");
+            break;
+        }
+        this.message = message;
+    }
+
+    @XmlTransient
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/JacksonJsonProvider.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/JacksonJsonProvider.java
new file mode 100644
index 000000000000..49792814c5ee
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/JacksonJsonProvider.java
@@ -0,0 +1,19 @@
+package io.swagger.api;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import io.swagger.util.Json;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces({MediaType.APPLICATION_JSON})
+public class JacksonJsonProvider extends JacksonJaxbJsonProvider {
+    private static ObjectMapper commonMapper = Json.mapper();
+
+    public JacksonJsonProvider() {
+        super.setMapper(commonMapper);
+    }
+}
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/NotFoundException.java
new file mode 100644
index 000000000000..b28b67ea4b2d
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/NotFoundException.java
@@ -0,0 +1,10 @@
+package io.swagger.api;
+
+
+public class NotFoundException extends ApiException {
+    private int code;
+    public NotFoundException (int code, String msg) {
+        super(code, msg);
+        this.code = code;
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/PetApi.java
new file mode 100644
index 000000000000..791d56e9eeb9
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/PetApi.java
@@ -0,0 +1,173 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+import io.swagger.api.PetApiService;
+import io.swagger.api.factories.PetApiServiceFactory;
+
+import io.swagger.annotations.ApiParam;
+
+import io.swagger.model.Pet;
+import java.io.File;
+import io.swagger.model.ModelApiResponse;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+
+@Path("/pet")
+
+
+@io.swagger.annotations.Api(description = "the pet API")
+
+public class PetApi  {
+   private final PetApiService delegate = PetApiServiceFactory.getPetApi();
+
+    @POST
+    
+    @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = void.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = void.class) })
+    public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.addPet(body,securityContext);
+    }
+    @DELETE
+    @Path("/{petId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = void.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = void.class) })
+    public Response deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathParam("petId") Long petId,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deletePet(petId,apiKey,securityContext);
+    }
+    @GET
+    @Path("/findByStatus")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Pet.class, responseContainer = "List") })
+    public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter",required=true) @QueryParam("status") List<String> status,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.findPetsByStatus(status,securityContext);
+    }
+    @GET
+    @Path("/findByTags")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "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")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class, responseContainer = "List") })
+    public Response findPetsByTags(@ApiParam(value = "Tags to filter by",required=true) @QueryParam("tags") List<String> tags,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.findPetsByTags(tags,securityContext);
+    }
+    @GET
+    @Path("/{petId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "api_key")
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Pet.class) })
+    public Response getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathParam("petId") Long petId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getPetById(petId,securityContext);
+    }
+    @PUT
+    
+    @Consumes({ "application/json", "application/xml" })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = void.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = void.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = void.class) })
+    public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.updatePet(body,securityContext);
+    }
+    @POST
+    @Path("/{petId}")
+    @Consumes({ "application/x-www-form-urlencoded" })
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = void.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = void.class) })
+    public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true) @PathParam("petId") Long petId,@ApiParam(value = "Updated name of the pet")@FormParam("name")  String name,@ApiParam(value = "Updated status of the pet")@FormParam("status")  String status,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.updatePetWithForm(petId,name,status,securityContext);
+    }
+    @POST
+    @Path("/{petId}/uploadImage")
+    @Consumes({ "multipart/form-data" })
+    @Produces({ "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = ModelApiResponse.class, authorizations = {
+        @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = {
+            @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+            @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets")
+        })
+    }, tags={ "pet", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
+    public Response uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathParam("petId") Long petId,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata")  String additionalMetadata,
+            @FormDataParam("file") InputStream inputStream,
+            @FormDataParam("file") FormDataContentDisposition fileDetail,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.uploadFile(petId,additionalMetadata,inputStream, fileDetail,securityContext);
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/PetApiService.java
new file mode 100644
index 000000000000..e472a575fae3
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/PetApiService.java
@@ -0,0 +1,30 @@
+package io.swagger.api;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import io.swagger.model.Pet;
+import java.io.File;
+import io.swagger.model.ModelApiResponse;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+
+public abstract class PetApiService {
+    public abstract Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response findPetsByStatus(List<String> status,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response findPetsByTags(List<String> tags,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response updatePet(Pet body,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream inputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext) throws NotFoundException;
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/StoreApi.java
new file mode 100644
index 000000000000..7319e0465f0f
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/StoreApi.java
@@ -0,0 +1,87 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+import io.swagger.api.StoreApiService;
+import io.swagger.api.factories.StoreApiServiceFactory;
+
+import io.swagger.annotations.ApiParam;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+
+@Path("/store")
+
+
+@io.swagger.annotations.Api(description = "the store API")
+
+public class StoreApi  {
+   private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
+
+    @DELETE
+    @Path("/order/{orderId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with 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") String orderId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deleteOrder(orderId,securityContext);
+    }
+    @GET
+    @Path("/inventory")
+    
+    @Produces({ "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
+        @io.swagger.annotations.Authorization(value = "api_key")
+    }, tags={ "store", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Integer.class, responseContainer = "Map") })
+    public Response getInventory(@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getInventory(securityContext);
+    }
+    @GET
+    @Path("/order/{orderId}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 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),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Order.class) })
+    public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("orderId") Long orderId,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getOrderById(orderId,securityContext);
+    }
+    @POST
+    @Path("/order")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Order.class) })
+    public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.placeOrder(body,securityContext);
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/StoreApiService.java
new file mode 100644
index 000000000000..5ef766d6aa70
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/StoreApiService.java
@@ -0,0 +1,25 @@
+package io.swagger.api;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+
+public abstract class StoreApiService {
+    public abstract Response deleteOrder(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/jersey2/src/gen/java/io/swagger/api/StringUtil.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/StringUtil.java
new file mode 100644
index 000000000000..6f4a3dadbbf8
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/StringUtil.java
@@ -0,0 +1,42 @@
+package io.swagger.api;
+
+
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) return true;
+      if (value != null && value.equalsIgnoreCase(str)) return true;
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) return "";
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/UserApi.java
new file mode 100644
index 000000000000..ed3d4e4ead4f
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/UserApi.java
@@ -0,0 +1,131 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+import io.swagger.api.UserApiService;
+import io.swagger.api.factories.UserApiServiceFactory;
+
+import io.swagger.annotations.ApiParam;
+
+import io.swagger.model.User;
+import java.util.List;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+
+@Path("/user")
+
+
+@io.swagger.annotations.Api(description = "the user API")
+
+public class UserApi  {
+   private final UserApiService delegate = UserApiServiceFactory.getUserApi();
+
+    @POST
+    
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.createUser(body,securityContext);
+    }
+    @POST
+    @Path("/createWithArray")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.createUsersWithArrayInput(body,securityContext);
+    }
+    @POST
+    @Path("/createWithList")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List<User> body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.createUsersWithListInput(body,securityContext);
+    }
+    @DELETE
+    @Path("/{username}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = void.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = void.class) })
+    public Response deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathParam("username") String username,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.deleteUser(username,securityContext);
+    }
+    @GET
+    @Path("/{username}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = User.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = User.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = User.class) })
+    public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true) @PathParam("username") String username,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.getUserByName(username,securityContext);
+    }
+    @GET
+    @Path("/login")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Logs user into the system", notes = "", response = String.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) })
+    public Response loginUser(@ApiParam(value = "The user name for login",required=true) @QueryParam("username") String username,@ApiParam(value = "The password for login in clear text",required=true) @QueryParam("password") String password,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.loginUser(username,password,securityContext);
+    }
+    @GET
+    @Path("/logout")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) })
+    public Response logoutUser(@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.logoutUser(securityContext);
+    }
+    @PUT
+    @Path("/{username}")
+    
+    @Produces({ "application/xml", "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = void.class, tags={ "user", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = void.class),
+        
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = void.class) })
+    public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username,@ApiParam(value = "Updated user object" ,required=true) User body,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.updateUser(username,body,securityContext);
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/UserApiService.java
new file mode 100644
index 000000000000..ceff72b6391d
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/UserApiService.java
@@ -0,0 +1,29 @@
+package io.swagger.api;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import io.swagger.model.User;
+import java.util.List;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+
+public abstract class UserApiService {
+    public abstract Response createUser(User body,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response createUsersWithArrayInput(List<User> body,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response createUsersWithListInput(List<User> body,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response deleteUser(String username,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response getUserByName(String username,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response loginUser(String username,String password,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response logoutUser(SecurityContext securityContext) throws NotFoundException;
+    public abstract Response updateUser(String username,User body,SecurityContext securityContext) throws NotFoundException;
+}
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Category.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java
rename to samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Category.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ModelApiResponse.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/ModelApiResponse.java
rename to samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ModelApiResponse.java
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Order.java
new file mode 100644
index 000000000000..825fa282b8b0
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Order.java
@@ -0,0 +1,196 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+
+
+
+
+
+public class Order   {
+  
+  private Long id = null;
+  private Long petId = null;
+  private Integer quantity = null;
+  private Date shipDate = null;
+
+
+  public enum StatusEnum {
+    PLACED("placed"),
+    APPROVED("approved"),
+    DELIVERED("delivered");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+  private StatusEnum status = null;
+  private Boolean complete = false;
+
+  /**
+   **/
+  public Order id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  public Order petId(Long petId) {
+    this.petId = petId;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("petId")
+  public Long getPetId() {
+    return petId;
+  }
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+
+  /**
+   **/
+  public Order quantity(Integer quantity) {
+    this.quantity = quantity;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
+  public Integer getQuantity() {
+    return quantity;
+  }
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+
+  /**
+   **/
+  public Order shipDate(Date shipDate) {
+    this.shipDate = shipDate;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
+  public Date getShipDate() {
+    return shipDate;
+  }
+  public void setShipDate(Date shipDate) {
+    this.shipDate = shipDate;
+  }
+
+  /**
+   * Order Status
+   **/
+  public Order status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  /**
+   **/
+  public Order complete(Boolean complete) {
+    this.complete = complete;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("complete")
+  public Boolean getComplete() {
+    return complete;
+  }
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Order order = (Order) o;
+    return Objects.equals(id, order.id) &&
+        Objects.equals(petId, order.petId) &&
+        Objects.equals(quantity, order.quantity) &&
+        Objects.equals(shipDate, order.shipDate) &&
+        Objects.equals(status, order.status) &&
+        Objects.equals(complete, order.complete);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
+    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
+    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Pet.java
new file mode 100644
index 000000000000..24092cbee254
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Pet.java
@@ -0,0 +1,199 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.Category;
+import io.swagger.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+
+public class Pet   {
+  
+  private Long id = null;
+  private Category category = null;
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>();
+  private List<Tag> tags = new ArrayList<Tag>();
+
+
+  public enum StatusEnum {
+    AVAILABLE("available"),
+    PENDING("pending"),
+    SOLD("sold");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+  private StatusEnum status = null;
+
+  /**
+   **/
+  public Pet id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  public Pet category(Category category) {
+    this.category = category;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("category")
+  public Category getCategory() {
+    return category;
+  }
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
+  /**
+   **/
+  public Pet name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  
+  @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+   **/
+  public Pet photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
+
+  
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  /**
+   **/
+  public Pet tags(List<Tag> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("tags")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  /**
+   * pet status in the store
+   **/
+  public Pet status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Pet pet = (Pet) o;
+    return Objects.equals(id, pet.id) &&
+        Objects.equals(category, pet.category) &&
+        Objects.equals(name, pet.name) &&
+        Objects.equals(photoUrls, pet.photoUrls) &&
+        Objects.equals(tags, pet.tags) &&
+        Objects.equals(status, pet.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, category, name, photoUrls, tags, status);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Tag.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java
rename to samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Tag.java
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/User.java
similarity index 100%
rename from samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java
rename to samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/User.java
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/Bootstrap.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/Bootstrap.java
new file mode 100644
index 000000000000..1f60ed6cf4b5
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/Bootstrap.java
@@ -0,0 +1,31 @@
+package io.swagger.api;
+
+import io.swagger.jaxrs.config.SwaggerContextService;
+import io.swagger.models.*;
+
+import io.swagger.models.auth.*;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+public class Bootstrap extends HttpServlet {
+  @Override
+  public void init(ServletConfig config) throws ServletException {
+    Info info = new Info()
+      .title("Swagger Server")
+      .description("This is a sample server Petstore server.  You can find out more about 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"))
+      .license(new License()
+        .name("Apache 2.0")
+        .url("http://www.apache.org/licenses/LICENSE-2.0.html"));
+
+    ServletContext context = config.getServletContext();
+    Swagger swagger = new Swagger().info(info);
+
+    new SwaggerContextService().withServletConfig(config).updateSwagger(swagger);
+  }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
new file mode 100644
index 000000000000..43321e8c0e9f
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/PetApiServiceFactory.java
@@ -0,0 +1,13 @@
+package io.swagger.api.factories;
+
+import io.swagger.api.PetApiService;
+import io.swagger.api.impl.PetApiServiceImpl;
+
+
+public class PetApiServiceFactory {
+    private final static PetApiService service = new PetApiServiceImpl();
+
+    public static PetApiService getPetApi() {
+        return service;
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
new file mode 100644
index 000000000000..254fd0a9a7da
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/StoreApiServiceFactory.java
@@ -0,0 +1,13 @@
+package io.swagger.api.factories;
+
+import io.swagger.api.StoreApiService;
+import io.swagger.api.impl.StoreApiServiceImpl;
+
+
+public class StoreApiServiceFactory {
+    private final static StoreApiService service = new StoreApiServiceImpl();
+
+    public static StoreApiService getStoreApi() {
+        return service;
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
new file mode 100644
index 000000000000..4c50105bb50f
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/factories/UserApiServiceFactory.java
@@ -0,0 +1,13 @@
+package io.swagger.api.factories;
+
+import io.swagger.api.UserApiService;
+import io.swagger.api.impl.UserApiServiceImpl;
+
+
+public class UserApiServiceFactory {
+    private final static UserApiService service = new UserApiServiceImpl();
+
+    public static UserApiService getUserApi() {
+        return service;
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
new file mode 100644
index 000000000000..9c9b7b6c23b0
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
@@ -0,0 +1,62 @@
+package io.swagger.api.impl;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import io.swagger.model.Pet;
+import java.io.File;
+import io.swagger.model.ModelApiResponse;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+
+public class PetApiServiceImpl extends PetApiService {
+    @Override
+    public Response addPet(Pet body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response deletePet(Long petId, String apiKey, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response findPetsByStatus(List<String> status, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response findPetsByTags(List<String> tags, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response getPetById(Long petId, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response updatePet(Pet body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response updatePetWithForm(Long petId, String name, String status, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response uploadFile(Long petId, String additionalMetadata, InputStream inputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
new file mode 100644
index 000000000000..85e14b0bbe5b
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
@@ -0,0 +1,41 @@
+package io.swagger.api.impl;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+
+public class StoreApiServiceImpl extends StoreApiService {
+    @Override
+    public Response deleteOrder(String orderId, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response getInventory(SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response getOrderById(Long orderId, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response placeOrder(Order body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
new file mode 100644
index 000000000000..67bdeb908f63
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
@@ -0,0 +1,61 @@
+package io.swagger.api.impl;
+
+import io.swagger.api.*;
+import io.swagger.model.*;
+
+import io.swagger.model.User;
+import java.util.List;
+
+import java.util.List;
+import io.swagger.api.NotFoundException;
+
+import java.io.InputStream;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+
+public class UserApiServiceImpl extends UserApiService {
+    @Override
+    public Response createUser(User body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response createUsersWithArrayInput(List<User> body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response createUsersWithListInput(List<User> body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response deleteUser(String username, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response getUserByName(String username, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response loginUser(String username, String password, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response logoutUser(SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response updateUser(String username, User body, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/jaxrs/jersey2/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000000..66837dccab8e
--- /dev/null
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+    <servlet>
+        <servlet-name>jersey</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>jersey.config.server.provider.packages</param-name>
+            <param-value>
+                io.swagger.jaxrs.listing,
+                io.swagger.sample.resource,
+                io.swagger.api
+            </param-value>
+        </init-param>
+        <init-param>
+            <param-name>jersey.config.server.provider.classnames</param-name>
+            <param-value>org.glassfish.jersey.media.multipart.MultiPartFeature</param-value>
+        </init-param>
+        <init-param>
+            <param-name>jersey.config.server.wadl.disableWadl</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>Jersey2Config</servlet-name>
+        <servlet-class>io.swagger.jersey.config.JerseyJaxrsConfig</servlet-class>
+        <init-param>
+            <param-name>api.version</param-name>
+            <param-value>1.0.0</param-value>
+        </init-param>
+        <init-param>
+            <param-name>swagger.api.title</param-name>
+            <param-value>Swagger Server</param-value>
+        </init-param>
+        <init-param>
+            <param-name>swagger.api.basepath</param-name>
+            <param-value>http://petstore.swagger.io/v2</param-value>
+        </init-param>
+
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+    <servlet>
+        <servlet-name>Bootstrap</servlet-name>
+        <servlet-class>io.swagger.api.Bootstrap</servlet-class>
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>jersey</servlet-name>
+        <url-pattern>/v2/*</url-pattern>
+    </servlet-mapping>
+    <filter>
+        <filter-name>ApiOriginFilter</filter-name>
+        <filter-class>io.swagger.api.ApiOriginFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ApiOriginFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>

From 91c35509b8099c55d5e4a77b0f448a9d0a445978 Mon Sep 17 00:00:00 2001
From: Takuro Wada <taxpon@gmail.com>
Date: Thu, 2 Jun 2016 15:51:13 +0900
Subject: [PATCH 071/139] set 'None' to body for request if given body is
 'None' ( issue #3020 ) (#3021)

---
 .../src/main/resources/python/rest.mustache   |  5 +-
 samples/client/petstore/python/LICENSE        |  2 +-
 samples/client/petstore/python/README.md      | 14 ++--
 .../python/docs/AdditionalPropertiesClass.md  |  2 +
 .../client/petstore/python/docs/ArrayTest.md  |  3 +
 ...dPropertiesAndAdditionalPropertiesClass.md |  1 +
 .../models/additional_properties_class.py     | 54 ++++++++++++-
 .../swagger_client/models/array_test.py       | 80 ++++++++++++++++++-
 ...perties_and_additional_properties_class.py | 30 ++++++-
 .../petstore/python/swagger_client/rest.py    |  5 +-
 10 files changed, 180 insertions(+), 16 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/python/rest.mustache b/modules/swagger-codegen/src/main/resources/python/rest.mustache
index e09090a97948..1a6cf193b6c8 100644
--- a/modules/swagger-codegen/src/main/resources/python/rest.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/rest.mustache
@@ -122,8 +122,11 @@ class RESTClientObject(object):
                 if query_params:
                     url += '?' + urlencode(query_params)
                 if headers['Content-Type'] == 'application/json':
+                    request_body = None
+                    if body:
+                        request_body = json.dumps(body)
                     r = self.pool_manager.request(method, url,
-                                                  body=json.dumps(body),
+                                                  body=request_body,
                                                   headers=headers)
                 if headers['Content-Type'] == 'application/x-www-form-urlencoded':
                     r = self.pool_manager.request(method, url,
diff --git a/samples/client/petstore/python/LICENSE b/samples/client/petstore/python/LICENSE
index 9c8f3ea0871e..8dada3edaf50 100644
--- a/samples/client/petstore/python/LICENSE
+++ b/samples/client/petstore/python/LICENSE
@@ -198,4 +198,4 @@
    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.
\ No newline at end of file
+   limitations under the License.
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index 1c037fa92522..274de71c4358 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-05-26T21:44:18.823+01:00
+- Build date: 2016-06-02T12:44:41.178+09:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -130,12 +130,6 @@ Class | Method | HTTP request | Description
 ## Documentation For Authorization
 
 
-## api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
 ## petstore_auth
 
 - **Type**: OAuth
@@ -145,6 +139,12 @@ Class | Method | HTTP request | Description
  - **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
 
diff --git a/samples/client/petstore/python/docs/AdditionalPropertiesClass.md b/samples/client/petstore/python/docs/AdditionalPropertiesClass.md
index 420ac6efe677..ea12f270f025 100644
--- a/samples/client/petstore/python/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/python/docs/AdditionalPropertiesClass.md
@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**map_property** | **dict(str, str)** |  | [optional] 
+**map_of_map_property** | [**dict(str, dict(str, str))**](dict.md) |  | [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/ArrayTest.md b/samples/client/petstore/python/docs/ArrayTest.md
index 9dcc2c97264c..6ab0d1378065 100644
--- a/samples/client/petstore/python/docs/ArrayTest.md
+++ b/samples/client/petstore/python/docs/ArrayTest.md
@@ -3,6 +3,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**array_of_string** | **list[str]** |  | [optional] 
+**array_array_of_integer** | **list[list[int]]** |  | [optional] 
+**array_array_of_model** | **list[list[ReadOnlyFirst]]** |  | [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/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 1f8d83427a2c..b9808d5275e5 100644
--- a/samples/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **uuid** | **str** |  | [optional] 
 **date_time** | **datetime** |  | [optional] 
+**map** | [**dict(str, Animal)**](Animal.md) |  | [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/swagger_client/models/additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
index ed19d7536aee..c62cc80cd8a2 100644
--- a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
@@ -42,13 +42,63 @@ class AdditionalPropertiesClass(object):
                                   and the value is json key in definition.
         """
         self.swagger_types = {
-            
+            'map_property': 'dict(str, str)',
+            'map_of_map_property': 'dict(str, dict(str, str))'
         }
 
         self.attribute_map = {
-            
+            'map_property': 'map_property',
+            'map_of_map_property': 'map_of_map_property'
         }
 
+        self._map_property = None
+        self._map_of_map_property = None
+
+    @property
+    def map_property(self):
+        """
+        Gets the map_property of this AdditionalPropertiesClass.
+
+
+        :return: The map_property of this AdditionalPropertiesClass.
+        :rtype: dict(str, str)
+        """
+        return self._map_property
+
+    @map_property.setter
+    def map_property(self, map_property):
+        """
+        Sets the map_property of this AdditionalPropertiesClass.
+
+
+        :param map_property: The map_property of this AdditionalPropertiesClass.
+        :type: dict(str, str)
+        """
+        
+        self._map_property = map_property
+
+    @property
+    def map_of_map_property(self):
+        """
+        Gets the map_of_map_property of this AdditionalPropertiesClass.
+
+
+        :return: The map_of_map_property of this AdditionalPropertiesClass.
+        :rtype: dict(str, dict(str, str))
+        """
+        return self._map_of_map_property
+
+    @map_of_map_property.setter
+    def map_of_map_property(self, map_of_map_property):
+        """
+        Sets the map_of_map_property of this AdditionalPropertiesClass.
+
+
+        :param map_of_map_property: The map_of_map_property of this AdditionalPropertiesClass.
+        :type: dict(str, dict(str, str))
+        """
+        
+        self._map_of_map_property = map_of_map_property
 
     def to_dict(self):
         """
diff --git a/samples/client/petstore/python/swagger_client/models/array_test.py b/samples/client/petstore/python/swagger_client/models/array_test.py
index ab340f1d1305..def23e7cd5e4 100644
--- a/samples/client/petstore/python/swagger_client/models/array_test.py
+++ b/samples/client/petstore/python/swagger_client/models/array_test.py
@@ -42,13 +42,89 @@ class ArrayTest(object):
                                   and the value is json key in definition.
         """
         self.swagger_types = {
-            
+            'array_of_string': 'list[str]',
+            'array_array_of_integer': 'list[list[int]]',
+            'array_array_of_model': 'list[list[ReadOnlyFirst]]'
         }
 
         self.attribute_map = {
-            
+            'array_of_string': 'array_of_string',
+            'array_array_of_integer': 'array_array_of_integer',
+            'array_array_of_model': 'array_array_of_model'
         }
 
+        self._array_of_string = None
+        self._array_array_of_integer = None
+        self._array_array_of_model = None
+
+    @property
+    def array_of_string(self):
+        """
+        Gets the array_of_string of this ArrayTest.
+
+
+        :return: The array_of_string of this ArrayTest.
+        :rtype: list[str]
+        """
+        return self._array_of_string
+
+    @array_of_string.setter
+    def array_of_string(self, array_of_string):
+        """
+        Sets the array_of_string of this ArrayTest.
+
+
+        :param array_of_string: The array_of_string of this ArrayTest.
+        :type: list[str]
+        """
+        
+        self._array_of_string = array_of_string
+
+    @property
+    def array_array_of_integer(self):
+        """
+        Gets the array_array_of_integer of this ArrayTest.
+
+
+        :return: The array_array_of_integer of this ArrayTest.
+        :rtype: list[list[int]]
+        """
+        return self._array_array_of_integer
+
+    @array_array_of_integer.setter
+    def array_array_of_integer(self, array_array_of_integer):
+        """
+        Sets the array_array_of_integer of this ArrayTest.
+
+
+        :param array_array_of_integer: The array_array_of_integer of this ArrayTest.
+        :type: list[list[int]]
+        """
+        
+        self._array_array_of_integer = array_array_of_integer
+
+    @property
+    def array_array_of_model(self):
+        """
+        Gets the array_array_of_model of this ArrayTest.
+
+
+        :return: The array_array_of_model of this ArrayTest.
+        :rtype: list[list[ReadOnlyFirst]]
+        """
+        return self._array_array_of_model
+
+    @array_array_of_model.setter
+    def array_array_of_model(self, array_array_of_model):
+        """
+        Sets the array_array_of_model of this ArrayTest.
+
+
+        :param array_array_of_model: The array_array_of_model of this ArrayTest.
+        :type: list[list[ReadOnlyFirst]]
+        """
+        
+        self._array_array_of_model = array_array_of_model
 
     def to_dict(self):
         """
diff --git a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
index 90b9dcc7d795..2122cabdb530 100644
--- a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
@@ -43,16 +43,19 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
         """
         self.swagger_types = {
             'uuid': 'str',
-            'date_time': 'datetime'
+            'date_time': 'datetime',
+            'map': 'dict(str, Animal)'
         }
 
         self.attribute_map = {
             'uuid': 'uuid',
-            'date_time': 'dateTime'
+            'date_time': 'dateTime',
+            'map': 'map'
         }
 
         self._uuid = None
         self._date_time = None
+        self._map = None
 
     @property
     def uuid(self):
@@ -100,6 +103,29 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
         
         self._date_time = date_time
 
+    @property
+    def map(self):
+        """
+        Gets the map of this MixedPropertiesAndAdditionalPropertiesClass.
+
+
+        :return: The map of this MixedPropertiesAndAdditionalPropertiesClass.
+        :rtype: dict(str, Animal)
+        """
+        return self._map
+
+    @map.setter
+    def map(self, map):
+        """
+        Sets the map of this MixedPropertiesAndAdditionalPropertiesClass.
+
+
+        :param map: The map of this MixedPropertiesAndAdditionalPropertiesClass.
+        :type: dict(str, Animal)
+        """
+        
+        self._map = map
+
     def to_dict(self):
         """
         Returns the model properties as a dict
diff --git a/samples/client/petstore/python/swagger_client/rest.py b/samples/client/petstore/python/swagger_client/rest.py
index 96c3b6dabccd..de53bcacdb1f 100644
--- a/samples/client/petstore/python/swagger_client/rest.py
+++ b/samples/client/petstore/python/swagger_client/rest.py
@@ -142,8 +142,11 @@ class RESTClientObject(object):
                 if query_params:
                     url += '?' + urlencode(query_params)
                 if headers['Content-Type'] == 'application/json':
+                    request_body = None
+                    if body:
+                        request_body = json.dumps(body)
                     r = self.pool_manager.request(method, url,
-                                                  body=json.dumps(body),
+                                                  body=request_body,
                                                   headers=headers)
                 if headers['Content-Type'] == 'application/x-www-form-urlencoded':
                     r = self.pool_manager.request(method, url,

From a3610f1c12e5d7912cf2e9f16dff2152ef40291b Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Thu, 2 Jun 2016 17:37:11 +0800
Subject: [PATCH 072/139] [Java] fix warning in pom.xml (java okhttp-gson)
 (#3023)

* fix warning in pom.xml

* minor fix to pom (okhttp-gson)
---
 .../Java/libraries/okhttp-gson/pom.mustache    | 18 ++++++++++++++++--
 .../client/petstore/java/okhttp-gson/pom.xml   | 13 +++----------
 .../java/io/swagger/client/ApiException.java   |  2 +-
 .../java/io/swagger/client/Configuration.java  |  2 +-
 .../src/main/java/io/swagger/client/Pair.java  |  2 +-
 .../java/io/swagger/client/StringUtil.java     |  2 +-
 .../io/swagger/client/auth/ApiKeyAuth.java     |  2 +-
 .../java/io/swagger/client/auth/OAuth.java     |  2 +-
 8 files changed, 25 insertions(+), 18 deletions(-)

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 7f08e5afb58c..cfe169c5eca8 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
@@ -68,6 +68,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.10</version>
         <executions>
           <execution>
             <id>add_sources</id>
@@ -104,7 +105,7 @@
           <target>1.7</target>
         </configuration>
       </plugin>
-      <!-- For testing build.gradle -->
+      <!-- For testing build.gradle, build.sbt -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -123,9 +124,21 @@
               </arguments>
             </configuration>
           </execution>
+          <execution>
+            <id>sbt-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>sbt</executable>
+              <arguments>
+                <argument>publishLocal</argument>
+              </arguments>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
-
     </plugins>
   </build>
   <dependencies>
@@ -164,5 +177,6 @@
     <gson-version>2.6.2</gson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index c3b5fe9ac46b..638e1b9345ea 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -68,6 +68,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.10</version>
         <executions>
           <execution>
             <id>add_sources</id>
@@ -104,7 +105,7 @@
           <target>1.7</target>
         </configuration>
       </plugin>
-      <!-- For testing build.gradle -->
+      <!-- For testing build.gradle, build.sbt -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -123,14 +124,6 @@
               </arguments>
             </configuration>
           </execution>
-        </executions>
-      </plugin>
-      <!-- For testing build.sbt -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
           <execution>
             <id>sbt-test</id>
             <phase>integration-test</phase>
@@ -146,7 +139,6 @@
           </execution>
         </executions>
       </plugin>
-
     </plugins>
   </build>
   <dependencies>
@@ -185,5 +177,6 @@
     <gson-version>2.6.2</gson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </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 974c3becece7..52f50890ee7a 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+08:00")
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
index 46a1778050a0..8bdc725b16ba 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+08:00")
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
index e3848de9f9e2..78b5ef4b659f 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+08:00")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
index fe552d7ae8de..73b7f76070c3 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index 6b157ac6601c..cb388174bfc0 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+08:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
index c097462f5cd8..ef8c42b0ea39 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+08:00")
 public class OAuth implements Authentication {
   private String accessToken;
 

From 328787186c501d6a8abf214ff5d77bc47d668151 Mon Sep 17 00:00:00 2001
From: "Pablo Gra\\~na" <pablo.pg@gmail.com>
Date: Wed, 1 Jun 2016 18:42:06 -0300
Subject: [PATCH 073/139] Use UnsupportedOperationException.

Replaced NotImplementedException with UnsupportedOperationException. See
bug #3011.

Eclipse was throwing some errors related to differences in package names
vs file path. I renamed the packages io.swagger.codegen.Go to
io.swagger.codegen.go, io.swagger.codegen.slim to package
io.swagger.codegen.lumen and io.swagger.codegen.springBoot to
io.swagger.codegen.springboot in some test files.
---
 .../io/swagger/codegen/languages/HaskellServantCodegen.java   | 4 +---
 .../test/java/io/swagger/codegen/go/GoClientOptionsTest.java  | 4 ++--
 .../src/test/java/io/swagger/codegen/go/GoModelTest.java      | 2 +-
 .../java/io/swagger/codegen/lumen/LumenServerOptionsTest.java | 2 +-
 .../codegen/springboot/SpringBootServerOptionsTest.java       | 4 ++--
 5 files changed, 7 insertions(+), 9 deletions(-)

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 324ca56e70b4..08147f60f362 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
@@ -7,10 +7,8 @@ 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 {
 
@@ -432,7 +430,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
             case "pipes": return "(QueryList 'PipeSeparated (" + type + "))";
             case "multi": return "(QueryList 'MultiParamArray (" + type + "))";
             default:
-                throw new NotImplementedException();
+                throw new UnsupportedOperationException();
         }
     }
 
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
index 528666c58e52..5baf4f9eb1cd 100644
--- 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
@@ -1,4 +1,4 @@
-package io.swagger.codegen.Go;
+package io.swagger.codegen.go;
 
 import io.swagger.codegen.AbstractOptionsTest;
 import io.swagger.codegen.CodegenConfig;
@@ -29,7 +29,7 @@ public class GoClientOptionsTest extends AbstractOptionsTest {
             clientCodegen.setPackageVersion(GoClientOptionsProvider.PACKAGE_VERSION_VALUE);
             times = 1;
             clientCodegen.setPackageName(GoClientOptionsProvider.PACKAGE_NAME_VALUE);
-            times = 1;                        
+            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
index 83fa8d6437e4..ce9646398f08 100644
--- 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
@@ -1,4 +1,4 @@
-package io.swagger.codegen.Go;
+package io.swagger.codegen.go;
 
 import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenProperty;
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/lumen/LumenServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/lumen/LumenServerOptionsTest.java
index 71d9b3942f19..dcb89d263cc6 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/lumen/LumenServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/lumen/LumenServerOptionsTest.java
@@ -1,4 +1,4 @@
-package io.swagger.codegen.slim;
+package io.swagger.codegen.lumen;
 
 import io.swagger.codegen.AbstractOptionsTest;
 import io.swagger.codegen.CodegenConfig;
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
index a7ecdd9d9744..7228f119711e 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
@@ -1,4 +1,4 @@
-package io.swagger.codegen.springBoot;
+package io.swagger.codegen.springboot;
 
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.java.JavaClientOptionsTest;
@@ -54,7 +54,7 @@ public class SpringBootServerOptionsTest extends JavaClientOptionsTest {
             times = 1;
             clientCodegen.setBasePackage(SpringBootServerOptionsProvider.BASE_PACKAGE_VALUE);
             times = 1;
- 
+
         }};
     }
 }

From f0d3bd8f21194f63ddd225c05c0be00051077557 Mon Sep 17 00:00:00 2001
From: clasnake <classical.zhu@gmail.com>
Date: Fri, 3 Jun 2016 00:37:53 +0800
Subject: [PATCH 074/139] Add sbt support for jersey2, fix dependency issue for
 okhttp-gson.

---
 .../codegen/languages/JavaClientCodegen.java  |   2 +
 .../Java/libraries/jersey2/build.sbt.mustache |  25 +++
 .../libraries/okhttp-gson/build.sbt.mustache  |   3 +-
 .../java/jersey2/.swagger-codegen-ignore      |  23 ++
 samples/client/petstore/java/jersey2/LICENSE  | 201 ++++++++++++++++++
 .../client/petstore/java/jersey2/build.sbt    |  25 +++
 .../jersey2/docs/AdditionalPropertiesClass.md |  11 +
 .../petstore/java/jersey2/docs/Animal.md      |   1 +
 .../petstore/java/jersey2/docs/ArrayTest.md   |  12 ++
 .../client/petstore/java/jersey2/docs/Cat.md  |   1 +
 .../client/petstore/java/jersey2/docs/Dog.md  |   1 +
 .../petstore/java/jersey2/docs/FakeApi.md     |  10 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |  12 ++
 .../client/petstore/java/jersey2/docs/Name.md |   1 +
 .../java/jersey2/docs/ReadOnlyFirst.md        |  11 +
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 .../java/io/swagger/client/ApiException.java  |   2 +-
 .../java/io/swagger/client/Configuration.java |   2 +-
 .../src/main/java/io/swagger/client/JSON.java |   2 +-
 .../src/main/java/io/swagger/client/Pair.java |   2 +-
 .../java/io/swagger/client/StringUtil.java    |   2 +-
 .../java/io/swagger/client/api/FakeApi.java   |  10 +-
 .../java/io/swagger/client/api/PetApi.java    |   4 +-
 .../java/io/swagger/client/api/StoreApi.java  |   2 +-
 .../java/io/swagger/client/api/UserApi.java   |   2 +-
 .../io/swagger/client/auth/ApiKeyAuth.java    |   2 +-
 .../io/swagger/client/auth/HttpBasicAuth.java |   2 +-
 .../java/io/swagger/client/auth/OAuth.java    |   2 +-
 .../model/AdditionalPropertiesClass.java      |  97 +++++++++
 .../java/io/swagger/client/model/Animal.java  |  27 ++-
 .../io/swagger/client/model/AnimalFarm.java   |   3 +-
 .../io/swagger/client/model/ArrayTest.java    | 116 ++++++++++
 .../java/io/swagger/client/model/Cat.java     |  25 ++-
 .../io/swagger/client/model/Category.java     |   3 +-
 .../java/io/swagger/client/model/Dog.java     |  25 ++-
 .../io/swagger/client/model/EnumClass.java    |   1 +
 .../io/swagger/client/model/EnumTest.java     |   3 +-
 .../io/swagger/client/model/FormatTest.java   |   3 +-
 ...ropertiesAndAdditionalPropertiesClass.java | 119 +++++++++++
 .../client/model/Model200Response.java        |   3 +-
 .../client/model/ModelApiResponse.java        |   3 +-
 .../io/swagger/client/model/ModelReturn.java  |   3 +-
 .../java/io/swagger/client/model/Name.java    |  17 +-
 .../java/io/swagger/client/model/Order.java   |   3 +-
 .../java/io/swagger/client/model/Pet.java     |   3 +-
 .../swagger/client/model/ReadOnlyFirst.java   |  84 ++++++++
 .../client/model/SpecialModelName.java        |   3 +-
 .../java/io/swagger/client/model/Tag.java     |   3 +-
 .../java/io/swagger/client/model/User.java    |   3 +-
 .../petstore/java/okhttp-gson/build.sbt       |   3 +-
 .../java/io/swagger/client/ApiException.java  |   2 +-
 .../java/io/swagger/client/Configuration.java |   2 +-
 .../src/main/java/io/swagger/client/Pair.java |   2 +-
 .../java/io/swagger/client/StringUtil.java    |   2 +-
 .../java/io/swagger/client/api/FakeApi.java   |   2 +-
 .../java/io/swagger/client/api/PetApi.java    |   2 +-
 .../io/swagger/client/auth/ApiKeyAuth.java    |   2 +-
 .../java/io/swagger/client/auth/OAuth.java    |   2 +-
 58 files changed, 886 insertions(+), 55 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
 create mode 100644 samples/client/petstore/java/jersey2/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/java/jersey2/LICENSE
 create mode 100644 samples/client/petstore/java/jersey2/build.sbt
 create mode 100644 samples/client/petstore/java/jersey2/docs/AdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/jersey2/docs/ArrayTest.md
 create mode 100644 samples/client/petstore/java/jersey2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/jersey2/docs/ReadOnlyFirst.md
 create mode 100644 samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
 create mode 100644 samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
index 9f771f056078..903eb1f89424 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -352,6 +352,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
                     gradleWrapperPackage.replace( ".", File.separator ), "gradle-wrapper.properties") ); 
             supportingFiles.add( new SupportingFile( "gradle-wrapper.jar", 
                     gradleWrapperPackage.replace( ".", File.separator ), "gradle-wrapper.jar") );
+            // "build.sbt" is for development with SBT
+            supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
         }
 
         if(additionalProperties.containsKey(DATE_LIBRARY)) {
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
new file mode 100644
index 000000000000..0a297497d9db
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.sbt.mustache
@@ -0,0 +1,25 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "{{groupId}}",
+    name := "{{artifactId}}",
+    version := "{{artifactVersion}}",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "io.swagger" % "swagger-annotations" % "1.5.8",
+      "org.glassfish.jersey.core" % "jersey-client" % "2.22.2",
+      "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2",
+      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.1",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.0",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.0",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.0",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.1.5",
+      "joda-time" % "joda-time" % "2.9.3",
+      "com.brsanthu" % "migbase64" % "2.2",
+      "junit" % "junit" % "4.12" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
index c1d931bbc8bc..4673864fdd64 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
@@ -13,6 +13,7 @@ lazy val root = (project in file(".")).
       "com.squareup.okhttp" % "okhttp" % "2.7.5",
       "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
       "com.google.code.gson" % "gson" % "2.6.2",
-      "junit" % "junit" % "4.12" % "test"
+      "junit" % "junit" % "4.12" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
     )
   )
diff --git a/samples/client/petstore/java/jersey2/.swagger-codegen-ignore b/samples/client/petstore/java/jersey2/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/java/jersey2/LICENSE b/samples/client/petstore/java/jersey2/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/java/jersey2/build.sbt b/samples/client/petstore/java/jersey2/build.sbt
new file mode 100644
index 000000000000..08a215edacfa
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/build.sbt
@@ -0,0 +1,25 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "io.swagger",
+    name := "swagger-petstore-jersey2",
+    version := "1.0.0",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "io.swagger" % "swagger-annotations" % "1.5.8",
+      "org.glassfish.jersey.core" % "jersey-client" % "2.22.2",
+      "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2",
+      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.1",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.0",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.0",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.0",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.1.5",
+      "joda-time" % "joda-time" % "2.9.3",
+      "com.brsanthu" % "migbase64" % "2.2",
+      "junit" % "junit" % "4.12" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )
diff --git a/samples/client/petstore/java/jersey2/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/jersey2/docs/AdditionalPropertiesClass.md
new file mode 100644
index 000000000000..0437c4dd8cc7
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/docs/AdditionalPropertiesClass.md
@@ -0,0 +1,11 @@
+
+# AdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**mapProperty** | **Map&lt;String, String&gt;** |  |  [optional]
+**mapOfMapProperty** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/jersey2/docs/Animal.md b/samples/client/petstore/java/jersey2/docs/Animal.md
index 3ecb7f991f38..b3f325c3524d 100644
--- a/samples/client/petstore/java/jersey2/docs/Animal.md
+++ b/samples/client/petstore/java/jersey2/docs/Animal.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **String** |  | 
+**color** | **String** |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/jersey2/docs/ArrayTest.md b/samples/client/petstore/java/jersey2/docs/ArrayTest.md
new file mode 100644
index 000000000000..9feee16427fb
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/docs/ArrayTest.md
@@ -0,0 +1,12 @@
+
+# ArrayTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**arrayOfString** | **List&lt;String&gt;** |  |  [optional]
+**arrayArrayOfInteger** | [**List&lt;List&lt;Long&gt;&gt;**](List.md) |  |  [optional]
+**arrayArrayOfModel** | [**List&lt;List&lt;ReadOnlyFirst&gt;&gt;**](List.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/jersey2/docs/Cat.md b/samples/client/petstore/java/jersey2/docs/Cat.md
index 373af540c416..be6e56fa8ce3 100644
--- a/samples/client/petstore/java/jersey2/docs/Cat.md
+++ b/samples/client/petstore/java/jersey2/docs/Cat.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **String** |  | 
+**color** | **String** |  |  [optional]
 **declawed** | **Boolean** |  |  [optional]
 
 
diff --git a/samples/client/petstore/java/jersey2/docs/Dog.md b/samples/client/petstore/java/jersey2/docs/Dog.md
index a1d638d3badd..71a7dbe809e2 100644
--- a/samples/client/petstore/java/jersey2/docs/Dog.md
+++ b/samples/client/petstore/java/jersey2/docs/Dog.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **String** |  | 
+**color** | **String** |  |  [optional]
 **breed** | **String** |  |  [optional]
 
 
diff --git a/samples/client/petstore/java/jersey2/docs/FakeApi.md b/samples/client/petstore/java/jersey2/docs/FakeApi.md
index c1fdd3103218..8e15d4d1f690 100644
--- a/samples/client/petstore/java/jersey2/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey2/docs/FakeApi.md
@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
 
 <a name="testEndpointParameters"></a>
 # **testEndpointParameters**
 > testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password)
 
-Fake endpoint for testing various parameters
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
-Fake endpoint for testing various parameters
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
 ### Example
 ```java
@@ -70,6 +70,6 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
+ - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
 
diff --git a/samples/client/petstore/java/jersey2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/jersey2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
new file mode 100644
index 000000000000..00cc10ca9b3d
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -0,0 +1,12 @@
+
+# MixedPropertiesAndAdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**uuid** | **String** |  |  [optional]
+**dateTime** | [**Date**](Date.md) |  |  [optional]
+**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/jersey2/docs/Name.md b/samples/client/petstore/java/jersey2/docs/Name.md
index 5390a15e9cd7..ce2fb4dee50c 100644
--- a/samples/client/petstore/java/jersey2/docs/Name.md
+++ b/samples/client/petstore/java/jersey2/docs/Name.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **name** | **Integer** |  | 
 **snakeCase** | **Integer** |  |  [optional]
 **property** | **String** |  |  [optional]
+**_123Number** | **Integer** |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/jersey2/docs/ReadOnlyFirst.md b/samples/client/petstore/java/jersey2/docs/ReadOnlyFirst.md
new file mode 100644
index 000000000000..426b7cde95ab
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/docs/ReadOnlyFirst.md
@@ -0,0 +1,11 @@
+
+# ReadOnlyFirst
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**bar** | **String** |  |  [optional]
+**baz** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/jersey2/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/jersey2/gradle/wrapper/gradle-wrapper.properties
index 73377e009b00..b7a364739551 100644
--- a/samples/client/petstore/java/jersey2/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/client/petstore/java/jersey2/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue May 17 23:03:46 CST 2016
+#Tue May 17 23:08:05 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
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 d5c0fa366bd5..f1df4e680b16 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-04-23T12:58:40.273+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java
index 91b18d8f79cd..d6d665385701 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-04-23T12:58:40.273+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java
index a6ffdc8fbe74..4c7dfb78be4e 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-04-23T12:58:40.273+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java
index b35329906885..a06e22c9c41d 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-04-23T12:58:40.273+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java
index 6409e1b1765f..98c891040a00 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-04-23T12:58:40.273+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
index 33c74e7a51cb..bfae70fa0700 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
@@ -15,7 +15,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-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class FakeApi {
   private ApiClient apiClient;
 
@@ -36,8 +36,8 @@ public class FakeApi {
   }
 
   /**
-   * Fake endpoint for testing various parameters
-   * Fake endpoint for testing various parameters
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
    * @param number None (required)
    * @param _double None (required)
    * @param string None (required)
@@ -111,12 +111,12 @@ if (password != null)
       localVarFormParams.put("password", password);
 
     final String[] localVarAccepts = {
-      "application/xml", "application/json"
+      "application/xml; charset=utf-8", "application/json; charset=utf-8"
     };
     final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
     final String[] localVarContentTypes = {
-      
+      "application/xml; charset=utf-8", "application/json; charset=utf-8"
     };
     final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
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 39b9775f39de..22da96104df1 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
@@ -8,15 +8,15 @@ import io.swagger.client.Pair;
 import javax.ws.rs.core.GenericType;
 
 import io.swagger.client.model.Pet;
-import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
+import java.io.File;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class PetApi {
   private ApiClient apiClient;
 
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 d2a87ef01fa8..9a574beb07bf 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-04-23T12:58:40.273+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class StoreApi {
   private ApiClient apiClient;
 
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 b97e2357a4b3..165c388117a9 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-04-23T12:58:40.273+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class UserApi {
   private ApiClient apiClient;
 
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 62506180f536..2c2fb6e56c7c 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-04-23T12:58:40.273+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index 65681bc9aa58..4db9e5ba12e6 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-04-23T12:58:40.273+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java
index dda7cae0a059..f1255df65b8b 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-04-23T12:58:40.273+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
new file mode 100644
index 000000000000..bde6c4d8644b
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -0,0 +1,97 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * AdditionalPropertiesClass
+ */
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
+public class AdditionalPropertiesClass   {
+  
+  private Map<String, String> mapProperty = new HashMap<String, String>();
+  private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();
+
+  
+  /**
+   **/
+  public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
+    this.mapProperty = mapProperty;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("map_property")
+  public Map<String, String> getMapProperty() {
+    return mapProperty;
+  }
+  public void setMapProperty(Map<String, String> mapProperty) {
+    this.mapProperty = mapProperty;
+  }
+
+
+  /**
+   **/
+  public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
+    this.mapOfMapProperty = mapOfMapProperty;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("map_of_map_property")
+  public Map<String, Map<String, String>> getMapOfMapProperty() {
+    return mapOfMapProperty;
+  }
+  public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
+    this.mapOfMapProperty = mapOfMapProperty;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+    return Objects.equals(this.mapProperty, additionalPropertiesClass.mapProperty) &&
+        Objects.equals(this.mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapProperty, mapOfMapProperty);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesClass {\n");
+    
+    sb.append("    mapProperty: ").append(toIndentedString(mapProperty)).append("\n");
+    sb.append("    mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).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/Animal.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java
index 0781e60a4d49..41bb4fba559e 100644
--- 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -9,10 +10,11 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Animal
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class Animal   {
   
   private String className = null;
+  private String color = "red";
 
   
   /**
@@ -32,6 +34,23 @@ public class Animal   {
   }
 
 
+  /**
+   **/
+  public Animal color(String color) {
+    this.color = color;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("color")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -41,12 +60,13 @@ public class Animal   {
       return false;
     }
     Animal animal = (Animal) o;
-    return Objects.equals(this.className, animal.className);
+    return Objects.equals(this.className, animal.className) &&
+        Objects.equals(this.color, animal.color);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className);
+    return Objects.hash(className, color);
   }
 
   @Override
@@ -55,6 +75,7 @@ public class Animal   {
     sb.append("class Animal {\n");
     
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
index 04767c63252e..9582f66a2a14 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import io.swagger.client.model.Animal;
 import java.util.ArrayList;
@@ -9,7 +10,7 @@ import java.util.List;
 /**
  * AnimalFarm
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class AnimalFarm extends ArrayList<Animal>  {
   
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
new file mode 100644
index 000000000000..1f650fe32dd3
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -0,0 +1,116 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * ArrayTest
+ */
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
+public class ArrayTest   {
+  
+  private List<String> arrayOfString = new ArrayList<String>();
+  private List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+
+  
+  /**
+   **/
+  public ArrayTest arrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("array_of_string")
+  public List<String> getArrayOfString() {
+    return arrayOfString;
+  }
+  public void setArrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+  }
+
+
+  /**
+   **/
+  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("array_array_of_integer")
+  public List<List<Long>> getArrayArrayOfInteger() {
+    return arrayArrayOfInteger;
+  }
+  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+  }
+
+
+  /**
+   **/
+  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("array_array_of_model")
+  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+    return arrayArrayOfModel;
+  }
+  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayTest arrayTest = (ArrayTest) o;
+    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
+        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
+        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayTest {\n");
+    
+    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).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
index 8acadb9a2f63..176531a313dd 100644
--- 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -10,10 +11,11 @@ import io.swagger.client.model.Animal;
 /**
  * Cat
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class Cat extends Animal  {
   
   private String className = null;
+  private String color = "red";
   private Boolean declawed = null;
 
   
@@ -34,6 +36,23 @@ public class Cat extends Animal  {
   }
 
 
+  /**
+   **/
+  public Cat color(String color) {
+    this.color = color;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("color")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
+
   /**
    **/
   public Cat declawed(Boolean declawed) {
@@ -61,13 +80,14 @@ public class Cat extends Animal  {
     }
     Cat cat = (Cat) o;
     return Objects.equals(this.className, cat.className) &&
+        Objects.equals(this.color, cat.color) &&
         Objects.equals(this.declawed, cat.declawed) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className, declawed, super.hashCode());
+    return Objects.hash(className, color, declawed, super.hashCode());
   }
 
   @Override
@@ -76,6 +96,7 @@ public class Cat extends Animal  {
     sb.append("class Cat {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
     sb.append("}");
     return sb.toString();
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 763fcccf2a7b..4c6e5940bbe0 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -9,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Category
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class Category   {
   
   private Long id = null;
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
index a9e7e2acce02..ca8a3103ff9b 100644
--- 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -10,10 +11,11 @@ import io.swagger.client.model.Animal;
 /**
  * Dog
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class Dog extends Animal  {
   
   private String className = null;
+  private String color = "red";
   private String breed = null;
 
   
@@ -34,6 +36,23 @@ public class Dog extends Animal  {
   }
 
 
+  /**
+   **/
+  public Dog color(String color) {
+    this.color = color;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("color")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
+
   /**
    **/
   public Dog breed(String breed) {
@@ -61,13 +80,14 @@ public class Dog extends Animal  {
     }
     Dog dog = (Dog) o;
     return Objects.equals(this.className, dog.className) &&
+        Objects.equals(this.color, dog.color) &&
         Objects.equals(this.breed, dog.breed) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className, breed, super.hashCode());
+    return Objects.hash(className, color, breed, super.hashCode());
   }
 
   @Override
@@ -76,6 +96,7 @@ public class Dog extends Animal  {
     sb.append("class Dog {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
     sb.append("}");
     return sb.toString();
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java
index 716bfbbc85e1..42434e297fff 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
index 8152b4405993..21385d972e3f 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -10,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * EnumTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class EnumTest   {
   
 
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
index 4098e37a8a99..c4879177e7ed 100644
--- 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -11,7 +12,7 @@ import java.util.Date;
 /**
  * FormatTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class FormatTest   {
   
   private Integer integer = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
new file mode 100644
index 000000000000..cabacdb2aae9
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -0,0 +1,119 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+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;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * MixedPropertiesAndAdditionalPropertiesClass
+ */
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
+public class MixedPropertiesAndAdditionalPropertiesClass   {
+  
+  private String uuid = null;
+  private Date dateTime = null;
+  private Map<String, Animal> map = new HashMap<String, Animal>();
+
+  
+  /**
+   **/
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+    this.uuid = uuid;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("uuid")
+  public String getUuid() {
+    return uuid;
+  }
+  public void setUuid(String uuid) {
+    this.uuid = uuid;
+  }
+
+
+  /**
+   **/
+  public MixedPropertiesAndAdditionalPropertiesClass 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 MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+    this.map = map;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("map")
+  public Map<String, Animal> getMap() {
+    return map;
+  }
+  public void setMap(Map<String, Animal> map) {
+    this.map = map;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
+        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid, dateTime, map);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+    
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
index 0101cd5e8e3a..68988570f9e2 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -10,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 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.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class Model200Response   {
   
   private Integer name = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
index af6f23fd7824..574ed38b9809 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -9,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ModelApiResponse
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class ModelApiResponse   {
   
   private Integer code = null;
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 827c22bef67b..bc7b008027e1 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -10,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class ModelReturn   {
   
   private Integer _return = null;
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 b7209d46b191..2ae18c1fc41d 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -10,12 +11,13 @@ 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")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class Name   {
   
   private Integer name = null;
   private Integer snakeCase = null;
   private String property = null;
+  private Integer _123Number = null;
 
   
   /**
@@ -59,6 +61,13 @@ public class Name   {
   }
 
 
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("123Number")
+  public Integer get123Number() {
+    return _123Number;
+  }
+
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -70,12 +79,13 @@ public class Name   {
     Name name = (Name) o;
     return Objects.equals(this.name, name.name) &&
         Objects.equals(this.snakeCase, name.snakeCase) &&
-        Objects.equals(this.property, name.property);
+        Objects.equals(this.property, name.property) &&
+        Objects.equals(this._123Number, name._123Number);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, snakeCase, property);
+    return Objects.hash(name, snakeCase, property, _123Number);
   }
 
   @Override
@@ -86,6 +96,7 @@ public class Name   {
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
     sb.append("    property: ").append(toIndentedString(property)).append("\n");
+    sb.append("    _123Number: ").append(toIndentedString(_123Number)).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 322b2b832cb1..31a5f86c19a2 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -11,7 +12,7 @@ import java.util.Date;
 /**
  * Order
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class Order   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
index 07becbd4107e..b70db430ef90 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -14,7 +15,7 @@ import java.util.List;
 /**
  * Pet
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class Pet   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
new file mode 100644
index 000000000000..17f3f5b868ba
--- /dev/null
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -0,0 +1,84 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**
+ * ReadOnlyFirst
+ */
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
+public class ReadOnlyFirst   {
+  
+  private String bar = null;
+  private String baz = null;
+
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("bar")
+  public String getBar() {
+    return bar;
+  }
+
+
+  /**
+   **/
+  public ReadOnlyFirst baz(String baz) {
+    this.baz = baz;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("baz")
+  public String getBaz() {
+    return baz;
+  }
+  public void setBaz(String baz) {
+    this.baz = baz;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+    return Objects.equals(this.bar, readOnlyFirst.bar) &&
+        Objects.equals(this.baz, readOnlyFirst.baz);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, baz);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ReadOnlyFirst {\n");
+    
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    baz: ").append(toIndentedString(baz)).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/SpecialModelName.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
index fccd55df94d6..09eb6dc202d0 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -9,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * SpecialModelName
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
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 417f95d4a2f6..18c24a5c287d 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -9,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Tag
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class Tag   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
index bf361b5a7653..4f8761824044 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
@@ -1,5 +1,6 @@
 package io.swagger.client.model;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -9,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * User
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-06T18:35:03.551+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:31:44.370+08:00")
 public class User   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt
index 13e459a4b264..bbfd5c01bab8 100644
--- a/samples/client/petstore/java/okhttp-gson/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson/build.sbt
@@ -13,6 +13,7 @@ lazy val root = (project in file(".")).
       "com.squareup.okhttp" % "okhttp" % "2.7.5",
       "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
       "com.google.code.gson" % "gson" % "2.6.2",
-      "junit" % "junit" % "4.12" % "test"
+      "junit" % "junit" % "4.12" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
     )
   )
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 974c3becece7..0078c08a91d2 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:32:07.772+08:00")
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
index 46a1778050a0..6ac013649858 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:32:07.772+08:00")
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
index e3848de9f9e2..1877288dba44 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:32:07.772+08:00")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
index fe552d7ae8de..c3532437a179 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:32:07.772+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
index 8f8debd6d684..d4b464235bf1 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
@@ -17,8 +17,8 @@ import com.squareup.okhttp.Response;
 
 import java.io.IOException;
 
-import java.util.Date;
 import java.math.BigDecimal;
+import java.util.Date;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
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 75fb730c4225..ac7ad688c56a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
@@ -18,8 +18,8 @@ import com.squareup.okhttp.Response;
 import java.io.IOException;
 
 import io.swagger.client.model.Pet;
-import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
+import java.io.File;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
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 6b157ac6601c..546fdddf662b 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:32:07.772+08:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
index c097462f5cd8..a036f792d8e1 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-05-31T22:17:12.179+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:32:07.772+08:00")
 public class OAuth implements Authentication {
   private String accessToken;
 

From a34373fe343c41dcd23d0d943b5a4f4d510820b0 Mon Sep 17 00:00:00 2001
From: Leon Yu <leon@bit.ly>
Date: Thu, 2 Jun 2016 18:26:25 -0400
Subject: [PATCH 075/139] Update typings version

rebuild test target
---
 .../TypeScript-Fetch/package.json.mustache    |   2 +-
 .../TypeScript-Fetch/typings.json.mustache    |   2 +-
 .../builds/default/.swagger-codegen-ignore    |  23 ++
 .../typescript-fetch/builds/default/LICENSE   | 201 ++++++++++++++++++
 .../builds/default/package.json               |   5 +-
 .../builds/default/typings.json               |   2 +-
 .../builds/es6-target/.swagger-codegen-ignore |  23 ++
 .../builds/es6-target/LICENSE                 | 201 ++++++++++++++++++
 .../builds/es6-target/package.json            |   5 +-
 .../builds/es6-target/typings.json            |   2 +-
 .../with-npm-version/.swagger-codegen-ignore  |  23 ++
 .../builds/with-npm-version/LICENSE           | 201 ++++++++++++++++++
 .../builds/with-npm-version/package.json      |   5 +-
 .../builds/with-npm-version/typings.json      |   2 +-
 .../tests/default/package.json                |   2 +-
 .../tests/default/typings.json                |   2 +-
 16 files changed, 688 insertions(+), 13 deletions(-)
 create mode 100644 samples/client/petstore/typescript-fetch/builds/default/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/typescript-fetch/builds/default/LICENSE
 create mode 100644 samples/client/petstore/typescript-fetch/builds/es6-target/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/typescript-fetch/builds/es6-target/LICENSE
 create mode 100644 samples/client/petstore/typescript-fetch/builds/with-npm-version/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/typescript-fetch/builds/with-npm-version/LICENSE

diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache
index 5a195c346ff7..d885089fc9c4 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/package.json.mustache
@@ -14,6 +14,6 @@
   },
   "devDependencies": {
     "typescript": "^1.8.10",
-    "typings": "^0.8.1"
+    "typings": "^1.0.4"
   }
 }
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/typings.json.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/typings.json.mustache
index 3aca69ff6485..e5bd78f06fe1 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/typings.json.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/typings.json.mustache
@@ -1,7 +1,7 @@
 {
   "version": false,
   "dependencies": {},
-  "ambientDependencies": { {{^supportsES6}}
+  "globalDependencies": { {{^supportsES6}}
     "core-js": "registry:dt/core-js#0.0.0+20160317120654",{{/supportsES6}}
     "node": "registry:dt/node#4.0.0+20160423143914",
     "isomorphic-fetch": "registry:dt/isomorphic-fetch#0.0.0+20160505171433"
diff --git a/samples/client/petstore/typescript-fetch/builds/default/.swagger-codegen-ignore b/samples/client/petstore/typescript-fetch/builds/default/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/default/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/typescript-fetch/builds/default/LICENSE b/samples/client/petstore/typescript-fetch/builds/default/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/default/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/typescript-fetch/builds/default/package.json b/samples/client/petstore/typescript-fetch/builds/default/package.json
index 06bb023ad5b9..97e572353a39 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/package.json
+++ b/samples/client/petstore/typescript-fetch/builds/default/package.json
@@ -1,6 +1,7 @@
 {
   "name": "typescript-fetch-api",
   "version": "0.0.0",
+  "license": "Apache-2.0",
   "main": "./dist/api.js",
   "browser": "./dist/api.js",
   "typings": "./dist/api.d.ts",
@@ -13,6 +14,6 @@
   },
   "devDependencies": {
     "typescript": "^1.8.10",
-    "typings": "^0.8.1"
+    "typings": "^1.0.4"
   }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/typescript-fetch/builds/default/typings.json b/samples/client/petstore/typescript-fetch/builds/default/typings.json
index 32c5b1e2b0b5..a82ea152b4a8 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/typings.json
+++ b/samples/client/petstore/typescript-fetch/builds/default/typings.json
@@ -1,7 +1,7 @@
 {
   "version": false,
   "dependencies": {},
-  "ambientDependencies": { 
+  "globalDependencies": { 
     "core-js": "registry:dt/core-js#0.0.0+20160317120654",
     "node": "registry:dt/node#4.0.0+20160423143914",
     "isomorphic-fetch": "registry:dt/isomorphic-fetch#0.0.0+20160505171433"
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.swagger-codegen-ignore b/samples/client/petstore/typescript-fetch/builds/es6-target/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/LICENSE b/samples/client/petstore/typescript-fetch/builds/es6-target/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/package.json b/samples/client/petstore/typescript-fetch/builds/es6-target/package.json
index ab5d5b0ce157..b2b5cc240dc8 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/package.json
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/package.json
@@ -1,6 +1,7 @@
 {
   "name": "typescript-fetch-api",
   "version": "0.0.0",
+  "license": "Apache-2.0",
   "main": "./dist/api.js",
   "browser": "./dist/api.js",
   "typings": "./dist/api.d.ts",
@@ -12,6 +13,6 @@
   },
   "devDependencies": {
     "typescript": "^1.8.10",
-    "typings": "^0.8.1"
+    "typings": "^1.0.4"
   }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/typings.json b/samples/client/petstore/typescript-fetch/builds/es6-target/typings.json
index 0f09addb3245..2ec50862694b 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/typings.json
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/typings.json
@@ -1,7 +1,7 @@
 {
   "version": false,
   "dependencies": {},
-  "ambientDependencies": { 
+  "globalDependencies": { 
     "node": "registry:dt/node#4.0.0+20160423143914",
     "isomorphic-fetch": "registry:dt/isomorphic-fetch#0.0.0+20160505171433"
   }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.swagger-codegen-ignore b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/LICENSE b/samples/client/petstore/typescript-fetch/builds/with-npm-version/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json
index 7dc5e398bc9e..c1d30ab94936 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@swagger/typescript-fetch-petstore",
   "version": "0.0.1",
+  "license": "Apache-2.0",
   "main": "./dist/api.js",
   "browser": "./dist/api.js",
   "typings": "./dist/api.d.ts",
@@ -13,6 +14,6 @@
   },
   "devDependencies": {
     "typescript": "^1.8.10",
-    "typings": "^0.8.1"
+    "typings": "^1.0.4"
   }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/typings.json b/samples/client/petstore/typescript-fetch/builds/with-npm-version/typings.json
index 32c5b1e2b0b5..a82ea152b4a8 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/typings.json
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/typings.json
@@ -1,7 +1,7 @@
 {
   "version": false,
   "dependencies": {},
-  "ambientDependencies": { 
+  "globalDependencies": { 
     "core-js": "registry:dt/core-js#0.0.0+20160317120654",
     "node": "registry:dt/node#4.0.0+20160423143914",
     "isomorphic-fetch": "registry:dt/isomorphic-fetch#0.0.0+20160505171433"
diff --git a/samples/client/petstore/typescript-fetch/tests/default/package.json b/samples/client/petstore/typescript-fetch/tests/default/package.json
index 3bab3bdb789f..b95b42bc29e2 100644
--- a/samples/client/petstore/typescript-fetch/tests/default/package.json
+++ b/samples/client/petstore/typescript-fetch/tests/default/package.json
@@ -8,7 +8,7 @@
     "ts-loader": "^0.8.2",
     "tsify": "^0.16.0",
     "typescript": "^1.8.10",
-    "typings": "^0.8.1",
+    "typings": "^1.0.4",
     "webpack": "^1.13.0"
   },
   "scripts": {
diff --git a/samples/client/petstore/typescript-fetch/tests/default/typings.json b/samples/client/petstore/typescript-fetch/tests/default/typings.json
index e792f9ecd7e5..d05709202f74 100644
--- a/samples/client/petstore/typescript-fetch/tests/default/typings.json
+++ b/samples/client/petstore/typescript-fetch/tests/default/typings.json
@@ -1,7 +1,7 @@
 {
   "name": "typescript-fetch-test",
   "version": false,
-  "ambientDependencies": {
+  "globalDependencies": {
     "chai": "registry:dt/chai#3.4.0+20160317120654",
     "es6-promise": "registry:dt/es6-promise#0.0.0+20160423074304",
     "mocha": "registry:dt/mocha#2.2.5+20160317120654"

From 689841ce8e8501251bd1481e732aaa429aa6057b Mon Sep 17 00:00:00 2001
From: Griffin Schneider <griffinschneider@gmail.com>
Date: Fri, 3 Jun 2016 02:47:59 -0400
Subject: [PATCH 076/139] [ObjC] Fix various bugs in generated code. (#3031)

* [ObjC] Fix bug where ApiClient.timeoutInterval didn't do anything.

* [ObjC] Fix bug where <AFNetworking.h> couldn't be found.

* [ObjC] Fix useages of 'SWG' instead of {{classPrefix}} in Sanitizer-body.mustache.
---
 .../src/main/resources/objc/ApiClient-body.mustache         | 6 ++++++
 .../src/main/resources/objc/ApiClient-header.mustache       | 2 +-
 .../src/main/resources/objc/Sanitizer-body.mustache         | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
index f0f99bc96e2a..3e7e70a81fb5 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
@@ -50,6 +50,7 @@ static NSString * {{classPrefix}}__fileNameForResponse(NSURLResponse *response)
 - (instancetype)initWithBaseURL:(NSURL *)url {
     self = [super initWithBaseURL:url];
     if (self) {
+        self.timeoutInterval = 60;
         self.requestSerializer = [AFJSONRequestSerializer serializer];
         self.responseSerializer = [AFJSONResponseSerializer serializer];
         self.securityPolicy = [self customSecurityPolicy];
@@ -87,6 +88,11 @@ static NSString * {{classPrefix}}__fileNameForResponse(NSURLResponse *response)
     [self.requestSerializer setValue:value forHTTPHeaderField:forKey];
 }
 
+- (void)setRequestSerializer:(AFHTTPRequestSerializer<AFURLRequestSerialization> *)requestSerializer {
+    [super setRequestSerializer:requestSerializer];
+    requestSerializer.timeoutInterval = self.timeoutInterval;
+}
+
 #pragma mark - Cache Methods
 
 +(void)clearCache {
diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
index 125d42e34915..be5eba32ee01 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-header.mustache
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import <ISO8601/ISO8601.h>
-#import <AFNetworking.h>
+#import <AFNetworking/AFNetworking.h>
 #import "{{classPrefix}}JSONResponseSerializer.h"
 #import "{{classPrefix}}JSONRequestSerializer.h"
 #import "{{classPrefix}}QueryParamCollection.h"
diff --git a/modules/swagger-codegen/src/main/resources/objc/Sanitizer-body.mustache b/modules/swagger-codegen/src/main/resources/objc/Sanitizer-body.mustache
index a111aad9ceff..00d74aaa1f70 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Sanitizer-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Sanitizer-body.mustache
@@ -35,13 +35,13 @@ NSString * {{classPrefix}}PercentEscapedStringFromString(NSString *string) {
     return escaped;
 }
 
-@interface SWGSanitizer ()
+@interface {{classPrefix}}Sanitizer ()
 
 @property (nonatomic, strong) NSRegularExpression* jsonHeaderTypeExpression;
 
 @end
 
-@implementation SWGSanitizer
+@implementation {{classPrefix}}Sanitizer
 
 static NSString * kApplicationJSONType = @"application/json";
 

From fe8b0cf07b210bed5f907222fc99ecc603b3f01c Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Fri, 3 Jun 2016 14:35:51 +0200
Subject: [PATCH 077/139] add option to only generate stubs of the API and no
 server files

Fix #3025
---
 bin/spring-stubs.sh                           |  31 +++
 .../languages/SpringBootServerCodegen.java    |  51 +++--
 .../resources/JavaSpringBoot/api.mustache     |  13 +-
 .../JavaSpringBoot/apiController.mustache     |  35 +++
 .../JavaSpringBoot/formParams.mustache        |   3 +-
 .../JavaSpringBoot/headerParams.mustache      |   2 +-
 .../resources/JavaSpringBoot/pom.mustache     |   4 +-
 .../JavaSpringBoot/queryParams.mustache       |   2 +-
 .../JavaSpringMVC/apiController.mustache      |  61 ++++++
 .../spring-stubs/.swagger-codegen-ignore      |  23 ++
 samples/client/petstore/spring-stubs/LICENSE  | 201 ++++++++++++++++++
 .../client/petstore/spring-stubs/README.md    |  18 ++
 samples/client/petstore/spring-stubs/pom.xml  |  41 ++++
 .../src/main/java/io/swagger/api/PetApi.java  | 157 ++++++++++++++
 .../main/java/io/swagger/api/StoreApi.java    |  74 +++++++
 .../src/main/java/io/swagger/api/UserApi.java | 115 ++++++++++
 .../main/java/io/swagger/model/Category.java  |  71 +++++++
 .../io/swagger/model/ModelApiResponse.java    |  85 ++++++++
 .../src/main/java/io/swagger/model/Order.java | 134 ++++++++++++
 .../src/main/java/io/swagger/model/Pet.java   | 137 ++++++++++++
 .../src/main/java/io/swagger/model/Tag.java   |  71 +++++++
 .../src/main/java/io/swagger/model/User.java  | 156 ++++++++++++++
 .../springboot/.swagger-codegen-ignore        |  23 ++
 samples/server/petstore/springboot/LICENSE    | 201 ++++++++++++++++++
 .../java/io/swagger/api/ApiException.java     |   2 +-
 .../java/io/swagger/api/ApiOriginFilter.java  |   2 +-
 .../io/swagger/api/ApiResponseMessage.java    |   2 +-
 .../io/swagger/api/NotFoundException.java     |   2 +-
 .../src/main/java/io/swagger/api/PetApi.java  | 109 ++--------
 .../java/io/swagger/api/PetApiController.java |  71 +++++++
 .../main/java/io/swagger/api/StoreApi.java    |  40 +---
 .../io/swagger/api/StoreApiController.java    |  45 ++++
 .../src/main/java/io/swagger/api/UserApi.java |  86 ++------
 .../io/swagger/api/UserApiController.java     |  67 ++++++
 .../SwaggerDocumentationConfig.java           |   2 +-
 .../main/java/io/swagger/model/Category.java  |   2 +-
 .../io/swagger/model/ModelApiResponse.java    |   2 +-
 .../src/main/java/io/swagger/model/Order.java |   2 +-
 .../src/main/java/io/swagger/model/Pet.java   |   2 +-
 .../src/main/java/io/swagger/model/Tag.java   |   2 +-
 .../src/main/java/io/swagger/model/User.java  |   2 +-
 41 files changed, 1900 insertions(+), 249 deletions(-)
 create mode 100755 bin/spring-stubs.sh
 create mode 100644 modules/swagger-codegen/src/main/resources/JavaSpringBoot/apiController.mustache
 create mode 100644 modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiController.mustache
 create mode 100644 samples/client/petstore/spring-stubs/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/spring-stubs/LICENSE
 create mode 100644 samples/client/petstore/spring-stubs/README.md
 create mode 100644 samples/client/petstore/spring-stubs/pom.xml
 create mode 100644 samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
 create mode 100644 samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
 create mode 100644 samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
 create mode 100644 samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
 create mode 100644 samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
 create mode 100644 samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java
 create mode 100644 samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java
 create mode 100644 samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
 create mode 100644 samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java
 create mode 100644 samples/server/petstore/springboot/.swagger-codegen-ignore
 create mode 100644 samples/server/petstore/springboot/LICENSE
 create mode 100644 samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java
 create mode 100644 samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java
 create mode 100644 samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java

diff --git a/bin/spring-stubs.sh b/bin/spring-stubs.sh
new file mode 100755
index 000000000000..48719f2e696c
--- /dev/null
+++ b/bin/spring-stubs.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l springboot -o samples/client/petstore/spring-stubs -DinterfaceOnly=true"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java
index 7a487494a5b6..1574fd7175e1 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java
@@ -10,15 +10,16 @@ import java.util.*;
 public class SpringBootServerCodegen extends JavaClientCodegen implements CodegenConfig{
     public static final String CONFIG_PACKAGE = "configPackage";
     public static final String BASE_PACKAGE = "basePackage";
+    public static final String INTERFACE_ONLY = "interfaceOnly";
     protected String title = "Petstore Server";
     protected String configPackage = "";
     protected String basePackage = "";
+    protected boolean interfaceOnly = false;
     protected String templateFileName = "api.mustache";
 
     public SpringBootServerCodegen() {
         super();
         outputFolder = "generated-code/javaSpringBoot";
-        modelTemplateFiles.put("model.mustache", ".java");
         apiTemplateFiles.put(templateFileName, ".java");
         apiTestTemplateFiles.clear(); // TODO: add test template
         embeddedTemplateDir = templateDir = "JavaSpringBoot";
@@ -40,6 +41,7 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
 
         cliOptions.add(new CliOption(CONFIG_PACKAGE, "configuration package for generated code"));
         cliOptions.add(new CliOption(BASE_PACKAGE, "base package for generated code"));
+        cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files."));
         
         supportedLibraries.clear();
         supportedLibraries.put(DEFAULT_LIBRARY, "Default Spring Boot server stub.");
@@ -79,30 +81,33 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
             this.setBasePackage((String) additionalProperties.get(BASE_PACKAGE));
         }
 
+        if (additionalProperties.containsKey(INTERFACE_ONLY)) {
+            this.setInterfaceOnly(Boolean.valueOf(additionalProperties.get(INTERFACE_ONLY).toString()));
+        }
+
         supportingFiles.clear();
         supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-        supportingFiles.add(new SupportingFile("apiException.mustache",
-                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiException.java"));
-        supportingFiles.add(new SupportingFile("apiOriginFilter.mustache",
-                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiOriginFilter.java"));
-        supportingFiles.add(new SupportingFile("apiResponseMessage.mustache",
-                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiResponseMessage.java"));
-        supportingFiles.add(new SupportingFile("notFoundException.mustache",
-                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "NotFoundException.java"));
-
-        supportingFiles.add(new SupportingFile("swaggerDocumentationConfig.mustache",
-                (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "SwaggerDocumentationConfig.java"));
-        supportingFiles.add(new SupportingFile("homeController.mustache",
-                (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "HomeController.java"));
-
-        supportingFiles.add(new SupportingFile("swagger2SpringBoot.mustache",
-                (sourceFolder + File.separator + basePackage).replace(".", java.io.File.separator), "Swagger2SpringBoot.java"));
-        
-        
-        supportingFiles.add(new SupportingFile("application.properties",
-                ("src.main.resources").replace(".", java.io.File.separator), "application.properties"));
 
+        if(!this.interfaceOnly) {
+            apiTemplateFiles.put("apiController.mustache", "Controller.java");
+            supportingFiles.add(new SupportingFile("apiException.mustache",
+                    (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiException.java"));
+            supportingFiles.add(new SupportingFile("apiOriginFilter.mustache",
+                    (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiOriginFilter.java"));
+            supportingFiles.add(new SupportingFile("apiResponseMessage.mustache",
+                    (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiResponseMessage.java"));
+            supportingFiles.add(new SupportingFile("notFoundException.mustache",
+                    (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "NotFoundException.java"));
+            supportingFiles.add(new SupportingFile("swaggerDocumentationConfig.mustache",
+                    (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "SwaggerDocumentationConfig.java"));
+            supportingFiles.add(new SupportingFile("homeController.mustache",
+                    (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "HomeController.java"));
+            supportingFiles.add(new SupportingFile("swagger2SpringBoot.mustache",
+                    (sourceFolder + File.separator + basePackage).replace(".", java.io.File.separator), "Swagger2SpringBoot.java"));
+            supportingFiles.add(new SupportingFile("application.properties",
+                    ("src.main.resources").replace(".", java.io.File.separator), "application.properties"));
+        }
     }
 
     @Override
@@ -256,6 +261,10 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
     public void setBasePackage(String configPackage) {
         this.basePackage = configPackage;
     }
+
+    public void setInterfaceOnly(boolean interfaceOnly) {
+        this.interfaceOnly = interfaceOnly;
+    }
     
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache
index b214f3761104..672e1bbe9bab 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache
@@ -7,9 +7,7 @@ import {{modelPackage}}.*;
 
 import io.swagger.annotations.*;
 
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -23,12 +21,11 @@ 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")
 {{>generatedAnnotation}}
 {{#operations}}
-public class {{classname}} {
+public interface {{classname}} {
   {{#operation}}
 
   @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
@@ -44,12 +41,8 @@ public class {{classname}} {
     {{#hasProduces}}produces = { {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}
     {{#hasConsumes}}consumes = { {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}
     method = RequestMethod.{{httpMethod}})
-  public ResponseEntity<{{>returnTypes}}> {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},
-    {{/hasMore}}{{/allParams}})
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<{{>returnTypes}}>(HttpStatus.OK);
-  }
+  ResponseEntity<{{>returnTypes}}> {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},
+    {{/hasMore}}{{/allParams}});
 
   {{/operation}}
 }
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/apiController.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/apiController.mustache
new file mode 100644
index 000000000000..0cde913d6602
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/apiController.mustache
@@ -0,0 +1,35 @@
+package {{apiPackage}};
+
+import {{modelPackage}}.*;
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import io.swagger.annotations.*;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Controller
+{{>generatedAnnotation}}
+{{#operations}}
+public class {{classname}}Controller implements {{classname}} {
+  {{#operation}}
+    public ResponseEntity<{{>returnTypes}}> {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},
+      {{/hasMore}}{{/allParams}}) {
+      // do some magic!
+      return new ResponseEntity<{{>returnTypes}}>(HttpStatus.OK);
+  }
+
+  {{/operation}}
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/formParams.mustache
index 65e84817a23a..d84de0c33769 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/formParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/formParams.mustache
@@ -1,2 +1 @@
-{{#isFormParam}}{{#notFile}}
-@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestPart(value="{{paramName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}})  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "file detail") @RequestPart("file") MultipartFile {{baseName}}{{/isFile}}{{/isFormParam}}
+{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestPart(value="{{paramName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}})  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "file detail") @RequestPart("file") MultipartFile {{baseName}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/headerParams.mustache
index 297d5131d929..7c9e7356a0b7 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/headerParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/headerParams.mustache
@@ -1 +1 @@
-{{#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}}
+{{#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}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/pom.mustache
index f6cc38793e7c..ab4449ee580d 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/pom.mustache
@@ -14,7 +14,7 @@
 		<version>1.3.3.RELEASE</version>
 	</parent>
 	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
+		<sourceDirectory>src/main/java</sourceDirectory>{{^interfaceOnly}}
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
@@ -27,7 +27,7 @@
 					</execution>
 				</executions>
 			</plugin>
-		</plugins>
+		</plugins>{{/interfaceOnly}}
 	</build>
 	<dependencies>
 		<dependency>
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/queryParams.mustache
index 3bb2afcb6cd4..d935fb11fd3c 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/queryParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value = "{{paramName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/isQueryParam}}
+{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value = "{{paramName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiController.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiController.mustache
new file mode 100644
index 000000000000..7fe7c5acf603
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiController.mustache
@@ -0,0 +1,61 @@
+package {{apiPackage}};
+
+import {{modelPackage}}.*;
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Authorization;
+import io.swagger.annotations.AuthorizationScope;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@Controller
+@RequestMapping(value = "/{{{baseName}}}", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/{{{baseName}}}", description = "the {{{baseName}}} API")
+{{>generatedAnnotation}}
+{{#operations}}
+public class {{classname}} {
+  {{#operation}}
+
+  @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
+    {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
+      {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
+      {{/hasMore}}{{/scopes}}
+      }{{/isOAuth}}){{#hasMore}},
+    {{/hasMore}}{{/authMethods}}
+  }{{/hasAuthMethods}})
+  @io.swagger.annotations.ApiResponses(value = { {{#responses}}
+    @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}})
+  public ResponseEntity<{{>returnTypes}}> {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},
+    {{/hasMore}}{{/allParams}})
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<{{>returnTypes}}>(HttpStatus.OK);
+  }
+
+  {{/operation}}
+}
+{{/operations}}
diff --git a/samples/client/petstore/spring-stubs/.swagger-codegen-ignore b/samples/client/petstore/spring-stubs/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/spring-stubs/LICENSE b/samples/client/petstore/spring-stubs/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/spring-stubs/README.md b/samples/client/petstore/spring-stubs/README.md
new file mode 100644
index 000000000000..8f9855eedf93
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/README.md
@@ -0,0 +1,18 @@
+# Swagger generated server
+
+Spring Boot Server 
+
+
+## Overview  
+This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  
+By using the [OpenAPI-Spec](https://github.com/swagger-api/swagger-core), you can easily generate a server stub.  
+This is an example of building a swagger-enabled server in Java using the SpringBoot framework.  
+
+The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox)  
+
+Start your server as an simple java application  
+
+You can view the api documentation in swagger-ui by pointing to  
+http://localhost:8080/  
+
+Change default port value in application.properties   
\ No newline at end of file
diff --git a/samples/client/petstore/spring-stubs/pom.xml b/samples/client/petstore/spring-stubs/pom.xml
new file mode 100644
index 000000000000..975433d48c8c
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/pom.xml
@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>io.swagger</groupId>
+	<artifactId>swagger-springboot-server</artifactId>
+	<packaging>jar</packaging>
+	<name>swagger-springboot-server</name>
+	<version>1.0.0</version>
+	<properties>
+		<springfox-version>2.4.0</springfox-version>
+	</properties>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.3.3.RELEASE</version>
+	</parent>
+	<build>
+		<sourceDirectory>src/main/java</sourceDirectory>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<!--SpringFox dependencies -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>${springfox-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>${springfox-version}</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
new file mode 100644
index 000000000000..9bb732d245c6
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
@@ -0,0 +1,157 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import io.swagger.model.Pet;
+import io.swagger.model.ModelApiResponse;
+import java.io.File;
+
+import io.swagger.annotations.*;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/pet", description = "the pet API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02: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", response = Void.class) })
+  @RequestMapping(value = "",
+    produces = { "application/xml", "application/json" }, 
+    consumes = { "application/json", "application/xml" },
+    method = RequestMethod.POST)
+  ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body);
+
+
+  @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", response = Void.class) })
+  @RequestMapping(value = "/{petId}",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.DELETE)
+  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);
+
+
+  @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", response = Pet.class),
+    @ApiResponse(code = 400, message = "Invalid status value", response = Pet.class) })
+  @RequestMapping(value = "/findByStatus",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  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);
+
+
+  @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", response = Pet.class),
+    @ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class) })
+  @RequestMapping(value = "/findByTags",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  ResponseEntity<List<Pet>> findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags);
+
+
+  @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", response = Pet.class),
+    @ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class),
+    @ApiResponse(code = 404, message = "Pet not found", response = Pet.class) })
+  @RequestMapping(value = "/{petId}",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",required=true ) @PathVariable("petId") Long petId);
+
+
+  @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
+    @ApiResponse(code = 404, message = "Pet not found", response = Void.class),
+    @ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
+  @RequestMapping(value = "",
+    produces = { "application/xml", "application/json" }, 
+    consumes = { "application/json", "application/xml" },
+    method = RequestMethod.PUT)
+  ResponseEntity<Void> updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body);
+
+
+  @ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
+  @RequestMapping(value = "/{petId}",
+    produces = { "application/xml", "application/json" }, 
+    consumes = { "application/x-www-form-urlencoded" },
+    method = RequestMethod.POST)
+  ResponseEntity<Void> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") Long petId,
+    @ApiParam(value = "Updated name of the pet" ) @RequestPart(value="name", required=false)  String name,
+    @ApiParam(value = "Updated status of the pet" ) @RequestPart(value="status", required=false)  String status);
+
+
+  @ApiOperation(value = "uploads an image", notes = "", response = ModelApiResponse.class, authorizations = {
+    @Authorization(value = "petstore_auth", scopes = {
+      @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
+      @AuthorizationScope(scope = "read:pets", description = "read your pets")
+      })
+  })
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
+  @RequestMapping(value = "/{petId}/uploadImage",
+    produces = { "application/json" }, 
+    consumes = { "multipart/form-data" },
+    method = RequestMethod.POST)
+  ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet to update",required=true ) @PathVariable("petId") Long petId,
+    @ApiParam(value = "Additional data to pass to server" ) @RequestPart(value="additionalMetadata", required=false)  String additionalMetadata,
+    @ApiParam(value = "file detail") @RequestPart("file") MultipartFile file);
+
+}
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
new file mode 100644
index 000000000000..b8a29cdf3b21
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
@@ -0,0 +1,74 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import io.swagger.annotations.*;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/store", description = "the store API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+public interface StoreApi {
+
+  @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
+    @ApiResponse(code = 404, message = "Order not found", response = Void.class) })
+  @RequestMapping(value = "/order/{orderId}",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.DELETE)
+  ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId);
+
+
+  @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", response = Integer.class) })
+  @RequestMapping(value = "/inventory",
+    produces = { "application/json" }, 
+    
+    method = RequestMethod.GET)
+  ResponseEntity<Map<String, Integer>> getInventory();
+
+
+  @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", response = Order.class),
+    @ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class),
+    @ApiResponse(code = 404, message = "Order not found", response = Order.class) })
+  @RequestMapping(value = "/order/{orderId}",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId);
+
+
+  @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation", response = Order.class),
+    @ApiResponse(code = 400, message = "Invalid Order", response = Order.class) })
+  @RequestMapping(value = "/order",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.POST)
+  ResponseEntity<Order> placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true ) @RequestBody Order body);
+
+}
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
new file mode 100644
index 000000000000..15d815fcb96f
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
@@ -0,0 +1,115 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import io.swagger.model.User;
+import java.util.List;
+
+import io.swagger.annotations.*;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/user", description = "the user API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02: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", response = Void.class) })
+  @RequestMapping(value = "",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.POST)
+  ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @RequestBody User body);
+
+
+  @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+  @RequestMapping(value = "/createWithArray",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.POST)
+  ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body);
+
+
+  @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+  @RequestMapping(value = "/createWithList",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.POST)
+  ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body);
+
+
+  @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", response = Void.class),
+    @ApiResponse(code = 404, message = "User not found", response = Void.class) })
+  @RequestMapping(value = "/{username}",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.DELETE)
+  ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true ) @PathVariable("username") String username);
+
+
+  @ApiOperation(value = "Get user by user name", notes = "", response = User.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation", response = User.class),
+    @ApiResponse(code = 400, message = "Invalid username supplied", response = User.class),
+    @ApiResponse(code = 404, message = "User not found", response = User.class) })
+  @RequestMapping(value = "/{username}",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true ) @PathVariable("username") String username);
+
+
+  @ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation", response = String.class),
+    @ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) })
+  @RequestMapping(value = "/login",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  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);
+
+
+  @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+  @RequestMapping(value = "/logout",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.GET)
+  ResponseEntity<Void> logoutUser();
+
+
+  @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", response = Void.class),
+    @ApiResponse(code = 404, message = "User not found", response = Void.class) })
+  @RequestMapping(value = "/{username}",
+    produces = { "application/xml", "application/json" }, 
+    
+    method = RequestMethod.PUT)
+  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);
+
+}
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
new file mode 100644
index 000000000000..be0a5b6ad472
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
@@ -0,0 +1,71 @@
+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.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02: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(id).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
new file mode 100644
index 000000000000..c9256ca70fe4
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
@@ -0,0 +1,85 @@
+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.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+public class ModelApiResponse  {
+  
+  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;
+    }
+    ModelApiResponse _apiResponse = (ModelApiResponse) 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 ModelApiResponse {\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/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java
new file mode 100644
index 000000000000..632893e46528
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java
@@ -0,0 +1,134 @@
+package io.swagger.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import 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.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+public class Order  {
+  
+  private Long id = null;
+  private Long petId = null;
+  private Integer quantity = null;
+  private Date shipDate = null;
+  public enum StatusEnum {
+     placed,  approved,  delivered, 
+  };
+  
+  private StatusEnum status = null;
+  private Boolean complete = false;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("petId")
+  public Long getPetId() {
+    return petId;
+  }
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
+  public Integer getQuantity() {
+    return quantity;
+  }
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
+  public Date getShipDate() {
+    return shipDate;
+  }
+  public void setShipDate(Date shipDate) {
+    this.shipDate = shipDate;
+  }
+
+  /**
+   * Order Status
+   **/
+  @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("complete")
+  public Boolean getComplete() {
+    return complete;
+  }
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Order order = (Order) o;
+    return Objects.equals(id, order.id) &&
+        Objects.equals(petId, order.petId) &&
+        Objects.equals(quantity, order.quantity) &&
+        Objects.equals(shipDate, order.shipDate) &&
+        Objects.equals(status, order.status) &&
+        Objects.equals(complete, order.complete);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  petId: ").append(petId).append("\n");
+    sb.append("  quantity: ").append(quantity).append("\n");
+    sb.append("  shipDate: ").append(shipDate).append("\n");
+    sb.append("  status: ").append(status).append("\n");
+    sb.append("  complete: ").append(complete).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java
new file mode 100644
index 000000000000..08e73d83c21f
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java
@@ -0,0 +1,137 @@
+package io.swagger.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.Category;
+import io.swagger.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+
+@ApiModel(description = "")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+public class Pet  {
+  
+  private Long id = null;
+  private Category category = null;
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>();
+  private List<Tag> tags = new ArrayList<Tag>();
+  public enum StatusEnum {
+     available,  pending,  sold, 
+  };
+  
+  private StatusEnum status = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("category")
+  public Category getCategory() {
+    return category;
+  }
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("tags")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  /**
+   * pet status in the store
+   **/
+  @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Pet pet = (Pet) o;
+    return Objects.equals(id, pet.id) &&
+        Objects.equals(category, pet.category) &&
+        Objects.equals(name, pet.name) &&
+        Objects.equals(photoUrls, pet.photoUrls) &&
+        Objects.equals(tags, pet.tags) &&
+        Objects.equals(status, pet.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, category, name, photoUrls, tags, status);
+  }
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  category: ").append(category).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("  photoUrls: ").append(photoUrls).append("\n");
+    sb.append("  tags: ").append(tags).append("\n");
+    sb.append("  status: ").append(status).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
new file mode 100644
index 000000000000..b339bb8db028
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
@@ -0,0 +1,71 @@
+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.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02: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(id).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java
new file mode 100644
index 000000000000..55c4a39b0922
--- /dev/null
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java
@@ -0,0 +1,156 @@
+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.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02: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(id).append("\n");
+    sb.append("  username: ").append(username).append("\n");
+    sb.append("  firstName: ").append(firstName).append("\n");
+    sb.append("  lastName: ").append(lastName).append("\n");
+    sb.append("  email: ").append(email).append("\n");
+    sb.append("  password: ").append(password).append("\n");
+    sb.append("  phone: ").append(phone).append("\n");
+    sb.append("  userStatus: ").append(userStatus).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/springboot/.swagger-codegen-ignore b/samples/server/petstore/springboot/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/server/petstore/springboot/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/server/petstore/springboot/LICENSE b/samples/server/petstore/springboot/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/server/petstore/springboot/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java
index 1652afba0ad7..dd9f929eef5a 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
 public class ApiException extends Exception{
 	private int code;
 	public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java
index d18415d8e7c9..0467b6d0b131 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
 public class ApiOriginFilter implements javax.servlet.Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java
index a58b9c19e97f..1acb8e00b62a 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
 public class ApiResponseMessage {
 	public static final int ERROR = 1;
 	public static final int WARNING = 2;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java
index 8770f484be13..fa5074394402 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
 public class NotFoundException extends ApiException {
 	private int code;
 	public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
index 7f66bdc75f7d..30cdb5b78148 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
@@ -3,14 +3,12 @@ package io.swagger.api;
 import io.swagger.model.*;
 
 import io.swagger.model.Pet;
-import java.io.File;
 import io.swagger.model.ModelApiResponse;
+import java.io.File;
 
 import io.swagger.annotations.*;
 
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -24,11 +22,10 @@ import java.util.List;
 
 import static org.springframework.http.MediaType.*;
 
-@Controller
 @RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/pet", description = "the pet API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
-public class PetApi {
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+public interface PetApi {
 
   @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
     @Authorization(value = "petstore_auth", scopes = {
@@ -42,14 +39,7 @@ public class PetApi {
     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" ,required=true ) @RequestBody Pet body
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
+  ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body);
 
 
   @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = {
@@ -64,18 +54,8 @@ public class PetApi {
     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);
-  }
+  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);
 
 
   @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = {
@@ -91,14 +71,7 @@ public class PetApi {
     produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.GET)
-  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
-
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<List<Pet>>(HttpStatus.OK);
-  }
+  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);
 
 
   @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 = {
@@ -114,14 +87,7 @@ public class PetApi {
     produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.GET)
-  public 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);
-  }
+  ResponseEntity<List<Pet>> findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags);
 
 
   @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = {
@@ -135,14 +101,7 @@ public class PetApi {
     produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.GET)
-  public 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);
-  }
+  ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",required=true ) @PathVariable("petId") Long petId);
 
 
   @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = {
@@ -159,14 +118,7 @@ public class PetApi {
     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);
-  }
+  ResponseEntity<Void> updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body);
 
 
   @ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = {
@@ -181,24 +133,9 @@ public class PetApi {
     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") Long petId
-
-,
-    
-
-
-@ApiParam(value = "Updated name of the pet" ) @RequestPart(value="name", required=false)  String name
-,
-    
-
-
-@ApiParam(value = "Updated status of the pet" ) @RequestPart(value="status", required=false)  String status
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
+  ResponseEntity<Void> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") Long petId,
+    @ApiParam(value = "Updated name of the pet" ) @RequestPart(value="name", required=false)  String name,
+    @ApiParam(value = "Updated status of the pet" ) @RequestPart(value="status", required=false)  String status);
 
 
   @ApiOperation(value = "uploads an image", notes = "", response = ModelApiResponse.class, authorizations = {
@@ -213,22 +150,8 @@ public class PetApi {
     produces = { "application/json" }, 
     consumes = { "multipart/form-data" },
     method = RequestMethod.POST)
-  public ResponseEntity<ModelApiResponse> uploadFile(
-@ApiParam(value = "ID of pet to update",required=true ) @PathVariable("petId") Long petId
-
-,
-    
-
-
-@ApiParam(value = "Additional data to pass to server" ) @RequestPart(value="additionalMetadata", required=false)  String additionalMetadata
-,
-    
-
-@ApiParam(value = "file detail") @RequestPart("file") MultipartFile file
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<ModelApiResponse>(HttpStatus.OK);
-  }
+  ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet to update",required=true ) @PathVariable("petId") Long petId,
+    @ApiParam(value = "Additional data to pass to server" ) @RequestPart(value="additionalMetadata", required=false)  String additionalMetadata,
+    @ApiParam(value = "file detail") @RequestPart("file") MultipartFile file);
 
 }
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java
new file mode 100644
index 000000000000..cb3b30c0ce05
--- /dev/null
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java
@@ -0,0 +1,71 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import io.swagger.model.Pet;
+import io.swagger.model.ModelApiResponse;
+import java.io.File;
+
+import io.swagger.annotations.*;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Controller
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+public class PetApiController implements PetApi {
+    public ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body) {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+    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) {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+    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) {
+      // do some magic!
+      return new ResponseEntity<List<Pet>>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<List<Pet>> findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags) {
+      // do some magic!
+      return new ResponseEntity<List<Pet>>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",required=true ) @PathVariable("petId") Long petId) {
+      // do some magic!
+      return new ResponseEntity<Pet>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<Void> updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body) {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<Void> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") Long petId,
+      @ApiParam(value = "Updated name of the pet" ) @RequestPart(value="name", required=false)  String name,
+      @ApiParam(value = "Updated status of the pet" ) @RequestPart(value="status", required=false)  String status) {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet to update",required=true ) @PathVariable("petId") Long petId,
+      @ApiParam(value = "Additional data to pass to server" ) @RequestPart(value="additionalMetadata", required=false)  String additionalMetadata,
+      @ApiParam(value = "file detail") @RequestPart("file") MultipartFile file) {
+      // do some magic!
+      return new ResponseEntity<ModelApiResponse>(HttpStatus.OK);
+  }
+
+}
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
index 8cf2283e4fe4..95dbf7170b67 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
@@ -7,9 +7,7 @@ import io.swagger.model.Order;
 
 import io.swagger.annotations.*;
 
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -23,11 +21,10 @@ import java.util.List;
 
 import static org.springframework.http.MediaType.*;
 
-@Controller
 @RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/store", description = "the store API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
-public class StoreApi {
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+public interface StoreApi {
 
   @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
   @ApiResponses(value = { 
@@ -37,14 +34,7 @@ public class StoreApi {
     produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.DELETE)
-  public ResponseEntity<Void> deleteOrder(
-@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
+  ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId);
 
 
   @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
@@ -56,11 +46,7 @@ public class StoreApi {
     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);
-  }
+  ResponseEntity<Map<String, Integer>> getInventory();
 
 
   @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)
@@ -72,14 +58,7 @@ public class StoreApi {
     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);
-  }
+  ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId);
 
 
   @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class)
@@ -90,13 +69,6 @@ public class StoreApi {
     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);
-  }
+  ResponseEntity<Order> placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true ) @RequestBody Order body);
 
 }
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java
new file mode 100644
index 000000000000..82d598784197
--- /dev/null
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java
@@ -0,0 +1,45 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import io.swagger.annotations.*;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Controller
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+public class StoreApiController implements StoreApi {
+    public ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId) {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<Map<String, Integer>> getInventory() {
+      // do some magic!
+      return new ResponseEntity<Map<String, Integer>>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId) {
+      // do some magic!
+      return new ResponseEntity<Order>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<Order> placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true ) @RequestBody Order body) {
+      // do some magic!
+      return new ResponseEntity<Order>(HttpStatus.OK);
+  }
+
+}
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
index 36c500fadedb..1d16485a5cc3 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
@@ -7,9 +7,7 @@ import java.util.List;
 
 import io.swagger.annotations.*;
 
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -23,11 +21,10 @@ import java.util.List;
 
 import static org.springframework.http.MediaType.*;
 
-@Controller
 @RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/user", description = "the user API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
-public class UserApi {
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+public interface UserApi {
 
   @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class)
   @ApiResponses(value = { 
@@ -36,14 +33,7 @@ public class UserApi {
     produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.POST)
-  public ResponseEntity<Void> createUser(
-
-@ApiParam(value = "Created user object" ,required=true ) @RequestBody User body
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
+  ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @RequestBody User body);
 
 
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
@@ -53,14 +43,7 @@ public class UserApi {
     produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.POST)
-  public ResponseEntity<Void> createUsersWithArrayInput(
-
-@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
+  ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body);
 
 
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
@@ -70,14 +53,7 @@ public class UserApi {
     produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.POST)
-  public ResponseEntity<Void> createUsersWithListInput(
-
-@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
+  ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body);
 
 
   @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class)
@@ -88,14 +64,7 @@ public class UserApi {
     produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.DELETE)
-  public ResponseEntity<Void> deleteUser(
-@ApiParam(value = "The name that needs to be deleted",required=true ) @PathVariable("username") String username
-
-)
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
+  ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true ) @PathVariable("username") String username);
 
 
   @ApiOperation(value = "Get user by user name", notes = "", response = User.class)
@@ -107,14 +76,7 @@ public class UserApi {
     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);
-  }
+  ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true ) @PathVariable("username") String username);
 
 
   @ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
@@ -125,18 +87,8 @@ public class UserApi {
     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);
-  }
+  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);
 
 
   @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
@@ -146,11 +98,7 @@ public class UserApi {
     produces = { "application/xml", "application/json" }, 
     
     method = RequestMethod.GET)
-  public ResponseEntity<Void> logoutUser()
-      throws NotFoundException {
-      // do some magic!
-      return new ResponseEntity<Void>(HttpStatus.OK);
-  }
+  ResponseEntity<Void> logoutUser();
 
 
   @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class)
@@ -161,17 +109,7 @@ public class UserApi {
     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);
-  }
+  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);
 
 }
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java
new file mode 100644
index 000000000000..c89b4344d423
--- /dev/null
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java
@@ -0,0 +1,67 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import io.swagger.model.User;
+import java.util.List;
+
+import io.swagger.annotations.*;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Controller
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+public class UserApiController implements UserApi {
+    public ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @RequestBody User body) {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body) {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body) {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true ) @PathVariable("username") String username) {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true ) @PathVariable("username") String username) {
+      // do some magic!
+      return new ResponseEntity<User>(HttpStatus.OK);
+  }
+
+    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) {
+      // do some magic!
+      return new ResponseEntity<String>(HttpStatus.OK);
+  }
+
+    public ResponseEntity<Void> logoutUser() {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+    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) {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+}
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java b/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java
index 185c0e087946..2b2c0e4ef8b8 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java
@@ -13,7 +13,7 @@ import springfox.documentation.spring.web.plugins.Docket;
 
 
 @Configuration
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
 public class SwaggerDocumentationConfig {
 
     ApiInfo apiInfo() {
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
index 411a206a7f6d..4a0a3f96c314 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
 public class Category  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
index 73a0717d5e54..1dc6b16915c6 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
 public class ModelApiResponse  {
   
   private Integer code = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java
index 3f8bbd49e375..951e1cb68785 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
 public class Order  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java
index 1507c988f3bd..be6ee7d529eb 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
 public class Pet  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
index 665a5c002701..7d2d0bd587c2 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
 public class Tag  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java
index dd8cd876e7b4..ffeaafe129f9 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-05-05T15:30:42.322+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
 public class User  {
   
   private Long id = null;

From 3b37584c1f4820ca49f74537c0e3ff82b0ce3efd Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Fri, 3 Jun 2016 15:37:06 +0200
Subject: [PATCH 078/139] update README

---
 .../resources/JavaSpringBoot/README.mustache  | 31 +++++++++++++++--
 .../client/petstore/spring-stubs/README.md    | 33 ++++++++++++-------
 samples/server/petstore/springboot/README.md  |  2 +-
 3 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/README.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/README.mustache
index 8f9855eedf93..02d932b8acac 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/README.mustache
@@ -1,4 +1,4 @@
-# Swagger generated server
+{{^interfaceOnly}}# Swagger generated server
 
 Spring Boot Server 
 
@@ -15,4 +15,31 @@ Start your server as an simple java application
 You can view the api documentation in swagger-ui by pointing to  
 http://localhost:8080/  
 
-Change default port value in application.properties   
\ No newline at end of file
+Change default port value in application.properties{{/interfaceOnly}}{{#interfaceOnly}}
+# Swagger generated API stub
+
+Spring Framework stub
+
+
+## Overview
+This code was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.
+By using the [OpenAPI-Spec](https://github.com/swagger-api/swagger-core), you can easily generate an API stub.
+This is an example of building API stub interfaces in Java using the Spring framework.
+
+The stubs generated can be used in your existing Spring-MVC or Spring-Boot application to create controller endpoints
+by adding ```@Controller``` classes that implement the interface. Eg:
+```java
+@Controller
+public class PetController implements PetApi {
+// implement all PetApi methods
+}
+```
+
+You can also use the interface to create [Spring-Cloud Feign clients](http://projects.spring.io/spring-cloud/spring-cloud.html#spring-cloud-feign-inheritance).Eg:
+```java
+@FeignClient(name="pet", url="http://petstore.swagger.io/v2")
+public interface PetClient extends PetApi {
+
+}
+```
+{{/interfaceOnly}}
\ No newline at end of file
diff --git a/samples/client/petstore/spring-stubs/README.md b/samples/client/petstore/spring-stubs/README.md
index 8f9855eedf93..99663f640822 100644
--- a/samples/client/petstore/spring-stubs/README.md
+++ b/samples/client/petstore/spring-stubs/README.md
@@ -1,18 +1,27 @@
-# Swagger generated server
 
-Spring Boot Server 
+# Swagger generated API stub
+
+Spring Framework stub
 
 
-## Overview  
-This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  
-By using the [OpenAPI-Spec](https://github.com/swagger-api/swagger-core), you can easily generate a server stub.  
-This is an example of building a swagger-enabled server in Java using the SpringBoot framework.  
+## Overview
+This code was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.
+By using the [OpenAPI-Spec](https://github.com/swagger-api/swagger-core), you can easily generate an API stub.
+This is an example of building API stub interfaces in Java using the Spring framework.
 
-The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox)  
+The stubs generated can be used in your existing Spring-MVC or Spring-Boot application to create controller endpoints
+by adding ```@Controller``` classes that implement the interface. Eg:
+```java
+@Controller
+public class PetController implements PetApi {
+// implement all PetApi methods
+}
+```
 
-Start your server as an simple java application  
+You can also use the interface to create [Spring-Cloud Feign clients](http://projects.spring.io/spring-cloud/spring-cloud.html#spring-cloud-feign-inheritance).Eg:
+```java
+@FeignClient(name="pet", url="http://petstore.swagger.io/v2")
+public interface PetClient extends PetApi {
 
-You can view the api documentation in swagger-ui by pointing to  
-http://localhost:8080/  
-
-Change default port value in application.properties   
\ No newline at end of file
+}
+```
diff --git a/samples/server/petstore/springboot/README.md b/samples/server/petstore/springboot/README.md
index 8f9855eedf93..a2e8a9f7b84b 100644
--- a/samples/server/petstore/springboot/README.md
+++ b/samples/server/petstore/springboot/README.md
@@ -15,4 +15,4 @@ Start your server as an simple java application
 You can view the api documentation in swagger-ui by pointing to  
 http://localhost:8080/  
 
-Change default port value in application.properties   
\ No newline at end of file
+Change default port value in application.properties
\ No newline at end of file

From a452bbf0397d32dbae3e1069941068fbdf006cf9 Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Fri, 3 Jun 2016 16:16:40 +0200
Subject: [PATCH 079/139] add interfaceOnly option test

---
 .../codegen/options/SpringBootServerOptionsProvider.java       | 3 +++
 .../codegen/springboot/SpringBootServerOptionsTest.java        | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java
index af70fc1834ab..6e766a21d070 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java
@@ -10,6 +10,7 @@ public class SpringBootServerOptionsProvider extends JavaOptionsProvider {
     public static final String CONFIG_PACKAGE_VALUE = "configPackage";
     public static final String BASE_PACKAGE_VALUE = "basePackage";
     public static final String LIBRARY_VALUE = "j8-async"; //FIXME hidding value from super class
+    public static final String INTERFACE_ONLY = "true";
 
     @Override
     public String getLanguage() {
@@ -22,6 +23,8 @@ public class SpringBootServerOptionsProvider extends JavaOptionsProvider {
         options.put(SpringBootServerCodegen.CONFIG_PACKAGE, CONFIG_PACKAGE_VALUE);
         options.put(SpringBootServerCodegen.BASE_PACKAGE, BASE_PACKAGE_VALUE);
         options.put(CodegenConstants.LIBRARY, LIBRARY_VALUE);
+        options.put(SpringBootServerCodegen.INTERFACE_ONLY, INTERFACE_ONLY);
+
         return options;
     }
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
index 7228f119711e..34a53db1dadd 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
@@ -54,6 +54,8 @@ public class SpringBootServerOptionsTest extends JavaClientOptionsTest {
             times = 1;
             clientCodegen.setBasePackage(SpringBootServerOptionsProvider.BASE_PACKAGE_VALUE);
             times = 1;
+            clientCodegen.setInterfaceOnly(Boolean.valueOf(SpringBootServerOptionsProvider.INTERFACE_ONLY));
+            times = 1;
 
         }};
     }

From 34fed26e79a6ee8d35e7612776813cde4b957089 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sat, 4 Jun 2016 00:02:30 +0800
Subject: [PATCH 080/139] add epaul to the core team

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2c427298c0b5..3a8e9d4c629b 100644
--- a/README.md
+++ b/README.md
@@ -901,7 +901,7 @@ Swaagger Codegen core team members are contributors who have been making signfic
 | Dart      |  |  
 | Groovy     |  |  
 | Go     |  @guohuang (2016/05/01) @neilotoole (2016/05/01) |  
-| Java      | @cbornet (2016/05/01) @xhh (2016/05/01) |
+| Java      | @cbornet (2016/05/01) @xhh (2016/05/01) @epaul (2016/06/04) |
 | NodeJS/Javascript | @xhh (2016/05/01) | 
 | ObjC      | @mateuszmackowiak (2016/05/09) |
 | Perl      | @wing328 (2016/05/01) |

From 17a639be75d13985c4b1fcede1b2a7716c2cd238 Mon Sep 17 00:00:00 2001
From: Landschaft <fabian.nart@gmail.com>
Date: Fri, 3 Jun 2016 13:12:07 +0200
Subject: [PATCH 081/139] [Swift] #3036 Make APIHelper.convertBoolToString
 return nil for nil input. This will prevent the creation of an empty body for
 GET requests.

---
 .../main/resources/swift/APIHelper.mustache   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/swift/APIHelper.mustache b/modules/swagger-codegen/src/main/resources/swift/APIHelper.mustache
index 7041709f3651..23e727b6b544 100644
--- a/modules/swagger-codegen/src/main/resources/swift/APIHelper.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/APIHelper.mustache
@@ -19,18 +19,19 @@ class APIHelper {
         return destination
     }
 
-    static func convertBoolToString(source: [String: AnyObject]?) -> [String:AnyObject] {
+    static func convertBoolToString(source: [String: AnyObject]?) -> [String:AnyObject]? {
+        guard let source = source else {
+            return nil
+        }
         var destination = [String:AnyObject]()
         let theTrue = NSNumber(bool: true)
         let theFalse = NSNumber(bool: false)
-        if (source != nil) {
-            for (key, value) in source! {
-                switch value {
-                    case let x where x === theTrue || x === theFalse:
-                        destination[key] = "\(value as! Bool)"
-                    default:
-                        destination[key] = value
-                }
+        for (key, value) in source {
+            switch value {
+            case let x where x === theTrue || x === theFalse:
+                destination[key] = "\(value as! Bool)"
+            default:
+                destination[key] = value
             }
         }
         return destination

From 83e8a2e90ca942e4ad7f9a636c8c9df4e1e7fa78 Mon Sep 17 00:00:00 2001
From: tao <tao@wealthfront.com>
Date: Fri, 3 Jun 2016 16:08:07 -0700
Subject: [PATCH 082/139] stop reading custom template file from subdirectories

---
 .../io/swagger/codegen/AbstractGenerator.java | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java
index 40b59435c442..849651baa9da 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java
@@ -72,28 +72,20 @@ public abstract class AbstractGenerator {
      * @return String Full template file path
      */
     public String getFullTemplateFile(CodegenConfig config, String templateFile) {
-        String library = config.getLibrary();
-        if (library != null && !"".equals(library)) {
-            String libTemplateFile = config.templateDir() + File.separator +
-                "libraries" + File.separator + library + File.separator +
-                templateFile;
-
-            if (new File(libTemplateFile).exists()) {
-                return libTemplateFile;
-            }
-
-            libTemplateFile = config.embeddedTemplateDir() + File.separator +
-                "libraries" + File.separator + library + File.separator +
-                templateFile;
-            if (embeddedTemplateExists(libTemplateFile)) {
-                // Fall back to the template file embedded/packaged in the JAR file...
-                return libTemplateFile;
-            }
-        }
         String template = config.templateDir() + File.separator + templateFile;
         if (new File(template).exists()) {
             return template;
         } else {
+            String library = config.getLibrary();
+            if (library != null && !"".equals(library)) {
+                String libTemplateFile = config.embeddedTemplateDir() + File.separator +
+                    "libraries" + File.separator + library + File.separator +
+                    templateFile;
+                if (embeddedTemplateExists(libTemplateFile)) {
+                    // Fall back to the template file embedded/packaged in the JAR file...
+                    return libTemplateFile;
+                }
+            }
             // Fall back to the template file embedded/packaged in the JAR file...
             return config.embeddedTemplateDir() + File.separator + templateFile;
         }

From 9ed290efeafcc5dd21f4e2b20b5adcf05f0cd74f Mon Sep 17 00:00:00 2001
From: clasnake <classical.zhu@gmail.com>
Date: Sat, 4 Jun 2016 20:53:21 +0800
Subject: [PATCH 083/139] Add sbt support for retrofit.

---
 .../codegen/languages/JavaClientCodegen.java  |   2 +
 .../libraries/retrofit/build.sbt.mustache     |  19 ++
 .../java/retrofit/.swagger-codegen-ignore     |  23 ++
 samples/client/petstore/java/retrofit/LICENSE | 201 ++++++++++++++++++
 .../client/petstore/java/retrofit/build.sbt   |  19 ++
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 .../java/io/swagger/client/StringUtil.java    |   2 +-
 .../java/io/swagger/client/api/FakeApi.java   |   6 +-
 .../java/io/swagger/client/api/PetApi.java    |   2 +-
 .../model/AdditionalPropertiesClass.java      |  84 ++++++++
 .../java/io/swagger/client/model/Animal.java  |  19 +-
 .../io/swagger/client/model/ArrayTest.java    |  98 +++++++++
 .../java/io/swagger/client/model/Cat.java     |  17 +-
 .../java/io/swagger/client/model/Dog.java     |  17 +-
 ...ropertiesAndAdditionalPropertiesClass.java | 101 +++++++++
 .../java/io/swagger/client/model/Name.java    |  16 +-
 .../swagger/client/model/ReadOnlyFirst.java   |  78 +++++++
 17 files changed, 694 insertions(+), 12 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
 create mode 100644 samples/client/petstore/java/retrofit/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/java/retrofit/LICENSE
 create mode 100644 samples/client/petstore/java/retrofit/build.sbt
 create mode 100644 samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java
 create mode 100644 samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
index 903eb1f89424..3f0d287a123c 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -332,6 +332,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
                     gradleWrapperPackage.replace( ".", File.separator ), "gradle-wrapper.properties") ); 
             supportingFiles.add( new SupportingFile( "gradle-wrapper.jar", 
                     gradleWrapperPackage.replace( ".", File.separator ), "gradle-wrapper.jar") );
+            // "build.sbt" is for development with SBT
+            supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
 
             //generate markdown docs for retrofit2
             if ( usesRetrofit2Library() ){
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
new file mode 100644
index 000000000000..174cb829ab68
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
@@ -0,0 +1,19 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "{{groupId}}",
+    name := "{{artifactId}}",
+    version := "{{artifactVersion}}",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "com.squareup.okhttp" % "okhttp" % "2.7.5" % "compile",
+      "com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile",
+      "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "junit" % "junit" % "4.12" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )
diff --git a/samples/client/petstore/java/retrofit/.swagger-codegen-ignore b/samples/client/petstore/java/retrofit/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/java/retrofit/LICENSE b/samples/client/petstore/java/retrofit/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/java/retrofit/build.sbt b/samples/client/petstore/java/retrofit/build.sbt
new file mode 100644
index 000000000000..bb75af8c3795
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/build.sbt
@@ -0,0 +1,19 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "io.swagger",
+    name := "swagger-petstore-retrofit",
+    version := "1.0.0",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "com.squareup.okhttp" % "okhttp" % "2.7.5" % "compile",
+      "com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile",
+      "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "junit" % "junit" % "4.12" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )
diff --git a/samples/client/petstore/java/retrofit/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/retrofit/gradle/wrapper/gradle-wrapper.properties
index 0c81b118d928..b7a364739551 100644
--- a/samples/client/petstore/java/retrofit/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/client/petstore/java/retrofit/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue May 17 23:04:28 CST 2016
+#Tue May 17 23:08:05 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
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 fb5b299a7066..c6db75c37085 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-04-28T16:10:49.444+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T20:43:54.025+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java
index 89fb9ddba73a..a77872ee5ba7 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java
@@ -16,9 +16,9 @@ import java.util.Map;
 
 public interface FakeApi {
   /**
-   * Fake endpoint for testing various parameters
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
    * Sync method
-   * Fake endpoint for testing various parameters
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
    * @param number None (required)
    * @param _double None (required)
    * @param string None (required)
@@ -41,7 +41,7 @@ public interface FakeApi {
   );
 
   /**
-   * Fake endpoint for testing various parameters
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
    * Async method
    * @param number None (required)
    * @param _double None (required)
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 66ed6aea9818..a019a4bf886d 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
@@ -7,8 +7,8 @@ import retrofit.http.*;
 import retrofit.mime.*;
 
 import io.swagger.client.model.Pet;
-import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
+import java.io.File;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
new file mode 100644
index 000000000000..839b04aa6c56
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -0,0 +1,84 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class AdditionalPropertiesClass   {
+  
+  @SerializedName("map_property")
+  private Map<String, String> mapProperty = new HashMap<String, String>();
+
+  @SerializedName("map_of_map_property")
+  private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, String> getMapProperty() {
+    return mapProperty;
+  }
+  public void setMapProperty(Map<String, String> mapProperty) {
+    this.mapProperty = mapProperty;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, Map<String, String>> getMapOfMapProperty() {
+    return mapOfMapProperty;
+  }
+  public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
+    this.mapOfMapProperty = mapOfMapProperty;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+    return Objects.equals(mapProperty, additionalPropertiesClass.mapProperty) &&
+        Objects.equals(mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapProperty, mapOfMapProperty);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesClass {\n");
+    
+    sb.append("    mapProperty: ").append(toIndentedString(mapProperty)).append("\n");
+    sb.append("    mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).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/Animal.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java
index 8df24899fb0b..9a14a1289fe4 100644
--- 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
@@ -15,6 +15,9 @@ public class Animal   {
   @SerializedName("className")
   private String className = null;
 
+  @SerializedName("color")
+  private String color = "red";
+
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -25,6 +28,16 @@ public class Animal   {
     this.className = className;
   }
 
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -35,12 +48,13 @@ public class Animal   {
       return false;
     }
     Animal animal = (Animal) o;
-    return Objects.equals(className, animal.className);
+    return Objects.equals(className, animal.className) &&
+        Objects.equals(color, animal.color);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className);
+    return Objects.hash(className, color);
   }
 
   @Override
@@ -49,6 +63,7 @@ public class Animal   {
     sb.append("class Animal {\n");
     
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java
new file mode 100644
index 000000000000..92337cc02463
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -0,0 +1,98 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class ArrayTest   {
+  
+  @SerializedName("array_of_string")
+  private List<String> arrayOfString = new ArrayList<String>();
+
+  @SerializedName("array_array_of_integer")
+  private List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
+
+  @SerializedName("array_array_of_model")
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getArrayOfString() {
+    return arrayOfString;
+  }
+  public void setArrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<List<Long>> getArrayArrayOfInteger() {
+    return arrayArrayOfInteger;
+  }
+  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+    return arrayArrayOfModel;
+  }
+  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayTest arrayTest = (ArrayTest) o;
+    return Objects.equals(arrayOfString, arrayTest.arrayOfString) &&
+        Objects.equals(arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
+        Objects.equals(arrayArrayOfModel, arrayTest.arrayArrayOfModel);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayTest {\n");
+    
+    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).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
index 60a99ed86da2..287d6a4d94ca 100644
--- 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
@@ -16,6 +16,9 @@ public class Cat extends Animal  {
   @SerializedName("className")
   private String className = null;
 
+  @SerializedName("color")
+  private String color = "red";
+
   @SerializedName("declawed")
   private Boolean declawed = null;
 
@@ -29,6 +32,16 @@ public class Cat extends Animal  {
     this.className = className;
   }
 
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
   /**
    **/
   @ApiModelProperty(value = "")
@@ -50,12 +63,13 @@ public class Cat extends Animal  {
     }
     Cat cat = (Cat) o;
     return Objects.equals(className, cat.className) &&
+        Objects.equals(color, cat.color) &&
         Objects.equals(declawed, cat.declawed);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className, declawed);
+    return Objects.hash(className, color, declawed);
   }
 
   @Override
@@ -64,6 +78,7 @@ public class Cat extends Animal  {
     sb.append("class Cat {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
     sb.append("}");
     return sb.toString();
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
index 1c31fc93746b..5d2ead15f07b 100644
--- 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
@@ -16,6 +16,9 @@ public class Dog extends Animal  {
   @SerializedName("className")
   private String className = null;
 
+  @SerializedName("color")
+  private String color = "red";
+
   @SerializedName("breed")
   private String breed = null;
 
@@ -29,6 +32,16 @@ public class Dog extends Animal  {
     this.className = className;
   }
 
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
   /**
    **/
   @ApiModelProperty(value = "")
@@ -50,12 +63,13 @@ public class Dog extends Animal  {
     }
     Dog dog = (Dog) o;
     return Objects.equals(className, dog.className) &&
+        Objects.equals(color, dog.color) &&
         Objects.equals(breed, dog.breed);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className, breed);
+    return Objects.hash(className, color, breed);
   }
 
   @Override
@@ -64,6 +78,7 @@ public class Dog extends Animal  {
     sb.append("class Dog {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
     sb.append("}");
     return sb.toString();
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
new file mode 100644
index 000000000000..d4afc9964406
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -0,0 +1,101 @@
+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 java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class MixedPropertiesAndAdditionalPropertiesClass   {
+  
+  @SerializedName("uuid")
+  private String uuid = null;
+
+  @SerializedName("dateTime")
+  private Date dateTime = null;
+
+  @SerializedName("map")
+  private Map<String, Animal> map = new HashMap<String, Animal>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getUuid() {
+    return uuid;
+  }
+  public void setUuid(String uuid) {
+    this.uuid = uuid;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, Animal> getMap() {
+    return map;
+  }
+  public void setMap(Map<String, Animal> map) {
+    this.map = map;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+    return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+        Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
+        Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid, dateTime, map);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+    
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
index b24b87366a41..5aa60a1f6f11 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
@@ -24,6 +24,9 @@ public class Name   {
   @SerializedName("property")
   private String property = null;
 
+  @SerializedName("123Number")
+  private Integer _123Number = null;
+
   /**
    **/
   @ApiModelProperty(required = true, value = "")
@@ -51,6 +54,13 @@ public class Name   {
     this.property = property;
   }
 
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer get123Number() {
+    return _123Number;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -63,12 +73,13 @@ public class Name   {
     Name name = (Name) o;
     return Objects.equals(name, name.name) &&
         Objects.equals(snakeCase, name.snakeCase) &&
-        Objects.equals(property, name.property);
+        Objects.equals(property, name.property) &&
+        Objects.equals(_123Number, name._123Number);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, snakeCase, property);
+    return Objects.hash(name, snakeCase, property, _123Number);
   }
 
   @Override
@@ -79,6 +90,7 @@ public class Name   {
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
     sb.append("    property: ").append(toIndentedString(property)).append("\n");
+    sb.append("    _123Number: ").append(toIndentedString(_123Number)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
new file mode 100644
index 000000000000..32e4f515bce4
--- /dev/null
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -0,0 +1,78 @@
+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 ReadOnlyFirst   {
+  
+  @SerializedName("bar")
+  private String bar = null;
+
+  @SerializedName("baz")
+  private String baz = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBar() {
+    return bar;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBaz() {
+    return baz;
+  }
+  public void setBaz(String baz) {
+    this.baz = baz;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+    return Objects.equals(bar, readOnlyFirst.bar) &&
+        Objects.equals(baz, readOnlyFirst.baz);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, baz);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ReadOnlyFirst {\n");
+    
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    baz: ").append(toIndentedString(baz)).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    ");
+  }
+}

From 503fb138f5b4d445e7319712197e27fc4e8a8e03 Mon Sep 17 00:00:00 2001
From: clasnake <classical.zhu@gmail.com>
Date: Sat, 4 Jun 2016 21:13:10 +0800
Subject: [PATCH 084/139] Add sbt support for retrofit2 and retrofit2rx.

---
 .../libraries/retrofit2/build.sbt.mustache    |  24 +++
 .../java/retrofit2/.swagger-codegen-ignore    |  23 ++
 .../client/petstore/java/retrofit2/LICENSE    | 201 ++++++++++++++++++
 .../client/petstore/java/retrofit2/build.sbt  |  20 ++
 .../docs/AdditionalPropertiesClass.md         |   2 +
 .../petstore/java/retrofit2/docs/ArrayTest.md |   3 +
 ...dPropertiesAndAdditionalPropertiesClass.md |   1 +
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 .../java/io/swagger/client/StringUtil.java    |   2 +-
 .../model/AdditionalPropertiesClass.java      |  84 ++++++++
 .../io/swagger/client/model/ArrayTest.java    |  98 +++++++++
 ...ropertiesAndAdditionalPropertiesClass.java | 101 +++++++++
 .../swagger/client/model/ReadOnlyFirst.java   |  78 +++++++
 .../java/retrofit2rx/.swagger-codegen-ignore  |  23 ++
 .../client/petstore/java/retrofit2rx/LICENSE  | 201 ++++++++++++++++++
 .../petstore/java/retrofit2rx/build.sbt       |  22 ++
 .../docs/AdditionalPropertiesClass.md         |   2 +
 .../java/retrofit2rx/docs/ArrayTest.md        |   3 +
 ...dPropertiesAndAdditionalPropertiesClass.md |   1 +
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 .../java/io/swagger/client/StringUtil.java    |   2 +-
 .../model/AdditionalPropertiesClass.java      |  84 ++++++++
 .../io/swagger/client/model/ArrayTest.java    |  98 +++++++++
 ...ropertiesAndAdditionalPropertiesClass.java | 101 +++++++++
 .../swagger/client/model/ReadOnlyFirst.java   |  78 +++++++
 25 files changed, 1252 insertions(+), 4 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
 create mode 100644 samples/client/petstore/java/retrofit2/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/java/retrofit2/LICENSE
 create mode 100644 samples/client/petstore/java/retrofit2/build.sbt
 create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java
 create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
 create mode 100644 samples/client/petstore/java/retrofit2rx/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/java/retrofit2rx/LICENSE
 create mode 100644 samples/client/petstore/java/retrofit2rx/build.sbt
 create mode 100644 samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java
 create mode 100644 samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
new file mode 100644
index 000000000000..8e6986fa2d2f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
@@ -0,0 +1,24 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "{{groupId}}",
+    name := "{{artifactId}}",
+    version := "{{artifactVersion}}",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "com.squareup.retrofit2" % "retrofit" % "2.0.2" % "compile",
+      "com.squareup.retrofit2" % "converter-scalars" % "2.0.2" % "compile",
+      "com.squareup.retrofit2" % "converter-gson" % "2.0.2" % "compile",
+      {{#useRxJava}}
+      "com.squareup.retrofit2" % "adapter-rxjava" % "2.0.2" % "compile",
+      "io.reactivex" % "rxjava" % "1.1.3" % "compile",
+      {{/useRxJava}}
+      "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "junit" % "junit" % "4.12" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )
diff --git a/samples/client/petstore/java/retrofit2/.swagger-codegen-ignore b/samples/client/petstore/java/retrofit2/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/java/retrofit2/LICENSE b/samples/client/petstore/java/retrofit2/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/java/retrofit2/build.sbt b/samples/client/petstore/java/retrofit2/build.sbt
new file mode 100644
index 000000000000..8ebea3cad9df
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/build.sbt
@@ -0,0 +1,20 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "io.swagger",
+    name := "swagger-petstore-retrofit2",
+    version := "1.0.0",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "com.squareup.retrofit2" % "retrofit" % "2.0.2" % "compile",
+      "com.squareup.retrofit2" % "converter-scalars" % "2.0.2" % "compile",
+      "com.squareup.retrofit2" % "converter-gson" % "2.0.2" % "compile",
+      "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "junit" % "junit" % "4.12" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )
diff --git a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md
index c72785d450f4..0437c4dd8cc7 100644
--- a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md
@@ -4,6 +4,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**mapProperty** | **Map&lt;String, String&gt;** |  |  [optional]
+**mapOfMapProperty** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/retrofit2/docs/ArrayTest.md b/samples/client/petstore/java/retrofit2/docs/ArrayTest.md
index 73c3e5305ada..9feee16427fb 100644
--- a/samples/client/petstore/java/retrofit2/docs/ArrayTest.md
+++ b/samples/client/petstore/java/retrofit2/docs/ArrayTest.md
@@ -4,6 +4,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**arrayOfString** | **List&lt;String&gt;** |  |  [optional]
+**arrayArrayOfInteger** | [**List&lt;List&lt;Long&gt;&gt;**](List.md) |  |  [optional]
+**arrayArrayOfModel** | [**List&lt;List&lt;ReadOnlyFirst&gt;&gt;**](List.md) |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index fcdbd3905172..00cc10ca9b3d 100644
--- a/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **uuid** | **String** |  |  [optional]
 **dateTime** | [**Date**](Date.md) |  |  [optional]
+**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/retrofit2/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/retrofit2/gradle/wrapper/gradle-wrapper.properties
index 77483e70e765..b7a364739551 100644
--- a/samples/client/petstore/java/retrofit2/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/client/petstore/java/retrofit2/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue May 17 23:04:50 CST 2016
+#Tue May 17 23:08:05 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
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 244ee20eb5b2..16b65ffb7ef7 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-05-17T10:34:26.353+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:04:39.523+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
new file mode 100644
index 000000000000..839b04aa6c56
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -0,0 +1,84 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class AdditionalPropertiesClass   {
+  
+  @SerializedName("map_property")
+  private Map<String, String> mapProperty = new HashMap<String, String>();
+
+  @SerializedName("map_of_map_property")
+  private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, String> getMapProperty() {
+    return mapProperty;
+  }
+  public void setMapProperty(Map<String, String> mapProperty) {
+    this.mapProperty = mapProperty;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, Map<String, String>> getMapOfMapProperty() {
+    return mapOfMapProperty;
+  }
+  public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
+    this.mapOfMapProperty = mapOfMapProperty;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+    return Objects.equals(mapProperty, additionalPropertiesClass.mapProperty) &&
+        Objects.equals(mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapProperty, mapOfMapProperty);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesClass {\n");
+    
+    sb.append("    mapProperty: ").append(toIndentedString(mapProperty)).append("\n");
+    sb.append("    mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).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/ArrayTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java
new file mode 100644
index 000000000000..92337cc02463
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -0,0 +1,98 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class ArrayTest   {
+  
+  @SerializedName("array_of_string")
+  private List<String> arrayOfString = new ArrayList<String>();
+
+  @SerializedName("array_array_of_integer")
+  private List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
+
+  @SerializedName("array_array_of_model")
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getArrayOfString() {
+    return arrayOfString;
+  }
+  public void setArrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<List<Long>> getArrayArrayOfInteger() {
+    return arrayArrayOfInteger;
+  }
+  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+    return arrayArrayOfModel;
+  }
+  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayTest arrayTest = (ArrayTest) o;
+    return Objects.equals(arrayOfString, arrayTest.arrayOfString) &&
+        Objects.equals(arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
+        Objects.equals(arrayArrayOfModel, arrayTest.arrayArrayOfModel);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayTest {\n");
+    
+    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).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/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
new file mode 100644
index 000000000000..d4afc9964406
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -0,0 +1,101 @@
+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 java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class MixedPropertiesAndAdditionalPropertiesClass   {
+  
+  @SerializedName("uuid")
+  private String uuid = null;
+
+  @SerializedName("dateTime")
+  private Date dateTime = null;
+
+  @SerializedName("map")
+  private Map<String, Animal> map = new HashMap<String, Animal>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getUuid() {
+    return uuid;
+  }
+  public void setUuid(String uuid) {
+    this.uuid = uuid;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, Animal> getMap() {
+    return map;
+  }
+  public void setMap(Map<String, Animal> map) {
+    this.map = map;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+    return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+        Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
+        Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid, dateTime, map);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+    
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    map: ").append(toIndentedString(map)).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/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
new file mode 100644
index 000000000000..32e4f515bce4
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -0,0 +1,78 @@
+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 ReadOnlyFirst   {
+  
+  @SerializedName("bar")
+  private String bar = null;
+
+  @SerializedName("baz")
+  private String baz = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBar() {
+    return bar;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBaz() {
+    return baz;
+  }
+  public void setBaz(String baz) {
+    this.baz = baz;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+    return Objects.equals(bar, readOnlyFirst.bar) &&
+        Objects.equals(baz, readOnlyFirst.baz);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, baz);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ReadOnlyFirst {\n");
+    
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    baz: ").append(toIndentedString(baz)).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/.swagger-codegen-ignore b/samples/client/petstore/java/retrofit2rx/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/java/retrofit2rx/LICENSE b/samples/client/petstore/java/retrofit2rx/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/java/retrofit2rx/build.sbt b/samples/client/petstore/java/retrofit2rx/build.sbt
new file mode 100644
index 000000000000..cfe2d8d341cb
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/build.sbt
@@ -0,0 +1,22 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "io.swagger",
+    name := "swagger-petstore-retrofit2-rx",
+    version := "1.0.0",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "com.squareup.retrofit2" % "retrofit" % "2.0.2" % "compile",
+      "com.squareup.retrofit2" % "converter-scalars" % "2.0.2" % "compile",
+      "com.squareup.retrofit2" % "converter-gson" % "2.0.2" % "compile",
+      "com.squareup.retrofit2" % "adapter-rxjava" % "2.0.2" % "compile",
+      "io.reactivex" % "rxjava" % "1.1.3" % "compile",
+      "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "junit" % "junit" % "4.12" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )
diff --git a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md
index c72785d450f4..0437c4dd8cc7 100644
--- a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md
@@ -4,6 +4,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**mapProperty** | **Map&lt;String, String&gt;** |  |  [optional]
+**mapOfMapProperty** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/retrofit2rx/docs/ArrayTest.md b/samples/client/petstore/java/retrofit2rx/docs/ArrayTest.md
index 73c3e5305ada..9feee16427fb 100644
--- a/samples/client/petstore/java/retrofit2rx/docs/ArrayTest.md
+++ b/samples/client/petstore/java/retrofit2rx/docs/ArrayTest.md
@@ -4,6 +4,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**arrayOfString** | **List&lt;String&gt;** |  |  [optional]
+**arrayArrayOfInteger** | [**List&lt;List&lt;Long&gt;&gt;**](List.md) |  |  [optional]
+**arrayArrayOfModel** | [**List&lt;List&lt;ReadOnlyFirst&gt;&gt;**](List.md) |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index fcdbd3905172..00cc10ca9b3d 100644
--- a/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **uuid** | **String** |  |  [optional]
 **dateTime** | [**Date**](Date.md) |  |  [optional]
+**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/retrofit2rx/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/retrofit2rx/gradle/wrapper/gradle-wrapper.properties
index d28218b9a145..b7a364739551 100644
--- a/samples/client/petstore/java/retrofit2rx/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/client/petstore/java/retrofit2rx/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue May 17 23:05:31 CST 2016
+#Tue May 17 23:08:05 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
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 4f33efd89914..4d786f284383 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-05-17T10:34:31.551+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:05:33.279+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
new file mode 100644
index 000000000000..839b04aa6c56
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -0,0 +1,84 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class AdditionalPropertiesClass   {
+  
+  @SerializedName("map_property")
+  private Map<String, String> mapProperty = new HashMap<String, String>();
+
+  @SerializedName("map_of_map_property")
+  private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, String> getMapProperty() {
+    return mapProperty;
+  }
+  public void setMapProperty(Map<String, String> mapProperty) {
+    this.mapProperty = mapProperty;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, Map<String, String>> getMapOfMapProperty() {
+    return mapOfMapProperty;
+  }
+  public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
+    this.mapOfMapProperty = mapOfMapProperty;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+    return Objects.equals(mapProperty, additionalPropertiesClass.mapProperty) &&
+        Objects.equals(mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapProperty, mapOfMapProperty);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesClass {\n");
+    
+    sb.append("    mapProperty: ").append(toIndentedString(mapProperty)).append("\n");
+    sb.append("    mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).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/ArrayTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java
new file mode 100644
index 000000000000..92337cc02463
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -0,0 +1,98 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class ArrayTest   {
+  
+  @SerializedName("array_of_string")
+  private List<String> arrayOfString = new ArrayList<String>();
+
+  @SerializedName("array_array_of_integer")
+  private List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
+
+  @SerializedName("array_array_of_model")
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<String> getArrayOfString() {
+    return arrayOfString;
+  }
+  public void setArrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<List<Long>> getArrayArrayOfInteger() {
+    return arrayArrayOfInteger;
+  }
+  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+    return arrayArrayOfModel;
+  }
+  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayTest arrayTest = (ArrayTest) o;
+    return Objects.equals(arrayOfString, arrayTest.arrayOfString) &&
+        Objects.equals(arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
+        Objects.equals(arrayArrayOfModel, arrayTest.arrayArrayOfModel);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayTest {\n");
+    
+    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).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/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
new file mode 100644
index 000000000000..d4afc9964406
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -0,0 +1,101 @@
+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 java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+
+public class MixedPropertiesAndAdditionalPropertiesClass   {
+  
+  @SerializedName("uuid")
+  private String uuid = null;
+
+  @SerializedName("dateTime")
+  private Date dateTime = null;
+
+  @SerializedName("map")
+  private Map<String, Animal> map = new HashMap<String, Animal>();
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getUuid() {
+    return uuid;
+  }
+  public void setUuid(String uuid) {
+    this.uuid = uuid;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Date getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(Date dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Map<String, Animal> getMap() {
+    return map;
+  }
+  public void setMap(Map<String, Animal> map) {
+    this.map = map;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+    return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+        Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
+        Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid, dateTime, map);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+    
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    map: ").append(toIndentedString(map)).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/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
new file mode 100644
index 000000000000..32e4f515bce4
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -0,0 +1,78 @@
+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 ReadOnlyFirst   {
+  
+  @SerializedName("bar")
+  private String bar = null;
+
+  @SerializedName("baz")
+  private String baz = null;
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBar() {
+    return bar;
+  }
+
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public String getBaz() {
+    return baz;
+  }
+  public void setBaz(String baz) {
+    this.baz = baz;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+    return Objects.equals(bar, readOnlyFirst.bar) &&
+        Objects.equals(baz, readOnlyFirst.baz);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, baz);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ReadOnlyFirst {\n");
+    
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    baz: ").append(toIndentedString(baz)).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    ");
+  }
+}

From 4da829315fda53c4fb24b98abb09a8bb367cc0f7 Mon Sep 17 00:00:00 2001
From: clasnake <classical.zhu@gmail.com>
Date: Sat, 4 Jun 2016 21:51:49 +0800
Subject: [PATCH 085/139] Add sbt support for feign.

---
 .../codegen/languages/JavaClientCodegen.java  |  2 ++
 .../Java/libraries/feign/build.sbt.mustache   | 26 +++++++++++++++++++
 samples/client/petstore/java/feign/build.sbt  | 26 +++++++++++++++++++
 .../io/swagger/client/FormAwareEncoder.java   |  2 +-
 .../java/io/swagger/client/StringUtil.java    |  2 +-
 .../java/io/swagger/client/api/FakeApi.java   |  2 +-
 .../java/io/swagger/client/api/PetApi.java    |  2 +-
 .../java/io/swagger/client/api/StoreApi.java  |  2 +-
 .../java/io/swagger/client/api/UserApi.java   |  2 +-
 .../model/AdditionalPropertiesClass.java      |  2 +-
 .../java/io/swagger/client/model/Animal.java  |  2 +-
 .../io/swagger/client/model/AnimalFarm.java   |  2 +-
 .../io/swagger/client/model/ArrayTest.java    |  2 +-
 .../java/io/swagger/client/model/Cat.java     |  2 +-
 .../io/swagger/client/model/Category.java     |  2 +-
 .../java/io/swagger/client/model/Dog.java     |  2 +-
 .../io/swagger/client/model/EnumTest.java     |  2 +-
 .../io/swagger/client/model/FormatTest.java   |  2 +-
 ...ropertiesAndAdditionalPropertiesClass.java |  2 +-
 .../client/model/Model200Response.java        |  2 +-
 .../client/model/ModelApiResponse.java        |  2 +-
 .../io/swagger/client/model/ModelReturn.java  |  2 +-
 .../java/io/swagger/client/model/Name.java    |  2 +-
 .../java/io/swagger/client/model/Order.java   |  2 +-
 .../java/io/swagger/client/model/Pet.java     |  2 +-
 .../swagger/client/model/ReadOnlyFirst.java   |  2 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../java/io/swagger/client/model/Tag.java     |  2 +-
 .../java/io/swagger/client/model/User.java    |  2 +-
 29 files changed, 80 insertions(+), 26 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache
 create mode 100644 samples/client/petstore/java/feign/build.sbt

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
index 3f0d287a123c..73930a838782 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -275,6 +275,8 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
                     gradleWrapperPackage.replace( ".", File.separator ), "gradle-wrapper.properties") ); 
             supportingFiles.add( new SupportingFile( "gradle-wrapper.jar", 
                     gradleWrapperPackage.replace( ".", File.separator ), "gradle-wrapper.jar") );
+            // "build.sbt" is for development with SBT
+            supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
         }
         supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.mustache", authFolder, "HttpBasicAuth.java"));
         supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.mustache", authFolder, "ApiKeyAuth.java"));
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache
new file mode 100644
index 000000000000..edb69307345f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache
@@ -0,0 +1,26 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "{{groupId}}",
+    name := "{{artifactId}}",
+    version := "{{artifactVersion}}",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+      "com.netflix.feign" % "feign-core" % "8.16.0" % "compile",
+      "com.netflix.feign" % "feign-jackson" % "8.16.0" % "compile",
+      "com.netflix.feign" % "feign-slf4j" % "8.16.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.1.5" % "compile",
+      "joda-time" % "joda-time" % "2.9.3" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "com.brsanthu" % "migbase64" % "2.2" % "compile",
+      "junit" % "junit" % "4.12" % "testCompile",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )
diff --git a/samples/client/petstore/java/feign/build.sbt b/samples/client/petstore/java/feign/build.sbt
new file mode 100644
index 000000000000..344d5538317e
--- /dev/null
+++ b/samples/client/petstore/java/feign/build.sbt
@@ -0,0 +1,26 @@
+lazy val root = (project in file(".")).
+  settings(
+    organization := "io.swagger",
+    name := "swagger-petstore-feign",
+    version := "1.0.0",
+    scalaVersion := "2.11.4",
+    scalacOptions ++= Seq("-feature"),
+    javacOptions in compile ++= Seq("-Xlint:deprecation"),
+    publishArtifact in (Compile, packageDoc) := false,
+    resolvers += Resolver.mavenLocal,
+    libraryDependencies ++= Seq(
+      "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
+      "com.netflix.feign" % "feign-core" % "8.16.0" % "compile",
+      "com.netflix.feign" % "feign-jackson" % "8.16.0" % "compile",
+      "com.netflix.feign" % "feign-slf4j" % "8.16.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.1.5" % "compile",
+      "joda-time" % "joda-time" % "2.9.3" % "compile",
+      "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "com.brsanthu" % "migbase64" % "2.2" % "compile",
+      "junit" % "junit" % "4.12" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test"
+    )
+  )
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 0ed60ea489ab..53d318f4e931 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-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class FormAwareEncoder implements Encoder {
   public static final String UTF_8 = "utf-8";
   private static final String LINE_FEED = "\r\n";
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
index 6c316df35167..1b26a71cc05c 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-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
index 4874476628b4..fd6d5f57174c 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public interface FakeApi extends ApiClient.Api {
 
 
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 330838eb0a08..9ffe12bca386 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
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public interface PetApi extends ApiClient.Api {
 
 
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 2ff088ba096c..0a5f75950224 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public interface StoreApi extends ApiClient.Api {
 
 
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 c2e63a1a48c7..9cd3dbed3347 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public interface UserApi extends ApiClient.Api {
 
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 4a7155f2b6a3..9b95277bab5a 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -13,7 +13,7 @@ import java.util.Map;
 /**
  * AdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class AdditionalPropertiesClass   {
   
   private Map<String, String> mapProperty = new HashMap<String, String>();
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
index 1b350d588c96..6cb7abb5b166 100644
--- 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Animal
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class Animal   {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
index e1ded2993733..401163f410ab 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * AnimalFarm
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class AnimalFarm extends ArrayList<Animal>  {
   
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
index 79b7694b6d3f..aa9dea92bcca 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * ArrayTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class ArrayTest   {
   
   private List<String> arrayOfString = new ArrayList<String>();
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
index 4302c3b25ea6..da253692d82e 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Cat
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class Cat extends Animal  {
   
   private String className = null;
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 f87abb520f45..0d6104965d9c 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Category
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class Category   {
   
   private Long id = null;
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
index 84f5e7027971..ea9cd4d2f98c 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Dog
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class Dog extends Animal  {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
index 8d11a05968f8..b4c74124d8de 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * EnumTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class EnumTest   {
   
 
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
index c4d9d9d32796..58555b88e6ad 100644
--- 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
@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * FormatTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class FormatTest   {
   
   private Integer integer = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 598ed2ccce35..8d1d0fd3c3d0 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   
   private String uuid = null;
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 59aa3011fb9f..7346078f4254 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 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.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class Model200Response   {
   
   private Integer name = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 1927555c00b0..5f814027b3c8 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ModelApiResponse
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class ModelApiResponse   {
   
   private Integer code = null;
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 843c2262bd27..85864f83ebfb 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class ModelReturn   {
   
   private Integer _return = null;
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 2d5b16efdb5f..da85a0e9d27f 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
@@ -11,7 +11,7 @@ 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")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class Name   {
   
   private Integer name = null;
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 9715dc583ca7..df44eca9f658 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
@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * Order
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class Order   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
index b6062e49c379..a381af628c96 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
@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * Pet
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class Pet   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 8afaf45f4a27..dee19f0d01a8 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ReadOnlyFirst
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class ReadOnlyFirst   {
   
   private String bar = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
index b29b9777a828..832a8a778aa5 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * SpecialModelName
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
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 d661146dd86d..1041d5df5838 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Tag
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class Tag   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
index 695c4053ff64..54fd17b7cbbb 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * User
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-31T18:50:49.249+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
 public class User   {
   
   private Long id = null;

From a84ed9cb57be09bd08e3eb2d523031e328d5f439 Mon Sep 17 00:00:00 2001
From: clasnake <classical.zhu@gmail.com>
Date: Sat, 4 Jun 2016 22:18:23 +0800
Subject: [PATCH 086/139] Fix build.sbt.mustache for feign.

---
 .../src/main/resources/Java/libraries/feign/build.sbt.mustache  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache
index edb69307345f..37eabbd27b25 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache
@@ -20,7 +20,7 @@ lazy val root = (project in file(".")).
       "joda-time" % "joda-time" % "2.9.3" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "com.brsanthu" % "migbase64" % "2.2" % "compile",
-      "junit" % "junit" % "4.12" % "testCompile",
+      "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
   )

From f3cff97acc4a6fed6bcd5a9e9a967758277ddf9b Mon Sep 17 00:00:00 2001
From: clasnake <classical.zhu@gmail.com>
Date: Sat, 4 Jun 2016 22:21:27 +0800
Subject: [PATCH 087/139] Regenerate the sample client for feign.

---
 .../feign/src/main/java/io/swagger/client/FormAwareEncoder.java | 2 +-
 .../java/feign/src/main/java/io/swagger/client/StringUtil.java  | 2 +-
 .../java/feign/src/main/java/io/swagger/client/api/FakeApi.java | 2 +-
 .../java/feign/src/main/java/io/swagger/client/api/PetApi.java  | 2 +-
 .../feign/src/main/java/io/swagger/client/api/StoreApi.java     | 2 +-
 .../java/feign/src/main/java/io/swagger/client/api/UserApi.java | 2 +-
 .../java/io/swagger/client/model/AdditionalPropertiesClass.java | 2 +-
 .../feign/src/main/java/io/swagger/client/model/Animal.java     | 2 +-
 .../feign/src/main/java/io/swagger/client/model/AnimalFarm.java | 2 +-
 .../feign/src/main/java/io/swagger/client/model/ArrayTest.java  | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Cat.java   | 2 +-
 .../feign/src/main/java/io/swagger/client/model/Category.java   | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Dog.java   | 2 +-
 .../feign/src/main/java/io/swagger/client/model/EnumTest.java   | 2 +-
 .../feign/src/main/java/io/swagger/client/model/FormatTest.java | 2 +-
 .../model/MixedPropertiesAndAdditionalPropertiesClass.java      | 2 +-
 .../src/main/java/io/swagger/client/model/Model200Response.java | 2 +-
 .../src/main/java/io/swagger/client/model/ModelApiResponse.java | 2 +-
 .../src/main/java/io/swagger/client/model/ModelReturn.java      | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Name.java  | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Order.java | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Pet.java   | 2 +-
 .../src/main/java/io/swagger/client/model/ReadOnlyFirst.java    | 2 +-
 .../src/main/java/io/swagger/client/model/SpecialModelName.java | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Tag.java   | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/User.java  | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

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 53d318f4e931..fccefc933cea 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-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class FormAwareEncoder implements Encoder {
   public static final String UTF_8 = "utf-8";
   private static final String LINE_FEED = "\r\n";
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
index 1b26a71cc05c..4a4c14468b5e 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-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
index fd6d5f57174c..82ec4afc25f4 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public interface FakeApi extends ApiClient.Api {
 
 
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 9ffe12bca386..b568770101b4 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
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public interface PetApi extends ApiClient.Api {
 
 
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 0a5f75950224..4ac08793f6c7 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public interface StoreApi extends ApiClient.Api {
 
 
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 9cd3dbed3347..4ebcce8981c5 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public interface UserApi extends ApiClient.Api {
 
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 9b95277bab5a..af4699c1cf50 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -13,7 +13,7 @@ import java.util.Map;
 /**
  * AdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class AdditionalPropertiesClass   {
   
   private Map<String, String> mapProperty = new HashMap<String, String>();
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
index 6cb7abb5b166..36a1e8433126 100644
--- 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Animal
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class Animal   {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
index 401163f410ab..e5ba3d20af25 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * AnimalFarm
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class AnimalFarm extends ArrayList<Animal>  {
   
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
index aa9dea92bcca..f5e4c25b5cfe 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * ArrayTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class ArrayTest   {
   
   private List<String> arrayOfString = new ArrayList<String>();
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
index da253692d82e..aea43d75c5ea 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Cat
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class Cat extends Animal  {
   
   private String className = null;
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 0d6104965d9c..27adc7a820cd 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Category
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class Category   {
   
   private Long id = null;
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
index ea9cd4d2f98c..dcf82945e15c 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Dog
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class Dog extends Animal  {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
index b4c74124d8de..5291f51c1749 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * EnumTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class EnumTest   {
   
 
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
index 58555b88e6ad..3be249333df3 100644
--- 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
@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * FormatTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class FormatTest   {
   
   private Integer integer = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 8d1d0fd3c3d0..22d0e33388f8 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   
   private String uuid = null;
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 7346078f4254..226aa300ca8c 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 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.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class Model200Response   {
   
   private Integer name = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 5f814027b3c8..1dcd3c9b99b7 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ModelApiResponse
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class ModelApiResponse   {
   
   private Integer code = null;
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 85864f83ebfb..d5bf9048c8af 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class ModelReturn   {
   
   private Integer _return = null;
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 da85a0e9d27f..4984f5e60b21 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
@@ -11,7 +11,7 @@ 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")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class Name   {
   
   private Integer name = null;
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 df44eca9f658..4a08d38f3b00 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
@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * Order
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class Order   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
index a381af628c96..8e6e02a37d35 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
@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * Pet
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class Pet   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index dee19f0d01a8..02ded2afd7db 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ReadOnlyFirst
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class ReadOnlyFirst   {
   
   private String bar = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
index 832a8a778aa5..1bc8d287a76c 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * SpecialModelName
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
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 1041d5df5838..359f3c1d8fad 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Tag
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class Tag   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
index 54fd17b7cbbb..3cb71c1a7fbb 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * User
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T21:21:36.995+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
 public class User   {
   
   private Long id = null;

From 992a22f40945f18c31c0ad54dd4314b707c36ee6 Mon Sep 17 00:00:00 2001
From: clasnake <classical.zhu@gmail.com>
Date: Sun, 5 Jun 2016 09:22:13 +0800
Subject: [PATCH 088/139] Add build folder under java sample clients into
 gitignore in sample.

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4e650733033a..7ac37b155293 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,11 @@ samples/client/petstore/java/jersey2/.gradle/
 samples/client/petstore/java/jersey2/build/
 samples/client/petstore/java/okhttp-gson/.gradle/
 samples/client/petstore/java/okhttp-gson/build/
+samples/client/petstore/java/feign/build/
+samples/client/petstore/java/retrofit/build/
+samples/client/petstore/java/retrofit2/build/
+samples/client/petstore/java/retrofit2rx/build/
+samples/client/petstore/java/default/build/
 
 #PHP
 samples/client/petstore/php/SwaggerClient-php/composer.lock

From 955d39f709dce3d415d12178f7389bbfe58dadd4 Mon Sep 17 00:00:00 2001
From: Takuro Wada <taxpon@gmail.com>
Date: Sun, 5 Jun 2016 23:15:36 +0900
Subject: [PATCH 089/139] [Python] Follow PEP8 rules ( Issue #3041 )

---
 .../src/main/resources/python/api.mustache    |  12 +-
 .../main/resources/python/api_client.mustache |   2 +-
 .../main/resources/python/api_test.mustache   |   2 +-
 .../resources/python/configuration.mustache   |   2 +-
 .../src/main/resources/python/model.mustache  |  20 +-
 .../main/resources/python/model_test.mustache |   2 +-
 .../resources/python/partial_header.mustache  |   6 +-
 .../src/main/resources/python/setup.mustache  |   5 +-
 samples/client/petstore/python/README.md      |   2 +-
 samples/client/petstore/python/setup.py       |  10 +-
 .../python/swagger_client/__init__.py         |   6 +-
 .../python/swagger_client/api_client.py       |   2 +-
 .../python/swagger_client/apis/fake_api.py    |  32 ++-
 .../python/swagger_client/apis/pet_api.py     |  22 +-
 .../python/swagger_client/apis/store_api.py   |  20 +-
 .../python/swagger_client/apis/user_api.py    |  22 +-
 .../python/swagger_client/configuration.py    |   8 +-
 .../python/swagger_client/models/__init__.py  |   6 +-
 .../models/additional_properties_class.py     |  11 +-
 .../python/swagger_client/models/animal.py    |  11 +-
 .../swagger_client/models/animal_farm.py      |   8 +-
 .../swagger_client/models/api_response.py     |  13 +-
 .../swagger_client/models/array_test.py       |  13 +-
 .../python/swagger_client/models/cat.py       |  13 +-
 .../python/swagger_client/models/category.py  |  11 +-
 .../python/swagger_client/models/dog.py       |  13 +-
 .../swagger_client/models/enum_class.py       |   8 +-
 .../python/swagger_client/models/enum_test.py |   7 +-
 .../swagger_client/models/format_test.py      |  59 ++--
 .../models/inline_response_200.py             | 251 ------------------
 ...perties_and_additional_properties_class.py |  13 +-
 .../models/model_200_response.py              |   9 +-
 .../swagger_client/models/model_return.py     |   9 +-
 .../python/swagger_client/models/name.py      |  15 +-
 .../python/swagger_client/models/order.py     |  17 +-
 .../python/swagger_client/models/pet.py       |  17 +-
 .../swagger_client/models/read_only_first.py  |  11 +-
 .../models/special_model_name.py              |   9 +-
 .../python/swagger_client/models/tag.py       |  11 +-
 .../python/swagger_client/models/user.py      |  23 +-
 .../petstore/python/swagger_client/rest.py    |   6 +-
 .../test/test_additional_properties_class.py  |  28 +-
 .../petstore/python/test/test_animal.py       |  28 +-
 .../petstore/python/test/test_animal_farm.py  |  28 +-
 .../petstore/python/test/test_api_response.py |  28 +-
 .../petstore/python/test/test_array_test.py   |  28 +-
 .../client/petstore/python/test/test_cat.py   |  28 +-
 .../petstore/python/test/test_category.py     |  28 +-
 .../client/petstore/python/test/test_dog.py   |  28 +-
 .../petstore/python/test/test_enum_class.py   |  28 +-
 .../petstore/python/test/test_enum_test.py    |  28 +-
 .../petstore/python/test/test_fake_api.py     |  30 ++-
 .../petstore/python/test/test_format_test.py  |  28 +-
 ...perties_and_additional_properties_class.py |  28 +-
 .../python/test/test_model_200_response.py    |  28 +-
 .../petstore/python/test/test_model_return.py |  28 +-
 .../client/petstore/python/test/test_name.py  |  28 +-
 .../client/petstore/python/test/test_order.py |  28 +-
 .../client/petstore/python/test/test_pet.py   |  28 +-
 .../petstore/python/test/test_pet_api.py      |  28 +-
 .../python/test/test_read_only_first.py       |  28 +-
 .../python/test/test_special_model_name.py    |  28 +-
 .../petstore/python/test/test_store_api.py    |  28 +-
 .../client/petstore/python/test/test_tag.py   |  28 +-
 .../client/petstore/python/test/test_user.py  |  28 +-
 .../petstore/python/test/test_user_api.py     |  28 +-
 .../python/tests/test_api_exception.py        |   3 +-
 .../python/tests/test_deserialization.py      |  89 ++++---
 68 files changed, 654 insertions(+), 879 deletions(-)
 delete mode 100644 samples/client/petstore/python/swagger_client/models/inline_response_200.py

diff --git a/modules/swagger-codegen/src/main/resources/python/api.mustache b/modules/swagger-codegen/src/main/resources/python/api.mustache
index 43962c7f5258..050278b2b5d3 100644
--- a/modules/swagger-codegen/src/main/resources/python/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api.mustache
@@ -73,7 +73,6 @@ class {{classname}}(object):
                 )
             params[key] = val
         del params['kwargs']
-
 {{#allParams}}
 {{#required}}
         # verify the required parameter '{{paramName}}' is set
@@ -85,28 +84,27 @@ class {{classname}}(object):
 {{#allParams}}
 {{#hasValidation}}
     {{#maxLength}}
-        if '{{paramName}}' in params and len(params['{{paramName}}']) > {{maxLength}}: 
+        if '{{paramName}}' in params and len(params['{{paramName}}']) > {{maxLength}}:
             raise ValueError("Invalid value for parameter `{{paramName}}` when calling `{{operationId}}`, length must be less than or equal to `{{maxLength}}`")
     {{/maxLength}}
     {{#minLength}}
-        if '{{paramName}}' in params and len(params['{{paramName}}']) < {{minLength}}: 
+        if '{{paramName}}' in params and len(params['{{paramName}}']) < {{minLength}}:
             raise ValueError("Invalid value for parameter `{{paramName}}` when calling `{{operationId}}`, length must be greater than or equal to `{{minLength}}`")
     {{/minLength}}
     {{#maximum}}
-        if '{{paramName}}' in params and params['{{paramName}}'] > {{maximum}}: 
+        if '{{paramName}}' in params and params['{{paramName}}'] > {{maximum}}:
             raise ValueError("Invalid value for parameter `{{paramName}}` when calling `{{operationId}}`, must be a value less than or equal to  `{{maximum}}`")
     {{/maximum}}
     {{#minimum}}
-        if '{{paramName}}' in params and params['{{paramName}}'] < {{minimum}}: 
+        if '{{paramName}}' in params and params['{{paramName}}'] < {{minimum}}:
             raise ValueError("Invalid value for parameter `{{paramName}}` when calling `{{operationId}}`, must be a value greater than or equal to `{{minimum}}`")
     {{/minimum}}
     {{#pattern}}
-        if '{{paramName}}' in params and not re.search('{{vendorExtensions.x-regex}}', params['{{paramName}}']{{#vendorExtensions.x-modifiers}}{{#-first}}, flags={{/-first}}re.{{.}}{{^-last}} | {{/-last}}{{/vendorExtensions.x-modifiers}}): 
+        if '{{paramName}}' in params and not re.search('{{vendorExtensions.x-regex}}', params['{{paramName}}']{{#vendorExtensions.x-modifiers}}{{#-first}}, flags={{/-first}}re.{{.}}{{^-last}} | {{/-last}}{{/vendorExtensions.x-modifiers}}):
             raise ValueError("Invalid value for parameter `{{paramName}}` when calling `{{operationId}}`, must conform to the pattern `{{pattern}}`")
     {{/pattern}}
 {{/hasValidation}}
 {{/allParams}}
-
         resource_path = '{{path}}'.replace('{format}', 'json')
         path_params = {}
 {{#pathParams}}
diff --git a/modules/swagger-codegen/src/main/resources/python/api_client.mustache b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
index 07b9419e08f8..2a4732f5afde 100644
--- a/modules/swagger-codegen/src/main/resources/python/api_client.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
@@ -191,7 +191,7 @@ class ApiClient(object):
         :return: The serialized form of data.
         """
         types = (str, int, float, bool, tuple)
-        if sys.version_info < (3,0):
+        if sys.version_info < (3, 0):
             types = types + (unicode,)
         if isinstance(obj, type(None)):
             return None
diff --git a/modules/swagger-codegen/src/main/resources/python/api_test.mustache b/modules/swagger-codegen/src/main/resources/python/api_test.mustache
index 4906d0e03718..a301d64722a7 100644
--- a/modules/swagger-codegen/src/main/resources/python/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api_test.mustache
@@ -35,4 +35,4 @@ class {{#operations}}Test{{classname}}(unittest.TestCase):
 {{/operations}}
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/modules/swagger-codegen/src/main/resources/python/configuration.mustache b/modules/swagger-codegen/src/main/resources/python/configuration.mustache
index 9ea2ab4a7b5b..2a26c651d7d2 100644
--- a/modules/swagger-codegen/src/main/resources/python/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/configuration.mustache
@@ -17,6 +17,7 @@ import logging
 
 from six import iteritems
 
+
 def singleton(cls, *args, **kw):
     instances = {}
 
@@ -59,7 +60,6 @@ class Configuration(object):
         # access token for OAuth
         self.access_token = ""
 {{/isOAuth}}{{/authMethods}}
-
         # Logging Settings
         self.logger = {}
         self.logger["package_logger"] = logging.getLogger("{{packageName}}")
diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index 781bb37e4e5a..a592278bf128 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -36,8 +36,8 @@ class {{classname}}(object):
 {{#vars}}
         self._{{name}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}
 {{/vars}}
-
-{{#vars}}
+{{#vars}}{{#-first}}
+{{/-first}}
     @property
     def {{name}}(self):
         """
@@ -58,7 +58,8 @@ class {{classname}}(object):
         :param {{name}}: The {{name}} of this {{classname}}.
         :type: {{datatype}}
         """
-        {{#isEnum}}allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
+{{#isEnum}}
+        allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
         if {{name}} not in allowed_values:
             raise ValueError(
                 "Invalid value for `{{name}}`, must be one of {0}"
@@ -71,23 +72,23 @@ class {{classname}}(object):
         if not {{name}}:
             raise ValueError("Invalid value for `{{name}}`, must not be `None`")
 {{#maxLength}}
-        if len({{name}}) > {{maxLength}}: 
+        if len({{name}}) > {{maxLength}}:
             raise ValueError("Invalid value for `{{name}}`, length must be less than `{{maxLength}}`")
 {{/maxLength}}
 {{#minLength}}
-        if len({{name}}) < {{minLength}}: 
+        if len({{name}}) < {{minLength}}:
             raise ValueError("Invalid value for `{{name}}`, length must be greater than or equal to `{{minLength}}`")
 {{/minLength}}
 {{#maximum}}
-        if {{name}} > {{maximum}}: 
+        if {{name}} > {{maximum}}:
             raise ValueError("Invalid value for `{{name}}`, must be a value less than or equal to `{{maximum}}`")
 {{/maximum}}
 {{#minimum}}
-        if {{name}} < {{minimum}}: 
+        if {{name}} < {{minimum}}:
             raise ValueError("Invalid value for `{{name}}`, must be a value greater than or equal to `{{minimum}}`")
 {{/minimum}}
 {{#pattern}}
-        if not re.search('{{vendorExtensions.x-regex}}', {{name}}{{#vendorExtensions.x-modifiers}}{{#-first}}, flags={{/-first}}re.{{.}}{{^-last}} | {{/-last}}{{/vendorExtensions.x-modifiers}}): 
+        if not re.search('{{vendorExtensions.x-regex}}', {{name}}{{#vendorExtensions.x-modifiers}}{{#-first}}, flags={{/-first}}re.{{.}}{{^-last}} | {{/-last}}{{/vendorExtensions.x-modifiers}}):
             raise ValueError("Invalid value for `{{name}}`, must be a follow pattern or equal to `{{pattern}}`")
 {{/pattern}}
 {{/hasValidation}}
@@ -145,6 +146,5 @@ class {{classname}}(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
 {{/model}}
-{{/models}}
+{{/models}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/python/model_test.mustache b/modules/swagger-codegen/src/main/resources/python/model_test.mustache
index ffd38a52b499..3533fa110634 100644
--- a/modules/swagger-codegen/src/main/resources/python/model_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model_test.mustache
@@ -34,4 +34,4 @@ class Test{{classname}}(unittest.TestCase):
 {{/models}}
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/modules/swagger-codegen/src/main/resources/python/partial_header.mustache b/modules/swagger-codegen/src/main/resources/python/partial_header.mustache
index ea97064963c8..004460091dda 100644
--- a/modules/swagger-codegen/src/main/resources/python/partial_header.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/partial_header.mustache
@@ -10,13 +10,13 @@
     {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
     {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
diff --git a/modules/swagger-codegen/src/main/resources/python/setup.mustache b/modules/swagger-codegen/src/main/resources/python/setup.mustache
index c825911f91a6..f46265995faa 100644
--- a/modules/swagger-codegen/src/main/resources/python/setup.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/setup.mustache
@@ -7,9 +7,7 @@ from setuptools import setup, find_packages
 
 NAME = "{{packageName}}"
 VERSION = "{{packageVersion}}"
-
 {{#apiInfo}}{{#apis}}{{^hasMore}}
-
 # To install the library, run the following
 #
 # python setup.py install
@@ -33,5 +31,4 @@ setup(
     {{appDescription}}
     """
 )
-
-{{/hasMore}}{{/apis}}{{/apiInfo}}
+{{/hasMore}}{{/apis}}{{/apiInfo}}
\ No newline at end of file
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index 274de71c4358..453d140f1f74 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-06-02T12:44:41.178+09:00
+- Build date: 2016-06-05T23:15:10.095+09:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/samples/client/petstore/python/setup.py b/samples/client/petstore/python/setup.py
index a4d22d206ac4..2029c83372c0 100644
--- a/samples/client/petstore/python/setup.py
+++ b/samples/client/petstore/python/setup.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -28,8 +28,6 @@ from setuptools import setup, find_packages
 NAME = "swagger_client"
 VERSION = "1.0.0"
 
-
-
 # To install the library, run the following
 #
 # python setup.py install
@@ -53,5 +51,3 @@ setup(
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \&quot; \\ 
     """
 )
-
-
diff --git a/samples/client/petstore/python/swagger_client/__init__.py b/samples/client/petstore/python/swagger_client/__init__.py
index 13fbf2257b09..ae225644f735 100644
--- a/samples/client/petstore/python/swagger_client/__init__.py
+++ b/samples/client/petstore/python/swagger_client/__init__.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
diff --git a/samples/client/petstore/python/swagger_client/api_client.py b/samples/client/petstore/python/swagger_client/api_client.py
index 5d5a5fccc4ca..5bc448a950c8 100644
--- a/samples/client/petstore/python/swagger_client/api_client.py
+++ b/samples/client/petstore/python/swagger_client/api_client.py
@@ -191,7 +191,7 @@ class ApiClient(object):
         :return: The serialized form of data.
         """
         types = (str, int, float, bool, tuple)
-        if sys.version_info < (3,0):
+        if sys.version_info < (3, 0):
             types = types + (unicode,)
         if isinstance(obj, type(None)):
             return None
diff --git a/samples/client/petstore/python/swagger_client/apis/fake_api.py b/samples/client/petstore/python/swagger_client/apis/fake_api.py
index f8c522d2bf84..317232217b85 100644
--- a/samples/client/petstore/python/swagger_client/apis/fake_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/fake_api.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -95,7 +95,6 @@ class FakeApi(object):
                 )
             params[key] = val
         del params['kwargs']
-
         # verify the required parameter 'number' is set
         if ('number' not in params) or (params['number'] is None):
             raise ValueError("Missing the required parameter `number` when calling `test_endpoint_parameters`")
@@ -109,31 +108,30 @@ class FakeApi(object):
         if ('byte' not in params) or (params['byte'] is None):
             raise ValueError("Missing the required parameter `byte` when calling `test_endpoint_parameters`")
 
-        if 'number' in params and params['number'] > 543.2: 
+        if 'number' in params and params['number'] > 543.2:
             raise ValueError("Invalid value for parameter `number` when calling `test_endpoint_parameters`, must be a value less than or equal to  `543.2`")
-        if 'number' in params and params['number'] < 32.1: 
+        if 'number' in params and params['number'] < 32.1:
             raise ValueError("Invalid value for parameter `number` when calling `test_endpoint_parameters`, must be a value greater than or equal to `32.1`")
-        if 'double' in params and params['double'] > 123.4: 
+        if 'double' in params and params['double'] > 123.4:
             raise ValueError("Invalid value for parameter `double` when calling `test_endpoint_parameters`, must be a value less than or equal to  `123.4`")
-        if 'double' in params and params['double'] < 67.8: 
+        if 'double' in params and params['double'] < 67.8:
             raise ValueError("Invalid value for parameter `double` when calling `test_endpoint_parameters`, must be a value greater than or equal to `67.8`")
-        if 'string' in params and not re.search('[a-z]', params['string'], flags=re.IGNORECASE): 
+        if 'string' in params and not re.search('[a-z]', params['string'], flags=re.IGNORECASE):
             raise ValueError("Invalid value for parameter `string` when calling `test_endpoint_parameters`, must conform to the pattern `/[a-z]/i`")
-        if 'integer' in params and params['integer'] > 100.0: 
+        if 'integer' in params and params['integer'] > 100.0:
             raise ValueError("Invalid value for parameter `integer` when calling `test_endpoint_parameters`, must be a value less than or equal to  `100.0`")
-        if 'integer' in params and params['integer'] < 10.0: 
+        if 'integer' in params and params['integer'] < 10.0:
             raise ValueError("Invalid value for parameter `integer` when calling `test_endpoint_parameters`, must be a value greater than or equal to `10.0`")
-        if 'int32' in params and params['int32'] > 200.0: 
+        if 'int32' in params and params['int32'] > 200.0:
             raise ValueError("Invalid value for parameter `int32` when calling `test_endpoint_parameters`, must be a value less than or equal to  `200.0`")
-        if 'int32' in params and params['int32'] < 20.0: 
+        if 'int32' in params and params['int32'] < 20.0:
             raise ValueError("Invalid value for parameter `int32` when calling `test_endpoint_parameters`, must be a value greater than or equal to `20.0`")
-        if 'float' in params and params['float'] > 987.6: 
+        if 'float' in params and params['float'] > 987.6:
             raise ValueError("Invalid value for parameter `float` when calling `test_endpoint_parameters`, must be a value less than or equal to  `987.6`")
-        if 'password' in params and len(params['password']) > 64: 
+        if 'password' in params and len(params['password']) > 64:
             raise ValueError("Invalid value for parameter `password` when calling `test_endpoint_parameters`, length must be less than or equal to `64`")
-        if 'password' in params and len(params['password']) < 10: 
+        if 'password' in params and len(params['password']) < 10:
             raise ValueError("Invalid value for parameter `password` when calling `test_endpoint_parameters`, length must be greater than or equal to `10`")
-
         resource_path = '/fake'.replace('{format}', 'json')
         path_params = {}
 
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 dd730f31dfee..2f2ee4429c29 100644
--- a/samples/client/petstore/python/swagger_client/apis/pet_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/pet_api.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -84,12 +84,10 @@ 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 = {}
 
@@ -163,12 +161,10 @@ class PetApi(object):
                 )
             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 `delete_pet`")
 
-
         resource_path = '/pet/{petId}'.replace('{format}', 'json')
         path_params = {}
         if 'pet_id' in params:
@@ -243,12 +239,10 @@ 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 = {}
 
@@ -321,12 +315,10 @@ 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 = {}
 
@@ -399,12 +391,10 @@ class PetApi(object):
                 )
             params[key] = val
         del params['kwargs']
-
         # verify the required parameter 'pet_id' is set
         if ('pet_id' not in params) or (params['pet_id'] is None):
             raise ValueError("Missing the required parameter `pet_id` when calling `get_pet_by_id`")
 
-
         resource_path = '/pet/{petId}'.replace('{format}', 'json')
         path_params = {}
         if 'pet_id' in params:
@@ -477,12 +467,10 @@ 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 = {}
 
@@ -557,12 +545,10 @@ class PetApi(object):
                 )
             params[key] = val
         del params['kwargs']
-
         # verify the required parameter 'pet_id' is set
         if ('pet_id' not in params) or (params['pet_id'] is None):
             raise ValueError("Missing the required parameter `pet_id` when calling `update_pet_with_form`")
 
-
         resource_path = '/pet/{petId}'.replace('{format}', 'json')
         path_params = {}
         if 'pet_id' in params:
@@ -641,12 +627,10 @@ class PetApi(object):
                 )
             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 `upload_file`")
 
-
         resource_path = '/pet/{petId}/uploadImage'.replace('{format}', 'json')
         path_params = {}
         if 'pet_id' in params:
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 61a2d50a5fff..e945b61509cc 100644
--- a/samples/client/petstore/python/swagger_client/apis/store_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/store_api.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -84,14 +84,12 @@ class StoreApi(object):
                 )
             params[key] = val
         del params['kwargs']
-
         # verify the required parameter 'order_id' is set
         if ('order_id' not in params) or (params['order_id'] is None):
             raise ValueError("Missing the required parameter `order_id` when calling `delete_order`")
 
-        if 'order_id' in params and params['order_id'] < 1.0: 
+        if 'order_id' in params and params['order_id'] < 1.0:
             raise ValueError("Invalid value for parameter `order_id` when calling `delete_order`, must be a value greater than or equal to `1.0`")
-
         resource_path = '/store/order/{orderId}'.replace('{format}', 'json')
         path_params = {}
         if 'order_id' in params:
@@ -164,8 +162,6 @@ class StoreApi(object):
             params[key] = val
         del params['kwargs']
 
-
-
         resource_path = '/store/inventory'.replace('{format}', 'json')
         path_params = {}
 
@@ -236,16 +232,14 @@ class StoreApi(object):
                 )
             params[key] = val
         del params['kwargs']
-
         # verify the required parameter 'order_id' is set
         if ('order_id' not in params) or (params['order_id'] is None):
             raise ValueError("Missing the required parameter `order_id` when calling `get_order_by_id`")
 
-        if 'order_id' in params and params['order_id'] > 5.0: 
+        if 'order_id' in params and params['order_id'] > 5.0:
             raise ValueError("Invalid value for parameter `order_id` when calling `get_order_by_id`, must be a value less than or equal to  `5.0`")
-        if 'order_id' in params and params['order_id'] < 1.0: 
+        if 'order_id' in params and params['order_id'] < 1.0:
             raise ValueError("Invalid value for parameter `order_id` when calling `get_order_by_id`, must be a value greater than or equal to `1.0`")
-
         resource_path = '/store/order/{orderId}'.replace('{format}', 'json')
         path_params = {}
         if 'order_id' in params:
@@ -318,12 +312,10 @@ 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 = {}
 
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 17865142a703..5a8f18154957 100644
--- a/samples/client/petstore/python/swagger_client/apis/user_api.py
+++ b/samples/client/petstore/python/swagger_client/apis/user_api.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -84,12 +84,10 @@ 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 = {}
 
@@ -162,12 +160,10 @@ 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 = {}
 
@@ -240,12 +236,10 @@ 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 = {}
 
@@ -318,12 +312,10 @@ 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 `delete_user`")
 
-
         resource_path = '/user/{username}'.replace('{format}', 'json')
         path_params = {}
         if 'username' in params:
@@ -396,12 +388,10 @@ 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 `get_user_by_name`")
 
-
         resource_path = '/user/{username}'.replace('{format}', 'json')
         path_params = {}
         if 'username' in params:
@@ -475,7 +465,6 @@ 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`")
@@ -483,7 +472,6 @@ class UserApi(object):
         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 = {}
 
@@ -558,8 +546,6 @@ class UserApi(object):
             params[key] = val
         del params['kwargs']
 
-
-
         resource_path = '/user/logout'.replace('{format}', 'json')
         path_params = {}
 
@@ -631,7 +617,6 @@ 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 `update_user`")
@@ -639,7 +624,6 @@ class UserApi(object):
         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 = {}
         if 'username' in params:
diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/swagger_client/configuration.py
index a1efadf13b7d..50b38c61d56f 100644
--- a/samples/client/petstore/python/swagger_client/configuration.py
+++ b/samples/client/petstore/python/swagger_client/configuration.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -37,6 +37,7 @@ import logging
 
 from six import iteritems
 
+
 def singleton(cls, *args, **kw):
     instances = {}
 
@@ -79,7 +80,6 @@ class Configuration(object):
         # access token for OAuth
         self.access_token = ""
 
-
         # Logging Settings
         self.logger = {}
         self.logger["package_logger"] = logging.getLogger("swagger_client")
diff --git a/samples/client/petstore/python/swagger_client/models/__init__.py b/samples/client/petstore/python/swagger_client/models/__init__.py
index a3c738c19a8d..4ccf94c04159 100644
--- a/samples/client/petstore/python/swagger_client/models/__init__.py
+++ b/samples/client/petstore/python/swagger_client/models/__init__.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
diff --git a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
index c62cc80cd8a2..510287a16336 100644
--- a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/additional_properties_class.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -74,7 +74,7 @@ class AdditionalPropertiesClass(object):
         :param map_property: The map_property of this AdditionalPropertiesClass.
         :type: dict(str, str)
         """
-        
+
         self._map_property = map_property
 
     @property
@@ -97,7 +97,7 @@ class AdditionalPropertiesClass(object):
         :param map_of_map_property: The map_of_map_property of this AdditionalPropertiesClass.
         :type: dict(str, dict(str, str))
         """
-        
+
         self._map_of_map_property = map_of_map_property
 
     def to_dict(self):
@@ -149,4 +149,3 @@ class AdditionalPropertiesClass(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/animal.py b/samples/client/petstore/python/swagger_client/models/animal.py
index 1fe5bc6d4bae..6ed4786c88b9 100644
--- a/samples/client/petstore/python/swagger_client/models/animal.py
+++ b/samples/client/petstore/python/swagger_client/models/animal.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -74,7 +74,7 @@ class Animal(object):
         :param class_name: The class_name of this Animal.
         :type: str
         """
-        
+
         self._class_name = class_name
 
     @property
@@ -97,7 +97,7 @@ class Animal(object):
         :param color: The color of this Animal.
         :type: str
         """
-        
+
         self._color = color
 
     def to_dict(self):
@@ -149,4 +149,3 @@ class Animal(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/animal_farm.py b/samples/client/petstore/python/swagger_client/models/animal_farm.py
index d240be4b7ff6..72fce33f2524 100644
--- a/samples/client/petstore/python/swagger_client/models/animal_farm.py
+++ b/samples/client/petstore/python/swagger_client/models/animal_farm.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -49,7 +49,6 @@ class AnimalFarm(object):
             
         }
 
-
     def to_dict(self):
         """
         Returns the model properties as a dict
@@ -99,4 +98,3 @@ class AnimalFarm(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/api_response.py b/samples/client/petstore/python/swagger_client/models/api_response.py
index dfbe253b8d9d..8719ec107bea 100644
--- a/samples/client/petstore/python/swagger_client/models/api_response.py
+++ b/samples/client/petstore/python/swagger_client/models/api_response.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -77,7 +77,7 @@ class ApiResponse(object):
         :param code: The code of this ApiResponse.
         :type: int
         """
-        
+
         self._code = code
 
     @property
@@ -100,7 +100,7 @@ class ApiResponse(object):
         :param type: The type of this ApiResponse.
         :type: str
         """
-        
+
         self._type = type
 
     @property
@@ -123,7 +123,7 @@ class ApiResponse(object):
         :param message: The message of this ApiResponse.
         :type: str
         """
-        
+
         self._message = message
 
     def to_dict(self):
@@ -175,4 +175,3 @@ class ApiResponse(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/array_test.py b/samples/client/petstore/python/swagger_client/models/array_test.py
index def23e7cd5e4..c00062076494 100644
--- a/samples/client/petstore/python/swagger_client/models/array_test.py
+++ b/samples/client/petstore/python/swagger_client/models/array_test.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -77,7 +77,7 @@ class ArrayTest(object):
         :param array_of_string: The array_of_string of this ArrayTest.
         :type: list[str]
         """
-        
+
         self._array_of_string = array_of_string
 
     @property
@@ -100,7 +100,7 @@ class ArrayTest(object):
         :param array_array_of_integer: The array_array_of_integer of this ArrayTest.
         :type: list[list[int]]
         """
-        
+
         self._array_array_of_integer = array_array_of_integer
 
     @property
@@ -123,7 +123,7 @@ class ArrayTest(object):
         :param array_array_of_model: The array_array_of_model of this ArrayTest.
         :type: list[list[ReadOnlyFirst]]
         """
-        
+
         self._array_array_of_model = array_array_of_model
 
     def to_dict(self):
@@ -175,4 +175,3 @@ class ArrayTest(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/cat.py b/samples/client/petstore/python/swagger_client/models/cat.py
index 92fe431523c4..3b44fde4ee07 100644
--- a/samples/client/petstore/python/swagger_client/models/cat.py
+++ b/samples/client/petstore/python/swagger_client/models/cat.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -77,7 +77,7 @@ class Cat(object):
         :param class_name: The class_name of this Cat.
         :type: str
         """
-        
+
         self._class_name = class_name
 
     @property
@@ -100,7 +100,7 @@ class Cat(object):
         :param color: The color of this Cat.
         :type: str
         """
-        
+
         self._color = color
 
     @property
@@ -123,7 +123,7 @@ class Cat(object):
         :param declawed: The declawed of this Cat.
         :type: bool
         """
-        
+
         self._declawed = declawed
 
     def to_dict(self):
@@ -175,4 +175,3 @@ class Cat(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/category.py b/samples/client/petstore/python/swagger_client/models/category.py
index 6962ce3a7a52..4a88b5776f27 100644
--- a/samples/client/petstore/python/swagger_client/models/category.py
+++ b/samples/client/petstore/python/swagger_client/models/category.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -74,7 +74,7 @@ class Category(object):
         :param id: The id of this Category.
         :type: int
         """
-        
+
         self._id = id
 
     @property
@@ -97,7 +97,7 @@ class Category(object):
         :param name: The name of this Category.
         :type: str
         """
-        
+
         self._name = name
 
     def to_dict(self):
@@ -149,4 +149,3 @@ class Category(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/dog.py b/samples/client/petstore/python/swagger_client/models/dog.py
index 62b03f7a405f..bf31dd373127 100644
--- a/samples/client/petstore/python/swagger_client/models/dog.py
+++ b/samples/client/petstore/python/swagger_client/models/dog.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -77,7 +77,7 @@ class Dog(object):
         :param class_name: The class_name of this Dog.
         :type: str
         """
-        
+
         self._class_name = class_name
 
     @property
@@ -100,7 +100,7 @@ class Dog(object):
         :param color: The color of this Dog.
         :type: str
         """
-        
+
         self._color = color
 
     @property
@@ -123,7 +123,7 @@ class Dog(object):
         :param breed: The breed of this Dog.
         :type: str
         """
-        
+
         self._breed = breed
 
     def to_dict(self):
@@ -175,4 +175,3 @@ class Dog(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/enum_class.py b/samples/client/petstore/python/swagger_client/models/enum_class.py
index 1a7e9fec7384..ec78827141b3 100644
--- a/samples/client/petstore/python/swagger_client/models/enum_class.py
+++ b/samples/client/petstore/python/swagger_client/models/enum_class.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -49,7 +49,6 @@ class EnumClass(object):
             
         }
 
-
     def to_dict(self):
         """
         Returns the model properties as a dict
@@ -99,4 +98,3 @@ class EnumClass(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/enum_test.py b/samples/client/petstore/python/swagger_client/models/enum_test.py
index 0f6c734a5b4f..9bcaafc0501a 100644
--- a/samples/client/petstore/python/swagger_client/models/enum_test.py
+++ b/samples/client/petstore/python/swagger_client/models/enum_test.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -193,4 +193,3 @@ class EnumTest(object):
         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
index b7aa17b3ee6c..d29155be1435 100644
--- a/samples/client/petstore/python/swagger_client/models/format_test.py
+++ b/samples/client/petstore/python/swagger_client/models/format_test.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -107,12 +107,12 @@ class FormatTest(object):
         :param integer: The integer of this FormatTest.
         :type: int
         """
-        
+
         if not integer:
             raise ValueError("Invalid value for `integer`, must not be `None`")
-        if integer > 100.0: 
+        if integer > 100.0:
             raise ValueError("Invalid value for `integer`, must be a value less than or equal to `100.0`")
-        if integer < 10.0: 
+        if integer < 10.0:
             raise ValueError("Invalid value for `integer`, must be a value greater than or equal to `10.0`")
 
         self._integer = integer
@@ -137,12 +137,12 @@ class FormatTest(object):
         :param int32: The int32 of this FormatTest.
         :type: int
         """
-        
+
         if not int32:
             raise ValueError("Invalid value for `int32`, must not be `None`")
-        if int32 > 200.0: 
+        if int32 > 200.0:
             raise ValueError("Invalid value for `int32`, must be a value less than or equal to `200.0`")
-        if int32 < 20.0: 
+        if int32 < 20.0:
             raise ValueError("Invalid value for `int32`, must be a value greater than or equal to `20.0`")
 
         self._int32 = int32
@@ -167,7 +167,7 @@ class FormatTest(object):
         :param int64: The int64 of this FormatTest.
         :type: int
         """
-        
+
         self._int64 = int64
 
     @property
@@ -190,12 +190,12 @@ class FormatTest(object):
         :param number: The number of this FormatTest.
         :type: float
         """
-        
+
         if not number:
             raise ValueError("Invalid value for `number`, must not be `None`")
-        if number > 543.2: 
+        if number > 543.2:
             raise ValueError("Invalid value for `number`, must be a value less than or equal to `543.2`")
-        if number < 32.1: 
+        if number < 32.1:
             raise ValueError("Invalid value for `number`, must be a value greater than or equal to `32.1`")
 
         self._number = number
@@ -220,12 +220,12 @@ class FormatTest(object):
         :param float: The float of this FormatTest.
         :type: float
         """
-        
+
         if not float:
             raise ValueError("Invalid value for `float`, must not be `None`")
-        if float > 987.6: 
+        if float > 987.6:
             raise ValueError("Invalid value for `float`, must be a value less than or equal to `987.6`")
-        if float < 54.3: 
+        if float < 54.3:
             raise ValueError("Invalid value for `float`, must be a value greater than or equal to `54.3`")
 
         self._float = float
@@ -250,12 +250,12 @@ class FormatTest(object):
         :param double: The double of this FormatTest.
         :type: float
         """
-        
+
         if not double:
             raise ValueError("Invalid value for `double`, must not be `None`")
-        if double > 123.4: 
+        if double > 123.4:
             raise ValueError("Invalid value for `double`, must be a value less than or equal to `123.4`")
-        if double < 67.8: 
+        if double < 67.8:
             raise ValueError("Invalid value for `double`, must be a value greater than or equal to `67.8`")
 
         self._double = double
@@ -280,10 +280,10 @@ class FormatTest(object):
         :param string: The string of this FormatTest.
         :type: str
         """
-        
+
         if not string:
             raise ValueError("Invalid value for `string`, must not be `None`")
-        if not re.search('[a-z]', string, flags=re.IGNORECASE): 
+        if not re.search('[a-z]', string, flags=re.IGNORECASE):
             raise ValueError("Invalid value for `string`, must be a follow pattern or equal to `/[a-z]/i`")
 
         self._string = string
@@ -308,7 +308,7 @@ class FormatTest(object):
         :param byte: The byte of this FormatTest.
         :type: str
         """
-        
+
         self._byte = byte
 
     @property
@@ -331,7 +331,7 @@ class FormatTest(object):
         :param binary: The binary of this FormatTest.
         :type: str
         """
-        
+
         self._binary = binary
 
     @property
@@ -354,7 +354,7 @@ class FormatTest(object):
         :param date: The date of this FormatTest.
         :type: date
         """
-        
+
         self._date = date
 
     @property
@@ -377,7 +377,7 @@ class FormatTest(object):
         :param date_time: The date_time of this FormatTest.
         :type: datetime
         """
-        
+
         self._date_time = date_time
 
     @property
@@ -400,7 +400,7 @@ class FormatTest(object):
         :param uuid: The uuid of this FormatTest.
         :type: str
         """
-        
+
         self._uuid = uuid
 
     @property
@@ -423,12 +423,12 @@ class FormatTest(object):
         :param password: The password of this FormatTest.
         :type: str
         """
-        
+
         if not password:
             raise ValueError("Invalid value for `password`, must not be `None`")
-        if len(password) > 64: 
+        if len(password) > 64:
             raise ValueError("Invalid value for `password`, length must be less than `64`")
-        if len(password) < 10: 
+        if len(password) < 10:
             raise ValueError("Invalid value for `password`, length must be greater than or equal to `10`")
 
         self._password = password
@@ -482,4 +482,3 @@ class FormatTest(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/inline_response_200.py b/samples/client/petstore/python/swagger_client/models/inline_response_200.py
deleted file mode 100644
index f55ff5ee4d5a..000000000000
--- a/samples/client/petstore/python/swagger_client/models/inline_response_200.py
+++ /dev/null
@@ -1,251 +0,0 @@
-# coding: utf-8
-
-"""
-Copyright 2016 SmartBear Software
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-    Ref: https://github.com/swagger-api/swagger-codegen
-"""
-
-from pprint import pformat
-from six import iteritems
-
-
-class InlineResponse200(object):
-    """
-    NOTE: This class is auto generated by the swagger code generator program.
-    Do not edit the class manually.
-    """
-    def __init__(self):
-        """
-        InlineResponse200 - a model defined in Swagger
-
-        :param dict swaggerTypes: The key is attribute name
-                                  and the value is attribute type.
-        :param dict attributeMap: The key is attribute name
-                                  and the value is json key in definition.
-        """
-        self.swagger_types = {
-            'tags': 'list[Tag]',
-            'id': 'int',
-            'category': 'object',
-            'status': 'str',
-            'name': 'str',
-            'photo_urls': 'list[str]'
-        }
-
-        self.attribute_map = {
-            'tags': 'tags',
-            'id': 'id',
-            'category': 'category',
-            'status': 'status',
-            'name': 'name',
-            'photo_urls': 'photoUrls'
-        }
-
-        self._tags = None
-        self._id = None
-        self._category = None
-        self._status = None
-        self._name = None
-        self._photo_urls = None
-
-    @property
-    def tags(self):
-        """
-        Gets the tags of this InlineResponse200.
-
-
-        :return: The tags of this InlineResponse200.
-        :rtype: list[Tag]
-        """
-        return self._tags
-
-    @tags.setter
-    def tags(self, tags):
-        """
-        Sets the tags of this InlineResponse200.
-
-
-        :param tags: The tags of this InlineResponse200.
-        :type: list[Tag]
-        """
-        self._tags = tags
-
-    @property
-    def id(self):
-        """
-        Gets the id of this InlineResponse200.
-
-
-        :return: The id of this InlineResponse200.
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """
-        Sets the id of this InlineResponse200.
-
-
-        :param id: The id of this InlineResponse200.
-        :type: int
-        """
-        self._id = id
-
-    @property
-    def category(self):
-        """
-        Gets the category of this InlineResponse200.
-
-
-        :return: The category of this InlineResponse200.
-        :rtype: object
-        """
-        return self._category
-
-    @category.setter
-    def category(self, category):
-        """
-        Sets the category of this InlineResponse200.
-
-
-        :param category: The category of this InlineResponse200.
-        :type: object
-        """
-        self._category = category
-
-    @property
-    def status(self):
-        """
-        Gets the status of this InlineResponse200.
-        pet status in the store
-
-        :return: The status of this InlineResponse200.
-        :rtype: str
-        """
-        return self._status
-
-    @status.setter
-    def status(self, status):
-        """
-        Sets the status of this InlineResponse200.
-        pet status in the store
-
-        :param status: The status of this InlineResponse200.
-        :type: str
-        """
-        allowed_values = ["available", "pending", "sold"]
-        if status not in allowed_values:
-            raise ValueError(
-                "Invalid value for `status`, must be one of {0}"
-                .format(allowed_values)
-            )
-        self._status = status
-
-    @property
-    def name(self):
-        """
-        Gets the name of this InlineResponse200.
-
-
-        :return: The name of this InlineResponse200.
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """
-        Sets the name of this InlineResponse200.
-
-
-        :param name: The name of this InlineResponse200.
-        :type: str
-        """
-        self._name = name
-
-    @property
-    def photo_urls(self):
-        """
-        Gets the photo_urls of this InlineResponse200.
-
-
-        :return: The photo_urls of this InlineResponse200.
-        :rtype: list[str]
-        """
-        return self._photo_urls
-
-    @photo_urls.setter
-    def photo_urls(self, photo_urls):
-        """
-        Sets the photo_urls of this InlineResponse200.
-
-
-        :param photo_urls: The photo_urls of this InlineResponse200.
-        :type: list[str]
-        """
-        self._photo_urls = photo_urls
-
-    def to_dict(self):
-        """
-        Returns the model properties as a dict
-        """
-        result = {}
-
-        for attr, _ in iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-
-        return result
-
-    def to_str(self):
-        """
-        Returns the string representation of the model
-        """
-        return pformat(self.to_dict())
-
-    def __repr__(self):
-        """
-        For `print` and `pprint`
-        """
-        return self.to_str()
-
-    def __eq__(self, other):
-        """
-        Returns true if both objects are equal
-        """
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """
-        Returns true if both objects are not equal
-        """
-        return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
index 2122cabdb530..99c7c9d943c1 100644
--- a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -77,7 +77,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
         :param uuid: The uuid of this MixedPropertiesAndAdditionalPropertiesClass.
         :type: str
         """
-        
+
         self._uuid = uuid
 
     @property
@@ -100,7 +100,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
         :param date_time: The date_time of this MixedPropertiesAndAdditionalPropertiesClass.
         :type: datetime
         """
-        
+
         self._date_time = date_time
 
     @property
@@ -123,7 +123,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
         :param map: The map of this MixedPropertiesAndAdditionalPropertiesClass.
         :type: dict(str, Animal)
         """
-        
+
         self._map = map
 
     def to_dict(self):
@@ -175,4 +175,3 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/model_200_response.py b/samples/client/petstore/python/swagger_client/models/model_200_response.py
index e566d5e16cde..cd86b10e9631 100644
--- a/samples/client/petstore/python/swagger_client/models/model_200_response.py
+++ b/samples/client/petstore/python/swagger_client/models/model_200_response.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -71,7 +71,7 @@ class Model200Response(object):
         :param name: The name of this Model200Response.
         :type: int
         """
-        
+
         self._name = name
 
     def to_dict(self):
@@ -123,4 +123,3 @@ class Model200Response(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/model_return.py b/samples/client/petstore/python/swagger_client/models/model_return.py
index 840e64004d6f..711418c3d91d 100644
--- a/samples/client/petstore/python/swagger_client/models/model_return.py
+++ b/samples/client/petstore/python/swagger_client/models/model_return.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -71,7 +71,7 @@ class ModelReturn(object):
         :param _return: The _return of this ModelReturn.
         :type: int
         """
-        
+
         self.__return = _return
 
     def to_dict(self):
@@ -123,4 +123,3 @@ class ModelReturn(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/name.py b/samples/client/petstore/python/swagger_client/models/name.py
index 8c66493dafac..45d7b4bd8d07 100644
--- a/samples/client/petstore/python/swagger_client/models/name.py
+++ b/samples/client/petstore/python/swagger_client/models/name.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -80,7 +80,7 @@ class Name(object):
         :param name: The name of this Name.
         :type: int
         """
-        
+
         self._name = name
 
     @property
@@ -103,7 +103,7 @@ class Name(object):
         :param snake_case: The snake_case of this Name.
         :type: int
         """
-        
+
         self._snake_case = snake_case
 
     @property
@@ -126,7 +126,7 @@ class Name(object):
         :param _property: The _property of this Name.
         :type: str
         """
-        
+
         self.__property = _property
 
     @property
@@ -149,7 +149,7 @@ class Name(object):
         :param _123_number: The _123_number of this Name.
         :type: int
         """
-        
+
         self.__123_number = _123_number
 
     def to_dict(self):
@@ -201,4 +201,3 @@ class Name(object):
         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 54c30dea04cb..a15e20f924e1 100644
--- a/samples/client/petstore/python/swagger_client/models/order.py
+++ b/samples/client/petstore/python/swagger_client/models/order.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -86,7 +86,7 @@ class Order(object):
         :param id: The id of this Order.
         :type: int
         """
-        
+
         self._id = id
 
     @property
@@ -109,7 +109,7 @@ class Order(object):
         :param pet_id: The pet_id of this Order.
         :type: int
         """
-        
+
         self._pet_id = pet_id
 
     @property
@@ -132,7 +132,7 @@ class Order(object):
         :param quantity: The quantity of this Order.
         :type: int
         """
-        
+
         self._quantity = quantity
 
     @property
@@ -155,7 +155,7 @@ class Order(object):
         :param ship_date: The ship_date of this Order.
         :type: datetime
         """
-        
+
         self._ship_date = ship_date
 
     @property
@@ -207,7 +207,7 @@ class Order(object):
         :param complete: The complete of this Order.
         :type: bool
         """
-        
+
         self._complete = complete
 
     def to_dict(self):
@@ -259,4 +259,3 @@ class Order(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/pet.py b/samples/client/petstore/python/swagger_client/models/pet.py
index f5dc79384b55..deccb9630b74 100644
--- a/samples/client/petstore/python/swagger_client/models/pet.py
+++ b/samples/client/petstore/python/swagger_client/models/pet.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -86,7 +86,7 @@ class Pet(object):
         :param id: The id of this Pet.
         :type: int
         """
-        
+
         self._id = id
 
     @property
@@ -109,7 +109,7 @@ class Pet(object):
         :param category: The category of this Pet.
         :type: Category
         """
-        
+
         self._category = category
 
     @property
@@ -132,7 +132,7 @@ class Pet(object):
         :param name: The name of this Pet.
         :type: str
         """
-        
+
         self._name = name
 
     @property
@@ -155,7 +155,7 @@ class Pet(object):
         :param photo_urls: The photo_urls of this Pet.
         :type: list[str]
         """
-        
+
         self._photo_urls = photo_urls
 
     @property
@@ -178,7 +178,7 @@ class Pet(object):
         :param tags: The tags of this Pet.
         :type: list[Tag]
         """
-        
+
         self._tags = tags
 
     @property
@@ -259,4 +259,3 @@ class Pet(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/read_only_first.py b/samples/client/petstore/python/swagger_client/models/read_only_first.py
index b4014f3a78b1..4f479ae1d7f7 100644
--- a/samples/client/petstore/python/swagger_client/models/read_only_first.py
+++ b/samples/client/petstore/python/swagger_client/models/read_only_first.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -74,7 +74,7 @@ class ReadOnlyFirst(object):
         :param bar: The bar of this ReadOnlyFirst.
         :type: str
         """
-        
+
         self._bar = bar
 
     @property
@@ -97,7 +97,7 @@ class ReadOnlyFirst(object):
         :param baz: The baz of this ReadOnlyFirst.
         :type: str
         """
-        
+
         self._baz = baz
 
     def to_dict(self):
@@ -149,4 +149,3 @@ class ReadOnlyFirst(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/special_model_name.py b/samples/client/petstore/python/swagger_client/models/special_model_name.py
index 9aac6ae248c1..af3fb00dda72 100644
--- a/samples/client/petstore/python/swagger_client/models/special_model_name.py
+++ b/samples/client/petstore/python/swagger_client/models/special_model_name.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -71,7 +71,7 @@ class SpecialModelName(object):
         :param special_property_name: The special_property_name of this SpecialModelName.
         :type: int
         """
-        
+
         self._special_property_name = special_property_name
 
     def to_dict(self):
@@ -123,4 +123,3 @@ class SpecialModelName(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/tag.py b/samples/client/petstore/python/swagger_client/models/tag.py
index 9ba29be5cd1f..a91b8127d51a 100644
--- a/samples/client/petstore/python/swagger_client/models/tag.py
+++ b/samples/client/petstore/python/swagger_client/models/tag.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -74,7 +74,7 @@ class Tag(object):
         :param id: The id of this Tag.
         :type: int
         """
-        
+
         self._id = id
 
     @property
@@ -97,7 +97,7 @@ class Tag(object):
         :param name: The name of this Tag.
         :type: str
         """
-        
+
         self._name = name
 
     def to_dict(self):
@@ -149,4 +149,3 @@ class Tag(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/models/user.py b/samples/client/petstore/python/swagger_client/models/user.py
index 4559387a9fec..f98a895b7168 100644
--- a/samples/client/petstore/python/swagger_client/models/user.py
+++ b/samples/client/petstore/python/swagger_client/models/user.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
@@ -92,7 +92,7 @@ class User(object):
         :param id: The id of this User.
         :type: int
         """
-        
+
         self._id = id
 
     @property
@@ -115,7 +115,7 @@ class User(object):
         :param username: The username of this User.
         :type: str
         """
-        
+
         self._username = username
 
     @property
@@ -138,7 +138,7 @@ class User(object):
         :param first_name: The first_name of this User.
         :type: str
         """
-        
+
         self._first_name = first_name
 
     @property
@@ -161,7 +161,7 @@ class User(object):
         :param last_name: The last_name of this User.
         :type: str
         """
-        
+
         self._last_name = last_name
 
     @property
@@ -184,7 +184,7 @@ class User(object):
         :param email: The email of this User.
         :type: str
         """
-        
+
         self._email = email
 
     @property
@@ -207,7 +207,7 @@ class User(object):
         :param password: The password of this User.
         :type: str
         """
-        
+
         self._password = password
 
     @property
@@ -230,7 +230,7 @@ class User(object):
         :param phone: The phone of this User.
         :type: str
         """
-        
+
         self._phone = phone
 
     @property
@@ -253,7 +253,7 @@ class User(object):
         :param user_status: The user_status of this User.
         :type: int
         """
-        
+
         self._user_status = user_status
 
     def to_dict(self):
@@ -305,4 +305,3 @@ class User(object):
         Returns true if both objects are not equal
         """
         return not self == other
-
diff --git a/samples/client/petstore/python/swagger_client/rest.py b/samples/client/petstore/python/swagger_client/rest.py
index de53bcacdb1f..d27f16527065 100644
--- a/samples/client/petstore/python/swagger_client/rest.py
+++ b/samples/client/petstore/python/swagger_client/rest.py
@@ -8,13 +8,13 @@
     OpenAPI spec version: 1.0.0
     Contact: apiteam@swagger.io
     Generated by: https://github.com/swagger-api/swagger-codegen.git
-    
+
     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.
diff --git a/samples/client/petstore/python/test/test_additional_properties_class.py b/samples/client/petstore/python/test/test_additional_properties_class.py
index 52163f2afec1..f2370e4ea21f 100644
--- a/samples/client/petstore/python/test/test_additional_properties_class.py
+++ b/samples/client/petstore/python/test/test_additional_properties_class.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestAdditionalPropertiesClass(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_animal.py b/samples/client/petstore/python/test/test_animal.py
index 279ed1850dd7..83c8f872250f 100644
--- a/samples/client/petstore/python/test/test_animal.py
+++ b/samples/client/petstore/python/test/test_animal.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestAnimal(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_animal_farm.py b/samples/client/petstore/python/test/test_animal_farm.py
index 74dd22fd3b9a..637d259b1e8a 100644
--- a/samples/client/petstore/python/test/test_animal_farm.py
+++ b/samples/client/petstore/python/test/test_animal_farm.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestAnimalFarm(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_api_response.py b/samples/client/petstore/python/test/test_api_response.py
index be73dbf373d2..6ee0ef03ae9f 100644
--- a/samples/client/petstore/python/test/test_api_response.py
+++ b/samples/client/petstore/python/test/test_api_response.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestApiResponse(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_array_test.py b/samples/client/petstore/python/test/test_array_test.py
index 494596c842f7..7d2e9ff9fe9a 100644
--- a/samples/client/petstore/python/test/test_array_test.py
+++ b/samples/client/petstore/python/test/test_array_test.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestArrayTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_cat.py b/samples/client/petstore/python/test/test_cat.py
index 728a824fa5b1..8baccfa294d3 100644
--- a/samples/client/petstore/python/test/test_cat.py
+++ b/samples/client/petstore/python/test/test_cat.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestCat(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_category.py b/samples/client/petstore/python/test/test_category.py
index 793fbdf41b05..ff57ffb1f7de 100644
--- a/samples/client/petstore/python/test/test_category.py
+++ b/samples/client/petstore/python/test/test_category.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestCategory(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_dog.py b/samples/client/petstore/python/test/test_dog.py
index 044dc5be51fc..cb44931140e0 100644
--- a/samples/client/petstore/python/test/test_dog.py
+++ b/samples/client/petstore/python/test/test_dog.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestDog(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_enum_class.py b/samples/client/petstore/python/test/test_enum_class.py
index 22e2b5ebb5c4..488e8306c8f0 100644
--- a/samples/client/petstore/python/test/test_enum_class.py
+++ b/samples/client/petstore/python/test/test_enum_class.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestEnumClass(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_enum_test.py b/samples/client/petstore/python/test/test_enum_test.py
index 49cb79e6bc34..bbe985aeeaf0 100644
--- a/samples/client/petstore/python/test/test_enum_test.py
+++ b/samples/client/petstore/python/test/test_enum_test.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestEnumTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_fake_api.py b/samples/client/petstore/python/test/test_fake_api.py
index 29b71bdf81a2..fb4804858295 100644
--- a/samples/client/petstore/python/test/test_fake_api.py
+++ b/samples/client/petstore/python/test/test_fake_api.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -42,10 +46,10 @@ class TestFakeApi(unittest.TestCase):
         """
         Test case for test_endpoint_parameters
 
-        Fake endpoint for testing various parameters
+        Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
         """
         pass
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_format_test.py b/samples/client/petstore/python/test/test_format_test.py
index 11101ad52da3..966a0887f0ab 100644
--- a/samples/client/petstore/python/test/test_format_test.py
+++ b/samples/client/petstore/python/test/test_format_test.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestFormatTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py
index 6cea606481cd..f19e0211af75 100644
--- a/samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestMixedPropertiesAndAdditionalPropertiesClass(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_model_200_response.py b/samples/client/petstore/python/test/test_model_200_response.py
index 8328d2b97578..74519b4bac58 100644
--- a/samples/client/petstore/python/test/test_model_200_response.py
+++ b/samples/client/petstore/python/test/test_model_200_response.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestModel200Response(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_model_return.py b/samples/client/petstore/python/test/test_model_return.py
index 4ff3f38b2eb5..54c9422545d8 100644
--- a/samples/client/petstore/python/test/test_model_return.py
+++ b/samples/client/petstore/python/test/test_model_return.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestModelReturn(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_name.py b/samples/client/petstore/python/test/test_name.py
index c3b27897eb1e..be10b1ddd783 100644
--- a/samples/client/petstore/python/test/test_name.py
+++ b/samples/client/petstore/python/test/test_name.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestName(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_order.py b/samples/client/petstore/python/test/test_order.py
index 23beefe346c6..21c2b4830d94 100644
--- a/samples/client/petstore/python/test/test_order.py
+++ b/samples/client/petstore/python/test/test_order.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestOrder(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_pet.py b/samples/client/petstore/python/test/test_pet.py
index 471b7b4f67c8..fc0ce0a727ca 100644
--- a/samples/client/petstore/python/test/test_pet.py
+++ b/samples/client/petstore/python/test/test_pet.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestPet(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_pet_api.py b/samples/client/petstore/python/test/test_pet_api.py
index 81ee6c76e9c7..8ea0c9c0acd9 100644
--- a/samples/client/petstore/python/test/test_pet_api.py
+++ b/samples/client/petstore/python/test/test_pet_api.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -104,4 +108,4 @@ class TestPetApi(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_read_only_first.py b/samples/client/petstore/python/test/test_read_only_first.py
index d7073915dfec..ea7a0ad76e88 100644
--- a/samples/client/petstore/python/test/test_read_only_first.py
+++ b/samples/client/petstore/python/test/test_read_only_first.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestReadOnlyFirst(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_special_model_name.py b/samples/client/petstore/python/test/test_special_model_name.py
index 17c12655031e..e76bc9bbf9b1 100644
--- a/samples/client/petstore/python/test/test_special_model_name.py
+++ b/samples/client/petstore/python/test/test_special_model_name.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestSpecialModelName(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_store_api.py b/samples/client/petstore/python/test/test_store_api.py
index e8dc0a64b1ca..ecce38463b5a 100644
--- a/samples/client/petstore/python/test/test_store_api.py
+++ b/samples/client/petstore/python/test/test_store_api.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -72,4 +76,4 @@ class TestStoreApi(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_tag.py b/samples/client/petstore/python/test/test_tag.py
index 35b51e4d7d2e..db35da374aed 100644
--- a/samples/client/petstore/python/test/test_tag.py
+++ b/samples/client/petstore/python/test/test_tag.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestTag(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_user.py b/samples/client/petstore/python/test/test_user.py
index 1aad154cbf8c..e57b3600f0e4 100644
--- a/samples/client/petstore/python/test/test_user.py
+++ b/samples/client/petstore/python/test/test_user.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -46,4 +50,4 @@ class TestUser(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/test/test_user_api.py b/samples/client/petstore/python/test/test_user_api.py
index 0205fe7383ab..88c2f8629834 100644
--- a/samples/client/petstore/python/test/test_user_api.py
+++ b/samples/client/petstore/python/test/test_user_api.py
@@ -1,21 +1,25 @@
 # coding: utf-8
 
 """
-Copyright 2016 SmartBear Software
+    Swagger Petstore
 
-   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
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    OpenAPI spec version: 1.0.0
+    Contact: apiteam@swagger.io
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
 
-   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.
+    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
 
-   ref: https://github.com/swagger-api/swagger-codegen
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 """
 
 from __future__ import absolute_import
@@ -104,4 +108,4 @@ class TestUserApi(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/samples/client/petstore/python/tests/test_api_exception.py b/samples/client/petstore/python/tests/test_api_exception.py
index 790a18dffd0d..96ca4e7bfbca 100644
--- a/samples/client/petstore/python/tests/test_api_exception.py
+++ b/samples/client/petstore/python/tests/test_api_exception.py
@@ -44,7 +44,7 @@ class ApiExceptionTests(unittest.TestCase):
     def test_404_error(self):
         self.pet_api.add_pet(body=self.pet)
         self.pet_api.delete_pet(pet_id=self.pet.id)
-        
+
         with self.checkRaiseRegex(ApiException, "Pet not found"):
             self.pet_api.get_pet_by_id(pet_id=self.pet.id)
 
@@ -87,4 +87,3 @@ class ApiExceptionTests(unittest.TestCase):
             return self.assertRegexpMatches(text, expected_regex)
 
         return self.assertRegex(text, expected_regex)
-
diff --git a/samples/client/petstore/python/tests/test_deserialization.py b/samples/client/petstore/python/tests/test_deserialization.py
index 1eae045ff761..e1d7e250b4bc 100644
--- a/samples/client/petstore/python/tests/test_deserialization.py
+++ b/samples/client/petstore/python/tests/test_deserialization.py
@@ -78,23 +78,23 @@ class DeserializationTests(unittest.TestCase):
     def test_deserialize_pet(self):
         """ deserialize pet """
         data = {
+            "id": 0,
+            "category": {
                 "id": 0,
-                "category": {
+                "name": "string"
+            },
+            "name": "doggie",
+            "photoUrls": [
+                "string"
+            ],
+            "tags": [
+                {
                     "id": 0,
                     "name": "string"
-                },
-                "name": "doggie",
-                "photoUrls": [
-                    "string"
-                ],
-                "tags": [
-                    {
-                        "id": 0,
-                        "name": "string"
-                    }
-                ],
-                "status": "available"
-            }
+                }
+            ],
+            "status": "available"
+        }
         deserialized = self.deserialize(data, "Pet")
         self.assertTrue(isinstance(deserialized, swagger_client.Pet))
         self.assertEqual(deserialized.id, 0)
@@ -106,42 +106,43 @@ class DeserializationTests(unittest.TestCase):
 
     def test_deserialize_list_of_pet(self):
         """ deserialize list[Pet] """
-        data = [{
-            "id": 0,
-            "category": {
+        data = [
+            {
                 "id": 0,
-                "name": "string"
-            },
-            "name": "doggie0",
-            "photoUrls": [
-                "string"
-            ],
-            "tags": [
-                {
+                "category": {
                     "id": 0,
                     "name": "string"
-                }
-            ],
-            "status": "available"
-        },
-        {
-            "id": 1,
-            "category": {
-                "id": 0,
-                "name": "string"
+                },
+                "name": "doggie0",
+                "photoUrls": [
+                    "string"
+                ],
+                "tags": [
+                    {
+                        "id": 0,
+                        "name": "string"
+                    }
+                ],
+                "status": "available"
             },
-            "name": "doggie1",
-            "photoUrls": [
-                "string"
-            ],
-            "tags": [
-                {
+            {
+                "id": 1,
+                "category": {
                     "id": 0,
                     "name": "string"
-                }
-            ],
-            "status": "available"
-        }]
+                },
+                "name": "doggie1",
+                "photoUrls": [
+                    "string"
+                ],
+                "tags": [
+                    {
+                        "id": 0,
+                        "name": "string"
+                    }
+                ],
+                "status": "available"
+            }]
         deserialized = self.deserialize(data, "list[Pet]")
         self.assertTrue(isinstance(deserialized, list))
         self.assertTrue(isinstance(deserialized[0], swagger_client.Pet))

From 556f529933c51fbb27be6a1de7e57fb154f0e764 Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Mon, 6 Jun 2016 11:45:07 +0200
Subject: [PATCH 090/139] add option to use single content-type
 produces/consumes

---
 bin/spring-stubs.sh                           |  2 +-
 .../languages/SpringBootServerCodegen.java    | 19 ++++++++---
 .../resources/JavaSpringBoot/api.mustache     |  8 +++--
 .../SpringBootServerOptionsProvider.java      |  2 ++
 .../SpringBootServerOptionsTest.java          |  2 ++
 .../src/main/java/io/swagger/api/PetApi.java  | 34 +++++++++----------
 .../main/java/io/swagger/api/StoreApi.java    | 18 +++++-----
 .../src/main/java/io/swagger/api/UserApi.java | 34 +++++++++----------
 .../main/java/io/swagger/model/Category.java  |  2 +-
 .../io/swagger/model/ModelApiResponse.java    |  2 +-
 .../src/main/java/io/swagger/model/Order.java |  2 +-
 .../src/main/java/io/swagger/model/Pet.java   |  2 +-
 .../src/main/java/io/swagger/model/Tag.java   |  2 +-
 .../src/main/java/io/swagger/model/User.java  |  2 +-
 14 files changed, 74 insertions(+), 57 deletions(-)

diff --git a/bin/spring-stubs.sh b/bin/spring-stubs.sh
index 48719f2e696c..3d13f2fe8b9a 100755
--- a/bin/spring-stubs.sh
+++ b/bin/spring-stubs.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.yaml -l springboot -o samples/client/petstore/spring-stubs -DinterfaceOnly=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l springboot -o samples/client/petstore/spring-stubs -DinterfaceOnly=true,singleContentTypes=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java
index 1574fd7175e1..2e58343f30ad 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java
@@ -11,10 +11,12 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
     public static final String CONFIG_PACKAGE = "configPackage";
     public static final String BASE_PACKAGE = "basePackage";
     public static final String INTERFACE_ONLY = "interfaceOnly";
+    public static final String SINGLE_CONTENT_TYPES = "singleContentTypes";
     protected String title = "Petstore Server";
     protected String configPackage = "";
     protected String basePackage = "";
     protected boolean interfaceOnly = false;
+    protected boolean singleContentTypes = false;
     protected String templateFileName = "api.mustache";
 
     public SpringBootServerCodegen() {
@@ -42,7 +44,8 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
         cliOptions.add(new CliOption(CONFIG_PACKAGE, "configuration package for generated code"));
         cliOptions.add(new CliOption(BASE_PACKAGE, "base package for generated code"));
         cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files."));
-        
+        cliOptions.add(CliOption.newBoolean(SINGLE_CONTENT_TYPES, "Whether to select only one produces/consumes content-type by operation."));
+
         supportedLibraries.clear();
         supportedLibraries.put(DEFAULT_LIBRARY, "Default Spring Boot server stub.");
         supportedLibraries.put("j8-async", "Use async servlet feature and Java 8's default interface. Generating interface with service " +
@@ -85,6 +88,10 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
             this.setInterfaceOnly(Boolean.valueOf(additionalProperties.get(INTERFACE_ONLY).toString()));
         }
 
+        if (additionalProperties.containsKey(SINGLE_CONTENT_TYPES)) {
+            this.setSingleContentTypes(Boolean.valueOf(additionalProperties.get(SINGLE_CONTENT_TYPES).toString()));
+        }
+
         supportingFiles.clear();
         supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
@@ -137,10 +144,10 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
         opList.add(co);
         co.baseName = basePath;
     }
-    
+
     @Override
     public void preprocessSwagger(Swagger swagger) {
-    	System.out.println("preprocessSwagger");
+        super.preprocessSwagger(swagger);
         if ("/".equals(swagger.getBasePath())) {
             swagger.setBasePath("");
         }
@@ -153,7 +160,7 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
                 port = parts[1];
             }
         }
-        
+
         this.additionalProperties.put("serverPort", port);
         if (swagger != null && swagger.getPaths() != null) {
             for (String pathname : swagger.getPaths().keySet()) {
@@ -265,6 +272,10 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
     public void setInterfaceOnly(boolean interfaceOnly) {
         this.interfaceOnly = interfaceOnly;
     }
+
+    public void setSingleContentTypes(boolean singleContentTypes) {
+        this.singleContentTypes = singleContentTypes;
+    }
     
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache
index 672e1bbe9bab..3ccc7686db9a 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache
@@ -37,9 +37,11 @@ public interface {{classname}} {
   }{{/hasAuthMethods}})
   @ApiResponses(value = { {{#responses}}
     @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}}
+  @RequestMapping(value = "{{{path}}}",{{#singleContentTypes}}
+    produces = "{{{vendorExtensions.x-accepts}}}",
+    consumes = "{{{vendorExtensions.x-contentType}}}",{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}
+    produces = { {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}{{#hasConsumes}}
+    consumes = { {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}{{/singleContentTypes}}
     method = RequestMethod.{{httpMethod}})
   ResponseEntity<{{>returnTypes}}> {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},
     {{/hasMore}}{{/allParams}});
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java
index 6e766a21d070..c4b1281c1dc0 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/SpringBootServerOptionsProvider.java
@@ -11,6 +11,7 @@ public class SpringBootServerOptionsProvider extends JavaOptionsProvider {
     public static final String BASE_PACKAGE_VALUE = "basePackage";
     public static final String LIBRARY_VALUE = "j8-async"; //FIXME hidding value from super class
     public static final String INTERFACE_ONLY = "true";
+    public static final String SINGLE_CONTENT_TYPES = "true";
 
     @Override
     public String getLanguage() {
@@ -24,6 +25,7 @@ public class SpringBootServerOptionsProvider extends JavaOptionsProvider {
         options.put(SpringBootServerCodegen.BASE_PACKAGE, BASE_PACKAGE_VALUE);
         options.put(CodegenConstants.LIBRARY, LIBRARY_VALUE);
         options.put(SpringBootServerCodegen.INTERFACE_ONLY, INTERFACE_ONLY);
+        options.put(SpringBootServerCodegen.SINGLE_CONTENT_TYPES, SINGLE_CONTENT_TYPES);
 
         return options;
     }
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
index 34a53db1dadd..c60ac3a582de 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/springboot/SpringBootServerOptionsTest.java
@@ -56,6 +56,8 @@ public class SpringBootServerOptionsTest extends JavaClientOptionsTest {
             times = 1;
             clientCodegen.setInterfaceOnly(Boolean.valueOf(SpringBootServerOptionsProvider.INTERFACE_ONLY));
             times = 1;
+            clientCodegen.setSingleContentTypes(Boolean.valueOf(SpringBootServerOptionsProvider.SINGLE_CONTENT_TYPES));
+            times = 1;
 
         }};
     }
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
index 9bb732d245c6..f19cf83d4363 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
@@ -24,7 +24,7 @@ import static org.springframework.http.MediaType.*;
 
 @RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/pet", description = "the pet API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public interface PetApi {
 
   @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
@@ -36,8 +36,8 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
   @RequestMapping(value = "",
-    produces = { "application/xml", "application/json" }, 
-    consumes = { "application/json", "application/xml" },
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.POST)
   ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body);
 
@@ -51,8 +51,8 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
   @RequestMapping(value = "/{petId}",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.DELETE)
   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);
@@ -68,8 +68,8 @@ public interface PetApi {
     @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
     @ApiResponse(code = 400, message = "Invalid status value", response = Pet.class) })
   @RequestMapping(value = "/findByStatus",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.GET)
   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);
 
@@ -84,8 +84,8 @@ public interface PetApi {
     @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
     @ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class) })
   @RequestMapping(value = "/findByTags",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<List<Pet>> findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags);
 
@@ -98,8 +98,8 @@ public interface PetApi {
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class),
     @ApiResponse(code = 404, message = "Pet not found", response = Pet.class) })
   @RequestMapping(value = "/{petId}",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",required=true ) @PathVariable("petId") Long petId);
 
@@ -115,8 +115,8 @@ public interface PetApi {
     @ApiResponse(code = 404, message = "Pet not found", response = Void.class),
     @ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
   @RequestMapping(value = "",
-    produces = { "application/xml", "application/json" }, 
-    consumes = { "application/json", "application/xml" },
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.PUT)
   ResponseEntity<Void> updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body);
 
@@ -130,8 +130,8 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
   @RequestMapping(value = "/{petId}",
-    produces = { "application/xml", "application/json" }, 
-    consumes = { "application/x-www-form-urlencoded" },
+    produces = "application/json",
+    consumes = "application/x-www-form-urlencoded",
     method = RequestMethod.POST)
   ResponseEntity<Void> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") Long petId,
     @ApiParam(value = "Updated name of the pet" ) @RequestPart(value="name", required=false)  String name,
@@ -147,8 +147,8 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
   @RequestMapping(value = "/{petId}/uploadImage",
-    produces = { "application/json" }, 
-    consumes = { "multipart/form-data" },
+    produces = "application/json",
+    consumes = "multipart/form-data",
     method = RequestMethod.POST)
   ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet to update",required=true ) @PathVariable("petId") Long petId,
     @ApiParam(value = "Additional data to pass to server" ) @RequestPart(value="additionalMetadata", required=false)  String additionalMetadata,
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
index b8a29cdf3b21..1e715e15d523 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
@@ -23,7 +23,7 @@ import static org.springframework.http.MediaType.*;
 
 @RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/store", description = "the store API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public interface StoreApi {
 
   @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
@@ -31,8 +31,8 @@ public interface StoreApi {
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
     @ApiResponse(code = 404, message = "Order not found", response = Void.class) })
   @RequestMapping(value = "/order/{orderId}",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.DELETE)
   ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId);
 
@@ -43,8 +43,8 @@ public interface StoreApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Integer.class) })
   @RequestMapping(value = "/inventory",
-    produces = { "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<Map<String, Integer>> getInventory();
 
@@ -55,8 +55,8 @@ public interface StoreApi {
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class),
     @ApiResponse(code = 404, message = "Order not found", response = Order.class) })
   @RequestMapping(value = "/order/{orderId}",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId);
 
@@ -66,8 +66,8 @@ public interface StoreApi {
     @ApiResponse(code = 200, message = "successful operation", response = Order.class),
     @ApiResponse(code = 400, message = "Invalid Order", response = Order.class) })
   @RequestMapping(value = "/order",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.POST)
   ResponseEntity<Order> placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true ) @RequestBody Order body);
 
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
index 15d815fcb96f..5155b294bd1b 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
@@ -23,15 +23,15 @@ import static org.springframework.http.MediaType.*;
 
 @RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
 @Api(value = "/user", description = "the user API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02: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", response = Void.class) })
   @RequestMapping(value = "",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.POST)
   ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @RequestBody User body);
 
@@ -40,8 +40,8 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
   @RequestMapping(value = "/createWithArray",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.POST)
   ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body);
 
@@ -50,8 +50,8 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
   @RequestMapping(value = "/createWithList",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.POST)
   ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body);
 
@@ -61,8 +61,8 @@ public interface UserApi {
     @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
     @ApiResponse(code = 404, message = "User not found", response = Void.class) })
   @RequestMapping(value = "/{username}",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.DELETE)
   ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true ) @PathVariable("username") String username);
 
@@ -73,8 +73,8 @@ public interface UserApi {
     @ApiResponse(code = 400, message = "Invalid username supplied", response = User.class),
     @ApiResponse(code = 404, message = "User not found", response = User.class) })
   @RequestMapping(value = "/{username}",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true ) @PathVariable("username") String username);
 
@@ -84,8 +84,8 @@ public interface UserApi {
     @ApiResponse(code = 200, message = "successful operation", response = String.class),
     @ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) })
   @RequestMapping(value = "/login",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.GET)
   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);
@@ -95,8 +95,8 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
   @RequestMapping(value = "/logout",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.GET)
   ResponseEntity<Void> logoutUser();
 
@@ -106,8 +106,8 @@ public interface UserApi {
     @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
     @ApiResponse(code = 404, message = "User not found", response = Void.class) })
   @RequestMapping(value = "/{username}",
-    produces = { "application/xml", "application/json" }, 
-    
+    produces = "application/json",
+    consumes = "application/json",
     method = RequestMethod.PUT)
   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);
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
index be0a5b6ad472..3164c584235d 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class Category  {
   
   private Long id = null;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
index c9256ca70fe4..dc24196a4ea5 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class ModelApiResponse  {
   
   private Integer code = null;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java
index 632893e46528..84d84a68f02a 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java
+++ b/samples/client/petstore/spring-stubs/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.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class Order  {
   
   private Long id = null;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java
index 08e73d83c21f..479228e5a1b4 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java
+++ b/samples/client/petstore/spring-stubs/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.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class Pet  {
   
   private Long id = null;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
index b339bb8db028..780333072cd5 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class Tag  {
   
   private Long id = null;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java
index 55c4a39b0922..dcce4f24516c 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java
+++ b/samples/client/petstore/spring-stubs/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.SpringBootServerCodegen", date = "2016-06-03T12:22:53.698+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
 public class User  {
   
   private Long id = null;

From 1836062e6f2ae7ceb80e8d70f5d10d12d9f3b0a4 Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Mon, 6 Jun 2016 14:40:11 +0200
Subject: [PATCH 091/139] don't put RequestMapping on the interface

as Spring-MVC will automatically consider it as a controller which is not necessarily the case (eg. for a spring-cloud FeignClient)
---
 .../languages/SpringBootServerCodegen.java    |  3 --
 .../resources/JavaSpringBoot/api.mustache     |  3 +-
 .../src/main/java/io/swagger/api/PetApi.java  | 21 +++++++-------
 .../main/java/io/swagger/api/StoreApi.java    | 13 ++++-----
 .../src/main/java/io/swagger/api/UserApi.java | 21 +++++++-------
 .../main/java/io/swagger/model/Category.java  |  2 +-
 .../io/swagger/model/ModelApiResponse.java    |  2 +-
 .../src/main/java/io/swagger/model/Order.java |  2 +-
 .../src/main/java/io/swagger/model/Pet.java   |  2 +-
 .../src/main/java/io/swagger/model/Tag.java   |  2 +-
 .../src/main/java/io/swagger/model/User.java  |  2 +-
 .../java/io/swagger/api/ApiException.java     |  2 +-
 .../java/io/swagger/api/ApiOriginFilter.java  |  2 +-
 .../io/swagger/api/ApiResponseMessage.java    |  2 +-
 .../io/swagger/api/NotFoundException.java     |  2 +-
 .../src/main/java/io/swagger/api/PetApi.java  | 25 +++++++---------
 .../java/io/swagger/api/PetApiController.java |  2 +-
 .../main/java/io/swagger/api/StoreApi.java    | 17 ++++-------
 .../io/swagger/api/StoreApiController.java    |  2 +-
 .../src/main/java/io/swagger/api/UserApi.java | 29 +++++++------------
 .../io/swagger/api/UserApiController.java     |  2 +-
 .../SwaggerDocumentationConfig.java           |  2 +-
 .../main/java/io/swagger/model/Category.java  |  2 +-
 .../io/swagger/model/ModelApiResponse.java    |  2 +-
 .../src/main/java/io/swagger/model/Order.java |  2 +-
 .../src/main/java/io/swagger/model/Pet.java   |  2 +-
 .../src/main/java/io/swagger/model/Tag.java   |  2 +-
 .../src/main/java/io/swagger/model/User.java  |  2 +-
 28 files changed, 73 insertions(+), 99 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java
index 2e58343f30ad..dbed6bc98c47 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringBootServerCodegen.java
@@ -131,9 +131,6 @@ public class SpringBootServerCodegen extends JavaClientCodegen implements Codege
         if (basePath == "") {
             basePath = "default";
         } else {
-            if (co.path.startsWith("/" + basePath)) {
-                co.path = co.path.substring(("/" + basePath).length());
-            }
             co.subresourceOperation = !co.path.isEmpty();
         }
         List<CodegenOperation> opList = operations.get(basePath);
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache
index 3ccc7686db9a..bd0d71805296 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/api.mustache
@@ -21,8 +21,7 @@ import java.util.List;
 
 import static org.springframework.http.MediaType.*;
 
-@RequestMapping(value = "/{{{baseName}}}", produces = {APPLICATION_JSON_VALUE})
-@Api(value = "/{{{baseName}}}", description = "the {{{baseName}}} API")
+@Api(value = "{{{baseName}}}", description = "the {{{baseName}}} API")
 {{>generatedAnnotation}}
 {{#operations}}
 public interface {{classname}} {
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
index f19cf83d4363..d055f19cc23f 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
@@ -22,9 +22,8 @@ import java.util.List;
 
 import static org.springframework.http.MediaType.*;
 
-@RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
-@Api(value = "/pet", description = "the pet API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
+@Api(value = "pet", description = "the pet API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:44.961+02:00")
 public interface PetApi {
 
   @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
@@ -35,7 +34,7 @@ public interface PetApi {
   })
   @ApiResponses(value = { 
     @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-  @RequestMapping(value = "",
+  @RequestMapping(value = "/pet",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.POST)
@@ -50,7 +49,7 @@ public interface PetApi {
   })
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
-  @RequestMapping(value = "/{petId}",
+  @RequestMapping(value = "/pet/{petId}",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.DELETE)
@@ -67,7 +66,7 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
     @ApiResponse(code = 400, message = "Invalid status value", response = Pet.class) })
-  @RequestMapping(value = "/findByStatus",
+  @RequestMapping(value = "/pet/findByStatus",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.GET)
@@ -83,7 +82,7 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
     @ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class) })
-  @RequestMapping(value = "/findByTags",
+  @RequestMapping(value = "/pet/findByTags",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.GET)
@@ -97,7 +96,7 @@ public interface PetApi {
     @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class),
     @ApiResponse(code = 404, message = "Pet not found", response = Pet.class) })
-  @RequestMapping(value = "/{petId}",
+  @RequestMapping(value = "/pet/{petId}",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.GET)
@@ -114,7 +113,7 @@ public interface PetApi {
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
     @ApiResponse(code = 404, message = "Pet not found", response = Void.class),
     @ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
-  @RequestMapping(value = "",
+  @RequestMapping(value = "/pet",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.PUT)
@@ -129,7 +128,7 @@ public interface PetApi {
   })
   @ApiResponses(value = { 
     @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-  @RequestMapping(value = "/{petId}",
+  @RequestMapping(value = "/pet/{petId}",
     produces = "application/json",
     consumes = "application/x-www-form-urlencoded",
     method = RequestMethod.POST)
@@ -146,7 +145,7 @@ public interface PetApi {
   })
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-  @RequestMapping(value = "/{petId}/uploadImage",
+  @RequestMapping(value = "/pet/{petId}/uploadImage",
     produces = "application/json",
     consumes = "multipart/form-data",
     method = RequestMethod.POST)
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
index 1e715e15d523..03c07525bb34 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
@@ -21,16 +21,15 @@ import java.util.List;
 
 import static org.springframework.http.MediaType.*;
 
-@RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
-@Api(value = "/store", description = "the store API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
+@Api(value = "store", description = "the store API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:44.961+02:00")
 public interface StoreApi {
 
   @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
     @ApiResponse(code = 404, message = "Order not found", response = Void.class) })
-  @RequestMapping(value = "/order/{orderId}",
+  @RequestMapping(value = "/store/order/{orderId}",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.DELETE)
@@ -42,7 +41,7 @@ public interface StoreApi {
   })
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Integer.class) })
-  @RequestMapping(value = "/inventory",
+  @RequestMapping(value = "/store/inventory",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.GET)
@@ -54,7 +53,7 @@ public interface StoreApi {
     @ApiResponse(code = 200, message = "successful operation", response = Order.class),
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class),
     @ApiResponse(code = 404, message = "Order not found", response = Order.class) })
-  @RequestMapping(value = "/order/{orderId}",
+  @RequestMapping(value = "/store/order/{orderId}",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.GET)
@@ -65,7 +64,7 @@ public interface StoreApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Order.class),
     @ApiResponse(code = 400, message = "Invalid Order", response = Order.class) })
-  @RequestMapping(value = "/order",
+  @RequestMapping(value = "/store/order",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.POST)
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
index 5155b294bd1b..3da36b4c67c9 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
@@ -21,15 +21,14 @@ import java.util.List;
 
 import static org.springframework.http.MediaType.*;
 
-@RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
-@Api(value = "/user", description = "the user API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
+@Api(value = "user", description = "the user API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:44.961+02: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", response = Void.class) })
-  @RequestMapping(value = "",
+  @RequestMapping(value = "/user",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.POST)
@@ -39,7 +38,7 @@ public interface UserApi {
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-  @RequestMapping(value = "/createWithArray",
+  @RequestMapping(value = "/user/createWithArray",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.POST)
@@ -49,7 +48,7 @@ public interface UserApi {
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-  @RequestMapping(value = "/createWithList",
+  @RequestMapping(value = "/user/createWithList",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.POST)
@@ -60,7 +59,7 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
     @ApiResponse(code = 404, message = "User not found", response = Void.class) })
-  @RequestMapping(value = "/{username}",
+  @RequestMapping(value = "/user/{username}",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.DELETE)
@@ -72,7 +71,7 @@ public interface UserApi {
     @ApiResponse(code = 200, message = "successful operation", response = User.class),
     @ApiResponse(code = 400, message = "Invalid username supplied", response = User.class),
     @ApiResponse(code = 404, message = "User not found", response = User.class) })
-  @RequestMapping(value = "/{username}",
+  @RequestMapping(value = "/user/{username}",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.GET)
@@ -83,7 +82,7 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = String.class),
     @ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) })
-  @RequestMapping(value = "/login",
+  @RequestMapping(value = "/user/login",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.GET)
@@ -94,7 +93,7 @@ public interface UserApi {
   @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-  @RequestMapping(value = "/logout",
+  @RequestMapping(value = "/user/logout",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.GET)
@@ -105,7 +104,7 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
     @ApiResponse(code = 404, message = "User not found", response = Void.class) })
-  @RequestMapping(value = "/{username}",
+  @RequestMapping(value = "/user/{username}",
     produces = "application/json",
     consumes = "application/json",
     method = RequestMethod.PUT)
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
index 3164c584235d..1c0dbbf75a7e 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:44.961+02:00")
 public class Category  {
   
   private Long id = null;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
index dc24196a4ea5..818052af3a51 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:44.961+02:00")
 public class ModelApiResponse  {
   
   private Integer code = null;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java
index 84d84a68f02a..d3754b6e8285 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java
+++ b/samples/client/petstore/spring-stubs/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.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:44.961+02:00")
 public class Order  {
   
   private Long id = null;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java
index 479228e5a1b4..dbfcc186ba70 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java
+++ b/samples/client/petstore/spring-stubs/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.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:44.961+02:00")
 public class Pet  {
   
   private Long id = null;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
index 780333072cd5..349ef702332e 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:44.961+02:00")
 public class Tag  {
   
   private Long id = null;
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java
index dcce4f24516c..2ba7d2274aa6 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java
+++ b/samples/client/petstore/spring-stubs/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.SpringBootServerCodegen", date = "2016-06-06T10:53:41.429+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:44.961+02:00")
 public class User  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java
index dd9f929eef5a..9da33ef61cf1 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class ApiException extends Exception{
 	private int code;
 	public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java
index 0467b6d0b131..a62f9cf5a04e 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class ApiOriginFilter implements javax.servlet.Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java
index 1acb8e00b62a..96257d752b86 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class ApiResponseMessage {
 	public static final int ERROR = 1;
 	public static final int WARNING = 2;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java
index fa5074394402..dbc07fc45452 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class NotFoundException extends ApiException {
 	private int code;
 	public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
index 30cdb5b78148..08c6882eb46b 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
@@ -22,9 +22,8 @@ import java.util.List;
 
 import static org.springframework.http.MediaType.*;
 
-@RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
-@Api(value = "/pet", description = "the pet API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@Api(value = "pet", description = "the pet API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public interface PetApi {
 
   @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
@@ -35,7 +34,7 @@ public interface PetApi {
   })
   @ApiResponses(value = { 
     @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-  @RequestMapping(value = "",
+  @RequestMapping(value = "/pet",
     produces = { "application/xml", "application/json" }, 
     consumes = { "application/json", "application/xml" },
     method = RequestMethod.POST)
@@ -50,9 +49,8 @@ public interface PetApi {
   })
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
-  @RequestMapping(value = "/{petId}",
+  @RequestMapping(value = "/pet/{petId}",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.DELETE)
   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);
@@ -67,9 +65,8 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
     @ApiResponse(code = 400, message = "Invalid status value", response = Pet.class) })
-  @RequestMapping(value = "/findByStatus",
+  @RequestMapping(value = "/pet/findByStatus",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.GET)
   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);
 
@@ -83,9 +80,8 @@ public interface PetApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
     @ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class) })
-  @RequestMapping(value = "/findByTags",
+  @RequestMapping(value = "/pet/findByTags",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.GET)
   ResponseEntity<List<Pet>> findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @RequestParam(value = "tags", required = true) List<String> tags);
 
@@ -97,9 +93,8 @@ public interface PetApi {
     @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class),
     @ApiResponse(code = 404, message = "Pet not found", response = Pet.class) })
-  @RequestMapping(value = "/{petId}",
+  @RequestMapping(value = "/pet/{petId}",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.GET)
   ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",required=true ) @PathVariable("petId") Long petId);
 
@@ -114,7 +109,7 @@ public interface PetApi {
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
     @ApiResponse(code = 404, message = "Pet not found", response = Void.class),
     @ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
-  @RequestMapping(value = "",
+  @RequestMapping(value = "/pet",
     produces = { "application/xml", "application/json" }, 
     consumes = { "application/json", "application/xml" },
     method = RequestMethod.PUT)
@@ -129,7 +124,7 @@ public interface PetApi {
   })
   @ApiResponses(value = { 
     @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-  @RequestMapping(value = "/{petId}",
+  @RequestMapping(value = "/pet/{petId}",
     produces = { "application/xml", "application/json" }, 
     consumes = { "application/x-www-form-urlencoded" },
     method = RequestMethod.POST)
@@ -146,7 +141,7 @@ public interface PetApi {
   })
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-  @RequestMapping(value = "/{petId}/uploadImage",
+  @RequestMapping(value = "/pet/{petId}/uploadImage",
     produces = { "application/json" }, 
     consumes = { "multipart/form-data" },
     method = RequestMethod.POST)
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java
index cb3b30c0ce05..64e909444641 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java
@@ -21,7 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
 
 @Controller
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class PetApiController implements PetApi {
     public ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body) {
       // do some magic!
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
index 95dbf7170b67..901d46bee81f 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
@@ -21,18 +21,16 @@ import java.util.List;
 
 import static org.springframework.http.MediaType.*;
 
-@RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
-@Api(value = "/store", description = "the store API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@Api(value = "store", description = "the store API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public interface StoreApi {
 
   @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
     @ApiResponse(code = 404, message = "Order not found", response = Void.class) })
-  @RequestMapping(value = "/order/{orderId}",
+  @RequestMapping(value = "/store/order/{orderId}",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.DELETE)
   ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId);
 
@@ -42,9 +40,8 @@ public interface StoreApi {
   })
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Integer.class) })
-  @RequestMapping(value = "/inventory",
+  @RequestMapping(value = "/store/inventory",
     produces = { "application/json" }, 
-    
     method = RequestMethod.GET)
   ResponseEntity<Map<String, Integer>> getInventory();
 
@@ -54,9 +51,8 @@ public interface StoreApi {
     @ApiResponse(code = 200, message = "successful operation", response = Order.class),
     @ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class),
     @ApiResponse(code = 404, message = "Order not found", response = Order.class) })
-  @RequestMapping(value = "/order/{orderId}",
+  @RequestMapping(value = "/store/order/{orderId}",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.GET)
   ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId);
 
@@ -65,9 +61,8 @@ public interface StoreApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Order.class),
     @ApiResponse(code = 400, message = "Invalid Order", response = Order.class) })
-  @RequestMapping(value = "/order",
+  @RequestMapping(value = "/store/order",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.POST)
   ResponseEntity<Order> placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true ) @RequestBody Order body);
 
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java
index 82d598784197..04178b670f47 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java
@@ -20,7 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
 
 @Controller
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class StoreApiController implements StoreApi {
     public ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId) {
       // do some magic!
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
index 1d16485a5cc3..da170f5eb3e7 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
@@ -21,17 +21,15 @@ import java.util.List;
 
 import static org.springframework.http.MediaType.*;
 
-@RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
-@Api(value = "/user", description = "the user API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@Api(value = "user", description = "the user API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02: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", response = Void.class) })
-  @RequestMapping(value = "",
+  @RequestMapping(value = "/user",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.POST)
   ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @RequestBody User body);
 
@@ -39,9 +37,8 @@ public interface UserApi {
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-  @RequestMapping(value = "/createWithArray",
+  @RequestMapping(value = "/user/createWithArray",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.POST)
   ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body);
 
@@ -49,9 +46,8 @@ public interface UserApi {
   @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-  @RequestMapping(value = "/createWithList",
+  @RequestMapping(value = "/user/createWithList",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.POST)
   ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @RequestBody List<User> body);
 
@@ -60,9 +56,8 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
     @ApiResponse(code = 404, message = "User not found", response = Void.class) })
-  @RequestMapping(value = "/{username}",
+  @RequestMapping(value = "/user/{username}",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.DELETE)
   ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true ) @PathVariable("username") String username);
 
@@ -72,9 +67,8 @@ public interface UserApi {
     @ApiResponse(code = 200, message = "successful operation", response = User.class),
     @ApiResponse(code = 400, message = "Invalid username supplied", response = User.class),
     @ApiResponse(code = 404, message = "User not found", response = User.class) })
-  @RequestMapping(value = "/{username}",
+  @RequestMapping(value = "/user/{username}",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.GET)
   ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true ) @PathVariable("username") String username);
 
@@ -83,9 +77,8 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = String.class),
     @ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) })
-  @RequestMapping(value = "/login",
+  @RequestMapping(value = "/user/login",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.GET)
   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);
@@ -94,9 +87,8 @@ public interface UserApi {
   @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
   @ApiResponses(value = { 
     @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-  @RequestMapping(value = "/logout",
+  @RequestMapping(value = "/user/logout",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.GET)
   ResponseEntity<Void> logoutUser();
 
@@ -105,9 +97,8 @@ public interface UserApi {
   @ApiResponses(value = { 
     @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
     @ApiResponse(code = 404, message = "User not found", response = Void.class) })
-  @RequestMapping(value = "/{username}",
+  @RequestMapping(value = "/user/{username}",
     produces = { "application/xml", "application/json" }, 
-    
     method = RequestMethod.PUT)
   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);
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java
index c89b4344d423..8af34d5d47a3 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java
@@ -20,7 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
 
 @Controller
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class UserApiController implements UserApi {
     public ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @RequestBody User body) {
       // do some magic!
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java b/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java
index 2b2c0e4ef8b8..9dcf5890183c 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java
@@ -13,7 +13,7 @@ import springfox.documentation.spring.web.plugins.Docket;
 
 
 @Configuration
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class SwaggerDocumentationConfig {
 
     ApiInfo apiInfo() {
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
index 4a0a3f96c314..da5fcf8299c1 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class Category  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
index 1dc6b16915c6..0f5c4078ae9e 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class ModelApiResponse  {
   
   private Integer code = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java
index 951e1cb68785..ae7fbc45add2 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class Order  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java
index be6ee7d529eb..de7615f484dc 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class Pet  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
index 7d2d0bd587c2..174ff984fc35 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class Tag  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java
index ffeaafe129f9..e22fd5071d5f 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-03T12:27:25.655+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
 public class User  {
   
   private Long id = null;

From 4c9e7ae5720ad3b4f0b4b53cfc0424d46beff774 Mon Sep 17 00:00:00 2001
From: clasnake <classical.zhu@gmail.com>
Date: Mon, 6 Jun 2016 22:04:17 +0800
Subject: [PATCH 092/139] Add gradle support for the scala client.

---
 .../codegen/languages/ScalaClientCodegen.java |  12 ++
 .../resources/scala/build.gradle.mustache     | 120 +++++++++++
 .../main/resources/scala/gradle-wrapper.jar   | Bin 0 -> 53639 bytes
 .../scala/gradle-wrapper.properties.mustache  |   6 +
 .../scala/gradle.properties.mustache          |   2 +
 .../main/resources/scala/gradlew.bat.mustache |  90 ++++++++
 .../src/main/resources/scala/gradlew.mustache | 160 ++++++++++++++
 .../resources/scala/settings.gradle.mustache  |   1 +
 .../petstore/scala/.swagger-codegen-ignore    |  23 ++
 samples/client/petstore/scala/LICENSE         | 201 ++++++++++++++++++
 samples/client/petstore/scala/build.gradle    | 120 +++++++++++
 .../reports/tests/classes/PetApiTest.html     | 121 +++++++++++
 .../reports/tests/classes/StoreApiTest.html   | 101 +++++++++
 .../reports/tests/classes/UserApiTest.html    | 121 +++++++++++
 .../build/reports/tests/css/base-style.css    | 179 ++++++++++++++++
 .../scala/build/reports/tests/css/style.css   |  84 ++++++++
 .../scala/build/reports/tests/index.html      | 150 +++++++++++++
 .../scala/build/reports/tests/js/report.js    | 194 +++++++++++++++++
 .../build/test-results/TEST-PetApiTest.xml    |  11 +
 .../build/test-results/TEST-StoreApiTest.xml  |   8 +
 .../build/test-results/TEST-UserApiTest.xml   |  12 ++
 .../build/test-results/binary/test/output.bin |   1 +
 .../test-results/binary/test/output.bin.idx   | Bin 0 -> 36 bytes
 .../test-results/binary/test/results.bin      | Bin 0 -> 605 bytes
 .../test/jar_extract_2499683789472893630_tmp  |   0
 .../test/jar_extract_2588204703609432255_tmp  | Bin 0 -> 10545 bytes
 .../test/jar_extract_5992752952754193465_tmp  | Bin 0 -> 596 bytes
 .../test/jar_extract_6315988328729383060_tmp  | Bin 0 -> 2287 bytes
 .../test/jar_extract_899015300961717389_tmp   | Bin 0 -> 572 bytes
 samples/client/petstore/scala/git_push.sh     |   4 +-
 .../client/petstore/scala/gradle.properties   |   2 +
 .../scala/gradle/wrapper/gradle-wrapper.jar   | Bin 0 -> 53639 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   6 +
 samples/client/petstore/scala/gradlew         | 160 ++++++++++++++
 samples/client/petstore/scala/gradlew.bat     |  90 ++++++++
 samples/client/petstore/scala/settings.gradle |   1 +
 .../scala/io/swagger/client/api/PetApi.scala  |   2 +-
 37 files changed, 1979 insertions(+), 3 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/scala/build.gradle.mustache
 create mode 100644 modules/swagger-codegen/src/main/resources/scala/gradle-wrapper.jar
 create mode 100644 modules/swagger-codegen/src/main/resources/scala/gradle-wrapper.properties.mustache
 create mode 100644 modules/swagger-codegen/src/main/resources/scala/gradle.properties.mustache
 create mode 100644 modules/swagger-codegen/src/main/resources/scala/gradlew.bat.mustache
 create mode 100755 modules/swagger-codegen/src/main/resources/scala/gradlew.mustache
 create mode 100644 modules/swagger-codegen/src/main/resources/scala/settings.gradle.mustache
 create mode 100644 samples/client/petstore/scala/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/scala/LICENSE
 create mode 100644 samples/client/petstore/scala/build.gradle
 create mode 100644 samples/client/petstore/scala/build/reports/tests/classes/PetApiTest.html
 create mode 100644 samples/client/petstore/scala/build/reports/tests/classes/StoreApiTest.html
 create mode 100644 samples/client/petstore/scala/build/reports/tests/classes/UserApiTest.html
 create mode 100644 samples/client/petstore/scala/build/reports/tests/css/base-style.css
 create mode 100644 samples/client/petstore/scala/build/reports/tests/css/style.css
 create mode 100644 samples/client/petstore/scala/build/reports/tests/index.html
 create mode 100644 samples/client/petstore/scala/build/reports/tests/js/report.js
 create mode 100644 samples/client/petstore/scala/build/test-results/TEST-PetApiTest.xml
 create mode 100644 samples/client/petstore/scala/build/test-results/TEST-StoreApiTest.xml
 create mode 100644 samples/client/petstore/scala/build/test-results/TEST-UserApiTest.xml
 create mode 100644 samples/client/petstore/scala/build/test-results/binary/test/output.bin
 create mode 100644 samples/client/petstore/scala/build/test-results/binary/test/output.bin.idx
 create mode 100644 samples/client/petstore/scala/build/test-results/binary/test/results.bin
 create mode 100644 samples/client/petstore/scala/build/tmp/test/jar_extract_2499683789472893630_tmp
 create mode 100644 samples/client/petstore/scala/build/tmp/test/jar_extract_2588204703609432255_tmp
 create mode 100644 samples/client/petstore/scala/build/tmp/test/jar_extract_5992752952754193465_tmp
 create mode 100644 samples/client/petstore/scala/build/tmp/test/jar_extract_6315988328729383060_tmp
 create mode 100644 samples/client/petstore/scala/build/tmp/test/jar_extract_899015300961717389_tmp
 create mode 100644 samples/client/petstore/scala/gradle.properties
 create mode 100644 samples/client/petstore/scala/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 samples/client/petstore/scala/gradle/wrapper/gradle-wrapper.properties
 create mode 100755 samples/client/petstore/scala/gradlew
 create mode 100644 samples/client/petstore/scala/gradlew.bat
 create mode 100644 samples/client/petstore/scala/settings.gradle

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 992693810da9..12467f12efef 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
@@ -35,6 +35,7 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig
     protected String artifactVersion = "1.0.0";
     protected String sourceFolder = "src/main/scala";
     protected String authScheme = "";
+    protected String gradleWrapperPackage = "gradle.wrapper";
     protected boolean authPreemptive;
     protected boolean asyncHttpClient = !authScheme.isEmpty();
 
@@ -74,6 +75,17 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig
                 (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.scala"));
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
         supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+        // gradle settings
+        supportingFiles.add(new SupportingFile("build.gradle.mustache", "", "build.gradle"));
+        supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
+        supportingFiles.add(new SupportingFile("gradle.properties.mustache", "", "gradle.properties"));
+        // gradleWrapper files
+        supportingFiles.add(new SupportingFile( "gradlew.mustache", "", "gradlew") );
+        supportingFiles.add(new SupportingFile( "gradlew.bat.mustache", "", "gradlew.bat") );
+        supportingFiles.add(new SupportingFile( "gradle-wrapper.properties.mustache",
+                gradleWrapperPackage.replace( ".", File.separator ), "gradle-wrapper.properties") );
+        supportingFiles.add(new SupportingFile( "gradle-wrapper.jar",
+                gradleWrapperPackage.replace( ".", File.separator ), "gradle-wrapper.jar") );
 
         importMapping.remove("List");
         importMapping.remove("Set");
diff --git a/modules/swagger-codegen/src/main/resources/scala/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/scala/build.gradle.mustache
new file mode 100644
index 000000000000..88faa3610b2d
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/scala/build.gradle.mustache
@@ -0,0 +1,120 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+group = '{{groupId}}'
+version = '{{artifactVersion}}'
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+    }
+}
+
+repositories {
+    jcenter()
+}
+
+
+if(hasProperty('target') && target == 'android') {
+
+    apply plugin: 'com.android.library'
+    apply plugin: 'com.github.dcendents.android-maven'
+    
+    android {
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
+        defaultConfig {
+            minSdkVersion 14
+            targetSdkVersion 23
+        }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
+        }
+    
+        // Rename the aar correctly
+        libraryVariants.all { variant ->
+            variant.outputs.each { output ->
+                def outputFile = output.outputFile
+                if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
+                    output.outputFile = new File(outputFile.parent, fileName)
+                }
+            }
+        }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
+    }
+    
+    afterEvaluate {
+        android.libraryVariants.all { variant ->
+            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
+            task.description = "Create jar artifact for ${variant.name}"
+            task.dependsOn variant.javaCompile
+            task.from variant.javaCompile.destinationDir
+            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
+            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+            artifacts.add('archives', task);
+        }
+    }
+    
+    task sourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
+    }
+    
+    artifacts {
+        archives sourcesJar
+    }
+
+} else {
+
+    apply plugin: 'scala'
+    apply plugin: 'java'
+    apply plugin: 'maven'
+    
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+    
+    install {
+        repositories.mavenInstaller {
+            pom.artifactId = '{{artifactId}}'
+        }
+    }
+    
+    task execute(type:JavaExec) {
+       main = System.getProperty('mainClass')
+       classpath = sourceSets.main.runtimeClasspath
+    }
+}
+
+ext {
+    scala_version = "2.10.4"
+    joda_version = "1.2"
+    jodatime_version = "2.2"
+    jersey_version = "1.19"
+    swagger_core_version = "1.5.8"
+    jersey_async_version = "1.0.5"
+    jackson_version = "2.4.2"
+    junit_version = "4.8.1"
+    scala_test_version = "2.2.4"
+}
+
+dependencies {
+    compile "com.fasterxml.jackson.module:jackson-module-scala_2.10:$jackson_version"
+    compile "com.sun.jersey:jersey-client:$jersey_version"
+    compile "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
+    compile "org.jfarcand:jersey-ahc-client:$jersey_async_version"
+    compile "org.scala-lang:scala-library:$scala_version"
+    compile "io.swagger:swagger-core:$swagger_core_version"
+    testCompile "org.scalatest:scalatest_2.10:$scala_test_version"
+    testCompile "junit:junit:$junit_version"
+    compile "joda-time:joda-time:$jodatime_version"
+    compile "org.joda:joda-convert:$joda_version"
+}
diff --git a/modules/swagger-codegen/src/main/resources/scala/gradle-wrapper.jar b/modules/swagger-codegen/src/main/resources/scala/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..2c6137b87896c8f70315ae454e00a969ef5f6019
GIT binary patch
literal 53639
zcmafaW0a=B^559DjdyI@wr$%scWm3Xy<^+Pj_sKpY&N+!|K#4>Bz;ajPk*RBjZ;<q
zE3~2vC>RV75EK*;qpZCo(BB5~-#>pF^k0$_Qx&3<k{4$H1ycMM#`aN7fZ$&SwZDY+
zzcb1S$xDfgsi@M+i9gCsPsz&A(J#Qu&{5A$&owJEF0<?(KTOk&OU=m5&`8k&!(4=$
zru{0>rs}{XFZ)$uJU-ZpbB>L3?|knJ{J+ge{%=bI`#Yn9v&Fxx>fd=_|H)(FY-DO{
z_Wxu>{a02GXCp^PGw1(fh-I*;dGTM?mA^##pNEJ#c-Y%I7@3kW(VN&Bxw!bn$iWOU
zB8BZ)vT4(}GX%q~h3EYwbR?$d6|xnvg_e@4>dl5l+%FtPbGqa`;Uk##t$#g&CK4GO
zz%my0ZR1Fv@~b2_>T0cBP)ECz-Uc^nW9e+`W4!=mSJPopgoe3A(NMzBd0mR?$&3XA
zRL1}bJ2Q%R#bWHrC`j_)tPKMEyHuGSpdJMhT(Ob(e9H+#=Skp%#jzj=BVvc(-RSWB
z{_T`UcEeWD{z`!3-y;_N|Ljr4%f;2qPSM%n?_s%GnYsM!d3p)CxmudpyIPqTxjH!i
z;}A+!>>N;pko++K5n~I7m4>yco2%Zc$59RohB(l%KcJc9s^nw^?2JGy>O4#x5+CZH
zqU~7kA>WE)ngvsdfKhLUX0Lc3r+In0Uyn}LZh<B}tw~~op<%&6ZK$@{8{=Zp*i|%F
zZ}3rdI&4S~#s=DgeBdT9_4h0F!aG!WO(mBH%M3NEe1bfe__#10=mcJ<jMs)BUJ*N=
zp8U~dE7~xbY6zc5$>m?n){&LHNJws546du%pi<WMsZ-!qFNu(vP96a$!(Lj5W>a=j
zyH8<T$vq;f9t>CD{^Qx%kFe@kX*$B!DxLa(Y?BO32sm8%#_ynjU-m>PJbabL`~0Ai
zeJm<6okftSJUd2!X(>}i#KAh-NR2!Kg%c2JD=G|T%@Q0JQzqKB)Qc4E-{ZF=#PGZg
zior4-caR<X)}~{E8-pUei}(b%o`Ve^0YhfvU+P@IHM2QDBJP4uUh~coeprjY^TKz2
z!|BNT(TYhiSgJ(@L}2B~NqtIKyEBWEsA}4{Xr(44M~15KRx$l5Z{e&uztqoklC4=V
zFc%7N8h)x>B-Jj;l}Xb_!)TjB`jC}})6z~3AsRE&t~CO&)g{dqM0iK;lvav8?kE1<
zmCrHxDZe?&rEK7M4tG-i!`Zk-*IzSk0M0&Ul8+J>*UD(A^;bAFDcz>d&lzAlw}b##
zjfu@)rAou-86EN%8_Nv;%bNUmy*<6sbgB9)ZCihd<UdQD)c;hif5?<r?9ac71sDEj
z`uqe9xd%r7+4#Pv8U|EI@kzg(nO&Oa!j(T8l5ijbg(npoY9jsf{n2-a5D4SU=gb=l
z%D;$)oJ|2L`JCcZV>Sh_VT2iGFv+T8p&Z&wO02nKtdx?eZh^=*<>SZHSn(Pv)bgn{
zb15>YnVnJ^PO025c~^uK&W1C1XTs1az44L~-9Z-fU3{VvA?T<G*%^wVJ7p*1cD?>&
zdpi&S`mZ|$tMuN{{i|O}fAx#*KkroHe;6z^7c*x`2Rk!a2L~HB$A4@(Rz*hvM+og(
zJW+4;S-A$#+Gec-rn8}at+q5gRrNy^iU?Z4Gz_|qzS~sG_EV#m%-VW!jQ>f3jc-Vq
zW;~>OqI1Th&*fx#`c^=|A4GGoDp+ZH!n0_fDo-ks3d&GlT=(q<l6V8rL1%CRP%o0V
zlDM*^+@K7!3|z9#@0Z^~)CQXqbq=LZi$d~qY3@t;uHlXs>zr(?Qw`PHvo3PoU6YJE
zu{35)=P`LRm@+=ziAI)7jktM6KHx*v&WHVBYp<~UtR3c?Wv_{a0(k&NF!o#+@|Y6Y
z>{||-i0v8N2n<X=PO~9utU9VscgB7EO!#ooNvCS<6*g*&HU4h#-dR1n@?!$lj_%84
z&q*iwEH`Vvj!k3>tXRrVx~#Z1JMA3C2ki}OkJ4W`WjZIuLByNUEL2HqqKrbi{9a8`
zk-w0I$a<6;W6&X<&EbIq<nC@7D?CHc(O;3wGtTlp#FtvAx6PpRma09YJ(la!o?xpz
z;}PK=J@6pi?)oKv-({rt#wp&^9Ngm!8K(MRuMy+i#t>ul`;nvc+D~{g5al{0oOSp~
zhg;6nG1Bh-XyOBM63jb_z`7apSsta``K{!Q{}mZ!m4rTmWi^<*BN2dh#PLZ)oXIJY
zl#I3@$+8Fvi)m<}lK_}7q~VN%BvT^{q~ayRA7mwHO;*r0ePSK*OFv_{`3m+96HKgt
z=nD-=Pv90Ae1p)+SPLT&g(Fdqbcc(Vnk5SFyc|Tq08qS;FJ1K4rBmtns%Su=GZchE
zR(^9W-y!{QfeVPBeHpaBA{TZpQ*(d$H-*GI)Y}>X2Lk&27aFkqXE7D?G_iGav2r&P
zx3V=8GBGi8agj5!H?lDMr`1nYmvKZj!~0{GMPb!tM=VIJXbTk9q8JRoSPD*CH@4I+
zfG-6{Z=Yb->)MIUmXq-#;=lNCyF1G*W+tW6gdD||kQfW$J_@=Y9KmMD!(t#9-fPcJ
z>%&KQC-`%E`{y^i!1u=rJP_hhGErM$GYE3Y@ZzzA2a-PC>yaoDziZT#l+y)tfyR}U
z5Epq`ACY|VUVISHESM5$BpWC0FpDR<q{<w)6T;j_As8b7jRn{=EDJ}JE}S}X$Po!=
zR>K&qi?G-q%Rd8UwIq&`d(Mqa<@(fH!OfNIgFICEG?j_Gj7FS()kY^P(I!zbl`%HB
z7Rx=q2vZFjy^XypORT$^NJv_`Vm7-gkJWYsN5xg>snt5%oG?w1K#l_UH<>4@d0G@3
z)r?|yba6;ksyc+5+8YZ?)NZ+ER!4fIzK>>cs^(;ib7M}asT&)+J=J@U^~ffJ>65V#
zt_lyUp52t`vT&gcQ%a6Ca)p8u6v}3iJzf?zsx#e9t)-1OtqD$Mky&Lpz6_v?p0|y4
zI{Nq9z89OxQbs<pj(heDRy=aDy}3Bqa%U0*yhS+rkm7UjQIJtgq-^Em0TT<XQRI9I
z$jtH|L?US5gE_XQQRSE#t_z6EB=)(DYpr3_0h#fWZCashM~0MIy^KFUK5gL%bn%UB
zxObd0ehaON%xvM{hWag3AH$8%YcJng%Z;U*Ki~PSjJPchs10r^nHej}otX>qX)UYj
z<P*L5tm1|1$h2k0bIJx85Ai~|NLtmBu+T6V?J$dDY1V7CFqbl~)^EG{gf+zg9+(LR
z<*~aPRDyX0q_G(Wk{X=uP4TI$z13Sy(F~^m#xd888gnt@SeT&z`tgi`X#XCvBeNb7
zqa|sv^!>(BGu`28f8C^e9R2jf0Turq;v+fPCWD*z8!8-Q-_s`ILgwo@mtnjpC_D$J
zCz7-()9@8rQ{4qy<5;*%b<?^|(wiJHTNY-~SEs7pYhnMfcn`Clh}W+-!O@8EkNd=!
z_(Y4mbgHn>vX3k$grUQ{Bt;B#w))A+7ih631uN?!_~?i^g+zO^l<DV%@M8k*{5uEJ
zAJknby{g5kf=sn-=SgH&nr$PPSSa}1+(|1n!JyyM!4=+=Fm2qE;S6#i0QvN?%PgAd
za=<tvN;7Gn9ea{mxbI~Z$aJ)wTuIL9br5=ODnW;r;L^|)@<~-sK{fT|Wh?<|;)+;u
zwOLj8{uTsmnSRR(Y82lzwjTYOUvq_qH||+HVtQXkic9_LN$QZ{Kw4F`bddNeeWoA8
zFJ6RCO^G+qNu*KtE1*5mU0x^>GK$>O1T1$6VdF~<N4sBkfy`#xHaO+PZ1$Zn3MM;h
zDSA#R9z53ibz2?w65#L}OLqjyBy~7h4VaGdgR#GILP-(ln68S^c04cM3e$lnSU_(F
zZm3e`1~?eu1>%FKR6~Px%M`ibJG*~uQ>o^r9qLo*`@^ry@KX^$LH0>NGPL%MG8|;8
z@_)h2uvB1M!qjGtZgy~7<q8Az3Cb?GC4S$`8By0G`gAIm+CJd0>-O=GUa`&;xEFvC
zwIt?+O;Fjwgn3aE%`_XfZEw5ayP+JS8x?I|V3ARbQ5@{JAl1E*5a{Ytc(UkoDKtD#
zu)K4XIYno7h3)0~5&93}pMJMDr*mcYM|#(FXS@Pj)(2!cl$)R-GwwrpOW!zZ2|wN)
zE|B38xr4_NBv|%_Lpnm$We<_~S{F1x42tph3PAS`0saF^PisF6EDtce+9y6jdITmu
zqI-CLeTn2%I3t3z_=e=YGzUX6i5SEujY`j|=aqv#(Q=iWPkKhau@g|%#xVC2$6<{2
zAoimy5vLq6rvBo3rv&^VqtaKt_@Vx^gWN{f4^@i6H??!ra^_KC-ShWC(GBNt3o~T^
zudX<0v!;s$rIflR?~Tu4-D=%~E=glv+1|pg*ea30re-2K@8EqQ{8#WY4X-br_!qpq
zL;PRCi^e~EClLpGb1MrsXCqfD2m615mt;EyR3W6XKU=4(A^gFCMMWgn#5o1~EYOH*
zOlolGlD;B!j%lRFaoc)q_bOH-O!r}g1Bhlhy*dRoTf-bI%`A`kU)Q=HA9HgCKqq&A
z2$_rtL-uIA7`PiJfw380j@M4Fff-?(Xe(aR`4>BZyDN2$2E7QQ1}95@X819fnA(}=
za=5VF-%;l}aHSRHCfs(#Qf%dPue~fGpy7qPs*eLX2Aa0+@mPxnS4Wm8@kP7KEL)8s
z<l&yJZ8Hg)Zm*Sj4(oBxZ9dCQJ+J1~sJquUnYngL&F@-ds6T_QS(b6?*4Q`mI`<l5
z=JLFJZM{b2e`)BQ7Vq46Q&<ph`)<Lk()aWz)=oIgeK@N$dN)Qir<E!#EK!#q(brX8
zRcA$1{duVpm*`Hi5ZyqoY_~Wd_1{yDQzeuakeI#Y6HT@3sE8C<y7u;2h0VV8S8d(b
z`o@7rhg;A$u&1wQyXe-L`F(Oz9n0YcA2QAYm*Y?TO>@tNmawLHST-FS4h%20%lVvd
zkXpxWa43E`zX{6-{2c+L9C`l(ZRG8`kO9g7t&hx?>j~5_C;y5u*Bvl79)Bq?@T7bN
z=G2?QDa0J3VwCfZG0BjOFP>xz4jtv3LS>jz#1x~b9u1*n9>Y6?u8W?I^~;N{GC<<w
za-$&yDJMGF;?PMK^^p7`?%v+-H&~`iif%?O(aenFpyM(*#hoPV-lQWw2O5zRwy82S
zv(ORx-(HD0PA?+VAI8r^9qEJ;IObxo&RPhmNg|h$%v(@pB%);Lgc`V}0<g|vh>1y}
zc&Wz{L`kJUSt=oA=5ZHtNj3PSB%w5^=0(U7GC^zUgcdkujo>ruzyBurtTjKuNf1-+
z<?S!nf0b<|KYXj>zn~oZFXCbR&xq&W{ar~T`@fNef5M$u^-C92HMBo=*``D8Q^ktX
z(qT{_R=*<y(QRR<=cP*#$rNdWyW|{_!%R7B*;~-j^WVh32I1m{H2AqfhOh=^$36Z4
zo;^4UXQDUFy>EI?-R9nNUFNR#{(Qb;27bM14bjI`c#4RiinHbnS445Jy^%krK%kpE
zFw%RVQd6kqsNbiBtH*#jiPu3(%}P7Vhs0G9&Dwb4E-hXO!|whZ!O$J-PU@j#;GrzN
zwP9o=l~Nv}4OPvv5rVNoFN>Oj0TC%P>ykicmFOx*dyCs@7XBH|w1k2hb`|3|i^GEL
zyg7PRl9<Vir;;}%o1e}82;)6wONlPSHEJt9e1cD!jw(;vnBgJz(qi(spG6X|*Z^=p
zgkdia)uB;qU}1LO=rA9a<zY8A7wzeGrR^}MV7LEeiOE_UdI?2ZO{7}NV|@%`FD1$r
z7SzfxB|#a1nM87$)h4F(h~5Zrxi7&Uk{+=%*QSbEt~sDs8q{*X*|~~L(cJ&alN>eV
ztQ1z)v~NwH$ebcMSKc-4D=?G^3sKVG47ZWldhR@SHCr}SwWuj5t!W$&HAA*Wo_9tM
zw5vs`2clw`z@~R-#W8d4B8!rFtO}+-$-{6f_`O-^-EhGraqg%$D618&<9KG``D|Rb
zQJ&TSE3cfgf8i}I^DLu+-z{{;QM>K3I9~3R9!0~=Y`A1=6`CF#XVH@MWO?3@xa6ev
zdw08_9L=>3%)iXA(_CE@ipRQ{Tb+@mxoN^3ktgmt^mJ(u#=_Plt?5qMZOA3&I1&NU
zOG+0XTsIkbhGsp(ApF2MphRG^)>vqagn!-%pRnppa%`-l@DLS0KUm8*e9jGT0F%0J
z*-6E@Z*YyeZ{eP<Z|R=TU(rcsEdEVO$n_dAGidpxAEXyW1_85q`y7uRQ!{6?E&)`6
zqTX;Ts^Wo720nn<<g}CpJ5Fq;Ptvd1b**tya?IvwiouQTtH35*(>7DGmxQedo}^+w
zM~>&E$5&SW6MxP##J56<C;RbEi@Y>Eo@0P34XG})MLCuhMyDFf**?tziO?_Ad&Jhd
z`jok^B{3ff*7cydrxYjdxX`14`S+34kW^$fxDmNn2%fsQ6+Zou0%U{3Y>L}UIbQbw
z*E#{Von}~UEAL?vvihW)4?Kr-R?_?JSN?B?QzhUWj==1VNEieTMuTJ#-nl*c@qP+`
zGk@aE0oAD5!9_fO=tDQ<t_;py##UpzDgzZ!uzlSnk{DvEWesm2qR_*)rts2}2y47p
z^xYRoz}y%4+XPe$gHUeS>At9g0rKTr{Z0t~S#oy5?F3&aWm<s(Lt*OX<rX_yV<J5}
z`oiifQg(ieomc3~k6n^Be({K4A%pQ(tSz+dpU|DKiO09F@6l(p#vg`6Xn>+igqKi|
zK9W3KRS|1so|~dx%90o9+FVuN7)O@by^mL=IX_m^M87i&kT1^#9TCpI@diZ_p$uW3
zbA+-ER9vJ{ii?QIZF=cf<TwJ5#kprBZ!2`MoSesBx+GO==l2u>ZT3#vJEKC|BQhNd
zGmxBDLEMn<M$7V3{JR(unAgVJJK~gdua8TY6nq2)W`TVWmV5&!B~CC5OVJ9!@(T5i
z@P{0`1Qv<HZ|EYNgNM3@ud7Nu(gF3Uu$qhBx!orEiSaHTgIn-_Apg~5mU=OEssDuo
zKz|)Y!vAbCWgRU3%OMO){%}}SL>uc*AET~k8g-P-K+S~_(+GE9q6jyIMka(dr}(H%
z$*z;JDnyI@6BQ7KGcrv03Hn(abJ_-vqS>5~m*;ZJmH$W`@csQ8ejiC8S#sYTB;AoF
zXsd!kDTG#3FOo-iJJpd$C~@8}GQJ$b1A85MXp?1#dHWQu@j~i4L*LG40J}+V=&-(g
zh~Hzk(l1$_y}PX}Ypluyiib0%vwSqPaJdy<Zvo%U(D}HyI8J<9sjIEdrF;a5%`Uf4
z@j9=PP<2F=PVc-k&gh&jQ4!~1LUg4Ujs`(BKTr!aeAL+YL)FdOm-jerRHrp88Z)mQ
zAWybRVG?evi6_F6vT+`&e1xjuHvGh$@{`7{d=uf>9EZ;?+;lFF8%Kb7cwPD17C}@N
z2OF;}QCM4;CDx~d;XnunQAx5mQbL#);}H57I+uB9^v|cmZwuXGkoH-cAJ%nIjSO$E
z{BpYdC9poyO5pvdL+ZPWFuK}c8WGEq-#I3myONq^BL%uG`RIoSBTEK9sAeU4UBh7f
zzM$s|&NtAGN&>`lp5Ruc%qO^oL;VGnzo9A8{fQn@YoORA>qw;^n2pydq>;Ji9(sPH
zLGsEeTIH?_6C3uyWoW(gkmM(RhFkiDuQPXmL7Oes(+4)YIHt+B@i`*%0KcgL&A#ua
zAjb8l_tO^Ag!ai3f54t?<K+&aOWzbv0c#i2n>@{aoW%&Hdst}dglRzQlS=M{O!=?l
z<st41Z<X$n<h4m?FUxq+^`tMtEn0JjEwTYhuoq>*xY2vJ?+#!70RO8<&N^R4p+f=z
z*&_e}QT%6-R5Wt66moGfvorp$yE|3=-2_(y`FnL0-7A?h%4NMZ#F#Rcb^}971t5ib
zw<20w|C?HVv%|)Q)Pef8tGjwQ+!+<{>IVjr@&SRVO*PyC?Efnsq;Eq{r;U2)1+tgp
z)@pZ}gJmzf{m=K@7YA_8X#XK+)F465h%z38{V-K8k%&_GF+g^s&9o6^B-&|MDFI)H
zj1ofQL>W(MJLOu3xkkJZV@$}GEG~XBz~WvRjxhT0$jKKZKjuKi$rmR-al}Hb3xDL)
z^xGG2?5+vUAo4I;$(JgeVQe9+e)vvJ={pO~05f|J={%dsSLVcF>@F9p4|nYK&hMua
zWjNvRod}l~WmGo|LX2j#w$r$y?v^H?Gu(_?(WR_%D@1I@$yMTKqD=Ca2<gxxi^@>)
zWBQmx#A$gMrHe^A8kxAgB}c2R5)14G6%HfpDf$(Di|p8ntcN;Hnk)DR1;toC9zo77
zcWb?&&3h65(b<ccjTWmfOL(f^AmD-(*=w5-{<SE0RQ0tcc)lRDeDfQ5Xn9O}3bu={
zmJZGBo?+jDZ7ad80oyqpuIL7@@k)5rBemDehK8mqH+O!!)L*<+RxUdZp~Srl!{GzA
ztDA-JvC_LO@7_Y(X9tjCE9W}r(O<iU>LAte%hstI9o%hZ*{y=8t$^!y2E~t<W2;rn
zY}+YgthWBBNkU!lMRXIfpPm=BD?XS`tChYjrkD&ivnb>z^XUY2N2NChy;EIBmf(Kl
zfU~&jf*}p(r;#MP4x5dI>i`vjo`w?`9^5(vfFjmWp`Ch!2Ig}rkpS|T%g@2h-%V~R
zg!*o7OZSU-%)M8D>F^|z+2F|!u1mOt?5^zG%;{^CrV^J?diz9AmF!UsO?Pl79DKvD
zo-2==yjbcF5oJY!oF?g)BKmC8-v|iL6VT|Gj!Gk5yaXfhs&GeR)OkZ}=q{exBPv)&
zV!QTQBMNs>QQ))>(rZOn0PK+-`|7vKvrjky3-Kmuf8uJ`x6&wsA5S(tMf=m;79Hzv
za%lZ(OhM&ZUCHt<WHM{IVoZIGA_lI-Z@E!>M~FRd#Uk<I_Y&v<gZXMTM{4K+KMl}Z
zJSEc3>3Iy%oXe^)!Jci39D(a$51WER+%gIZYP)!}nDtDw_FgPL3e>1ilFN=M(j~V`
zjOtRhOB8bX8}*FD0oy}+s@r4XQT;OFH__cEn-G<U@I6w_V7c*_&BNwv=^R%8f{M2Y
zv@?)zDSH@}S#qh~k^?fC6WB7hXu~9jbYt-H-2*xDE>#aYHpJDI4&Zo4y2>uJdbPYe
zOMGMvbA6#(p00i1{t~^;RaHmgZtE@we39mFaO0r|CJ0zUk$|1Pp60Q&$A;dm>MfP#
zkfdw?=^9;jsLEXsccMOi<+0-z|NZ<QD|7#&39tAQ5)<BDA90WCaHex+e-XISu2OPw
zX&SGY(oV;Vi$GDF3CLZN%A9@|Kx#ECyWXu?#f>b(#wwkcO)nVxJxkF3<L`?%HzqAe
zp2w~+DmvSjgP}@Yzy1enu&YG_S}U>g(OvW4`m36ytfPx5e-ujFXf($)cVOn|qt9LL
zNr!InmcuVkxEg8=_;E)+`>n2Y0eAIDrklnE=T9Pyct>^4h$VDDy>}JiA=W9JE79<6
zv%hpzeJC)TGX|(gP!MGWRhJV}!fa1mcvY%jC^(tbG3QIcQnTy&8UpPPvIekWM!R?R
zKQanRv+YZn%s4bqv1LBgQ1PWcEa;-MVeCk`$^FLYR~v%9b-@&M%giqnFHV;5P5_et
z@R`%W>@G<6GYa=JZ)JsNMN?47)5Y3@RY`EVOPzxj;z6bn#jZv|D?Fn#$b}F!a}D9{
ztB_roYj%34c-@~e<Bb^byl$up%GSTMk`*>hWM_z;B{G5;udhY`rBH0|+u#!&KLdnw
z;!A%tG{%Ua;}OW<LH7q0yToQzb}HU3^R?8irQEQ}xQ~jYz9={pa-R?@@=D#YDY67P
zA*zM+SOo2L^HNfNpxC|M%>$BG`B#^8#K$1wX2K$m`OwL-6;hmh{aiuyTz;U|EKES=
z9UsxUpT^ZZyWk0;GO;Fe=hC`kPSL&1GWS7kGX0>+votm@V-lg&OR>0*!Iay>_|5OT
zF0w~t01mupvy4&HYKnrG?sOsip%=<>nK}Bxth~}g)?=Ax94l_=mC{M@`bqiKtV5vf
zIP!>8I;zHdxsaVt9K?{lX<Q!renxPOe3H|(E)>Cc$%kKfIwh&WM__JhsA?o$!dzxP
znoRU<t+v_L(`H04w<LiTQQ)Pk<mETquNt<;8T2RJOP-lIMG8r14u5#DzR-v-`RrMJ
zM)*~9kI$6G^R_F6eBbww^*k53E`Q_KJ1L@d0>4ZdzeN3-W{6h~QQSos{-!W@sIMaM
z4o?97?W5*cL~5%q+T@>q%L{Yvw(a2l&68hI0Ra*H=ZjU!-o@3(*7hIKo?I<hU$o;^
z0m|-;4cZ|Zq`^rWQ4+5R4jd$Ssf2Z;ggZu}3saAzm@Cqo*(A|g?P%$hK1H1c^_qBN
zIyEJ!dBD20U)xJzYisL@x{br-b#L$M%kI_(^=p8+J4d!D(ji0tm-&fL&gq|=TVDhH
zua6~(AC|-cNCo_}>7$gfB(Vlr!62-_R-+T;I0eiE^><*1_t|scfB{r9+a%UxP~CBr
zl1!X^l01w8o(|2da~Mca)>Mn}&rF!PhsP_RIU~7)B~VwKIruwlUIlOI5-yd4ci^m{
zBT(H*GvKNt=l7a~GUco)C*2t~7>2t?;V{gJm=WNtIhm4x%KY>Rm(EC^w3uA{0^_>p
zM;Na<+I<&KwZOUKM-b0y6;HRov=GeEi&CqEG9^F_GR*0RSM3ukm2c2s{)0<%{+g78
zOyKO%^P(-(U09FO!75Pg@xA{p+1$*cD!3=CgW4NO*p}&H8&K`(HL&$TH2N-bf%?JL
zVEWs;@_UDD7IoM&P^(k-U?Gs*sk=bLm+f1p$ggYKeR_7W>Zz|Dl{{o*iYiB1LHq`?
ztT)b^6Pgk!Kn~ozynV`O(hsUI52|g{0{cwdQ+=&@$|!y8{pvUC_a5zCemee6?E{;P
zVE9;@3w92Nu9m_|x24gtm23{ST8B<ok)5(u*|3@P%kHPFNP^26t5y{A8W-@Tx8I($
zR_9DM(F9UL4>p;;iJlhaiH2DVcnYqot`tv>!xiUJXFEIMMP(ZV!_onqyQtB_&x}j9
z?LXw;&z%kyYjyP8CQ6X);-QW^?P1w}&HgM}irG~pOJ()IwwaDp!i2$|_{Ggvw$-%K
zp=8N>0Fv-n%W6{A8g-tu7{73N#KzURZl;sb^L*d%leKXp2Ai(ZvO96T#6*!73GqCU
z&U-NB*0p@?f;m~1MUN}mfdpBS5Q-dbhZ$$OWW=?t8bT+R5^vMUy$q$xY}ABi60bb_
z9;fj~2T2Ogtg8EDNr4j96{@+9bRP#Li7YDK1Jh8|Mo%NON|bYXi~D(W8oiC2SSE#p
z=yQ0EP*}Z)$K$v?MJp8s=xroI@gSp&y!De;aik!U7?>3!sup&HY{6!eElc+?ZW*|3
zjJ;Nx>Kn@)3WP`{R821FpY6p1)yeJPi6yfq=EffesCZjO$#c;p!sc8{$>M-i#@fCt
zw?GQV4MTSvDH(NlD2S*g-YnxCDp*%|z9^+|HQ(#XI0Pa8-Io=pz8C&Lp?23Y5JopL
z!z_O3s+AY&`HT%KO}EB73{oTar{hg)6J7*KI;_Gy%V%-oO3t+vcyZ<w#%_E>?;&%L
z3t4A%Ltf=2+f8qITmoRfolL;I__Q8Z&K9*+_f#Sue$2C;xTS@%Z*z-lOAF-+gj1C$
zKEpt`_qg;q^41dggeNsJv#n=5i+6Wyf?4P_a=>s9n(ET_K|*zvh633Mv3Xm3OE!n`
zFk^y65tStyk4aamG*+=5V^UePR2e0Fbt7g$({L1SjOel~1^9SmP2zGJ)RZX(>6u4^
zQ78wF_qtS~6b+t&mKM=w&Dt=k(oWMA^e&V#&Y5dFDc>oUn+OU0guB~h3};G1;X=v+
zs_8IR_~Y}&zD^=|P;U_xMA{Ekj+lHN@_n-4)_cHNj0gY4(Lx1*NJ^z9vO>+2_lm4N
zo5^}vL2G%7EiPINrH-qX77{y2c*#;|bSa~fRN2)v=)>U@;YF}9H0XR@(+=C+kT5_1
zy?ZhA&_&mTY7O~ad|LX+%+F{GTgE0K8OKaC2@NlC1{j4Co8;2vcUbGpA}+hBiDGCS
zl~yxngtG}PI$M*JZYOi{Ta<*0f{3dzV0R}yIV7V>M$aX=TNPo|kS;!!LP3-kbKWj`
zR;R%bSf%+AA#LMkG$-o88&k4bF-uIO1_OrXb%uFp((Pkvl@nVyI&^-r5p}XQh`9wL
zKWA0SMJ9X|rBICxLwhS6gCTVUGjH&)@nofEcSJ-t4LTj&#NETb#Z;1xu(_?NV@3WH
z;c(@t$2zlY@$o5Gy1&pvja&AM`YXr3aFK|wc+u?%JGHLRM$J2vK<!+-k054D)p4?D
zuBs*5Uh&-fcg<k8T3?WZ>N~}5@!jdKBlA>;10A(*-o2>n_hIQ7&>E>TKcQoWhx7um
zx+JKx)mAsP3Kg{Prb(Z7b};vw&>Tl_WN)E^Ew#Ro{-Otsclp%Ud%bb`8?%r>kLpjh
z@2<($JO9+%V+To>{K?m76vT>8qAxhypYw;Yl^JH@v9^QeU01$3lyvRt^C#(Kr#1&2
ziOa@LG9p6O=jO6YCVm-d1OB+_c<QxmWgG@GQ8xIJzp@sh{kRv)>858dtHm>!h6DUQ
zj?dKJvwa2OUJ@qv4!>l1<N=~t9w@Yj+E2++1rI}?cBwbS8D~TR62}sT=r>I?bS$Rj
zdUU&mofGqgLqZ2jGREYM>;ubg@~XE>T~B)9tM*t-GmFJLO%^tMWh-iWD9tiYqN>eZ
zuCTF%GahsUr#3r3I5D*SaA<cZd+-|6N`I>75=3lfE!SpchB~1Xk>a7Ik!R%vTAqhO
z#H?Q}PPN8~@>ZQ^rAm^I=*z>a(M4Hxj+BKrRjJcRr42J@DkVoLhUeVWjEI~+)UCRs
zja$08$Ff@s9!r47##j1A5^B6br{<%L5uW&8t%_te(<jb<koi^d3JR#aLkW~VEIqJ8
z<u7Ch{}SxRmVqoBIK{S|r>t@c|4Fane;UzM<g`qjcPx`$^+|h+Of8|tKRQSCsh8SM
zX-G?eZ(|juU2Ozxl<6#gNl<m#66aZ@o_yw`e}Jj_%`cGhV^b*%Pi5Y$+I>{jKhXfC
zQa|k^)d*t}!<)K)(nnDxQh+Q?e@YftzoGIIG?V?~$cDY_;kPF>N}C9u7YcZzjzc7t
zx3Xi|M5m@PioC>dCO$ia&r=5ZLdGE8PXlgab`D}>z`dy(+;Q%tz^^s*@5D)gll+QL
z6@O3@K6&zrhitg~{t*EQ><jJhiYMYf!UyeY-=zgd8lUo`i^Y?ysR8hWj}BlwEE3!%
zUk$(QyzQlD@lgbNXzaZdN(B}qVE(8d@7+IB_s@BdwC8#12)<{ZCniYDv|C<59>-YN
zy&k{89XF*^mdeRJ<OD=%fC2EFCh_D0l&v<#d4kVLDUR`)%hS3DYFd-6MqSS}Z$$YQ
zVucT&8n1^$)O!n!Sp&T`rowjeJ07s@TUFF&d&wTp&yQqtFE@t8*<S_~VXy_vSC&OM
zf6N=L;mw}FfLr)Z>p{#;EAFi_U<7}|>dl^*QFg**9wzlA#N9!`Qnc68+XRbO-Za=t
zy@wz`mi0MmgE?4b>L$q&<Yiv@3^}R$UeEhUDOn}c?D}#xx@zmW<3TYrHsdi`q^!p0
z<@Xv_@;27lFMX-=l8%KQp!26NC&w<>!%B!6MC7JjyG#Qvwj{d8)bdF<CVrJMTj@ii
zdha(WjgEJ1S?C6#<=_dC56R1~%o=U}`0jc!<xOgW`%!+7ZAwTD`nC{4NAe0|2wH;8
zJuB~Y9?sQuOhcj}BVKRivwqLnceSiRq`?AW`EgQgyPP}4$+D3^wN4aF5Y95k`JRfY
zDH|;R>`hA`LWSv+lBIs(3~hKSQ^0Se!@QOt;z5`!;Wjy1l8w=(|6%GPeK)b)2&Ula
zoJ#7UYiJf>EDwi%YFd4u5wo;2_gb`)QdsyTm-zIX954I&vLMw&_@qLHd?I~=2X}%1
zcd?XuDYM)(2^~9!3z)1@hrW`%-TcpKB1^;IEbz=d0hv4+jtH;wX~%=2q7YW^C67Fk
zyxhyP=Au*oC7n_O>l)aQgISa=B$Be8x3eCv5vzC%fSCn|h2H#0`+P1D*PPuPJ!7Hs
z{6WlvyS?!zF-KfiP31)E&xYs<)C03BT)N6YQYR*Be?;bPp>h?%RAeQ7@N?;|sEoQ%
z4FbO`m}Ae_S79!jErpz<Ys$E3Px+tQxaSltK6h^T0MGjz4SqrJ;}A4U8a$3neFCCq
z##n}WPFZQMW21*u4g50b2wQ}F5g(lQ`PmWa*s?|J1S5i(GL)WNDGrm8?Lw*c`C8GJ
z?D653Y{^uM{vWyoPyTs*fdq*sP~eh3UDU(`<a8s<m1W+OS%DdnZF+?q1khJcrc9)3
z5x<T?`h>DJ)d`-!A8BZ+ASx>I%lITl;$st<;keU6oXJgVi?CJUCotEY>)blbj&;Qh
zN*IKSe7UpxWPOCl1!d0I*VjT?k6n3opl8el=lonT&1Xt8T{(7rpV(?%jE~nEAx_mK
z2<?RpfJiye<OPI(x`nuE>x=-+Sl-h<%IAsBz1ciQ_jr9+nX57O=bO_%VtCzheWy<v
z_LW0P&vH9{hD`cr>A}*Sw!kN-S9_+tM}G?KEqqx1H036ELVw3Ja0!*Kr-Q<HTGGAk
zWu>o>)t*<du!W~yWOKN*7a-*P_EtPEPa<xvDV(ru7ru(NBxwc4+1ekxW{sdPdv5^^
z?+TqI!9Rgoct<OXHJvwG7NT%lM7R8y_n;HAMRgbaIo0r6AFDEuzM%98zAOH-$aS@b
zWB!W~g#@CSpa7D1M08VZuLP9QhM4@ExaKZcJhV>?aj2$x;CajQ@t`vbVbNp1Oczu@
zIKB+{5l$S;n(ny4#$RSd#g$@+V+qpAU&pBORg2o@QMHYLxS;zGOPnTA`lURgS{%VA
zujqnT8gx7vw18%wg2)A>Kn|F{yCToqC2%)srDX&HV#^`^CyAG4XBxu7QNb(Ngc)kN
zPoAhkoqR;4K<!d<L!hHwjd$Y36b)oW*{TkCg@Gd`9Rv}EJ)LgJdXYv;o7X~PM=M=_
zRqG7qQxtXUd;Aj0&n4wsWNmh|W*571UHI^|c}`AaY7(YMO<vfd{0J;tpa+LGlYt2S
zR0tw}e)GK8ik?aJW~OR$Qa-a&JTKJG(+vlOEvKaFWg@&^fM--*^3@9nE3O9LG_co=
z4@)M3Rys9_bT7WChiD}D*F<%-l>UlU%%|t2D8CYQ2tS2|N#4ya9zsd~cIR=9X1m~a
zq1vs3Y@UjgzTk#$YOubL*)YvaAO`Tw+x8GwYPEqbiAH~JNB?Q@9k{nAuAbv)M=kKn
zMgOOeEKdf8OTO|`sVCnx_UqR>pFDlXMXG*KdhoM9NRiwYgkFg7%1%0B2UWn_9{BBW
zi(Ynp7L|1~Djhg=G&K=N`~Bgoz}Bu0TR6WsI&MC@&)~>7%@S4zHRZxEpO(sp7d)R-
zTm)))1Z^NHOYIU?+b2HZL0u1k>{4VGqQJAQ(V6y6+O+>ftKzA`v~wyV{?_@hx>Wy#
zE(L|zidSHTux00of7+wJ4YHnk%)G~x)Cq^7ADk{S-wSpBiR2u~n=gpqG~f=6Uc7^N
zxd$7)6Cro%?=xyF>PL6z&$ik^I_QIRx<=gRAS8P$G0YnY@PvBt$7&%M`ao@XGWvuE
zi5mkN_5kYHJCgC;f_Ho&!s%CF7`#|B`tbUp4>88a8m$kE_O+i@pmEOT*_r0Ph<Fxp
z*JPTyb}n(oW843=9{v)cH5UL?5p`NVkNc#8yD4_&H5Bfir)yryF>CjRvYxN*d5+w5
z<+S)w+1pvfxU6u{0}0sknRj8t^$uf?FCLg<%7SQ-gR~Y6u|f!Abx5U{*KyZ8o(S{G
znhQx#Zs_b8jEk`5jd9CUYo>05&e69Ys&-x_*|!PoX$msbdBEGgPSpIl93~>ndH;t5
z?g>S+H^$HtoWcj4>WYo*Gu;Y#8LcoaP!HO?SFS&F9TkZnX`WBhh2jea0Vy%vVx~36
z-!7X*!Tw{Zdsl3qOsK&lf!nnI(lud){Cp$j$@cKrIh@#?+cEyC*m$8tnZIbhG~Zb8
z95)0Fa=3ddJQjW)9W+G{80kq`gZT`XNM=8eTkr^fzdU%d5p>J}v#h&h$)O+oYYaiC
z7~hr4Q0PtTg(Xne6E%<Hr!+_GI?3MP*%m9bH)P>E@0lhv-CW^o0@EI3>0ZbxAwd2Q
zkaU2c{THdFUnut_q0l+0DpJ5KMWNTa^<MGbU>i@v%r`<c`N-|erW1o-!Y=1aaMgf4
z%0)4v&<ZH_OW+V8u@6Oio6)Dj{{F93oq0+ms>~}fxdmmVFzq6{%vbv?MJ+Q86h6qf
zKiGz6Vrb>!7)}8~9}bEy^#HSP)Z^_vqKg2tAfO^GWSN3hV4YzUz)N3m`%I&UEux{a
z>>tz9rJBg(&!@S9o5=M@E&|@v2N+w+??UBa3)CDVmgO9(CkCr<m@k`63K-Fp8P@Lh
zz&C^Qy(MDhkn-ut^x<Ff+HMq_C5>+a1(#<deJVPi99ZL8y4ms|{N1092G?Mn4ArS~
z3ox$V+23Qaaj*MW=bsE;2Ak8khWJu!{u$WM4W|h-<mHz47F6#-6B{#M4b9EjALqA2
z9xiuWv%fB8c|F((Z)dxmx1nnoUGlP-)^lH=V}!hDc^}uKxdk8W33h&pRlqvdG@UN|
z`L}}bodMY&!++~eQvW`;`M(r|3p+Tty14!=tdcXbvR836a(4Y+MJHN1Tk1%BgH7O7
zC<C@kV2&VY*(35Q(zpez&|wW&Nrq|MCD9EG;-YC4w5Vrk^j06Zzc<tS*crm>edYE(
z7=AAYEV$R1hHyNrAbMnG^0>@S_nLgY&p9vv_XH7|y*X)!GnkY0Fc_(e)0~)Y5B0?S
zO)wZqg+nr7PiY<ueR=clCq+DKrXr;?k`*J{psbqN8mbIJK1(`s#J@F+M2tPZDUM3K
zX%138E51AHh+`(9D1-Q_WEE~Kf$$dIg#$T_$}$1RGR+v$bWXE3uP)o=l6_}nsy@T7
zEWY&-p<V0I(GcOW)Vi|TRZ``O<!fJj^EVfH$SuuowrHudk=j?M&D2N%@6sB;oFUqc
zyexyVRaJ{~<FwPwNGf!p%*4!Eac8^URj6l?v@A1X5Oouu&cGRU{(Y<<7*egLN++Dp
z3ZIR?$<mcIGb+nAB8lawfHfUgS3fGP`so<1$U_1=L*9swj5zZ=HNDG56_HC0fw8rq
zwHVjM-DJz4u)W~V<W-w$Umjl8dAcz~w$;wIG%megy1o#jDm#Ncp=Zuz>Me}!Rb@(l
zV=3>ZI(0z_siWqdi(P_*0k&+_l5k``E8WC(s`@v6N3tCfOjJkZ3E2+js++(KEL|!7
z6JZg>9o=$0`A#$_E(Rn7Q78lD1>F}$MhL@|()$cYY`aSA3FK&;&tk3-Fn$m?|G11=
z8+AqH86^TNcY64-<)aD>Edj$nbSh>V#yTIi)@m1b2n%j-NCQ51$9C^L6pt|!FCI>S
z>LoMC0n<0)p?dWQRLwQC%6wI02x4wAos$QHQ-;4>dBqO9*-d+<429tbfq7d4!Bz~A
zw@R_I;~C=vgM@4fK?a|@=Zkm=3H<rzz2z)62b4zWSL@8P8nvqmK-YT*lVXadRk0yP
zO>1<#sg`7IM7zB#6JKC*lUC)sA&P)nfwMko15q^^TlLnl5fY75&oPQ4IH{}dT3fc%
z!h<Taxuf{7ua&lj=6Jt(I<NBnlSiZ;YOP?Y>+Ty;cx9$M$}mW~k$k(($-MeP_DwDJ
zXi|*ZdNa$(kiU?}x0*G^XK!i{P4vJzF|aR+T{)yA8LBH!cMjJGpt~YNM$%jK0HK@r
z-Au8gN>$8)y;2q-NU&vH`htwS%|ypsMWjg@&jytzR(I|Tx_0(w74iE~aGx%A^s*&-
zk#_zHpF8|67{l$Xc;OU^XI`QB5XTUxen~bSmAL6J;tvJSkCU0gM3d#(oWW$IfQXE{
zn3IE<Axwdw6p1e;9ExGoabTwSHIO2MiKE3(j{Ro?ip$Z^a&WnO-YiOA;Cw-pfI$}7
zkF*&~1Z{-!F=*5R$K00NLB={`xSgk&c@aXOUW92cOle>WgD|FFf_r2i$iY`bA~B0m
zA9y069nq|>2M~U#o)a3V_J?v!I5Y|FZVrj|Ib<YKyA%vh3X0=9Okz(9J+4u!!wvn{
zSl3>zwDCPTFEP<}#;<c{_*SS6&Q)Hz_mB@~pU{1QuWP48cT@cVxkWSw{n}){!8ayP
zpHAvQ?l7=0s3ki9<Q}0*r%AqYZaJe6FpuDIPp8a_zu6P+HQ8T#<h2p}fptfG+CT7i
zwWQN>MDK$4+z+?k5&t!TFS*)Iw)D3Ij}!|C2=Jft4F4=K74tMRar>_~W~mxphIne&
zf8?4b?Aez>?UUN5sA$RU7H7n!cG5_tRB*;uY!|bNRwr&)wbrjfH#P{MU;qH>B0Lf_
zQL)-~p>v4Hz#@zh+}jWS`$15LyVn_6_U0`+_<*bI*WTCO+c&>4pO0TIhypN%y(kYy
zbpG4O13DpqpSk|q=%UyN5QY2pTAgF@?ck2}gbs*@_?{L>=p77^(s)ltdP1s4hTvR#
zbVEL-oMb~j$4?)op8XBJM1hEtuOdwkMwxzOf!Oc63_}v2ZyCOX3D-l+QxJ?adyr<H
zfWU}j9?GGyFHf>SiIJ$W&@WV>oH&K3-1w<073L3DpnPP)xVQVzJG{i)57QSd0e;Nk
z4Nk0q<cBX`AOooVXkcHeKnBRWRG>cUDTVj@R-&%Z>&u6)a5x3E!|b;-$@ezGJ?J9L
zJ#_Lt*u#&vpp2IxBL7fA$a~aJ*1&wKioHc#eC(TR9Q<>9ymdbA?RFnaPsa)iPg7Z;
zid$y8`qji`WmJ5nDcKSVb}G$9yOPDUv?h1UiI_S=v%J8%S<83{;qMd0({c8>lc=7V
zv$okC+*w{557!ohpAUMyBHhKLAwzs&D11ENhrvr_OtsnS!U{B+CmDH-C=+po+uSqt
z+WVVXl8fKe5iCZoP;>}4OVen6_|uw8*ff-r;)O2W+6p7BPT7sT<|Qv=6lgV<EYm;Y
zpjDzNpX2<>#3`Ch${(-Wy#6NA$YanDSFV_3aa=PAn%l@^<HEfJe~!$&tD|Xn@$&I~
zJZpvzRt&D$4WDbe8IY7BnwE{axroNe@Wy7OZ5L)j7w(7!&9sIS7rNCA6oTYTa!@Km
zU;2WdqPMmpott<zhy)26x#eBweKGlMij7&wQDF6sj&OC^ZZ4Ozsq7_5vha+tkeDvZ
z0yqo3a*K&db?}RadQoax5}8b3@AcQAPv9g!?p;RrmRmdM7O~iprw@3&qvcEg1_F<G
z*dXeH1LdsJO0&7jZOPhZ8B~PCe1$aC7UvH|@<i>l(XxVdh!TyFFE&->QRkk@GKyy(
zC<Od}Rw$gMVIl_qOzojnonQPER$i^&N<i(F$!6f|B1cPJrlBLrr0rTW!@{^;D*Ir&
zmt+AacbYHHL=`P5i$uUlbQGnw<jfNWZ#@$GMOZ8zoi!NaxZZ}X^3<7h*O_S8v&K$n
zx7}s@Qe~gd#aQqo#U(07r>3N%PhyJf^y9iSI;o|)q9U-;Akk>;M>C8E6=3T!vc?1(
zyKE(2vV5X_-<HvOEk@-}EBNyo{R4W<_n%a0%pR(`g3iD_;w{}Kze17fjA4e#E={@d
z-Fj2WiZ?d@A#OcKPtN2f6cz8f2K1IL_At!Qh}ZcH$E7S+6;AsES!{L9y}3mziy7K+
z9K7_KvoQxX-q^h#gL}=^m|A?)?nh?SqYW}6rJjvZ>HDSB2>a6LR9MvCfda}}+bZ>X
z+S(fTl)S}<ZXHr1`C@tmV+rPRRd3ObpK9!vJ=qIVvFVnqETxAIaWUCyyfn5KsXxvE
z#f3aL-}K#o#<v{7{;05jljE|9d9x;7u`^F}#HKwp-Sv?SWR0f4+jb8;JD{h%{U${I
zG~g{i^qNH*Fl>)HZM`YM`uzRw>!i~X71Kb^FnwAlOM;!g_+l~ri;+f44XrdZb4Lj%
zLnTNWm+yi8c7CSidV%@Y+C$j{{Yom*(152<DOH)51yS7JLF4YtX({R!G&+_XKkk%1
zwjr;G+L^6WoTD{78zz=c*M-gw#-`Hqdp5XL?)o56imx`}l{{(Uu7iO6naYF#y$qgo
zg@8c%0?vms*<CK#e$uAa4_@WTYUEU760Fx5y&dLzs`vS#(-=#Bq@EhMbg&*wtyCH2
z4xRBcs)|}Bg}Pt4mYNbEgYJreWz^j{k7vW|+vz``l%2O~Vr-uSfi{!lb)^|X>77jE
z9jJKoT4E%31A+HcljnWqvFsatET*zaYtpHAWtF|1s_}q8!<94D>pAzlt1KT6*zLQF
z+QCva$ffV8NM}D4kPEFY+viR{G!wC<ud1TZi|JGhO?hAFnZ1Yt+12GaQ2(8wBb2w9
zn&G|-zNA06;S}1<gMiHS&Bo4bh4bO8FbWg(W0b<J@`&7-@Npr%DQAl8bydgn=i2dl
zv3%c%XP^;nGu+{1hxJRes?b)Ey-WMT_?H#-V`t+#c<Hc`!{DazoC$cjSE;*#wRs9=
zTVB+;m-+D*td@4d!;6eGH;c%s?o+PisahgD2$~EIN?YofzY$Xm6SK}s@m5{T2tQdo
zj7p<S%X)N-dnp}HV650)KKRWM+V@8-7?LPon@NUhiYoMKGQs^kjbyy{8N?zF@6$wy
zhxeI^RR6e0y_lrE`>cp_=a#|l?MwO^f4^EqV7OCWWFn3rmjW=&X+g|Pp(!m2b#9mg
zf|*G(z#%g%U^ET)RCAU^ki|7_Do17A<T4@C(n!sagpvoie`W<^g2WM1eY((?7VU}e
zuXDL5`6N`)toe{}7K^5)5vCkhi?%3^#m#HIrMqT&QW4hEiPt*mo(DLZv^B+0L(`L6
zpu`(pl)N+wC83K@Lbc+F*~GwcqqMiN@<Vb<gzVspHq)YQFE2!Ym?-kcplRk@(6Vt{
zRo}3o<g%gUu`x1sm&T~h9Z|_05zlstZEjoDvT0h&LM${Yo(m^E99ST6T>da$cv$~(
zHG#hw<kLI_Y5ZG*ZXXzbxx$Ix${C_0fJ%8lTbC08HA~)#+`BHy$v!mf)d75}B2HPV
z8|dRi+;r9k%o{Sl9evyZm##t}B#ffMp3=--5yh7bN8M-v;y`uki|w3JG3q7%f&;B-
zL#Sly1M=*C!W)=HyV<$;6K?XbB{MC|Fx=Kor}B%WqQ#Ys{vNDlp|vRHoiCQgGE8c6
z%pvPTUH;YG2Oeo%r0`kGmNU52g)>*H+aJSX`fwUs+fCgF0bc3Yz3eQqR@qIogSt10
znM-VrdE@vOy!0O4tT{+7Ds-+4yp}DT-60aRoqOe@?ZqeW1xR{Vf(S+~+JYGJ&R1<A
zotgX#YSmc=LkoYF*qpp_Yps^89~5S);VH4|%hrwU7FAwrq)JPDXqve*RbyHh1cpB}
z=*ke%b92WLtwXX&_;GK#zOJ0Z$R5<!rA5)z2>-*anVaMt_zSKsob;XbReSb02#(OZ
z#D3Aev@!944qL=76Ns-<0PJ;dXn&sw6vB9Wte1{(ah0OPDEDY9J!WVsm`axr_=>uc
zQRIf|m;>km2Ivs`a<#Kq@8qn&IeDumS6!2y$8=YgK;QNDcT<o7wAnyq?f0O3>U}8B
zepl6erp@*v{>?ixmx1RS_1r<z_JNI4ZnRXAxJ){9EB7WO`|nNdi_DjhS4`7Aw&4fu
zv^%#>kQC<(hHfN%u_tsNcRo^O<2n71wFlb-^F2vLUoIfB|Hjxm#aY&*+um7eR@%00
zR;6vT(zb2ewr$(CwbHgKRf#X(?%wBgzk8qWw=d@1x>$40h?wIUG2;Jxys__b)vnPF
z{VWvLyXGjG4LRo}MH@AP-GOti6rPu^F04vaIukReB|8<7&5cebX<)Zk(VysCOLBuL
zW9pEvRa--4vwT?k6P??+#lGMUYE;EsaU~=i_|j!1qCVS_UjMVhKT%Cuov<?vZ?iw*
zmW^!ka<gY3z`$TSc{r0cs+yL`16dX(nwnB?Rpfjb$6fI1_o6QQULI2mV$93MnPW`}
zFwWH@!FuchVCPK5wBTm@<Hvsr<3Oy!iux~MEbt|ass3kS{Lh2q|B}alc?JK9;;2Em
zqKu$^K*+2wm@9KY6%HhVz%0g2`$pCEBB&z~#3JMx`&o5nqMhEHs%&1$?<MP(tcER!
z)g^H7%Iu+Ja*(fuOJAUn%ec5-Pn~vgznHi<aRF!res#l7U3R*?ce!1|$@1Ob6aXzp
zL{T;G(xGDCFtv4R(bdS^NT7ltY5A&Ba_o;(yt_ticBu@V+qU38J>R;6*~rP0)s5eX
zxVhGZv+qtpZ{_FDf9p{m`ravh=h>mPMVR7J-U@%MaAOU2eY@`s<z5qh=$hmIRG}6G
zU#b?|0F5UnPu#W{0#EfEiw|F3IuxQ@$Vk{jc6b-7h4*MM9ure~vya&3qtwTVia%sP
zg*P&y<cX6bcPq}5x1$KnSEbLKt#pg&xg0Yio<8&E77XlHV$QGl5ZSQ-dP$Klv5Y!)
zQsM0>-M3Oi>oRtT?Y&9o({nn~qU4FaEq|l^qnkXer)Cf0IZw;GaBt)}EIen=1lqeg
zAHD~nbloktsjFh&*2iYVZ=l1yo%{RK#rgTg8a2WRS8>kl03$CS(p3}E-18`!UpyOg
zcH=`UYwn0b@K1`E&aQ%*riO|F-hq;S;kE7UwYd~Ox(u)>VyaE7DA6h_V3_kW2vAR}
zBZi_RC*l3!t;JPD;<*z1FiZt;=KK-xuZ`j>?c5oxC^E2R=d`f68!-X=Xw2ONC@;@V
zu|Svg4StiAD$#wGarWU~exyzzchb#8=V6F<6*nAca@x}!zXN}k1t78xaOX1yloahl
zC4{Ifib;g}#xqD)@Jej<+wsP+JlAn)&WO=qSu>9eKRnm6IOjwOiU=bzd;3R{^cl5*
zc9kR~Gd9x`Q$_G^uwc4T9JQhvz3~XG+XpwCgz98Z>Pez=J{DD)((r(!ICFKrmR-;}
zL^`7lPsSmZT?p&QpVY&Ps~!n($zaAM8X@%z!}!>;B|CbIl!Y={$prE7WS)cgB{?+|
zFnW-KRB-9zM5!L+t{e~B$5lu-N8Yvbu<+|l;OcJH_P;}LdB~2?zAK67?L8YvX})BM
zW1=g!&!aNylEkx#95zN~R=D=_+g^bvi(`m0Cxv2EiSJ>&ruObdT4&wfCLa2Vm*a{H
z8w@~1h9cs&FqyLbv7}{R)aH=Bo80E3&u_CAxNMrTy_$&cgxR10Gj9c7F~{hm#j+lj
z#){r0Qz?MaCV}f2TyRvb=Eh|GNa8M(rqpMPVxnYugYHqe!G`M@x(;>F%H46LGM_cU
z{*0k6-F<ov2>!7r3;j{KOaDxrV16WUIiFAfcx?^t*}ca4B8!-d?R|$UxwV8tyHdKL
zhx;7%0Zn#qtx;S)REtEP-meAlV8*1qGFbRJ*eeX&+hsiLF*g9%r0Zl`L^Kn`4I)ul
z32#3pg6Mu$LEI@<nu$kXW9H~cwnU){(CC&Ml|W26QDm5m=Nop&A@WJ1gbGMgM3&wt
zvdRZ;sEJhTwIZ_u53P|1pbo{$7__CzMyU#gkx2-r5skCfiGiZX=Y>hssUb?T$di_z
zHgaB3zw;*0Lnzo$a~T_cFT&y%rdb*kR`|6opI#Pbq~F%t%*KnyUNu|G?-I#~C=i#L
zEfu}ckXK+#bWo11e+-E$oobK=nX!q;YZhp}LSm6&Qe-w0XCN{-KL}l?AOUNppM-)A
zyTRT@xvO=k&Zj|3XKebEPKZr<kRMoF0jexE6hc`vUr}h0FH$)-s3A{X8^*J#fgHXu
zM3#udPBd2_Z@_^Pl@sFAKy=0;A7i1O%{vZ5ykcA|#=arAz-M>JDrta?GFKYrlpnSt
zA8VzCoU+3vT$%E;kH)pzIV7ZD6MIRB#w`0dViS6g^&rI_mEQjP!m=f>u=Hd<bF2Fu
zjd#JxF}i+npNSrCDWNJXZZQ?Hg|1K|xF!=ST0~R<N~e<5&4_&)W9<(5qRgOs*)<wW
z-Ozc?fEtUj@}gRe7f^Qx0XCFn09u_cS}?lTKi*ozXF?xRnz%$&p_5C8o-$nBeM7--
z<c1F6z}=x(<?JDY(0p1o7z01yw$PDrC`;3DId$s(Qg?$VjDGl?GEkeH+@MB<5%8Ty
z)<oG`(^r30WtK3cvwm1Ha3P9krn5bW_IU5UgL?uD4v)s6<C>04PU^cb>f|JhZ19Vl
zkx66rj+G-*9z{b6?PBfYnZ4m6(y*&kN`VB?SiqFiJ#@hegDUqAh4f!+AXW*NgLQGs
z>XrzVFqg&m>FT^*5DAgmMCMuFkN4y*!rK^eevG!HFvs7nC672ACBBu<xC}#!%4nyR
zu`{!C)3#VlJQVI+sh83uRB^y7%8V|pO`l;)r;=xRa4=+ummoK9jh5>5h(+#G@{0J-
zPLsJ{ohQEr2<Z}HEMSgM^Z4711`JcjM(~<mavPGzvYrK=|J*9oxfXWGz6Bgd+Ald}
zA1i3wO7Zheh1|Tj&8T$u2jCMUhNaaTu}o$aG=Riy+~1jV2MlDh13q~G!>N|PmEHw9
znQ`qe-xyv93I;Ym=WnoVU8dau&S^(*Wp=}PSGw;&DtaKz-);y)zjD|@-RT`*6nowj
z7B%)h3>Lro-}5THC@BLymu<VEV;K%w;ZRtle)8xR;2dd~f~fAeSEmO6;fg+M20{jh
z3G3Sh?}bBocp|~HW0BX@W<=Orqd*6f$*u0eyw1yk2Xy<3?%-=+P@Li3fh}&agfGk*
z_mU!MQS}8VQV<)tN%GhJoTr0+#hQm~M3KqQ7lxt=M3c#jr-)ckix*LjC10Zb$n7yh
z;%`%5S7@YDV+o7USj=5#2r?4v%crC{#!_PpOG1W})?1RB{o%KS-0BL=deB4`)x?~9
zE#iBQ#pO<GRaG=_CLaV&BT7s+#C0LS{J3DHYQWpofC!#fQVZ3h&ulFUqvK!25kP&5
zp<#6$#f?X_CC}{{bH~Xk5rei%DD*-qct?PrT%ab#`Lqu{7}|tC!Whia<;~k=9WP19
zsU>L&3~kh8M}ZrZGtYKAmrT^cym$^O!$eeK$q5X2JF1w5a}4Z6yJ<=8&J?(m6U?;+
z{+*B;P@yGffMz;OSfm7NDhkGR5|7&~FNvel8Yj{F!DWnHG>%?ReZ$1w5I$Bt_u|4v
z-ow>!SF!pCGrD&K8=-<;Gp@oB<@9C&%>vPHrp4s<yX~UAVO7~^_4fBweMd@lg8OxK
zZ!im6v7H%KN>QEJj2FdedjC=0FqD>EG?NCf=KQKVd^stDZP7KNCAP-uEO*!?vg<OZ
zYT7cCmeX>wvdp&Dm3h5Cldn!cIOL@u>1!HSfK+~kn-9Ekr|MWNApAJCJ5&5#izmjm
z$CI|Boo@;O?Z(Bo9ejP>bbH|jRKn7W3y0L1!O6v$RUtt;%5R#**`+39c$JuO`SMU+
zbzu$7Eu`JQ+ri_ap{w(R_juHcw0X8~e$48TzBX%Yd+HkSSYt2){)+rYm48G^^G#W*
zFiC0%tJs0q3%fX_Mt8A=!ODeM?}<UZC<-odR!q{S<g#9(X%EbmaF-g&3o$_rp&=E|
zwGOv{<jVGP%cO+veHDR1!eARv>KLDt@ot6_%a<c`Ep?D}(MUlUR3!D82CJs`3wsRE
zpGEgHMfWsM`4DFYMJkp1gFVK2a!=vR9<kFL>AdLgJ7jCqh_1O`#DT`IGhP2LIMhF*
z=l?}r%Tl#)!CpcItYE2!^N8bo`z9X(%0NK9Dgg^cA|rsz?aR+dD6=;#tvNhT5W}1;
zFG@_F2cO&7Pdp1;l<I<yU@D2NQOQvV7vo%2z2to%>J8?TYlI(VI8nbx_FIGRX^Z(d
zyWyJi58uPgr>8w$ugIGhX1kr*po@^F>fn<Q4?%xu9)tm+p+P7Sx*w(>tO1j&ocjyK
za8Z*GGvQt+q~@R@Y=LdQt&v=8-&4WOU^_-YOuT9Fx-H7c;7%(nzWD(B%>dgQ<PWr4
zTa=j4*EtMt{}Fvxt-Z*-FpBKRJ<8K;gxkhRA2N}~8Ic<;P;z2dojkAcT5c<Li`4>^
zU6~0sR24(ANJ?U>HZ#m8%EmD1X{uL{<PuwTs{?fd(rx=JkZfM|F~;`?Kd*qyMv2M#
z>igUzdbi+JN=G9t`kZMGk!iLCQQiVMhOP&(*~gU(d+&V4$(z=>4zqh(GX+9C&;~g2
z9K2$`gyTRJpG_)fYq=9sG^1I{*I=s%0NX^}8!mJVc?y$OYM^n!x(2<we1yCUuF~u)
z0H>jw$$;}n&dh%D;St+FA;eW=+<x|k22(XDy;9*D^lR=ugTEC@1R3kf*Lm{kD6JL|
z6B;Ft`ii=4MxS~H)pt3W@J)RuDlI$=ra#W^v+QlqE6Dfa1Kj%VelPYTEDl58o=Ocm
zL}d7*kkYQvn2r+766l4Nb&kmf{GriioV<dTU{qZ@<uni5gDE%A1hxn%obe~p!Nx2Y
z{m~(to2w<fudy>28j#G^YLi@Gdk*H#r-#6u?7sF7#_pv?WS^K7feY1F^;!;$rgU%J
zS$lZ(hmo$F>zg$V^`25cS|=QKO1Qj((VZ;&RB*9t<wa{kHEk=RrB^HW**2>S;OXa7
zy(n<$4O;q>q5{{H>n}1-PoFt;=5Ap+$K8LoiaJV7w8Gb%y5icLxGD~6=6hgYQv`ZI
z2Opn57nS-1{bJUr(syi^;dv+XcX8?rQRLbhfk1py8M(gkz{TH#=lTd;K=dr!mwk2s
z#XnC){9$x)tjD0cUQ90|hE2BkJ9+_tIVobRGD6OQ-uKJ#4fQy!4P;tSC6Az)q?c>E
zXt(59YUKD?U}Ssn(3hs&fD$i3I*L_Et-%lx%HDe%#|)*q+ZM-v%Ds3u1LPpPKe-q}
zc!9Rt)FvptekA2s+NXxF7I;sH1CNPpN@RT+-*|6h*ZWL{jgu9vth{q)u=E<7D(F06
zN~UUfzhsK)`=W%Z-vr#IIVwmdb(q7k+FX-lciYO%NE!xl25SV53Hwdql-3>8y5X1U
zW<CX#Hu*w;O)7SOvEt9trNCs(_iJp}|3bOtO<_$^YZg<{phM~mb?VH{7SF!s=a%zn
zEQAGi{WUPR?nh|U(NVia0-Wlce<XA@g}7+`rHdOe`wc&pc7WH!XE1=l?KZDlKQFkh
z>a3_Qfp2Z;jVX+N+1?`(dx-EJL)%oQsI0G3S=ad&v{dzNal~flHvq(0HjY!v;oE>n
z4gQSa2FdJI52Weu$+lED4VYSW;D`5Zn`C#@7Hxa1Ls*#TLBjje(%NYFF+4uOc~dK!
zlnyxE4NWVz0c8yx`=sP2t)fHW(PPKZPp{SCwT-on2sEM9tyGO4AW7|R;Iw5|n1KpV
zR^S>`h}rxcNv2u+7H6<T_;dAO+!UIe_>rCvMLMV3p*H#WcN}}t0@Us{w}{20i<-v>
zyos+Ev_>@CA**@JrZ6Jzm=pWd6ys`c!7-@jf<~3;!|A_`221MFp-IPg28<e7-y9j3
zKd^|_DNXY(aTik6=08y#K0?|j)Od;bOze!77`#z`C>ABf<tk&ULTvXCwqG@zK<07V
zHX9cP8>6kj-Y#eaRcQ!t!|0SRtkQK^pz;YiTC@@lJ4MDpI(++<XdWx%inbDy`FdTV
z+{1E0vkx9N{JE^IVw9JW0bEM!SK!Ko5sdY&f{S3Rs{PU0i=En2r9s-r7J=f>=}nTC
zRb4Ak&K16t*d-P(s5zPs+vbqk1u>e5Y&a!;cO<Ct$W!&{m-Wo<yi5I1!2zxWu?=rw
zm(q?KU=I9Lx<6W)uv(zg7wewIgIs*EUz3Y`0T3?^=5XM>(x;E4A4}_Cgp_VoIFwhA
z-o^7)=BRYu)zLT8>-5os4@Ss8R&I^?#p?bY1H-c;$NNdXK%RNCJHh)2LhC?B9yL2y
z(P-1t9f~NV0_bQ{4zF|-e^9LG9qqevchug76wtFn95+@{PtD)XESnR2u}QuG0jYoh
z0df4#&dz_FStgOPG0?LVGW&{znCUzHU%*b1f~F+)7aefg7_j76Vb|2WuG#1oYH_~4
zrzy#g1WMQ#gof`)Ar((3)4m3mARX~3(I<D4_oEkInTI)ez7)Z8HO=7<ox|!x54sOf
z=THUbq;3@?ysY%YB+iUi=Yu@ivlZ)Tj8YE6_DOgSk&1d}4bqGEW;wO=&7A>j=>-BC
zR@&7dF70|)q>tI$wIr?&;>+!pE`i6CkomA1zEb&JOkmg9!>#z-nB{%!&T@S-2@Q)9
z)ekri>9QUuaHM{bWu&pZ+3|z@e2YjVG^?8F$0qad4oO9UI|R~2)ujGKZiX)9P2;pk
z-kPg%FQ23x*$PhgM_1uIBbuz3<i8s7tjEqtG7;9;T7iUlAQ5zVdvT1vHdKGt@w>YC
z#9Rz(hzqTU{b28?PeO)PZWzB~VXM5)*}eUt_|uff_A8M4v&@iY{kshk{7dHX1vgHs
zC%vd9vD^c;%!7NNz=JX9Q{?$~G@6h!`N>72MR*!Q{xE7IV*?trmw>3qWCP*?>qb01
zqe|3!Y0nv<V~WfV;wMXa&Hf#CT`4hFPx93+D84q3i=8lD)iv7Z%fT%4H>7sp|Md9c
z4J5EJA%TD-;emh%|L2kLpA^g>)i56v6HIU8h7M+KSWYw~HHz3`ILj*{==jD(l33>r
zmOdINZ8^Jo?ll^~q@{^5l#*3f`ETncJmo?iRLz*=W=o3MJ!K^xjVcw*H}p63#p4XX
z1)|C%{Y&)IpRIk5oMVsUi6oyKAFy8MH$@|Zpjr^lxlMX3O{0AZTjc{gso{KRuo30V
zUJxq2K=_CwV*Qx_D!hJCBTuQ}5oMNrWUBNVaa8zyMg5lrXgv8Zw@rm5NAcFplYa>P
zmUNB>EB|r?#Z!Gq^`<qlhUz&zeCpX9Xlq8O!{4UV6?j|emNrwVR#B>(HZl__UJ*K5
z=>`{UTlt0;Y+LmP1Wb19IWK(SIWDrqh=+K81c`t@BCS|2#@K0u5eEwQ7CG92=Axx4
zQ?CPaVE5!XY`2r!Ce@m(tRtB=&+c>a09WzP-Ys!~i;V0hEq}PU8n1a;bVbJ17rYW1
zjz|KkLZo<P_)!`+Y~=f8fvILgpzg9n37p0nhxOX2Ut?8C{cvx7)$xg)?xrSA{Oq8c
z3df|{QDC>O7-S6oQp_ocIzS43P@CJJxQ$k;$!fS3*V)m|VtBIEgCtU@W`AG9VMU_d
znB-Zs3I)I(Wg=xj)Wcx03h}U3i5{D@*udPLg?Jx7dp&KEIwJiW=eh}Ps<NmA;|WfD
zB6FhfzPXO6Zwm@5zrP`#ic)M9i5A=h>#FxbsS?F}7z<;<5RP6-UAD+_An$s3y-JAC
zh{JlAX3e^CDJl1gJDbH`e=hD88ER_6+Mw8CwK&^|$BnzA|AvDV`#xF^z9b6iWb)0@
z+gir=oSUaVcJi%1k+9!pd`(3|h~4}!NM7NHPNV6rI<VQEC&7(9#U;&M@K>(W4~Ie5
zl@(Xg2`OSq|HJRUg3qgr-c!}9@W?pEJXKtxP7f(aE2Es33gRSu#~<W}f-wiApsH)A
zWF#bMlZv1>XiCIpV-J;JLM{(@qK2wEvsi@6-9(cyXX!6YS0n7;TK0Ldf*JGmlvrF0
zGQ+Z509rmWa)O}r`z2W3!6u{^ZQrY`KR#VlTRmllG2v$R!7%B~IU@XnNi!E1qM$J8
z%{XFU4vy_*M0tKjDY3E*7N!d<N%r>%&vnx5qr#=!IKWZfoRo8j=7ji1{xW?g^)A|7
zaaA5Rg6rwCF?y33Kz-90z!ze`@5N916S)(fHPa>{F`UEF8N5PTNjbo)PF5W_YLB*#
z?o`qxQTIzokhSdBa1QGmn9b;O#g}y_4d*j*j`cx^bk(=%QwiFxlAhFSNhO0$g|ue>
zDh=<LRDe}?)z@9OfO+D$UXV2%`?R6VdH`1;XKVjRaZ0mK3um)Wg<1o`pjXy_RY7CZ
zj>p|hUow5Knbclx8V;+^H6N_GHwOi!S>Qxv&}FeG-?F7bbOWud`NCE6Tv-~ud&PS6
z;F*l>WT4zvv39&RTmCZQLE67$bwxRykz(UkGzx}(C23?iLR}S-43{WT80c$J*Q`XT
zVy-3mu&#j}wp^p0G%NAiIVP2_PN{*!R%t7*IJ<sUQ=7`jt~mVehIR){w{f<k@QJ-V
z3aYFu3Uyx2q@>BVvWVD#wxNRyF9aXsIAl)YpxfQr$d%Rt20U@UE}@w?|8^FMT%k36
zcGi_Mw+vMvA@#}0SfIiy0<HUTe4Gu7pqM~sQ>KEKwQ|`iR++|PF2;LtiH7ea($I{z
z32QPp-FlEQ**K_A<O|+yO(APcJ5t)Et`i%nKV6URh^Ob0MT~>@OC943z`Qy7wC~&v
z*a`z;(`5(e#M|qb4bkN6sWR_|(7W~8<)GnX)cJAt``gu8gqP(AheO-SjJMYlQsGs0
z!;RBZwy>bfw)!(Abmna(pwAh^-;&+#$vChUEXs5QOQi8TZfgQHK$tspm+rc%ee0gy
zjTq5y20IJ`i{ogd8l?~8Sbt^R_6Fx*!n6~Jl#rIt@w@qu2eHeyEKhrzqLtEPdFrzy
z9*I^6<V{*j8HbkD?M2Pra^S`Q0B@J1TGzbRR|e63^El0dzC00rHc<THNsDE-D>dIZ
z)8Gdw1V^@xGue9trS?=(#e5(O#tCJv9fRvP=`a{mnOTboq<-W$-ES7)!Xhi*#}R#6
zS&7hR(QeUetr=$Pt6uV%N&}tC;(iKI>U!y$j6RW&%@8W|29wXe@~{QlQ0OjzS;_>q
z(B!=<WUOPkt8EuGms!~D3!L04nqGP%cHc;YZF<fkV|6TchtAJpQRUu0_+&q-w4l|}
zBDKPjB2f^myI=ymz#OxNr2{nHozyEu8zoI#7lCB%f`C4>A71r|@CmR7eWdu9n0;OJ
zP@VOOo#T+N$s{`3m`3Li+HA4owg&>YqCwsA5|E$b;J&v#6RbT$D!x$Yaflo92wU?A
zvgD8g(aY`g7}Y2^2i31ocm&k9Km`NQipEsjU>MuRzD35*Jk7^Q(O;M32!gt1cEB@-
zBOHd@@Qo{fQ^7o{FiNdS)_vTi<r9pK{f_Gjg>P8toqZ`iNi^1-4(hp+s751}Tf34b
z_UYQ1q0~*jIp9pRIpI8ue}$|~uu0#p>-y8t{yEwB(8yAjMXrJ{`{rp7*-wlh8&bso
zHV`LnAF7Bw+w}Wm9ii3U@lEvcc-i$0&h+eUmlQuREzg!ao)ZjwThhqIKA})}akyX7
zcbuIw9K}9aUZ;hvAxk~rqpk?bYMWr<A61b%6raG2tU{$Csat$#*_A0e_-LIRQUbIR
z5izsZK<TKj>-@b-pMTR8))ggQa$kBv=Ii<kT>nobKCR0?S&g*+Al2J`VR7he{}0Pu
zae7LYa!OoTOk8?ma)M@Ta%NxQacV~KMw&)}fkmF7wvmagnTbWo))`Kofr)`-pNe99
zMnam7vRRs5LTXHWNqTzhfQo90dTdg<=@9teXaX2tyziuRI?UOxKZ5fmd%yNGf%Kis
zEDdSxjSP&;Y#smYU$Dk>Sr0J42D)@hAo|7QaAGz(Qp*{d%{I-#UsBYP2*yY8d0&$4
zI^(<X%+u-JrI2b+aUBZjy4b?SnKRoh1Gfo`ar21#-NCg0rx?Iq4p>l62Q-y4>!>S{
zn;iO%<duByQsi~++S#+j?WbKymLj<{JG7)3mL0UmBwVa9JaV6qhBqz;b!kYqp<+EK
z<UGgx$o18t?|5M@Jaj>>={D42;(0h@P{>EZnIzpFV|^F%-OJADQz(1GpUqqg#t!*i
zcK}eD_qV$RmK}-y_}f$Xy7B+hY~f4s{iCD7zq%C|SepGu`+>h6TI}dUGS3%oOYsZ0
z#rWTU&aeMhM%=(r(8kK@3rr|wW^MFE;dK5&^Z!>`JV{CWi^Gq?3jz~C-5hFFwLJ@e
zSm3z9mnI+vIcF+RjyOL!VuZP3rJDjPSm4vYolnm)H;BIz!?dLyE0^5(pm)5*>2clW
zaI^*Z;p6iGZW~Gr0(Eh+%8Jkz{S9{}=}Ewi6W0wF3|BbVb?CR2x>4xST?woP;Mz8L
zDfs+0L9ga3jcM)zCC=`-ah9#oulxt9bZq9zH*fJK$bhT=%(2bPMY~}cPfTyE{_4p+
zc}3pPX`B04z+T>XwRQ4$(`U~037JrmN`)3F8vu_OcBE}M&B;1Vd%|I|1tni?f_b&$
z5wpdJ6F*oif)r=IzB$ytT72GuZi$y>H0p_#amQcJLZ^4KZySOUrRyXy3A2(i=$zB9
znZnGFLC34k?N@s@`)u8aZN({9Hfe}|^@Xk(TmCqNBR*Bter>opM!SGiDU8ShK6FNp
zvod~z>Tj!GOXB^#R>6}_D@j67f5cNc#P;yMV}`S*A_OmXk_BIq3I$C}3M~aPU)agY
zWC+0JA-)}O@e4XTtjzen&g=J0GIVNjG`_gS6ErXj3cGxeDN*4xEk0PNzfzO@6gb&N
zB$S-WV-@efQWs%UX$AVjFN5M@8U>+?Mcqg?@=Z-R`~n~;mQGVJT_vBL|3^fHxZ?#T
zE(Sd`8%2WHG)TcNaCHmv_Id%D+K}H3s&c`bxKs(_ScZzyCTpv<w?kGoFkjKtHzcuQ
zIu441jr<s6<VX7OkK$+Y1B*bOp@yIC!P#{wLn^v0|Bl)EYbY}PGKwkw8iFTZ*WXgQ
ze~sLK8-j9r_Fo|T|1xHSBKiMnhavoF+N1&FeApgpAvhz40xH~xJm_3XYX&U-+m?>U
zHv~yhtKF9G{s+GC*7>_D@F+qEq@YmXiKTV(j#X7^?WpvIg!Yxi6uBAhh7<91{8vFL
zfT?<Z)(colBs2~zs!J-Zq(O}kSlT;wOG5k^>Y~vwmE;(WOL!V5Ag&#@U$mP~T=*#_
ze#QynX>tO#4IJqSj^UB>8ubSEn>Nk!Z?jZE01CJCYuY`1S<pQHecJu^dzChGa4@qr
zk+uD+H0QTB`8u)TX!NfrMv}Jdf-cI)=L}nW)wy9VK{pe6Vi$oysIM=XKRu%iOP{X4
zDtu)cD?o7`ZJWOHb{PAeKu0W}__iN@Cxj`xgw_FDayXgnl2i7J4!Y9#4-#H(ASx>3
zf%2eyXaWoAQUw)KYO;wi<&+R3_7E%h(7F?xq!8l>!^3Jqj_t<WC0t4eSHR;>NPrG=
z+y2S-0j;(AilOo;>SCQu#;Cn?<qA7_N^F6rce3c8$&};ags@L&0|L$XKdlo8>y4Eu
za`??!yHz)qFH1Z(3KMqgn+B$&t+5s0zY|}<1kB^Q8FEAumh;^;Yr~amTx1K2%2JUk
z@7uIE&0DVch|1R=ro5rjr)w!iU{_09PqfhnGqhAN^$^oz#wVNdTRQ!8^nF};4<uct
zwZovAW7=MlX>);Jz#=dTBTMMW7icnZ$dK1E0UEgP4&DNk9MFoKOhtAkVUR`d_vc!x
zc|1mY&%{PBxepp^JPHmFDBQ8t@DD-3!C)-ZhGJt)?{)^0MvC%RzI;4}>XoOUF;6~j
z{S20Ra%PaiGvM$pFbH;N6)b1J(N;{+Gp^^Qk34JAuPKH}Ap}fen!WlC5vrQ0$pnyq
z5poi8VG>>PnGw2^-CY3XdG3<;|0xU}#WBPqn{mO=z0RwL=MXn3=;oA(1C@<e6In5f
z1e+}aDnEd666$7kg+5U5vD~A8i}q*cIJYyE1fCWQm&GJV`}DKL1qmwSO1!pemBpjG
z#AdS{10p9)DnuAVXTbBd0f!nUO|_3~7W~0}h+*?{KMH4|6(tvqhxey^^vp+#Y|_;Q
zjQ&MM$bzRJehRR(9+B@R;Y96rElBNqv!M>V^6F;ogwB4EBUpltu=)(MC@To2kSPbL
zDdGz<wI1jlx=O$BJoAGP)#JZq^8cFcot4r|e_@{kzCJv>|C<@`&!MmQ<xg3ge9aGA
zy)O>*e>H>2Qkwa~K%;yZw;SnM<=qwNHu-Dh$r(}-d}T}u!=UOAkzvEOiZ6>{)t$$#
zlAmjO$1)&1Zh^zdh8uhmZ>OBA1T4%s9Jex_y4|ifY_=XoX6UzpP;MuC5su(6%;)NI
z4d#4<Nt;r+l9kgf<wwG!m4p3gPe*k#2$OSu=+2H?1N1S<#75kgc&atFu;rU5nKbMy
z`uPyDmHtqaf`!bRh+Sua&O1GV$Z|#1dw3G@AhzNO>aW<*)L6o7w?MY2+jRx6-3S4i
zC(~)A`|)5(s?)pBvTfYjwvr@Z-Dx-F7uq}z#WJB6&}0TIi6sGXFWOxD!As%cUg)_A
zI)sRCf-5kPBU|rVm0A{!s=W2){AJwvShr6Tsvbg|NrXi!7zoMde_n>-+XFX0fiQy~
zjRp|;6~pR()0a>ETtC7mZD|i$Emj!r-gq!yhAFdV1uR*M<4O?t83N1JRT~8Cy8Vha
z+STlcw&CoCJt$k^#ar+~DBmvtC5tr{(>|W6wHq*NSE!^#8*rs>!oYj%fl9~Nu*d4t
zdk!|mGJehKW8xJE5ZOcHRfp4plI+l1Pct;rK={=P`YH8&1hNW*YE)4yF2@wa7JFaL
zLHJH6<OiXMoo<Qk*U5oz?T?5WmL9j)fc9kG0LHv5;%Ut_hr?{b>ZWc1j|n<NdIa~}
zB{R>Q55Znh#>tV`!~N7l<k5R^lou2gH!_mOWos-%g)Nd|fq3p#K|FH%iqRdqxe1~W
zj{~zZT%zo#(4Io6NK5;?8{Ai-cRGgEvzOn@R=OqX@f0#4Q}KxzDh#Zw^1IUYJn;#?
zlbHeFj?lwpy3u!xJl}5{Qemv{3=El3@CCjV9PkoEED`{8zsbhFfc;+!?ys?aLJW5&
z`lU)GzsCFjAhP~#wf|b#ovgk(9ewq|F#5+*|IZ~pDQ-#vgb^i3_LaGysaeB{`mFz|
zQ5j+-$v@Pep|!T?k0VxbT$&IQ^O;2(RqM?+PYOnHNmN>Y_05Cq%|8I-yN}yf@EzDG
zB<NKpy$xZ2a6m8Tv407#|7)I)EPfffJfi!%k{zOROfYDWB&RW`at@4h#t?BaxFd>L
z(b0sjh+ui^*s(rg)=l8fU<%cPfba<7y?>}j3R83$2KHzWbVF*`!x^V8JY`D0<jydS
zxT$Gbj}}5>itC?ZSTYH|w3lUD#$5G$@!v(Lphex2O1;%>w;Qh$t7YF3<pT`_f^zR;
zR1q({r+OxY#toWVg<#y?VT=!dPJ-fUXZ?1}Ug%i3lH%97cn^;ztzdIH{I2r5jIm<=
zHNA*~!a$oDwt~q7aDwU9)p0p}i_(@;%L{0<(SvBH2b;_qm@Es2v#?umUg7&Ui~O&*
z@&n!UbL0!_8S+IS`(Ld<lGb01xc<2e{ZoPb+ea9nX5or*i0a*An4nGu5*!5Nr&5w0
zYv=&~En>EjFuySPC$>~%<GP-U6gWHcM%o(a#gK&NB|vAEO~s=Qa^2le0!g5AQKvTl
z_j11M=cC&zkJsyVP8F|-v2#NPpf>EspW}@Ctn1Bghd<L-L!a3`-+pp$CDnnsROgZs
z79blSNnsMIMT+0ux#?Ky;OJ--%Zg*b8wm6xVy^6z!h*RlJ_IpztNGFIPDnYnNbU9X
zZ+MV+Di6DR@<w_XSq^wHeF1as###)&Vu*VE*TJ{E!<)bSuJ<82-{ksZo}W4Je-P|r
z;3eJ|U^><IKSTMDySY(B=G;B$VaDv3Nd38oegl4zd?u}MQ|hnz^2_Ba3oX=+d@Zn#
zLIV>5*HVJ=tZK~8oMi<ZZ~%y=mkk$j%ZQp0<PXbg{ic_7!^14hTPCTm-c!zw9b_3k
zAwSz{_;=2}umn6p+K3sVXu7vbgAEvAMU!@{swuYNtzO9B7=*J5o69urY))E|h0n=J
zULj3(Rjh|tVat32cBhs@zKr_j*5hP-tT53ouYUrKqZ`4WuJrA$N_Q6<wLgx!!KAtt
z7~onYcLcob?u<n8T8|^R-QA`wF;F0XtJ&Qxqe{)^U~w02Kr{+M^$WdLrY2)7S_V9Q
zV;bB-QgcZ#lTPhc{&KB#Hhudm4>Z@9IxfFLSk~>p9cT9gOSPLyP!^bOah`U-6{}C_
zmyhS7S_-tYDm|9C6(Wu<F-Mb{IvU%y6)u>2Qe=*g5@{**z@#Ekz3Y{o7fw!^4z$yi
z&=a^zmtOpsRO0lFr&c=khr)cL2v9LFKX<l2;ZM~w+X0fh@x)f0jra3?6KFbIZfoOS
zx={KQx*#g!(WmSfnMdb$rWzck(2u#QeQ>RDdE}tWlOgpR%}oWHCeJ4;(9U_HeJYl!
zwz$p|t6?#eCju@0{IF0gbk>So3C{Ror~J<?pd(XIT&nLXRm)3UPUf5QxJ!*%OG{Ua
z%2P@UnA-yHc6|F!xLlPZqxIW6;%wKHV6yv|ep!Ix@)%M;0VbQ1fWu;;RTQ=zZ}pbm
znz<$75-pMpHAlcURVx@fwJVw+^t8TMe`0TQKHatj$9JQo98Sl>TpuOW!G@^?lBVrf
zf?%rDK2E3x=xGC)J_lEk{(ESh-Uw*#k-n4l42f3oC3BJX0-2NMZo?P)-6y1v+?|+<
zfFHX8(bw;H@;6K!?=!B#eZrkowcdn7)roPT=WM@MK?>T-cUa$oQdYp&3YRdWu~rhA
z@rZK<myC(rL2ATY75g-4-mKn~`?o<C^^?kXkhTz8A3+|?{h~>mqj8Ftz-*@`&iH|)
zC(H;QiqYx4{Mz@rm`qs~*Ue~4EHM^J7i{QnL~t)O)tnwIQC;23p}TBoc=9rcuS!cQ
zQgl)_F@t9{c)ESLtAcg1AbCXqVS%i1ZZRiy$*?Bu=r2ad13e|ZeWV=3pSL>YAk>X&
zQZAY4kJD`CYrK-nNti&;uJ*e{cRILOFk@z?B@fNO(exjUhf!b=yuC`@(RS#ko1HA+
zOwsym7?F)}ufcD5&IV+qr+i7Mo3)6M2oI)*3?@-%ah^0rL#0PIn}XmOTP9Xsg5C;t
zqkFe6yT##_ZG5KuhVQY)89LfWOeXpXVNWX2PmiRqq<$C!<^WlyO~Q=pk${$DsWY-7
zZ->4<+c@KPgKzKosGPF+&Q*>L>WaN6_FC~SP<ZpBnC$B+RGfykL)Fu_pT5&unrQ(9
zXqxy9!_0LxU74cuW$chi-to@!vRn2-u7v~?{fa?PMScB$<}G)<%&u}@uHF45Ydh-W
zLr`NH0!`4lUPvzSgediVi%s`YB=Ysai{>~3gH7bvg6>QgPzp`&QTpf3W>HjxDxj!y
zZb`O;&XZzI2YJ4!^Mq5~Vz7lLv`S<ORJr0r?Lj>tN|TSP@jdF}@9<l?ghA9D7U2yx
zhwy|}(G#CP?ki$qlg4!a;ED<lsWtmPZfj_C;#P@87nL2vV*6cnGWTw1*sM|pU-T{p
ziq0l;C>;ql?u*#Q+_E}~hak(3B%AQNq)t7PKgAWTYp>EJz^VIj67KcZ3^vvZ7{b;;
zcOOArcAw2$T+$UwIib|pt3i#NAuP#3?Z@Oaz?Mt(H&u7HZu!03kV7`t5IRcf7hwck
zf{Ujp*YsH;dvcW0q|=o$;z#Cg52;n5t1phY44To!sQ99h`iVzXd+v(L%?A$Ks|Ne;
z7fby7IVUXqN8gzsnL-<HBQ9W7)aYIs0J2Ah@hzf?rf~0)zj2MlD|SYSyu;bM&x^h}
zeQrQ*yu&I_2$#gjtJnZbK8+PtR2&(;v4DRue<$rnw-cI`Iy74$YU9(rbZGVd;-60v
zxor4;Clv5d7&T&@;>s?uIv>=Qh!qAxoe{fRaI&EcSGCTdggq-Qq?DU%SBOu<YXzE*
zE6&b{O`lAA=hXUqlqX$e>mmO5cRa9NW}V>A0IH#pxch)!$2p8=^-XYjsB%$S$U5nI
zlJEMBb!BZ_O4@87cE<dv__vK$x2H_%WjhE<EjPJpa(d8v{6Unn0nm!JA*y<?QM!xg
z5Wyw8418y#>YUBH7}Y_MF$+(~gdf-!7)D-D)+O{*18TC{HGZFF+`%IPcmK{O{YxR>
zSfJHSeQCChuPUAWe_x~gy*f!!wvt_tL-Dp=nUm+juu;4L6N1IIG4dsVMa<MkLuW`M
zyfwg_qB+%=cOJ~yh2M?%)hnj|d=W#Gy}{;CE3qr+F~fVzIn(yk+2~X4{SGeI8y(4V
zWcYBW3jdX{8%3z2Fo2ps(veV$i`)Byq9d-hf8zut426xP!|Z5<k-TfgL}LHq1zu-}
ze+KJ?Ixz2&5d{Kxsl-h!#4KH9o!VT%3Ah$4I`LxF3ZC4mGg(y`v&ONAK3e-8pwLVM
zpiE0YKMPbVUzO3W;$F`yt6*J_gW8y_6vR79IBIQYc1tK2C0KgH1$&L{2qL(l8796n
z+H3S`>t#T^p7p1n*Tx2a!YaivBTqLsSJAF=kJej?@QWf)Y-8Ks>WkC456{B#hW-ML
zI+f23(}F=MeSdbWQ>R98TOzv#Haw}ua+17H=P5|~#BDmoEPkzl#lBTvCoyj`XU|IS
zHn?dXbq>rqUW8^kQN01zL~6!Vxn4!$Pu|F&#<tpdQ$*ULqS(cCI-C+<v>XbiF{{>T
z)&khW&2Y?d8^jC|phWKQ4!CM9b66+l*<QD`I@jge!wSk56`;k~z))#xKlu}|l)krl
zYGNxnZN;~2lIrSVSjX6;I~M!W@dxmm%_!$z%)zNnibf4J%|RbmD<;qz_;uTKvG903
zIH3^UBo_dHE|oOQs$(<xLT&;;zXd#8?MXNX5ymG0`Reh2=KQ3RKY7a<jc=@;%p|n?
zb_>HTdPm+)M|e5yT)I32Q~2ENVJ*ZH;JF^Y907{XNHLoQ+85J~!w@3h_5d04o=~|1
zCBAvjnXMn`S#qMkPZE}9#RX`%al{`J=oFKk(aJYT&Ss`4iBrXa_pQ=3lS1IUFA|Rr
zgnh;c8nkGH)|*yyoUZ?tE1XKwkF$n6`sdkf^7)(wZ<dSSO-hlnK5-4bktl&EO5#Vo
z{40N%+R(|b|Ez2d^q0tYzh;Q_myZ7NznLM*))xOiD!NN~LgA~9=j9zE(PR1viEtYf
zN->52xtm86N>o&&jG_@#ue(B`xPM|8oGz94>*kl17-|d^y0`D=&hScq6gGQ%Z6|LU
zG@<~h-R{xW)y7k1x7XFw!TWW~HPC^bCO_;xG#A4he?=xkLjS=~U!uR+q>vqJxCN~J
z+I}|P5RTv*qRT{k2N^Kz8OX*mz$hYR!aYq-f5<K>bN4R4=omUVP19L|)EZq?O0#B9
z<ZS02mhcJ-b}Y%{4Qxhzlg-{D+hQFYcL*j#EqJ$Jl25iSI)@+*Y=Nyy7@XHDvyPMB
zW5{F~vwuP+F8mygvLb1|_=@i+BbiR;0Hw8QT3hiVKzG%{JYEb$_Tsqte%`zFFfIB$
zC6hMM7AZA*+vsG=OGn2(N<zGaSAjiiEw|P{@oPi;Y-1}v)`Ka_tVK550DpeVEZ2G?
zl2K=$*nWJg-jPwC9i#W=><3G&oAZ`UeIqZWlujz8UNNSK#<zuu<;-x++3U3Y_c8-c
z<h>{=_c`*(&TwlIr3ZpC0sfS5Jy?;t+&wb1g4Q91r<sL5h9#5@pv47(WGhj_*IhRB
za6J})IdgD2+&4jTdbDe654vB+DnXC$QNvB&mg=Y(h4A~ozp4etqQK=TD>RNiEt1|L
zisgH;)V()S&(TSB|1yAxZLH%BY`nnhUw_6sz~zdKCCc!ZV*Ws6`U4u|CBpv4pYIX1
z<V30hNf*cj$cL29@Iyk2@`YMnDm353j;@tUQpZqyccsaLh^W8&tD)g<mK`IGm_DF1
znArN}n9&U4oogrEHt_DB<4S!F2So|JKRj*A)8#zkA|pN`QZcT5jpOVGQK76-7T1MM
z@#XFB2n&eRR%Hj*YTDzGlvU2e=;<J|unP%JBU0Itaen}9a4IZ8;QvsZDpN)sNcwq<
zAp(+RAohnVLV5T)GLSKcHbUlZ042--&0OuxV0w>5*)5C*N#D}gj<@pdZxtw!`<O=j
zm;aRp2lV&G5`S~N|5<hZ%kNdubXZV9_(;T<s1rtl9o)qu@HIf*L<3GNl!I*fDdt-!
zE|@D^r!1-zr=@;0|EKF6rt_idun4|UvA=NA@pVwp<dytYaNS!}#c-`&vN$1ZI(sP_
zVB^xmdx!7y`HJnEa%+Xd%|L3v70o8)q|3c^(hF-G^ib?NNoosn54AZ+d+RDWyaBZt
zOl80?!WTV#R^}heLfA!InD0t6oI7GGO0gZ)hfq#xw~PWWDIz}Xfn->5aFVQ^Jj?1W
z+EsBx6>WV`%wnP@Fp{XlqFkbHf%LfCgIi_|w?uPPjHAgOF+lDnAb+WEB+i_53PFmu
zj!=umx@ez9mVxC&jA_RtKRfQG>Cz`A77S2SpOt7%Rt*}fG|yO+2t7CMuK$^}D#i}k
zZmO9yUwK6%!LbRsULVnxUxfxso5KFES=!WCm>y&YSR@0CS|iON0v59pkQ7dVA{j*+
zmcRtD@lxXuFq@#$DKKSal#<a{JTy9yd#gIlCrg{@9<!Ou-OQR!-@U(S$yF<k)MK*l
z(VSiMXQLZb*5t)V3dnldHur+e(!`+QPFAm}EE4K0W{xQXTZzF3QZ&}cuMk=4%hTpO
zwi4@6;1W&uYMj~gILgFYNQ?eiuwYUI=18+AzyE<va#g(Kd0vLy)MP)TYpf|?Go$2K
zkP8LwIPa3xP;gpX!<r|Bv}`s|dj(e4Tmr#?r}?g`3Mod9snJW)&84To-*3#`ax+M|
z_^WhkRjzfwBE8<Q-H*m!R&?QWAVqSJvO@p3>ApSJLw58m_NIJ?z;eD3Z8u*-#}EaK
zyG~L>-7laE`Y}{g#FPs9YA-wT4>X>xRNtTHp8_rhvWA|eJH(!o-<P#w&W)P6m-08D
zAN6|tWpB#-K?Gi5b0RL$9~ggG2yE-((>G~C&tvHB9$UEJI{ngD>QjBz=wl~x-j1MB
z4)L_#jZSvaQkbmVbN)4{#^r&ZmfhhV%?tet3`xJ;#jI}DsS94qc&s)#2kXv5pkt;K
zaY6emqzF1JWMxI(7h}mk*MQ5C8WLAol60!DPj|u0jMrLTkU7G?ud**S@bYx-vp$+r
zMVXWc4H}2=yF+YML9!k~LT(|<#By?F2bS~weMi9dD@DA&k#0e&MM1YT!qoQDeNLwB
zA;{KvwSzP?-K(>@_b@4vTkIX7xwj}ckrusCw!k=#;Krt6;}3q4d*)?c{>I|C2I^4p
zR(o48TqHbw?4Z`c`>?P{`cT;FpJoFW1wJ3IVO#5Q`wsB>o>zsRDDATmct`aaYQbTL
zJVlHeok9_?w83#Z*J<xOX-65VwyDpd(4q{Wt@AQCq<031sMX3-c0X!VDYJ4@%vCtA
z0;jmXUDjE|Iz&(;{@Kh`CO_{4QYI%}><UiEPO#7dgXBy=O>(_BMs-;N;mNeq{;f3S
zSy{i5hNY5s`c#)~KhQZ{0_hNmrMD2b7CLC2+x#<EkS7~P_v!{%oCB~p_G&Eiz2iBZ
zlQTemW-Ldif1TN}{#1LvQs>EmLcNa8V1Q=jz@e~VV)Yq!Z|$nv$TEG3j6K4opW+mH
z3~z?*H$qobb652kQ}ZHFHUVj$%JAwS-Ie=Vh&Iivx3hjMCZ1k)4dRjdhxRb17P;Gz
zZCsB4J=l1S8`O|(g!8c$aOMaYeUoCJj&n#kbDxe(^GQ)E)$Rq+i-wbPKeaQvL!`Y-
zcL<JKpxB=nIH3&a#g2`dr=lb8)fRk>=QOLcWBdDq_`HLow9P5BG2EMY$v;w9cR$C{
zMv)5zrmYv!uzHFAxDI>aftAp&ad>GYoPt!d;A*$s)^6E5l5ct#&O7A0p^8J1ceXa)
znIq{NgKbbOSC`6E_af2bCoI(gD@(krDr^mDVw>cRz3zJ^&9kbuf6)J@Cd#zbnko5m
zdyD^j^!9J7`oH!u{~wlOl7jYM(OcdI^#*5Y>BjUumq<zxN^6u~Bt)h^QT(Cfc%IqB
zgD*#oRgB3=KMQ&aWrO&hL0${OUD&=M!k9VZO=oo+XHW3De7wEC!|ovb@-(bH9T+MO
zi4U;~z9>_g&tx<#_pkzQL3{!g?50d=#eCov*uIw$N*glXJe1F{FuUF_wCElS)Z2X=
z8&w0?WkCX%HfL)#n-m1tiLy!jDMqH$LikJF=#lu@<N1lNp4!gV_zK#`x#PG7JS!;{
zk3?Xn+P?E9VjgWhlqo-vN%o-rHW1bb=#~rK&0qIC*mgs(Lj|WTD1ts$q@E7x*SbAW
zPMY)-!<Ii(B#FGK9RLajoEcsYv;zW}D;bqOLZqWKZhyKA6*WpycJJe?LOG;<bp;OE
zHGNfPK+(}|zvKz0gL`qpO2HUU5Y?lQCTb&f@29&+2{JGtQsr$23p8Xje)Q>k5%&vN
zOEmQQ^n*t^76E;JhHPzQqbY0+m8GQ9;~dJLLZ@*sqVX0ui5yz%8Hyn87vqUisY_0-
zDtUu5haWdOvDBOX9Y;=s;7ul^_xLxfU(?k(HStRfk0Ab!pY(scal?Nz{Qu?etFHNA
ztD=60Y>dte)hUle1IUyYIFgMxgGpvx%Odv4q;WPV?Zj<0pph+zWMfSd=SIUcB_#7^
zgNlm4(v!WIBm4?kpvZnCvp?TXW7~Azs3LT8Gh<0Ew=&W*e+4X_xQ{(e+UCESTaWwz
zd1ly>%|#A|W%fgeL_3gAwxjeb?Wi3rAR3U#9Rie*)dfz7YxUK;ex+a4F>@qyQAL0^
zZncndzG56R<hQ`x2qO_p-Kjfu^rW-VDTbb$e%2Uvp2D5KqW4j6y_HQn$z;4)!)kWx
z)x5QVJOzi(?K<Or!gr?)X1Ge8cuMkg)8g5TJx2##8m}!&7uXxREjK$BjAoTZoW*mg
zHT|C7Y1F`rn`Np%hg+)FNDoYi`Xvf55@!t$pz9q?G(&}mNY<b*3%Dosy0Kd-Hw}Vv
zu#;znR&3A9vZslTMC4R%ZVWeGy;3Qfd#*HAJnS3J0t)yZTSS{KsnG`^VWw&+iQ5vs
zB)sQP(DdCzq6YG$3%i-EFFNWh*g8i1WOA7@vzAqo_t(70>$F&?R4SOX>&%UDdBid6
zIn=GRfcto+s-%gMB)Wx7!_Z+SS)f3IG!&s%P2eNfHI6~E*=>e`^RpvJQY?T95IOKL
zeX-_BCdRE#f06_QAoDyMH;#IIBnT#PWSOtks+PCo`04X-brsea32I~@X(Bwl*Q`$c
z{Al@04k=Mmd0}}ts=u%dCO;qn-;qh>Hr7bB6!NOVxy@Yi#GK2vusj7iU9757HTqN~
zNMoKeZY}o)nA*{CqTTPKnWi*JgZFZj&EjD$V;O9zqHV#tB#r<Nn?2cryrbR;j9V{R
zV!d;qg`=y>5Ur$<wCdo=M6|X(P-`bd8W<n4858HV4NmCm+wKn0gv$EoB)BcUT3Pnp
zaBZcrO&n-rQJ{~Xry#j}o$R4Ot3dMV3GHkJ(ueEk)79apPhdr>V3To8iP<t}?!wAo
zrFzp*lR>-bO*Gl_d%qc2$SoU`Hu-6*hWbuWzAn(83_jZ%>P{PY3XVV!q$~ALE^GC(
zdIGgR(HnV8Rn*P^7b8#AzONo*U_W}{Ne!=#*qNJIRZzapu_fOkvki(|8NDg>&D=OZ
zL3G)1WS*8CFh`-sb*#8*hIN7WDjw6<$D&T|B>JPi`K!*5DF(O*^A+r*Jfnt))c8|M
zQKtgEytAqpy@~XZGnVYMJmZSG0U~uvP?i*?DhgDOSYtx6s%6u*vL$SW87`&xJ9<xG
z{s<4#jkbOff>cmDLrPHI@G7Pb*cizPGf|!5th41a2ijel>Xfk3i?7Bd*{|)@>|ZBi
zH6gO9a2Yd&_ZeKmNQC^e&S$cl!3D2oBCX)C;Ve{0qc|4+*fwK!x{=QYtb#3QD1|Yi
z%r?t<GmO4Y<tI<1%d6r4f1P~=P+iH^HSX^2F2OyxdkC%x?(XjH65N9Xch}$^+})iJ
z91{3%-ekVaki2<Q|Eaol?xpCp+D><$-Mjbli1fF(C?V&w#;Gq3-**P<A%e0%OwEI9
zrP`mzbfBUdQQDf{a+RaoaLHlRp;54rCPe(KYDVcTA|8W*j|lCr75JIBd}06bo@g$Z
zz4ZGRVzN8F2;!k`A66emgVWZy7I123+?*y&s5OBAy#&2uh;2tExvD_DO^CQ}=C8<P
z_U0;OyOh)OV&XolT4XgvsvOqBi$hqEv<117!HKuzX6lGZMCm=)(B1HnXjhdF;5Y@?
zI_->gsGPPsXN(0fb?pIDc{s6b<9{t%6D*47A9ZHlc4rEGU<}u;tiom3^lA-&)1i=j
z|I#)cctK)AH-b2*a3Wm%Gt*;#GWjNF6q0q^Evid`6G2yhMg_4TaMUK&x<oXxXczPl
z%-ZQ#p8TeyR63qVoREi~N`RbqGwC&@!&snwgmimgMvXl(F$F#oO;01zlTW!hLIl(#
z@8TBcY3kw4GE}JTt`YRp22bD3!O}iO!;PGHpVnhAsUL6fg0Rq+<j7Mu$WV{__Oy9N
z_N>*D*5+KtlF#!)86A7pn~&yvD-Rh%`@(o!Wc#9t=t;(9_y*(MWS;4cPU&cJcE+h}
z6fZHrjH@7{6~n40#qgL(yA-oVrt;Kcu=fV1WQ0QY`_I8lVds$PYR7KDvhsTbkC8q6
zct`{-n;z2!($SBZ?;(ZMu1sY(VY)KJ@%p)!LEBL+M{ck-$kHEx=3N+%$#msc!LKD>
z?(7`Owu6Iuf-Nb|5wFxCm}U)Du@JO|nHV?%8lk(y3x-=F_d}u8>#AU~<NS)YOSR-N
z<k~a@X#ZS87O$1-yVJ`J#nPMmW^|scYtwIV<T_3|U(s^|0;5cXxm!3y_B0AFyt~Ji
z_EV(K!Z~M_8DOq4+@9jzR4mq_>iWtSD6|VuV&YM<ym*@-{DPmlzSN`*Y3CyOCK<;e
z88kOnlD%G}sGK~PARAZIS3Xi~g^J*+`U4b_Sghfd)>=#_v-HDjZ4mS|L2%K2K}Mhz
zVb)f#Q>%4Du>|ea6cbNYrpi<6A!rSmbeh7+xGZ{-TPG);DG9qg=>9!44ScDdh49-_
z;|KUp*RQ-So$jyV%Ss5FnJa^|LYAl%8niBhd%(W!x$Rpq@pcp6(XF^fHFRF2KQP>$
zo@`Qi&QlkFxp%0@2)7RlN4+NzCWo{?_x}5$E?kh!!UM3Vg9R+=xPLWty|S}5Gt_qg
z+-v~8k*0?Bf0^Q+IZS56Ny~Q$pap&c2NUt&f7P9P+zEz*>bOO!5J8(uhIJ#%lgMNl
z3<nDRB&AC6;w$hY)fQSY)4a$Q-RVI(*V?61f%O?f1<-YsrT_-6tHo~BJ8|mZ6FeuV
z1yp1hPcaF=G35Xm#pd+NWfbBL0toGLEA=^!F%4<%kq&(+k&F3}{Y)&RD2>;y^@Yht
z_Dko1D=J@nc@`zIXz6dWsr`Kdt!m8`gGlx59A(t5ZjDVmrsjl#0wT@It~$j=uGRM!
z@XJK@Q})NA_sQpEZkNduP-h{cP|l+Qqwr{g--LeHY2&||4dJFD34ZCj7@+4ZH4}La
zjfr1gHXr8j#pp<fM*6041|Mdvt^i(5dG#}nN*jK}`(;x`0w(VPbNH^0-UyL4oc<Zk
zkQ!BMoJx$wr~EkBuP${9#?n$O6C%b=c>Oa+gkiuHYf$a+VGA${f!~LtdO!~|X+>{b
zY8=`^(0d9`z1f!nNzD`;4&65cNlg)@h5m5oOj&gG%ms<rLbYBBV7vqam|(<yZPULr
z;g5y7u&%u!K#<JP%HGt$)XDJozDW6se>lXlc+jou#n#`d_l6}hwB+CG5k*Sr36Yrz
zP2B)Pq#G?*Iwb)FJiXU@lTvTrdR&WRpV8sUz(Sx3C%f;BHSLY@I$!TqSg!%IetroG
zD$gu&K<>-imH@Bh&}f!zwO-`w8Dt>MMZ>8V@{X1g?!2BS0S;GtXTW(%@{L=6uC*fB
znj>TvA9Cj80~Hn`A5GSVpyqA$*6rlEa`u=Z!{-DRtCo0{jnK|3KxpDEi3&^DwWNg4
z%|~wf=EtEq^ku$fbX{@*EYr&TP@j@?OyLdVKVk*&H23K=xzmgV8p0Y|jK+@cNaPE1
zovLSR73MssgV04G7S-h7L}ID!!8|-X7U6-7?t~caWg)yk6*s=m)9us~kZ7pC6I1+@
zd&wXW<RBl3k1SJ%Qr4mEh(on>Px{8Z>47wN=yJJ;BgQ&`z)H7hxm}Jq_9GiAq)9R-
z7<EdEl%XD~CPXGv>(@1=H+oqdJ(YFEq(LiJW=s}h(Yx~}5%_cQ&3xV0VUT%{sXE!%
zVMqItDE@pLL%E2I2<48s8InBVbnt|shpL|$wrvbdWe<tuH@WY2@qFO7bF!c%vB;yL
z@F~+OW*Cro7Vjc@#$+DO7yPIzkY5Ip$&+@oFg9UVtL&v9mt5B?K+*2l#=n$vX0(NE
zKpt+(O?A#qwMKqV7*jUuMWj&p1RhuO4wGTbHylNMxwoxS1cPV$98V%tPvol~U39|R
zl6O=iz_49l$b5MhSWd!UNfU$~usFK-I0tovqfWiD=<JHt{yqW)=GS5xqW}T*0RnYV
z{EOcD!&s;e>!LJMr$c+e86OWy77OJ6k_2&3KMqL9=QFd2QUVwwR8X*sgj}5OpiFWK
zkiv)DX__mAlH9kRszqfgqLLvBrDbP&mL;Amd=_UXSF4&!?$+*0ZswW?9oH!-BQgjS
z*IQf1yzUikvx`UPXLZi2UvHaGMOee-cPA0<z3;w?@(~X1Rp5N1PkNLiJlf7t<UV;j
zSrn?ig_q%As?CjkJiE}XlQPSCZJM6e&%Jk`)EOjq_flvpmK**2!^^Qfzn3qzS+-d;
zwn#D%K4TF^&zQc9o|><iA|p84V%fO?yOTi+ljPR!j`!4}BQ+j04vUbvI%hQ*obvRj
z?_+U*VGQ3!iIjFM*1NV%sonVkJrD+Srv&3qv%#atS0f@{XXQkY)os76n0>C5fni_Q
zcj2Hhbit;RZ5t^!?2;o_*D4W$VcsfIc+m?Z?b!Uv2;-s&XYSCUiczc2-b0I0g-hNj
z@xi1}g6j<*=Dr7UMa-%w&YN`cBbWT>BQ~p;QyS!^#eQ><Gii@ys*X7`k0Lo$s4Yh=
zqPDBeFrP~hoHx5$6bo|@85*wdFWK*0YSi}ZG8#UkbEmb=^pEC3f1Sv!=`G{4iXU`}
z^q1)|D1{0xGtnN1=q<&XN><J|e@nKE6%EmC=@=U&$70q;su0=0BwNm+KO1H<0@Lqz
zzAi_b7DBzIlhJO)Gu0^Fz0@76t?O=AhaIUt(btIGz=|Na*;|-$^p?g33xNfF22!6X
zq~6&4y`>q9dy!?Nrh+?bfo*_kEe;nyR%9=3OTAD90?RT8#Bk}X#Pkr(TqBF2&!V=`
z^iWLr%Yk96POnG@bEb?cv#Uk)5}bP0=~;%g>Sm{t#hoNp#yeFj7UxuD?en)EXw2%=
zTS`>YY)#O023TqIXj@8o2KAM29NQM4Q<wYRYR*SEi&k~-q|}5TXA!e3s~EDVH8P`E
zmY9X7(i4{ybD@<=9a|bQS}Y8`&;rQ>H=;sYP$pcqtRoxg?ZK@CWy{=P7(uI7%TOp;
zP-^!<qe8@8toDzkVXNiC>0wmMVv-f2E>6tEj7ZTG#-KaZMuUUgl1|nl&p%3Dc8tZ4
zW{0iAY38oin5YwiQlKRrH8RP-h95fX$>v!l2*6R~)3vTQ7V(gjstAxGVc>U<8Jwb)
zPTqZIfoIV>X`vA2EuAW0Ghj||3;hwn0w`nHnL~5Xr-xuSDNmuyhoZWBBa|hf3)-7$
z6nhe93c?Vv(WT4=mKowy$9Fu8Y)h5yEW6z&zzB7;Yf(a|ei#jb>!ayFWo?MkgWxQK
z47{-ws_k4#8xv#$x229MEUK#x*X1k=2QLLnaWhYREFj!ta9&)3I+w+wuB-hQ0SFLZ
zlvuP9c*O0k+Bm_8bPyfY2o>Ts&0yRSIg4c@Rv71IVHGS{L3?%!54(HvY;tru5FCHC
z9_ER%i7@?-Tq&gCLBVg_3g3?9Gu6P$T^70*)YqUQTN$IHtc4g5UG7WN_J&c!4-lZ&
z0a=#~p%2D>Wvx?z(9bP0Z<&FgpEnI^CYsg{+)}t}Teb>kj&)7NNmPz4Zv@MJA2cA4
zE{uQ3IbdMxWrxK|%90Rdmx)yBJ3FI$YLuF4DF~35POQtBilKK{44PuvYIHjt?~mW&
zzNwc$LazTnX6dO-hE|>Wu0KO)5xDdvCq>WTfkeI85j!LDvSNHy0&TTnCpr_Y@_<W&
zQ(b+Sd>=eYt;}dhqY5=4^QRl&pzt9Bed!EmviR=h>B6ynC7MGc`x^9c*)$$|imA)E
z9KmcfaDlPY6j0i|;UW8=8oO5$aRyZaYTM*qBd?3;u=u(KdjqYJ_fLd`tRoym(-gX)
zqoT2Ua$jR%Ibg0>jte$VWiyOhLaYcnGe^pQ(V0O%I}YnENL<hjALq0hM{FF<?rudT
zbbG~j1B3+0?vjIT-cMn>$+J%d>ulP(v~JZtnH_w<RIr&7<u7;~+lTYU@H4?GEgU~-
zR!K^6@XKqwBMo)W$i4@-_QZ-QmyVBFJ4f)3cxyoE!%_79*4v;V{$Viw{GT|Ol;NmZ
z+YT|*IkvDqe3*B++Z^42SnGm>Yk$}A_Os<zQGe?_9v~BPY5jcYu-<ou5Nm^wf%`A~
z&vu1@EZG>Qn5BbzOkG2(!baa2N({4d%BrLdzn_qpUhmGmod2kf3s)xrh|=VU=smdZ
ze#hs3hAI5A(;4e45x>FbZjXU=hACbM{;p^<kDm1ks0Is2gdui+!mSDlP!iM*a<BG`
zjrBT(VL$&ABlsF0+(x-j#}10Det0jxj?86akm>HFvP31DF<gp^W9jsd@?R9OHH#v}
zMy<G*S-o(4k*V1ClP+ofqr-r+HjLr<`s7WQ^~dF#=GM2=hZPG$K6;|qo*q;kY(#X{
zFfFd{-9q?3+_^%fl($}jfKaPw(ZRy;5u0-MVMnrgDeQOnl8~2)fiBjk5Tmtd<8ziO
z26CD)xF7Yh6!aURLF)G!K|zgAYA^ed5LwhIg<&v+rgWHoZXm-oI~=j$L}6gp)CeOr
zHJ2@grxZ`MOjTQs=nHoS-#Y1Kp)pdzae!SZJ|BkY=&CULnrhH<C4(D0SjCBg;E2f~
z-et>z6_lHCVuZC63Xv9`wzN@Y6rcuoPF<~3V<@&m2~m3D5&4GW7GA+XXs{sPo!wDK
z85d-&4Og)(j6Q8x3f?Ooxm7VJf?Nw>3_s3fV9y_1xSDfCy31yB<u1e5^t!M^93C=E
z{z8n&*~Nx?e^9USF8!O$N3>hkr2LI_&)xUpcLxXfuNl6z9z^w)MF}E8U)#3YWS4&8
z{-CVR?>0{F?ccm>oP#mMTY-&w90y~vwccFmV3Wd60@~aufc|xzwLI_AA^-goYhcMf
z>+D@$bjnFLRX|X?6oMyaW_}(z!Ys&@5~HmlWUY|}!wJnBP8YPsWvf1%(iPjQZ2#s7
zd=-ANqy%pCwL5&H8<nOu@vXrn1BFmw^%lWZN+*Yu95oEVNo^uErUA33R$12ciP4kI
z<z=<GSv8W}a48ke#7$DN{i*uOkGil=BPUDe8Ab*|$yn-bb0c_t_5!mt!5DB2YArk3
zosslqNQ4zOtEuHgQslH#%#?E;8VjzWEVNEl%c*Sz&6gnBc&=Fm8u5Po1d=N&(s;^*
z3r4*PS8yLHme3UkP*^X5N^LY-wF9Z)VlbgOM7ks)cWH;V*%QOP%GrxX#+<@<3p?dN
zVU;JFY%)oc7jt9F$F2lpHIotGziboRa_H}m$cva@RFi#@V%rO>Tzs{Ux(<1et1ny>
z?C%$W*FgAI%!nl0a{QuH&7L*c<K!rTGU5(_9lPLN>r$DOVP-67{8fQkKPfPD$L+Lv
zSnj#tSMG<%-tcmKzH8dSPFO)VC^+Dw0|si;bY^#=`Ilum<yf^iCkC>3dEF5!JrA9J
z^7-aQuXu7vwaQBlnT>)~G|scmodeOzMFBpiJ_`6WePZh+=vMX276uFz4Vd%}>sndc
z95j(>Uq_*mC-r*$6iUb)5mCYRy8>n-Y?K==<R#pKJHp1*YyDG02Bf$0UBno~t<HKb
zMQ1wjpKN1Qzxfx_C%E$|JaRVCZr%XGLo7y}C4Dw$YMSUaQRjC}jf!hXs@3_zTZXk9
zUJ;dOLLHfBf53MMmzI872pNJ_0*PA69xpy2M|YI3RXLUBMtz3WG|rYfw9>}9iFFRN
zB_u(i5p)JpS@Is*ArpnM&nOOwsI6t6IAmTNaVm+)*gWI?2fN{+=&1n$oGYcUGS!0y
znn-1<Fy$A#LeYAUQ1{g*73)vkmsm{!MMp%JpFnY)`FA+36a^I*YPJvG3l->azfTgI
zyHQk7RQGW=l@WF&jO?B1KXJa9;4BdKc<ts@U_E||BOkanC2UNvN%=Li3!0bp9BJof
zDvv^)yJ-VzEqr5>fcpq35}=O+x=GE;TGw}Ub3M+AbPW8_LG;zZ%{IenPEAQ0yCE`_
z5medk+}GQkcA+x*kGZgwAC&01r6-zsp<h>Cxwld`4~iEZGot%8<4p%sS7d>FR_YB`
z1Ifjyuvj`fc|U|FGJ>_SBP*e_IMD*V%9fftjgs&{b6*4#VT3Vun6n`CvL$#d*2ygL
z)7eoDSMZ1NGifW#;&EW?%%%0BG5R6&cx8T(iz?c$ah{_eCRo%Dp%dN0c9w$xeo))f
z!{R2?4ug`a98BH;1&H}cNC!iP7dTNKFKcpxcOl6#wP-S<UIVQ~vPQ8_DD}9|Ys+Cy
zU}#9I#)Nt=nbJBcvS`cFJD{pdRH=xl<MK+MT%v#<wA4m=K@{Imi4eYq%*bVo&W4K4
zm&=skX-v-5lCsSd*It(3aV0(3w45Hza3DX+FS!Le*$_8n;E!7CHzDMgpF1z9%~~tK
zy#;NK^_J(jAUsfcq+RJFoI2r(dqjEQm8i5b=vF;2zg?A#Kd^NJX%mmJU@j13>COy%
z!JYwOs<?l2Np^rIJjNf0-ZXAjl6oa*WtFQcRWUV{J(ca>HXEGr4S3cKrNjJ=%MF4T
z@!bVaWe=0&6`nIQ;)FZc{l;u(ho}|4c%t0S8wEmM$g~?uCNTxxtk^R4o;IIHXg4Nb
zZhIyY?230y#03^WP!{XWxKemhpfBjbwIDOpx8d|`8Pt~dI`s(SzLBSax8yVhRmu9{
zw$*00x8`h$)GaBWP=7&dA{3Isa5b890UcZ}9{lKpxjTOUjiBd@0mQR5q$sBg0u@Iy
zwll8RkI|Pv!)|-}!4Q;*3w)M>C<U=T1*~O6L=&E&)R%C!`xEXu$AmNLS2k$dx9+0i
zWZr;437ub1?lDZ3l?0|XvM4LN*|J?ybUx1O36$TC<a3f$*`u}<S55^Fc*C!Ll5`y+
za23Wrm%XpIM4qGh44V2y^IL6gQESo|xW_DrN)j6|_>tQ|Yfu<k`}Krfa&FdG@WG1@
zwyIR-(?H!Q*PPUC0fMdUX|RE#FqH}tArT!^gWGzH>Y*dE7B89}m%)-8C#3~yUl6@M
z@$xCS^_0V!62E%u6hMI}Baijc^H8CqqH=??%n$8DrN(@_lxx_H?j+3I+s>0uS4W->
zq0;-tBt+ZUCJDUZPCC#K`72}x<h4^_Fa6|a`b{nCAUBAmU*NaqvD6u4sO3b@mh4E~
zrucRZFEhMSj0Z89ZjR)wMaI=Yk~lR+t$z(RzNF>S)J822;Tq5LaYD!CkRo6su~3oN
zg&ag$fC3ZxSR5uvsAWN7eFh2^)f87O^;9TTDscs|OpfUC5ghp1K49VjDrt>4fKO=L
zLxxhlumLD^ZNtMYZExK9PV1gvZsMjXa&<%d^2M4I|F-IW|5xsB0rGy*D60s$dYsg6
zMdyH$$qnp@ADG-=TiGN!GTMc$NnfrNngX>@GClAFT;EKG&5U1Bb*)IV83-ppR>OmP
z;mE%>wS^m>hiH7_YYVSpTmR5U_95QXcNL(22X&|AmEtABFNSh^r+yF3YBOQc4!O80
zW_5fFeqSWTBALo%V#({BIC-%Lq^vp1z-V;gLfX5<o0tEBVL0@DFUceaQhQonwKK)2
z&0X@&e4AdYrn)q`z5tVgl~*Bo+J%CkU>Rua>+TgW*Re+49!T|9sLVQu&ivPtDwn<#
zB=%%^7~>Vd1WyRru7m;?SybRpu<w?vO}IR>TdTkp!CqN?qy2_^y(`WSe9uYa9qE|o
zcGg`Ff;qg;-$@F&9QY~YAiHAU+kZCb9ucTo{Gb6k#xmH@V2*O=2$V9hv3N!FG!${7
zTp-rnDN>xcgi;~=_Mxb*sFFSwD6?;CdR1Cbi8F3{DehvaW-t1+1l`nx@J2Uuss#I}
z7YEQopO?lmS-vrY<18fFZQj;RUYHV1%R8M@0Tkd>SU5a}8CH-r{t1(N7NT#$sq)^w
zmVCLx`_@z>k8<ve&h!y>uq?b|oJ{kgpSC_o3O$%4V2RH#rTN1lnS2uTuJCihJod=<
zbK*b<K&B~Q;e;>D&;BL?vnWrN{SD(*)sBR6Em-F63?LK}2oSl&aN^HYHdZan2q(BF
z)D7u<lJ0O;J05y5nSuHAQNeEPGuad2w+US)L}BLRtHSBB4;rILk^KHnm#@&&PWgna
z=2(<euz2Lojj1kci-{q^0?f7tUS2+yl6i)dVnpDHYByGd>S5-tMDl2IECM|7gx%2>
zc};Ho`i;kR%Dy)GUpF~6W1Ki*Wd%6#FMi5xBe)PX;SaussO4z3-v?U!<o`%f%i(W@
zKYodCeaiprbn_cTzRC9h!zwjkBb?=5n5xJGjR5fk{&0h^|HE!o_U=DE)BR5kxJUaC
zxKtsZVEqJO6LNAxm=rvq21QUELR*=f&GBc-*_=hsNpH11h(o1vLkT+(4PQ2tyswV+
zW0H0I#C5a0#<jO<zm(O{{tf6=Ul;`X6i#*W0i~oWQwedTD?9~;Qi3ua^Y)=v%^+{d
zrVD$wOD`sT4RPbnqS1=u2&Go7g}LLJaUik%@Ok<=d-t|O^@Gei;<iIgFb0Y4d#4(s
z@WR&JIK#%xxhBn>u2?q%8AwgJaANO0!?)r6)*$^idCj}7^=gi;C5G{41QB@Q*c8MR
zn@7|~dhs0<3%J0Tf=dI8%-XKKYj#sRI^D}q0b6V;M(o(HwO9@8wBzAG+cAYdG<Gpg
zCoU<NGH2tkyT`cqNWI7nr@vW?{_^Q=wfXE@5yg!vgtPlhA|3;QWUn#=V=4Yda{S;<
zC3->z_#F+444xshfBlAac=NZ;*fOTY9TtZ05z^pR5AEUigsEZVK|3P%EN69l9T#rt
ztMj^w%zcjN9ADJ>WP_UYuZX&jZR@ji&u>=*IXGQau?w2zE-No+$nTgu_GgZsa&$M#
zZYvI)dh>Bd=#L)dh+N*aEL{^5`qD^U_KpbEKUE%6$K7WS@R1G!nIcLmnv5J+Ack3a
z2%04+f%{()h=i%kj`tsqCkKKoh%KE`ZGs_5p$zYHg~mcPi@d*l{hE-c6mFY*IgBX*
zL6~^BD26Gh26+p)EPJ2IL;Sue$6HLwX#VB^s1h4Q+Hww|5(zlpA&M+;`=Svm=S+;v
zJkHERRBWx#%q|GpK%F+Rc$V1Q(oO+`kKp_?Haa3}B9gaq1r)nI#4!25hPe^VDlLJ6
z5!=XtON&dC5`5o5js^}ccFq*%Q{E2ZcqcfHG;3~hzIV1Smr2JnUrzA}qvJS0pHByD
zCj6^D|3`QKV-Mkn7l`7C+;{KiDa87OI_;q(s#HJaMS4T(P0Ely98^+ZR5*wy_!G56
z3+J?z-u?HtV2|%ah$ea<Kj%a^7tjhVf!*5gt@7BP^6rg|obmH}0e{$BAS%yJpwKUf
z6;uzhr&gLw4$jvlhKDyaEuN$+uu;v_p0s(>4I0FGlLpsR$NLzoiQt?zYqY;)WuKzk
zX&zj^7gwX#;?y|AsCmpgmqu;LL}sQV%xExYp;~&@;1uwbc*ZH@^yP4QVY8iniz)@m
z`NT(X?G-$aA(h8Yb5{k|ODM1t4fD*k+EhMk&aPsfdgTiZ`crm;aE@iffH$0xl)xzk
zP;cf1mo~EIT*L1pFr>c)6bMypnY#=C1<hejy7FZer-~j=`LQaSVqn8yeq@3>chd$F
z%xSI__^fdrclZD!Ywh;nrQKS)Gv4n`Ga?-lrHjRFhZVaU8$}1Fr&DC&0+5EHg+pD*
z&pKO@6Taone5>3KFT+$B7Il<7`8grSj`|R;58(C6<DN^vJd)1O;x;VGW%WJ{{{TVg
zH25PA&$1!bk$qGC&E=453;i<0#EEk@CAw)r(e9_MpqJko;l9mc$tLtk>d48Z%;pV6
zj;G<~o22D(mZ@K0+17Z31aLV+Ib~<-!z5<ka0P%(F%5j68h)Gp<qiQ3wGo0!zFv1I
zK2mRc%2LFV?*o<^QwM3RG=c6qY=M{15}%k<kbi=4EgtbV^!O+CpfL*%o()za^D5n5
z;j`&T7sflZ+)RuzI|fq%!83^HED%bbx58ng;_L8n;$1l@J5BmM2+ixMerXw`lq}<n
z_@e^d5vjhHRyjV6v0awS2fAXL%_*kF$+9JrOd~X!J$cP>SSzQzTB0}{rh&2duz%ly
zaG}^#dJ9k$#eoF^;`w!0|1(z1zu5!@L<V%mQAT@2fRkZP+4aj|qbQSvLkEE`t2d=*
zm71D<J1ANdYD(+m1D%3qWMdQ}^5lP3zT^Jp2-Z?dS~cq%{v(28mM@V(WxjgXrq=a>
z@tL*vL%QefR>d1{NE>i|3C`dpl0@?KUi{TkiN<hw@=}t~!mRTNUTEx6NwxkyB=++=
zq;`QsjvL6&`Cy3k5S6?EwjRBdJgu%oo5X8R5<PPyc5sh*1?JZ%{v3D<dPs?pxkHR`
z6Aq4TDuX4vp5$*RB#HFV622trnR%?Dz+7h<F=>6mGNRUDey67%i8-Y4@?C?4BK3S)
zfr7HErec}l`_~GWBpfXk`;cTxqhQ@?lDsP1%O4g~b66sRNmD#`1VWS0+t5BO78E2&
zICkZ`iPxc*m11BQxRt7dE1Ik0(P7<}s}!ezaiQ@+*Mlw==xGFmqi$4i>jy2&9mUsA
z*j>?_P%uwoz{<j4S+$IFQiS8TpvW?t)vH8RP|t{L_oOqcvQa_P$x6EA5?E31q&B~<
zNG&$xiUDbxzcjJ$aR@GAB^RlJCy1Db>pMh_#KrelvNTR1Opo6mb0SRdK0M!Onk`Fp
z=ys4!Z0vaFCTK~5b`EdIQS#2A*Qxqp3-@B7aA|=0WBE1wz(P~(nkuXl$tH%v&|#9R
zeLm0olbua(?JgZv2G?R6yz3gVQMwP#Y?)mq-k6@gOK|{k8!R#T#dqf~3JgcyYV_!1
zp9v$!CMgIg^wGUhsG`m7QN0#1VZJ^W5m6TdZ-x>ULth(W{8-URkIild7h~&lW-x6#
zkamVW=Fm$^>gUSsTS%jcc8$w;GJ85Mm6ERkFl=0h8YO#a*X7vZdhL(N<z)d*lWz6T
zsIDrO>Z^$yXf-l)ch{DbY`+M4q6{fN>WVq;uQz|Q)ZP2YT2wh+vZ<uFNsM$_3WPnn
zscO}z*~OS$S4{P;tsEYIhHX9Z^&t7<><qvKu^Vw;cP2yfMsdFVFt-46=DzQRa3v<X
z=_A>+$wOqNyK`2r(RlH>u<W%9)q%q&N-nHZa!jNBr(Ukl(NKNXyme>ebaK2avbVcg
z{@;W^5h;qUc)ExRI?u}9`&={vL4h#9%kfVg8oSDKpXrtx)=Dkv95RS`c6_Ya%CPQC
zTS5MSS`B|Ys|SBOr^kwpi#7i^XAT5X7Z2tT*1m^K5{>uKVM+tlmjz}bI(8LGIh*ms
zsMRF~<K~gl^+qu(+^z#2j-3c!H$?Z_B(gzJR;7?X3mn5n6SWMK?*@bzhNs}#C#>)Z
zhf64Z9Si<mve8z-H=w@I#QUfO9G_Lp56&>FjJH1?Ww#3?_{~Ehqr&!d1@{PteLg{|
z77qv)uM`QvK+3m{7!R~TPcnJ&7Vd@$JSpSW?&Q|)()t24_zF+GMe1DJe9u=JL((pz
z4@A;xoiw;3?LGCEciG5$Z{N|`rA>OUUZZTmgJoTfSjMXtou~^{@2Gdt3#}aVPkp&$
z;<LS<{)^1f_j7#l8LjB8fVr6nFgMfvI&l5sl=;`w7LkgY{|PNp-#~vtlCOm(NQIe0
zKNN=9`l<wsiP*F!55nJCm`6S6`=m^d><#mYqWv~IR4PWq6R@TK>G(xHnxscc2G>Kz
zna3IzOUIMP6YyJPT55w=uM}j6{e%$j8MAVCg2K`y>GEQHGW+Q1C~P&o&OS8KcHC@N
z=WVu!LBgQ8k675M3KmokUnj4A2`EwxIHITBFM{dT(;41?F>3Zo@~au76RvQJs*KoS
z&L@-VLeWtdWPLNQgrr$_l(4LdjNv_DW?{dFzQj%)S2oXPWW_8#V2>5y%Hx-?O<S+O
zAJlzFF=t*d{)V}K=SsO{;;oAIYfDyMT}`DIrZ(1!IIkF!8PbzP2;`7N(s_LyQqy@c
zTRSyUXO3v2Cd_Px6&VxwqvN9DOW_9}rRD8{n{xEbCUC)vidXE+zBa|+W3_Z1`WZ|z
z2Izu=7MiKz1)oR{;@rp1*x=W|P{@^(r%`Yut6wGe&#lfjei9AwVO4EtN~^J8Xz0Fn
ziBf;ydSa#<5K^QeFmnNmdx_H}=~_O)%savA>f->d(WT$~az&0U;asF!k=o??sn0dY
zP~Sai?n7|WSX9ty2<<9(n`Ys=AX@RNRjzxYcMjsFZ?*klo(9`Xy0pz%+dO3^(+0==
zbA1P2Ogj6>A;Xc#xtnp7B~iZ?OK=h>aDmEqi5QqA&V7UYaQwbvoMw%fid2k?v=$&W
zU9LC1N7!8#Q-W<rkKRG-<+G|!R$qNc9LFF228l-q5!;h6NRe`5A9)h_tKW5zwrw)2
zpIMR8`>fmkA|V1){F$W1nSN@5^O7TnxTnpys|30Y$U>gDEnU0u7`$EzCUgxKF=SKK
zc(M!e{m6AkXWHEu3NF(2SA@7<23J^(Jg^;%h5KGp(c)gN$N7PNs6sUOs-M(%hY-0?
z|B;LE-P5z_yS}s1J{j;76a!AP{;PNwe>?_)&boGne>lMWCEi7uGGMK$fW+GXaJzP@
zLeKG9htxxEMuTA+D1<>_B7;wzX8q{haH4_P(6W0v8!dhg{dEgbRwR;)&j-;kT{BT*
zGF5alYiw*J#lFCK_w@1W)i+2V*HX%u9(Z`}>My23@3YcyD46nzA%%NuA<zN4Cv0Sl
zg?c)ovBc{3X|ku&(uw-a5lLDTRIFeXOGY_Hnt}aVE=Hagh(_;-cljGykF^LLFw3>6
z$lONl=$>A5cNf{XG<uYGWm_~mnz56E@{}3Ppvk+;6b!r?EVFIt3MBtV^kKjWn>kwN
zKJmz+b(iE7?Za|mYx@aj!F+AgUP^!_!U^+IR_LR7^Wd6_?3V!V5M8Vknv-+Y*0=VB
z3RDkWb~q(Xg>VWlaH=;l$s&6kowW8sh+In-9=`2&@$jt{s5oin8d<4-abf1&S1-yY
z4Xll-Q5$CpVd1vYSL)4;BBv`+o2Uw73krO-6KUK|T~D`hx1+))!2)*!D_zF}$3nUF
z@+Bco^6H5c!eU*o;#dsv6N7QlCIKiGMYk#s&zjCk;|@N&6P?8zHiT>2<9Z~6OW+dy
z1;en?LH?maVakQZ=w<717oPTVD5{odQy#<P@H^gv1&f;x8JXrU@d_g*a9<ZX8-sP*
z_4+z!yx<khePt3IWKz91K#NQw#cnBc=8t_$OCsh)I3X`c{~_@U9b)7tQLhn`P!-(H
zhoEE8>~CajBt5Rs?}0C1?oiNK3OWSt#y7$R%ayCbDQ7oAH<-&`Wp2>)fn@T+)hdW?
zvE+)d2_$+7ALBDazH-i|WSMsT%KI8p;uxa*y6SzABt(4(r{>`#y^}+@uNBzb65Cdz
zz%0=Yndh4^T4e5FymIO<wDH23NYK^bn{A>P2e;OLU$IhxNx)$Py!MR08zX)l`2XVJ
z^~^~xQbAU_TL8%u;DbF~QB3)XgcU}tLY7)W0SyEOdbQ!8*+P<|dL`kJ9q|#!JE2iF
z2P|F)Gcm)p=B!P3ckkv1x081a-vK`zC7nzWwj4fZ4YttY<JSc0jSj5x1<oBoXm@;h
zS3Qsl7-a6~;Q()(l%gho7C&6coa8|^%H<hoL@70cS|t)J2wOatYm`iP-GV>{*0j83
z`PT;>OuT#X3hZf2Y|#0OO*KdOdF<`w8GXTMqD!jidZDjP_B-7vFClC@%wCpeyiVBR
z-jHXmyT>GNns9^GS}Ruz7(N+Gs|YythV2@4+Vsb`i=eGpP)ZXpdFz-;FN8{;cCt`v
zc+QT8%U1bDX*pG@Uj@NNt;c*Ds=wF$3*_JHS9k(r_YmL_=>d2n_*Y@<gba<W?F_|C
z?d%;C9rb?H{~vF^y(*T9sH%Wd^3^uBH6{}9@9O6z`~`HN1WN>vV3A``LM;>6=Nn|z
zre+N07A%UrbNF+fy2fh#6N|1jjqmfH-t*^9**oh)QB;1kEqHS}+ypo@-}EWd{rd6h
z%$flx&-P89`bb8uk&YOaJsvhT3Wg!wx(1MR<Jfs<GM#-X)I2;kvkKQNMCF*RVjl$G
zJEjoXsPqV=dd@F+4cPZ5XIE|xLArFt8t;^PUptp*6l={Ws@JF}My{k=nKUSul&fP4
zF#rw`Fff(MyLG=2=iFUk*D^9o6C6ry!Rf}<oj047N_7;cR~|$eN-?Z!F4JgE=7@~T
z9!AocI895eFVJ*s8K+|NWTwIm%28h^)~GNCOS>S$J~<4L!=WM+XbG8e#Rw9dqM9!@
z+#_6QHns5>W898fQL8nHugDl&2EBr0Q&x_YDt@cktT5=HQP5iCd`p4gHB$_A!2NZi
zfd&6%=r+PKc<L^qtYRC46&Hb7Jk45!trmMzGMu<CFdX8V6pd?*9M8e7J2Po&t%(tK
zZribb46IQ%jbdsD9^PrE3~Up6dUuGQZtJjZFtIBMcJFQrO#L}{e-cdCyl#k#<cD>F
zcD>}A2!}ZrljP{g7lSURAIQNm87b5}hmrWXJFAsVr&+soJYUbIW<3f`8Rn&64AN|n
zSdEEN^c|s2!F}}qI+8?SVwkqY15P7FqL;E!ycf$J%{gv!1HO@T*!_;91hNgu4&Yv_
zLVv=T^B%)U-s|Imj%(pjRp^!<7P~u*P@4{oI(<@|8!tD9aMICh#2eS4$eGG3v%|!D
z3A9hb5HtqpqehMMa#N!Ts_sj&kZ`-;{^vSa$2KvUzQTu(^Rn+6Ub!urJ5;1XyfGF+
zPk&ug5Jz{R?Xt?FQ>0Rd;JiS)`RxM2aDHoU{Tt$KM~`fJ4=u@MHp~=H1h{{0>(l^Z
z)`#oM8@Fg94%5>@ozPzIKn4u?<Bv})qn<8Vi&J`$+QNjILO$C4kOsH~Y+d>Z9^Kdq
zb>z6+;*Il{_Z$%8;%)VaMOgBcyqA`}UcP78_o$yfdftM9!cK-<QcjlNP0It6onG{r
z;)EdUxHd<B)Z4GU<QYTzHrT}icEfmSN0^g4ABz{OL%im?nCniEzHbzI2p>_c98twa
zHqXs$;lCQr75r$Jq!!*D1TBMN$&{KKiwJy76a<FvnXoOXhw~bVOugB)@nxCBw7odJ
zQ?^QnO*cjcBNOH%OgEGCA&arY;DmI<i!J><cP(2Ft={12iWn#311^tDI)%f2@^dX6
zfpnc->O*8aAD0)##01^2jiQZ=S6PyL9<tv!;=U68eGG{Q;z{}LS^X6-Msxi-Mk~77
zI~ZF28=FE#+^|%)09w$e`4Y>z`dPCX(PcIvRFR%Q%oq&J*9@-?yiy6KV#!b`ri50d
zRQ+HHJA+XuO_7QOd(_ieE<QbtrZ=^Ex3&X!0$U^zAx4r|pyj9sjDlF8XNwYf551)L
z1Z}W*A0tpd+%J*6XiTswvw|Gv&TW_Q`piC@TbM?TRj#Krz0#*sAq#e?795|)L<4~Z
zQkQ6=4Ru+Z7#l+Sw0Rm=Jlv^?Ly;s56@(4fP!Go1bFfi7dt&w>+CfY<*sY!`#?Q6B
zy5398or>DtM&>Pt;fqQzX%#y7TO~D@!Q8N`jsznSaHVV@QII_GY`mUV{i<lbTfkD5
z<tAR$WqpLKT!JTNE@gESmGEU#_T46curtQfDY;fioL~Fdik7sqUx@jlO~-ZES3+`K
ztt$+JgpTEIR^z15puV$zU=RT8I6zC$?CMt`7^2hK`w!7FwZqJSos!uUv|rZxuy^F7
zFgVbIkJ9Dx6qx|-FLE_tiuufsHJ-r!-lX*CCVr5B=4=5Ni<p0H(!Wf*KOC!nSzf+V
zT(h2hh4v^%jRtGqxva#B%7Mqoe(1r1B}<l?9AgP>gy`NP(A}J%X}?5&&wsZWPQiBz
zc?)>svRp9m2Q!__B)myK^VmyYTJ!dL1hE0?7sFX%XPzI+HQT~=qMN2?g-TJ)yv&^o
zP-?RkV&wTaPG0K7dqAKQ@lbwGb<gK6wepteD{9V5OZjvohuy${<*HXXC2p}H^C?e6
z`6b-#P{K)wnkxd4>9HunYmN}@dk%i*Y6CgtG26<8lS=_zY90qI7DfB}ire6El{#mc
z;nEwoLQ&~Dc`v!lIOL$!8Cqc^q1h(sj5ncZeba?%Dy69??%`Jp?ZZZ>TN*R4Ep}sI
zw{?js2HG>`K26%gY%2}$aMg~J`MfG&2;w$5vc%2GLM?tmm92FD7>Lt&#@luqnUb7n
zMTH2f?x*aH%6_dW3+wKB{N5x-bY8Q7_w;nlC+dFhl!&BN&Ff1*S?}lyRicHzJ65=f
zO#y?AA+n$PMh7kEH#NpfC>Lnwc{{Z)Vlk`VfVXgIAuJw^YU76nsxsw4)XG69SOl3M
zXsToc7Sjz)_Km2o@OS4l8Pk|X#8Bcodlqp{eX(rt5%t!Csf6D|iO(IUR*jxn8u2KO
zQ2ElC42(){N+<T^m8EQdLCd;i%VN#UMk(Zt+-k5%GQ_6lE7I+)<$53VKu1_3Li~XF
z_iiOt4|T%}SZxeJ|JMHaYq$E(w$guDY#hCwdWG~TrwNq@ECt@fqi2{+Uki?0=|Zji
z;x(0;=){|x9vmv@c!+a!51=(rV~1BMwqN%mqBn&(PbFc{q|>?>x3X&7oo+mgooiaS
zIvzb95Qu_Akw-&VCsEKR{6ZwE1sQ^Dq&q8pmb6%CggTRbctH9@U2Nq8LLNW}pd=Wl
z)2ye3h=#^9CL^`Tj0Z|w$>T;#V)NRoh|No=l@&1z-e+UkRuibQ&9wG2&Ky}hRs@pk
z&{u^6Votln-4}O_cY$AM;?jnlE9nfz_he1h*m+5^E44Gg@Gffy)%TbyGEpeMe`{2)
z5*7nD8Bstj#>{{T1EU_vd5^`35WIP5gh(GPDeFoGC)=FJWY{fZomyNDEx}y7*y@Q+
zE!*X`kfss8HWb@hx<i6J^{P&*RcmtZ*cF@oZapy)PhJa~z>{mGnzB$zNE*{{roGJ)
z74vfpFx-*xmyL|>aP{5|H_RRB2nK&RUyU)Q5Nyxk0h)N4isUHfG~i4EXs`76b>R{p
zaTE$B^0yjYa0Dz4T!#L-BNMU4i_Hbr=KTo*#^mn;q#H-@)7~#Sw!W<g@en5$^^RmS
zoP%>zJV<O|`;^4m{kdqdI5GJc7j>yR2QRWHPVe)!r_j!+mZ)-gCwne;e2sekE2s#u
zBB@|AlL)>RmIfI%!jyQ9yJ=36Y=kjt3Ss$!7>SBfYIXZ3iz10mkjP@voHl-|)^tIh
z#IY2OH0SyP1y$O`Gex+}Lv)?dR?e$O)x$1IK~c<aJDU5vogRFA<01Cly?eN$N9>ET
zQ>(H{FhP9X=x~9~8;=t1n2V;CyWI65+}B__iGq-W+!Er~oYCPvy%Po`*xl&OqhjBD
zAY4Ky{Ib^XLF8{~54CQ6@9!S7KA#DyA;cCC4>(OU)<D{(ES-F8!GnpHI9yX@Kf!C<
z-19l+(pZ44tuX|fryb77_MGtLfz}e|X!_WM+tWm~PX*El-4Ol$5<^=?(d291+ujib
z{qnuw1tI808=x22(d)^*;AJ1UFooua%sK*@d|*W=sX#|BHxJ1Mm2>A_lDLI*%?VKI
zVF7!a^&(NWCGBf}7T177CBQTaEqJ;4=I>8sWt6@0_tP^XfDa+y^Fs#!aMb<(TLYk)
zx#~9>06Tw+{0|I*1`1Fvhk^oP1X%b0y#E*V9xyumxR8KO1iyck6;%?Xmy{C&9Mu1N
zvW7l2DgnShC<8udfX|;-p6~a!#s5ntD<~%^CaS3PLRRdr2;|R*0khqY3km3(U>e}N
zwVm<bIG?8gyf*zMMaPd6Kf?9@6BQt2>0c5a{ypIj35H*oP5cau-UI%12Jj*Mk^K9u
z))ybJ{`#KRAIyIO{HY7|XQcJ#IqF>voJ9l7^EQBze{cRjuUcPVz+e9f@cF6^u)cF~
z6?Akk0mQyF)&CjT`8ng>v6_7`fMyBsA^DRIaIf`s2IS#4jFNwr;g6Th=XhX6ZYx@V
zyea@v)Bg=m7ho&?4W782u7QQ2G9diCgteuijJ377qs{N3@iw)WdI2E!fL{82L-^0D
z))&xce+LbS`D@{54>(sQW@=$5sIPBmZ!fEBrEC1B(!%q+kHG7QeUG4h2e9Y;J?{hn
zQPbb#UG)!X4uGk{$kf;o5I!3aO8)nGSMbC)-2qeyHX!eee`XwTul2o0`YrVH_LKmK
zMOgf|jOV*DHmd+K4g{#3?<2;aSFJBS#&6MOtd0L`EsWV6g`ordOsoK9{(da#&#TtA
z6CeWen_Bpr?A`B+&$(K^f(v-Wjsc?p(Vu{Td#x`v;OB2J0fzz|bS*4?kG9e&6WRl)
z%y)o+>F@1i2j~~SK@+mJcK9y4VI!++Y6Y;l{uJAI-UTFP8_1>rZA1zv>UYV6Kd)L}
zU(Vk`|L6juE{6J!{}(;|Icfk-UP(0oRS1Ae^Cu+WUhA7G{9DvN9*Q5>-!uLDig>QM
z`zLg*ZvsF><~J4bqgwyl@bg^b@F$)FU_k#3-rt)3zbPI*uZ`#Wc|TdaRDa9z&m+!r
z*_@wnvv2-y^87IX|8@fXYyQ4(ZatU1`3Y$J_P>kZJV*JS>iZ-4{rWB&^T+jl9<$W_
zTPeSXuz8;Nxrof4$!mSne@*<So4{X|>(7j@&*7g7gZzZ2H25WNe}Vn+a>?{-Z~R_w
z&m}m1qM{o93)FuQ<anO{=TZkhnb1xC1=C+0g#e|q`K$23bE@Z&=6_NFoBtEle~CN)
z9R7L8^q=ra7XJkQqb2?+fckT)=do9RQZ+gJ3#vaV?SEC*^YE2FNtT@d1<5}LvwU8n
z=h6Otl3~056WL#Pqn~3wk2UoZ^UUX;Fn=`2AJBjN_{-+rbC%~pjefEm`~AZ5AGBXX
z96iT;9#G*YW>46!nEyV!!gHSIhx~u?BuD(h^XuU8ua5jb=X`!t`zNPZ^#A7k{c!c%
zr}ii2dCvdF{Edh0^GrW?VEjq2llLzO{yIwiz68(R$9@tF6#hc+=PdDW48PAy^4#6y
zCy{UIFGRm|*MEB4o^PT5L=LX_1^L&`^au3sH`JdO;`!F)Pb#<Sf1>&ybLsOPyPvR&
zHU9+rW5D=_{k!J{cy8DK$wbij3)A!WhriU_|0vLNTk}tv^QK>D{sQ}>K!4o+VeETu
zbo_}g(fTj&|GNqDd3`;%qx>XV1sDeYcrynq2!C%?c_j@FcnkclF2e+b1PDE++xh+1
F{{tUq7iIte

literal 0
HcmV?d00001

diff --git a/modules/swagger-codegen/src/main/resources/scala/gradle-wrapper.properties.mustache b/modules/swagger-codegen/src/main/resources/scala/gradle-wrapper.properties.mustache
new file mode 100644
index 000000000000..b7a364739551
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/scala/gradle-wrapper.properties.mustache
@@ -0,0 +1,6 @@
+#Tue May 17 23:08:05 CST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
diff --git a/modules/swagger-codegen/src/main/resources/scala/gradle.properties.mustache b/modules/swagger-codegen/src/main/resources/scala/gradle.properties.mustache
new file mode 100644
index 000000000000..05644f0754af
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/scala/gradle.properties.mustache
@@ -0,0 +1,2 @@
+# Uncomment to build for Android
+#target = android
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/scala/gradlew.bat.mustache b/modules/swagger-codegen/src/main/resources/scala/gradlew.bat.mustache
new file mode 100644
index 000000000000..72d362dafd89
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/scala/gradlew.bat.mustache
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/modules/swagger-codegen/src/main/resources/scala/gradlew.mustache b/modules/swagger-codegen/src/main/resources/scala/gradlew.mustache
new file mode 100755
index 000000000000..9d82f7891513
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/scala/gradlew.mustache
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/modules/swagger-codegen/src/main/resources/scala/settings.gradle.mustache b/modules/swagger-codegen/src/main/resources/scala/settings.gradle.mustache
new file mode 100644
index 000000000000..b8fd6c4c41f9
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/scala/settings.gradle.mustache
@@ -0,0 +1 @@
+rootProject.name = "{{artifactId}}"
\ No newline at end of file
diff --git a/samples/client/petstore/scala/.swagger-codegen-ignore b/samples/client/petstore/scala/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/scala/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/scala/LICENSE b/samples/client/petstore/scala/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/scala/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/scala/build.gradle b/samples/client/petstore/scala/build.gradle
new file mode 100644
index 000000000000..979db7783c43
--- /dev/null
+++ b/samples/client/petstore/scala/build.gradle
@@ -0,0 +1,120 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+group = 'io.swagger'
+version = '1.0.0'
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+    }
+}
+
+repositories {
+    jcenter()
+}
+
+
+if(hasProperty('target') && target == 'android') {
+
+    apply plugin: 'com.android.library'
+    apply plugin: 'com.github.dcendents.android-maven'
+    
+    android {
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
+        defaultConfig {
+            minSdkVersion 14
+            targetSdkVersion 23
+        }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
+        }
+    
+        // Rename the aar correctly
+        libraryVariants.all { variant ->
+            variant.outputs.each { output ->
+                def outputFile = output.outputFile
+                if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
+                    output.outputFile = new File(outputFile.parent, fileName)
+                }
+            }
+        }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
+    }
+    
+    afterEvaluate {
+        android.libraryVariants.all { variant ->
+            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
+            task.description = "Create jar artifact for ${variant.name}"
+            task.dependsOn variant.javaCompile
+            task.from variant.javaCompile.destinationDir
+            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
+            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+            artifacts.add('archives', task);
+        }
+    }
+    
+    task sourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
+    }
+    
+    artifacts {
+        archives sourcesJar
+    }
+
+} else {
+
+    apply plugin: 'scala'
+    apply plugin: 'java'
+    apply plugin: 'maven'
+    
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+    
+    install {
+        repositories.mavenInstaller {
+            pom.artifactId = 'swagger-scala-client'
+        }
+    }
+    
+    task execute(type:JavaExec) {
+       main = System.getProperty('mainClass')
+       classpath = sourceSets.main.runtimeClasspath
+    }
+}
+
+ext {
+    scala_version = "2.10.4"
+    joda_version = "1.2"
+    jodatime_version = "2.2"
+    jersey_version = "1.19"
+    swagger_core_version = "1.5.8"
+    jersey_async_version = "1.0.5"
+    jackson_version = "2.4.2"
+    junit_version = "4.8.1"
+    scala_test_version = "2.2.4"
+}
+
+dependencies {
+    compile "com.fasterxml.jackson.module:jackson-module-scala_2.10:$jackson_version"
+    compile "com.sun.jersey:jersey-client:$jersey_version"
+    compile "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
+    compile "org.jfarcand:jersey-ahc-client:$jersey_async_version"
+    compile "org.scala-lang:scala-library:$scala_version"
+    compile "io.swagger:swagger-core:$swagger_core_version"
+    testCompile "org.scalatest:scalatest_2.10:$scala_test_version"
+    testCompile "junit:junit:$junit_version"
+    compile "joda-time:joda-time:$jodatime_version"
+    compile "org.joda:joda-convert:$joda_version"
+}
diff --git a/samples/client/petstore/scala/build/reports/tests/classes/PetApiTest.html b/samples/client/petstore/scala/build/reports/tests/classes/PetApiTest.html
new file mode 100644
index 000000000000..832cc577c495
--- /dev/null
+++ b/samples/client/petstore/scala/build/reports/tests/classes/PetApiTest.html
@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta http-equiv="x-ua-compatible" content="IE=edge"/>
+<title>Test results - Class PetApiTest</title>
+<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
+<link href="../css/style.css" rel="stylesheet" type="text/css"/>
+<script src="../js/report.js" type="text/javascript"></script>
+</head>
+<body>
+<div id="content">
+<h1>Class PetApiTest</h1>
+<div class="breadcrumbs">
+<a href="../index.html">all</a> &gt; 
+<a href="../packages/default-package.html">default-package</a> &gt; PetApiTest</div>
+<div id="summary">
+<table>
+<tr>
+<td>
+<div class="summaryGroup">
+<table>
+<tr>
+<td>
+<div class="infoBox" id="tests">
+<div class="counter">4</div>
+<p>tests</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="failures">
+<div class="counter">0</div>
+<p>failures</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="ignored">
+<div class="counter">0</div>
+<p>ignored</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="duration">
+<div class="counter">8.201s</div>
+<p>duration</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+</td>
+<td>
+<div class="infoBox success" id="successRate">
+<div class="percent">100%</div>
+<p>successful</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div id="tabs">
+<ul class="tabLinks">
+<li>
+<a href="#tab0">Tests</a>
+</li>
+<li>
+<a href="#tab1">Standard output</a>
+</li>
+</ul>
+<div id="tab0" class="tab">
+<h2>Tests</h2>
+<table>
+<thead>
+<tr>
+<th>Test</th>
+<th>Duration</th>
+<th>Result</th>
+</tr>
+</thead>
+<tr>
+<td class="success">PetApi should add and fetch a pet</td>
+<td>2.414s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">PetApi should find pets by status</td>
+<td>2.665s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">PetApi should find pets by tag</td>
+<td>0.567s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">PetApi should update a pet</td>
+<td>2.555s</td>
+<td class="success">passed</td>
+</tr>
+</table>
+</div>
+<div id="tab1" class="tab">
+<h2>Standard output</h2>
+<span class="code">
+<pre>finding by tags
+</pre>
+</span>
+</div>
+</div>
+<div id="footer">
+<p>
+<div>
+<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
+<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
+</label>
+</div>Generated by 
+<a href="http://www.gradle.org">Gradle 2.6</a> at Jun 6, 2016 9:57:03 PM</p>
+</div>
+</div>
+</body>
+</html>
diff --git a/samples/client/petstore/scala/build/reports/tests/classes/StoreApiTest.html b/samples/client/petstore/scala/build/reports/tests/classes/StoreApiTest.html
new file mode 100644
index 000000000000..3de64cc1941d
--- /dev/null
+++ b/samples/client/petstore/scala/build/reports/tests/classes/StoreApiTest.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta http-equiv="x-ua-compatible" content="IE=edge"/>
+<title>Test results - Class StoreApiTest</title>
+<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
+<link href="../css/style.css" rel="stylesheet" type="text/css"/>
+<script src="../js/report.js" type="text/javascript"></script>
+</head>
+<body>
+<div id="content">
+<h1>Class StoreApiTest</h1>
+<div class="breadcrumbs">
+<a href="../index.html">all</a> &gt; 
+<a href="../packages/default-package.html">default-package</a> &gt; StoreApiTest</div>
+<div id="summary">
+<table>
+<tr>
+<td>
+<div class="summaryGroup">
+<table>
+<tr>
+<td>
+<div class="infoBox" id="tests">
+<div class="counter">2</div>
+<p>tests</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="failures">
+<div class="counter">0</div>
+<p>failures</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="ignored">
+<div class="counter">0</div>
+<p>ignored</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="duration">
+<div class="counter">3.613s</div>
+<p>duration</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+</td>
+<td>
+<div class="infoBox success" id="successRate">
+<div class="percent">100%</div>
+<p>successful</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div id="tabs">
+<ul class="tabLinks">
+<li>
+<a href="#tab0">Tests</a>
+</li>
+</ul>
+<div id="tab0" class="tab">
+<h2>Tests</h2>
+<table>
+<thead>
+<tr>
+<th>Test</th>
+<th>Duration</th>
+<th>Result</th>
+</tr>
+</thead>
+<tr>
+<td class="success">StoreApi should delete an order</td>
+<td>2.357s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">StoreApi should place and fetch an order</td>
+<td>1.256s</td>
+<td class="success">passed</td>
+</tr>
+</table>
+</div>
+</div>
+<div id="footer">
+<p>
+<div>
+<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
+<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
+</label>
+</div>Generated by 
+<a href="http://www.gradle.org">Gradle 2.6</a> at Jun 6, 2016 9:57:03 PM</p>
+</div>
+</div>
+</body>
+</html>
diff --git a/samples/client/petstore/scala/build/reports/tests/classes/UserApiTest.html b/samples/client/petstore/scala/build/reports/tests/classes/UserApiTest.html
new file mode 100644
index 000000000000..450651fcea95
--- /dev/null
+++ b/samples/client/petstore/scala/build/reports/tests/classes/UserApiTest.html
@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta http-equiv="x-ua-compatible" content="IE=edge"/>
+<title>Test results - Class UserApiTest</title>
+<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
+<link href="../css/style.css" rel="stylesheet" type="text/css"/>
+<script src="../js/report.js" type="text/javascript"></script>
+</head>
+<body>
+<div id="content">
+<h1>Class UserApiTest</h1>
+<div class="breadcrumbs">
+<a href="../index.html">all</a> &gt; 
+<a href="../packages/default-package.html">default-package</a> &gt; UserApiTest</div>
+<div id="summary">
+<table>
+<tr>
+<td>
+<div class="summaryGroup">
+<table>
+<tr>
+<td>
+<div class="infoBox" id="tests">
+<div class="counter">6</div>
+<p>tests</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="failures">
+<div class="counter">0</div>
+<p>failures</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="ignored">
+<div class="counter">0</div>
+<p>ignored</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="duration">
+<div class="counter">10.898s</div>
+<p>duration</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+</td>
+<td>
+<div class="infoBox success" id="successRate">
+<div class="percent">100%</div>
+<p>successful</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div id="tabs">
+<ul class="tabLinks">
+<li>
+<a href="#tab0">Tests</a>
+</li>
+</ul>
+<div id="tab0" class="tab">
+<h2>Tests</h2>
+<table>
+<thead>
+<tr>
+<th>Test</th>
+<th>Duration</th>
+<th>Result</th>
+</tr>
+</thead>
+<tr>
+<td class="success">UserApi should authenticate a user</td>
+<td>0.559s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">UserApi should create 2 users</td>
+<td>1.912s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">UserApi should create 3 users</td>
+<td>2.355s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">UserApi should fetch a user</td>
+<td>0.594s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">UserApi should log out a user</td>
+<td>2.130s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
+<td class="success">UserApi should update a user</td>
+<td>3.348s</td>
+<td class="success">passed</td>
+</tr>
+</table>
+</div>
+</div>
+<div id="footer">
+<p>
+<div>
+<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
+<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
+</label>
+</div>Generated by 
+<a href="http://www.gradle.org">Gradle 2.6</a> at Jun 6, 2016 9:57:03 PM</p>
+</div>
+</div>
+</body>
+</html>
diff --git a/samples/client/petstore/scala/build/reports/tests/css/base-style.css b/samples/client/petstore/scala/build/reports/tests/css/base-style.css
new file mode 100644
index 000000000000..4afa73e3ddcf
--- /dev/null
+++ b/samples/client/petstore/scala/build/reports/tests/css/base-style.css
@@ -0,0 +1,179 @@
+
+body {
+    margin: 0;
+    padding: 0;
+    font-family: sans-serif;
+    font-size: 12pt;
+}
+
+body, a, a:visited {
+    color: #303030;
+}
+
+#content {
+    padding-left: 50px;
+    padding-right: 50px;
+    padding-top: 30px;
+    padding-bottom: 30px;
+}
+
+#content h1 {
+    font-size: 160%;
+    margin-bottom: 10px;
+}
+
+#footer {
+    margin-top: 100px;
+    font-size: 80%;
+    white-space: nowrap;
+}
+
+#footer, #footer a {
+    color: #a0a0a0;
+}
+
+#line-wrapping-toggle {
+    vertical-align: middle;
+}
+
+#label-for-line-wrapping-toggle {
+    vertical-align: middle;
+}
+
+ul {
+    margin-left: 0;
+}
+
+h1, h2, h3 {
+    white-space: nowrap;
+}
+
+h2 {
+    font-size: 120%;
+}
+
+ul.tabLinks {
+    padding-left: 0;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    overflow: auto;
+    min-width: 800px;
+    width: auto !important;
+    width: 800px;
+}
+
+ul.tabLinks li {
+    float: left;
+    height: 100%;
+    list-style: none;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    margin-bottom: 0;
+    -moz-border-radius: 7px;
+    border-radius: 7px;
+    margin-right: 25px;
+    border: solid 1px #d4d4d4;
+    background-color: #f0f0f0;
+}
+
+ul.tabLinks li:hover {
+    background-color: #fafafa;
+}
+
+ul.tabLinks li.selected {
+    background-color: #c5f0f5;
+    border-color: #c5f0f5;
+}
+
+ul.tabLinks a {
+    font-size: 120%;
+    display: block;
+    outline: none;
+    text-decoration: none;
+    margin: 0;
+    padding: 0;
+}
+
+ul.tabLinks li h2 {
+    margin: 0;
+    padding: 0;
+}
+
+div.tab {
+}
+
+div.selected {
+    display: block;
+}
+
+div.deselected {
+    display: none;
+}
+
+div.tab table {
+    min-width: 350px;
+    width: auto !important;
+    width: 350px;
+    border-collapse: collapse;
+}
+
+div.tab th, div.tab table {
+    border-bottom: solid #d0d0d0 1px;
+}
+
+div.tab th {
+    text-align: left;
+    white-space: nowrap;
+    padding-left: 6em;
+}
+
+div.tab th:first-child {
+    padding-left: 0;
+}
+
+div.tab td {
+    white-space: nowrap;
+    padding-left: 6em;
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+
+div.tab td:first-child {
+    padding-left: 0;
+}
+
+div.tab td.numeric, div.tab th.numeric {
+    text-align: right;
+}
+
+span.code {
+    display: inline-block;
+    margin-top: 0em;
+    margin-bottom: 1em;
+}
+
+span.code pre {
+    font-size: 11pt;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 10px;
+    padding-right: 10px;
+    margin: 0;
+    background-color: #f7f7f7;
+    border: solid 1px #d0d0d0;
+    min-width: 700px;
+    width: auto !important;
+    width: 700px;
+}
+
+span.wrapped pre {
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: break-all;
+}
+
+label.hidden {
+    display: none;
+}
\ No newline at end of file
diff --git a/samples/client/petstore/scala/build/reports/tests/css/style.css b/samples/client/petstore/scala/build/reports/tests/css/style.css
new file mode 100644
index 000000000000..3dc4913e7a07
--- /dev/null
+++ b/samples/client/petstore/scala/build/reports/tests/css/style.css
@@ -0,0 +1,84 @@
+
+#summary {
+    margin-top: 30px;
+    margin-bottom: 40px;
+}
+
+#summary table {
+    border-collapse: collapse;
+}
+
+#summary td {
+    vertical-align: top;
+}
+
+.breadcrumbs, .breadcrumbs a {
+    color: #606060;
+}
+
+.infoBox {
+    width: 110px;
+    padding-top: 15px;
+    padding-bottom: 15px;
+    text-align: center;
+}
+
+.infoBox p {
+    margin: 0;
+}
+
+.counter, .percent {
+    font-size: 120%;
+    font-weight: bold;
+    margin-bottom: 8px;
+}
+
+#duration {
+    width: 125px;
+}
+
+#successRate, .summaryGroup {
+    border: solid 2px #d0d0d0;
+    -moz-border-radius: 10px;
+    border-radius: 10px;
+}
+
+#successRate {
+    width: 140px;
+    margin-left: 35px;
+}
+
+#successRate .percent {
+    font-size: 180%;
+}
+
+.success, .success a {
+    color: #008000;
+}
+
+div.success, #successRate.success {
+    background-color: #bbd9bb;
+    border-color: #008000;
+}
+
+.failures, .failures a {
+    color: #b60808;
+}
+
+.skipped, .skipped a {
+    color: #c09853;
+}
+
+div.failures, #successRate.failures {
+    background-color: #ecdada;
+    border-color: #b60808;
+}
+
+ul.linkList {
+    padding-left: 0;
+}
+
+ul.linkList li {
+    list-style: none;
+    margin-bottom: 5px;
+}
diff --git a/samples/client/petstore/scala/build/reports/tests/index.html b/samples/client/petstore/scala/build/reports/tests/index.html
new file mode 100644
index 000000000000..6393b7719327
--- /dev/null
+++ b/samples/client/petstore/scala/build/reports/tests/index.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta http-equiv="x-ua-compatible" content="IE=edge"/>
+<title>Test results - Test Summary</title>
+<link href="css/base-style.css" rel="stylesheet" type="text/css"/>
+<link href="css/style.css" rel="stylesheet" type="text/css"/>
+<script src="js/report.js" type="text/javascript"></script>
+</head>
+<body>
+<div id="content">
+<h1>Test Summary</h1>
+<div id="summary">
+<table>
+<tr>
+<td>
+<div class="summaryGroup">
+<table>
+<tr>
+<td>
+<div class="infoBox" id="tests">
+<div class="counter">12</div>
+<p>tests</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="failures">
+<div class="counter">0</div>
+<p>failures</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="ignored">
+<div class="counter">0</div>
+<p>ignored</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="duration">
+<div class="counter">22.712s</div>
+<p>duration</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+</td>
+<td>
+<div class="infoBox success" id="successRate">
+<div class="percent">100%</div>
+<p>successful</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div id="tabs">
+<ul class="tabLinks">
+<li>
+<a href="#tab0">Packages</a>
+</li>
+<li>
+<a href="#tab1">Classes</a>
+</li>
+</ul>
+<div id="tab0" class="tab">
+<h2>Packages</h2>
+<table>
+<thead>
+<tr>
+<th>Package</th>
+<th>Tests</th>
+<th>Failures</th>
+<th>Ignored</th>
+<th>Duration</th>
+<th>Success rate</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="success">
+<a href="packages/default-package.html">default-package</a>
+</td>
+<td>12</td>
+<td>0</td>
+<td>0</td>
+<td>22.712s</td>
+<td class="success">100%</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div id="tab1" class="tab">
+<h2>Classes</h2>
+<table>
+<thead>
+<tr>
+<th>Class</th>
+<th>Tests</th>
+<th>Failures</th>
+<th>Ignored</th>
+<th>Duration</th>
+<th>Success rate</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="success"/>
+<a href="classes/PetApiTest.html">PetApiTest</a>
+<td>4</td>
+<td>0</td>
+<td>0</td>
+<td>8.201s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success"/>
+<a href="classes/StoreApiTest.html">StoreApiTest</a>
+<td>2</td>
+<td>0</td>
+<td>0</td>
+<td>3.613s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success"/>
+<a href="classes/UserApiTest.html">UserApiTest</a>
+<td>6</td>
+<td>0</td>
+<td>0</td>
+<td>10.898s</td>
+<td class="success">100%</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div id="footer">
+<p>
+<div>
+<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
+<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
+</label>
+</div>Generated by 
+<a href="http://www.gradle.org">Gradle 2.6</a> at Jun 6, 2016 9:57:03 PM</p>
+</div>
+</div>
+</body>
+</html>
diff --git a/samples/client/petstore/scala/build/reports/tests/js/report.js b/samples/client/petstore/scala/build/reports/tests/js/report.js
new file mode 100644
index 000000000000..83bab4a19f36
--- /dev/null
+++ b/samples/client/petstore/scala/build/reports/tests/js/report.js
@@ -0,0 +1,194 @@
+(function (window, document) {
+    "use strict";
+
+    var tabs = {};
+
+    function changeElementClass(element, classValue) {
+        if (element.getAttribute("className")) {
+            element.setAttribute("className", classValue);
+        } else {
+            element.setAttribute("class", classValue);
+        }
+    }
+
+    function getClassAttribute(element) {
+        if (element.getAttribute("className")) {
+            return element.getAttribute("className");
+        } else {
+            return element.getAttribute("class");
+        }
+    }
+
+    function addClass(element, classValue) {
+        changeElementClass(element, getClassAttribute(element) + " " + classValue);
+    }
+
+    function removeClass(element, classValue) {
+        changeElementClass(element, getClassAttribute(element).replace(classValue, ""));
+    }
+
+    function initTabs() {
+        var container = document.getElementById("tabs");
+
+        tabs.tabs = findTabs(container);
+        tabs.titles = findTitles(tabs.tabs);
+        tabs.headers = findHeaders(container);
+        tabs.select = select;
+        tabs.deselectAll = deselectAll;
+        tabs.select(0);
+
+        return true;
+    }
+
+    function getCheckBox() {
+        return document.getElementById("line-wrapping-toggle");
+    }
+
+    function getLabelForCheckBox() {
+        return document.getElementById("label-for-line-wrapping-toggle");
+    }
+
+    function findCodeBlocks() {
+        var spans = document.getElementById("tabs").getElementsByTagName("span");
+        var codeBlocks = [];
+        for (var i = 0; i < spans.length; ++i) {
+            if (spans[i].className.indexOf("code") >= 0) {
+                codeBlocks.push(spans[i]);
+            }
+        }
+        return codeBlocks;
+    }
+
+    function forAllCodeBlocks(operation) {
+        var codeBlocks = findCodeBlocks();
+
+        for (var i = 0; i < codeBlocks.length; ++i) {
+            operation(codeBlocks[i], "wrapped");
+        }
+    }
+
+    function toggleLineWrapping() {
+        var checkBox = getCheckBox();
+
+        if (checkBox.checked) {
+            forAllCodeBlocks(addClass);
+        } else {
+            forAllCodeBlocks(removeClass);
+        }
+    }
+
+    function initControls() {
+        if (findCodeBlocks().length > 0) {
+            var checkBox = getCheckBox();
+            var label = getLabelForCheckBox();
+
+            checkBox.onclick = toggleLineWrapping;
+            checkBox.checked = false;
+
+            removeClass(label, "hidden");
+         }
+    }
+
+    function switchTab() {
+        var id = this.id.substr(1);
+
+        for (var i = 0; i < tabs.tabs.length; i++) {
+            if (tabs.tabs[i].id === id) {
+                tabs.select(i);
+                break;
+            }
+        }
+
+        return false;
+    }
+
+    function select(i) {
+        this.deselectAll();
+
+        changeElementClass(this.tabs[i], "tab selected");
+        changeElementClass(this.headers[i], "selected");
+
+        while (this.headers[i].firstChild) {
+            this.headers[i].removeChild(this.headers[i].firstChild);
+        }
+
+        var h2 = document.createElement("H2");
+
+        h2.appendChild(document.createTextNode(this.titles[i]));
+        this.headers[i].appendChild(h2);
+    }
+
+    function deselectAll() {
+        for (var i = 0; i < this.tabs.length; i++) {
+            changeElementClass(this.tabs[i], "tab deselected");
+            changeElementClass(this.headers[i], "deselected");
+
+            while (this.headers[i].firstChild) {
+                this.headers[i].removeChild(this.headers[i].firstChild);
+            }
+
+            var a = document.createElement("A");
+
+            a.setAttribute("id", "ltab" + i);
+            a.setAttribute("href", "#tab" + i);
+            a.onclick = switchTab;
+            a.appendChild(document.createTextNode(this.titles[i]));
+
+            this.headers[i].appendChild(a);
+        }
+    }
+
+    function findTabs(container) {
+        return findChildElements(container, "DIV", "tab");
+    }
+
+    function findHeaders(container) {
+        var owner = findChildElements(container, "UL", "tabLinks");
+        return findChildElements(owner[0], "LI", null);
+    }
+
+    function findTitles(tabs) {
+        var titles = [];
+
+        for (var i = 0; i < tabs.length; i++) {
+            var tab = tabs[i];
+            var header = findChildElements(tab, "H2", null)[0];
+
+            header.parentNode.removeChild(header);
+
+            if (header.innerText) {
+                titles.push(header.innerText);
+            } else {
+                titles.push(header.textContent);
+            }
+        }
+
+        return titles;
+    }
+
+    function findChildElements(container, name, targetClass) {
+        var elements = [];
+        var children = container.childNodes;
+
+        for (var i = 0; i < children.length; i++) {
+            var child = children.item(i);
+
+            if (child.nodeType === 1 && child.nodeName === name) {
+                if (targetClass && child.className.indexOf(targetClass) < 0) {
+                    continue;
+                }
+
+                elements.push(child);
+            }
+        }
+
+        return elements;
+    }
+
+    // Entry point.
+
+    window.onload = function() {
+        initTabs();
+        initControls();
+    };
+} (window, window.document));
\ No newline at end of file
diff --git a/samples/client/petstore/scala/build/test-results/TEST-PetApiTest.xml b/samples/client/petstore/scala/build/test-results/TEST-PetApiTest.xml
new file mode 100644
index 000000000000..cc2e356f55ee
--- /dev/null
+++ b/samples/client/petstore/scala/build/test-results/TEST-PetApiTest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="PetApiTest" tests="4" skipped="0" failures="0" errors="0" timestamp="2016-06-06T13:56:37" hostname="clasnake-MacBook-Pro.local" time="8.201">
+  <properties/>
+  <testcase name="PetApi should add and fetch a pet" classname="PetApiTest" time="2.414"/>
+  <testcase name="PetApi should update a pet" classname="PetApiTest" time="2.555"/>
+  <testcase name="PetApi should find pets by status" classname="PetApiTest" time="2.665"/>
+  <testcase name="PetApi should find pets by tag" classname="PetApiTest" time="0.567"/>
+  <system-out><![CDATA[finding by tags
+]]></system-out>
+  <system-err><![CDATA[]]></system-err>
+</testsuite>
diff --git a/samples/client/petstore/scala/build/test-results/TEST-StoreApiTest.xml b/samples/client/petstore/scala/build/test-results/TEST-StoreApiTest.xml
new file mode 100644
index 000000000000..0944febda9b6
--- /dev/null
+++ b/samples/client/petstore/scala/build/test-results/TEST-StoreApiTest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="StoreApiTest" tests="2" skipped="0" failures="0" errors="0" timestamp="2016-06-06T13:56:46" hostname="clasnake-MacBook-Pro.local" time="3.614">
+  <properties/>
+  <testcase name="StoreApi should place and fetch an order" classname="StoreApiTest" time="1.256"/>
+  <testcase name="StoreApi should delete an order" classname="StoreApiTest" time="2.357"/>
+  <system-out><![CDATA[]]></system-out>
+  <system-err><![CDATA[]]></system-err>
+</testsuite>
diff --git a/samples/client/petstore/scala/build/test-results/TEST-UserApiTest.xml b/samples/client/petstore/scala/build/test-results/TEST-UserApiTest.xml
new file mode 100644
index 000000000000..4773a968d0e5
--- /dev/null
+++ b/samples/client/petstore/scala/build/test-results/TEST-UserApiTest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="UserApiTest" tests="6" skipped="0" failures="0" errors="0" timestamp="2016-06-06T13:56:51" hostname="clasnake-MacBook-Pro.local" time="10.902">
+  <properties/>
+  <testcase name="UserApi should fetch a user" classname="UserApiTest" time="0.594"/>
+  <testcase name="UserApi should authenticate a user" classname="UserApiTest" time="0.559"/>
+  <testcase name="UserApi should log out a user" classname="UserApiTest" time="2.13"/>
+  <testcase name="UserApi should create 2 users" classname="UserApiTest" time="1.912"/>
+  <testcase name="UserApi should create 3 users" classname="UserApiTest" time="2.355"/>
+  <testcase name="UserApi should update a user" classname="UserApiTest" time="3.348"/>
+  <system-out><![CDATA[]]></system-out>
+  <system-err><![CDATA[]]></system-err>
+</testsuite>
diff --git a/samples/client/petstore/scala/build/test-results/binary/test/output.bin b/samples/client/petstore/scala/build/test-results/binary/test/output.bin
new file mode 100644
index 000000000000..51c4ba6dd66e
--- /dev/null
+++ b/samples/client/petstore/scala/build/test-results/binary/test/output.bin
@@ -0,0 +1 @@
+
finding by tags
diff --git a/samples/client/petstore/scala/build/test-results/binary/test/output.bin.idx b/samples/client/petstore/scala/build/test-results/binary/test/output.bin.idx
new file mode 100644
index 0000000000000000000000000000000000000000..dfffe31d6255ce161034f51b7dfff3bcf73779a0
GIT binary patch
literal 36
QcmZQ%Vq|4N1OL$g0Eo>G`Tzg`

literal 0
HcmV?d00001

diff --git a/samples/client/petstore/scala/build/test-results/binary/test/results.bin b/samples/client/petstore/scala/build/test-results/binary/test/results.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a2b463d4a3dbe53dbf45eb3df60789f20a0bd3d0
GIT binary patch
literal 605
zcmZQ(X6g<|EpaT!3`s36VPIekRb#L{$-=k@BB)TDkzbmVqL7#Z#Ca(SX{ja2848IC
z1*s(r?}Q-A-OU-8XQL`FEl5c$NrkHWEeuf?XvDyRW^7s}&`h9N#R^H43dJRfC8fm-
zFGV2Aqh~X)&PO#CMR`eLI>UArh}zgo3|u{-#i>Oo{wUnS#yJNn3iAle1EoO4440tV
zOV}8=7o#amEG@}M%`3@FhIj<5emzuunJEL$JT&z=`RNMzr6oW=LyQ)HxU8;&ffrqA
za#1SCP$RI)Vul}l5T$Jl417408bg(Ch6Z`RF$4cxGzY-L9Bls-DTtwSycpPfgG=&@
zQc;2?_6ZZ)N|-P#YzlG`lYx<jh~_+n{Gt?KIKAM67?yN~fnx!>u9VcAR8U;Q6mNyP
IF^7o(0G=Maj{pDw

literal 0
HcmV?d00001

diff --git a/samples/client/petstore/scala/build/tmp/test/jar_extract_2499683789472893630_tmp b/samples/client/petstore/scala/build/tmp/test/jar_extract_2499683789472893630_tmp
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/samples/client/petstore/scala/build/tmp/test/jar_extract_2588204703609432255_tmp b/samples/client/petstore/scala/build/tmp/test/jar_extract_2588204703609432255_tmp
new file mode 100644
index 0000000000000000000000000000000000000000..407a6ed065bd255fcc8bee40e43ab9e049919e09
GIT binary patch
literal 10545
zcmcJV3wRt=701ur$!;>qY}(Cc+onlVHrYHjAx)FgHqC~#yV-7;Z9;95rfnqDO|osb
zO*UzEQ(9g=@PQ9}q9}@@D2f&eC=x-dD2i556h%=KMNt$*Q4~c%&z-yJ%<bIlNACCe
z^-Fd;|M~y!+;h&HnS0yQFWqwr0NP2I!0OCcVj|HxGn>w)CX=n<(M)zGF_w+ZrpL0W
zsdQT*5CXfq2HQG&4<(K!S|<|e1Fbto4<*O4p?<-!Zu@DyY=|?+uED{!&|rV4J49gV
z+0a5LAh6^tM<KWfEVo_T8sjtq)wvO7lKUs{x>^V5lm=1<(uwTsOcF<Njvmh@GsMy4
zB7N(2`iaBgSmp85dfKz8xVF(<9XL8t8d#C8>S*_=6=8q4Aal4guwu<c>q-=#x-&7-
zKDyUcMf@>`T9;gjVRM%H)tzlMQR4KfiEx+{L`L?P5B057oxV-P(Wp3<s;Zs{R(Fi2
z>MuXA#;q!~dV-LMvz!o@>Zu(iLDds(?o*ZK1gQxtTCsD)?@u@yr&Be(2huB5#h29m
z;X*|zbY_+>Eh+GBx<Vh@j~w4D9xqaq<$VQvCiku%-CIAn$30x(+D6)y{l!H}PsNNs
ztb0opcfX$$7dYHU%8sS0LYuwLpeGV8cPef@S$c7WQ+GBE`1_Q=u9ibRu>wcU?mAD{
z6(P=w?(8KkZl$ir*W_u4l&wwZ#p98%r_HOXQGZz3wzpf`)@thO50A7{eS=qRi~32y
z)_p_e+tv&-K5;tAG9KMuM0OH~*XJfKhoi10;wdUx9dXwTY;D5vFFWp-y#U9*qRw-q
z2*+>k?6vZH3YXO;kstM{{;imoo_*cpyIU$c+Eq{SKwZR`cP14#=d&*y_cfT;*Sx!B
z%v<R2)@=8wg9){AL*;OBl*B#tCH~-%V$wtWuC{PvWyhh^r8Q-KpX#i0VE&>+!J>C3
zrl%*42PVgcqk+scfr7?paF~GatlA8WO(ZgzLMTP4@$6C$p+y4?mKMVj@E{|5FqI+T
zpD);j?mDbl$I&(dBx<>isCgZDSU6ZzgXK^`2U}?|#!O>u0b@*qDyXK$)fS^}8ubN?
zx(0rzrN)587&nda1&nbG>Y<SugBIhEX&hR>IHW-{v{2(3i*Y!XOH#~8l06f6T!XdH
zPL1m@vKWao8IGD}ab#mbjO+&Jpyo{$W6U&)BO421WJ7R1HFjH!x@i<gHWtLlZh;6j
z_E?N@(<qK?EQpca3frjh0*i6TG>Rh|3u0vB&`XVd7UQs<i>$stWbwELJ76a@_G4sm
zLS|%5vpBLkjqEPiP0f2O#+YdoM^>ki9fpgjal~TOO`|xnI*sf;NKoUb#TYk@;>hYW
zvg5Fy8V^{EL#9z2S)E2U1&66|!eShb=OP<lAhLK|gEUN2;}MK3UY8kJ(=3i`oJKYa
zN2&P|i!o*z#gUEE$R3BwsPS@(Q8$g^$i``8uY}i7<7+L(xM>teHclgZ6}*8O-)J!o
znMQGB<215Y!&|8Ftpp0krY5JSGD!jfdjkmCnlpj*_S0-<*?k&Z1Mi?iz7unTmEf^?
z@D(O^Df7<{4X$OL_i~!i(>1t`Y47JWqit(&J<~qOX+~$(;0C6BnA42rtHF&-`zWUw
z{Z)gTnD%i_Gg_zyH#6;%oMv=L4Q^rDr#a1Nf*PD)+O3>s^f?VqGVOLwGg_GjcQWm>
zoMv<@4enyv=Q+)2NE*yB?F*b1rT3x+_cHB^oMyBX4Nfub%baF(4Gr#N+E+QvXbc+M
z&$O>|nsM)I@Bq`k$!W&zt-)!geVfyww6ZmLkZIrLG~))<;31}cpVN$cP=kk=_CroH
zZZi!YVcL&5&A5{^c$8^B#aktj9v?iIOl$BMJN9!tKX=Tm*~gjoOHRwx>=R7;HK*lj
z_DQDwmeX=I`xMiD&uO`ueVS>1<g{GPKEt#>b6T!upJm!#IW1SS&oS-qoR+KE=b83T
zPRrHo3rzbrr{!w)MW(&PX{=@m7#hJhNNYTex+DtI3OJ3`EO9ZdkkeSr5|wGioW^RF
zXiRf+8mn2dglS7TjnynEW15%KSj`e2)0S}>t68#wX%(EtYL-+ot%}oF&5~-S;rpc}
zF05vWpJ_Fm#%h)Xm{v!iC_6Qfok^v!<(4-FEelO{6knR_?EPGDo<<r-5c@Z2BH-#u
zrBhjaHB%b#SwhYw_-5%O_-5$}P$58vvbA@5=33H55$*U=-!nCikDRjJDO`6BC1z5I
z(TU_B{e{!%O{J3;&Q6XdXL3i>GYeA!+q=S|CA4k8uEB7KE}FYTwug}+v9<KUMbIq4
z%Pr;?V2e&9F!g^Kimj~Xw<01_$CBf_FbBp)!OIU-e+Z)`oDJP}pb~+X9V+|u7l1Et
z;vzzot1|oa7dv9{z|`!_STdHP1z6F~)|f-7ObRP9oK8<=6Le<>m!U=T8zlvPaDWr=
zses!;z4)nt8~1(A!@qTcf`0&9O$~EUb^^aS$a?&}3>|nByiksx^qUWl5wgMfj!h65
zxMu?^M4ZZ#s4s?71*=4yb8cHC#}73kPTgYXRSyj!PSdT6yq;z_SHx+(W09P-&~}F7
zV3}#EorCl8&ucw;_<U`EjUrBG{(RXvA?OluHs{ZmowEhPB2IL%^V$kA5l7FTFZ=bx
zVY`TPVg7vCIXmDLHcsUn4CJ5JAbR+G?Sdf@XK(&|**U}TN)hMc{Q0tT_Q9(}oUz5u
zYaEgy&cXcovR_XM4v9FE`SWGxq+#j|XTBe<o`aeE^U9!y&sP>^MVw>#^JV88hf77A
zEAr>d&bbm^E#kaxvGckLUN7RjDSy7~*K;+zS;To;{(RXv*TCEH`NE!G^Zl@S4&HTp
zp1%5Scn^+k$rssZoZW%Xv1`S=_sQ@!A@4dd?*p>D>&3he$?|Rx^FAWWyHU*hm@Mxm
zG4B&HyiUx=&0^lCWOy{cw}^S4k>#Bb^KO&nofPx#kmcPe=6z0<cbAxVw+xTwcTUW^
zM}|l9d#{-HC0X7nG4Cs~y!*twugUW67xTU$%X>h~`<4uk=J&Li_Z=A?&F_O^-uGmA
z4~cm{kmWrr=KV;P_lTJH6ItG)V&2bWcr?F{iFv<};f0X*xS01V86K{5;0ZDBH?q7Z
z#k}9i@}3g&{vgYHTFm>CEbkdH?=LdE^D!UKig|yN;nDm)C+7V_miN4v_b*xA3u4}X
zWO*-&dH<E<;dYSdeVjOCc$i<@M;G#(GCaCd;S%$TWO=HXS0c;P#Jo~j-V!m-Bg-oj
z^U7s-G`~JEZ@CPQ=68jdw^Ei@Ddw$`<yDJ$=g9K>VqUE*FCgaC%kXG^8%QJmrt9-o
z?5=dT*x58knoS(tJjR1;d)c}uM;rbdO>S|&E@xJo?k24WSZD4NFo0?Y<W}`9`2P%z
f^*t!0o38Vrh-}8s5=5%_Q=EYkvIP$)PJsUb;nrq|

literal 0
HcmV?d00001

diff --git a/samples/client/petstore/scala/build/tmp/test/jar_extract_5992752952754193465_tmp b/samples/client/petstore/scala/build/tmp/test/jar_extract_5992752952754193465_tmp
new file mode 100644
index 0000000000000000000000000000000000000000..3e1bb0634afebb49f94fe39d81e5c4938811ff83
GIT binary patch
literal 596
zcmah`O-sW-5PjRGjg8T2{ivUa5U}mRpdM2SDinmEhidPexYR9aBFRSlTb>jT{s4cJ
zIEn40LCUf-%)B=<`*yy6KED8*W1rz9@p-`QI1QDY2>a4YRLp(VPeWhHC_J+!{_w_1
zo^>#Wk-LE1b;taL+W`+p_MJBtzH;VDuA*1*_z+6v^kz_DmcwwgV2}=tq4`HD)a$4c
zSdem>(;2E=N%MOQ<yL!Wq6Wi21<MSF|Mau`fG3HL6{@weT8rVJH5FEv?qp5tSTnGS
zbp}m6$%LUj_YZ~F%|4pMYuC}EU}(4z?Pkbh$-O|_XNIBf%23><6Hmm`Ol=@XAy;Wk
zs4<Ar*cW}7Q7eONwc0UCB#%L-l`}e|m+Tfr7kLcSI`1$$A85Q$vV?82CP4&X1DoWV
VbgOyBL>W62mB{brehGWz@eAj8oiP9a

literal 0
HcmV?d00001

diff --git a/samples/client/petstore/scala/build/tmp/test/jar_extract_6315988328729383060_tmp b/samples/client/petstore/scala/build/tmp/test/jar_extract_6315988328729383060_tmp
new file mode 100644
index 0000000000000000000000000000000000000000..0539403de97cd71d5d0abbb3e9fede0e71f84f08
GIT binary patch
literal 2287
zcma)-ZCBbz6vyu*nP4EO!Lo{0>|i3IRSLBAvF;{_71Vl^mR4I%PhhErDp(S_r@Q?~
z`}k`2?2G*X`=R#i4HV0<*|WUJ%-oy%yZ2`1&+zv@fBppkX*eV>V^_@!Gudi49P6@{
z)GM~rGONx`yHRzlX5*d@2!XB5<MsWz`QA)kn2odKVWnQHIvZPGy7s%-uIbIE#~WK4
z1V(SdJ`f0u+=%vpNMQVn7M43<1frj^w`y-Luzs@Wc3!m38m7~3)vyY!d~j+u;ld(0
z$Q&`kaon_`%qnTeD#$CrsQSJ<tWGp;ucpFML}$8Szg<@+mS1H8d{{a%%jwFAc$+Yh
zleB{fVOgI-6DLP8!ux58G2LKIyRdi`%yEHfJ<m*m=f@(8=Z(ll{q?#aWOZo_DWyUQ
z<9IC*ApxGx2VzVNVxCmU&}B-e-?fLM59;Np5Yw|kKeZS$b<7)^Wc=<Z##teQj8eK3
z8A_g}>)G^v{N7|H9SCwoE2Jtu8nbf(7szQ!iW+1%Zroj2dYQT`*5!EcRmM-l=~-r|
z_Un=`Z|EV)mX65I-gxTlq_BNH8uL>v#&mA+y_vo{zKeODYl<!!gwi+aivzUFn(_{9
zF&_IEABhg};aq{~L7wwz_Txi*Z)wVr591?S&UbEnQ&Y$g+P;_^ci*?MFSNyA`r~-e
z<=e=Q@?22);rU@?<;}EoL=rq_NOX-^uU0SjMCS~{x5p%wV}vi2=hO*<sBu0)=8`X0
z>ek%-7nkLT_?U+HdOkw)+S_Nk!0k;vlu`wrI|$O0zFS_svc4}UjHBWV$0YKM_&#XP
z_;B=2n9uQPJxr7-s-TQz^Xls2gL+v#RqZPR{Cwh+K)9o><h5kg>V;|BJ{Tr&YyPI5
zHxj2Z$S~@M5l{#S&beh1U_D{}*N+Ibd0iV%r(4_bE?~$IhH<yRL?4yyQCV*)E5jt*
zcB$z;YP&~mdsEvo%m8z#SRb|1qjtQh9T`-ZbE$YAmG4n`Zz?ZC0v28BZXZ?XQ3Y?R
zAj2};bE#AxRqRnkZ>lIm1|GQ7!#=9iqe|XXNrqKecPTutA*We%T2|xCjZO63bX_k-
zXddeLGERm^@U@%s8v^2{)v%l`84OtS0|h)wQFUFa47qM)+;Sn?{I*6QwBN-0tz@<=
zvvN^;>JE5g?pux8llEn$*81d;t}j3W{$jJ;s@8TaH#BnGRb$DrEoAjZqv@FLm5zcP
z>Rp`z0}dM@;KToe0M0T5aoj~Ki8H~OF8l$ZA92A!9!I(BgfX~<RskQe<8l3A_zK6H
zaAYue5~e)h=wR>++_{E1Ty@)?{RJ2Q-?j?cHT?OT=YJjuPQZc(yfj$b%bi{BZrJCx
z(?1PVIRp1SDz6Myc@@??;LYC#s{9DHJYfCTfnd}=o{9U-8BF3Hm9+3XY@^B^->fcq
isBEuOWDNx9u6Wq*c!uBrXIH`!K7JdQPtd_rfPVq7pOYy7

literal 0
HcmV?d00001

diff --git a/samples/client/petstore/scala/build/tmp/test/jar_extract_899015300961717389_tmp b/samples/client/petstore/scala/build/tmp/test/jar_extract_899015300961717389_tmp
new file mode 100644
index 0000000000000000000000000000000000000000..74d2409d2e0ba550401e032be317d63ed5a7be59
GIT binary patch
literal 572
zcmah`!AiqG5Pj38iHXr_)mE(_LXg^n6+N~TROl&qY3+TRF1nB=CE0+#<w^122l!Fq
zB-Tq+%Ca-eyf<%Wc0NAe-T_>qNjOad5sFTdMOw{d=X#RrL<D+}MS)gvbm7f{v6s#*
z5Mku6AorFCH}R94-bYGz``rb!EZij=uTZsM5bEEg<#G!qq4BHh^MXw<dx~H06Uwc#
zu?riHg9_FOM}NzCK`7GH!UmUmd8tQew*G59m#kvT!6vo|hJI8j;fKBIM|p7LHl9jC
z&5wBpW05E^3FRm^gsQJ1d6&&5GFfEop?Zjf&JsqQVVos_9H^XH8RjcAPEg|62o|rF
z`0%i7_c*#LV!&>{z-_;x_RPr=>TF$x7{Cs8**Ex_MaD%L`y7?n9~6EKhwSkM&2W_3

literal 0
HcmV?d00001

diff --git a/samples/client/petstore/scala/git_push.sh b/samples/client/petstore/scala/git_push.sh
index 1a36388db023..ed374619b139 100644
--- a/samples/client/petstore/scala/git_push.sh
+++ b/samples/client/petstore/scala/git_push.sh
@@ -8,12 +8,12 @@ git_repo_id=$2
 release_note=$3
 
 if [ "$git_user_id" = "" ]; then
-    git_user_id="YOUR_GIT_USR_ID"
+    git_user_id="GIT_USER_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"
+    git_repo_id="GIT_REPO_ID"
     echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
 fi
 
diff --git a/samples/client/petstore/scala/gradle.properties b/samples/client/petstore/scala/gradle.properties
new file mode 100644
index 000000000000..05644f0754af
--- /dev/null
+++ b/samples/client/petstore/scala/gradle.properties
@@ -0,0 +1,2 @@
+# Uncomment to build for Android
+#target = android
\ No newline at end of file
diff --git a/samples/client/petstore/scala/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/scala/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..2c6137b87896c8f70315ae454e00a969ef5f6019
GIT binary patch
literal 53639
zcmafaW0a=B^559DjdyI@wr$%scWm3Xy<^+Pj_sKpY&N+!|K#4>Bz;ajPk*RBjZ;<q
zE3~2vC>RV75EK*;qpZCo(BB5~-#>pF^k0$_Qx&3<k{4$H1ycMM#`aN7fZ$&SwZDY+
zzcb1S$xDfgsi@M+i9gCsPsz&A(J#Qu&{5A$&owJEF0<?(KTOk&OU=m5&`8k&!(4=$
zru{0>rs}{XFZ)$uJU-ZpbB>L3?|knJ{J+ge{%=bI`#Yn9v&Fxx>fd=_|H)(FY-DO{
z_Wxu>{a02GXCp^PGw1(fh-I*;dGTM?mA^##pNEJ#c-Y%I7@3kW(VN&Bxw!bn$iWOU
zB8BZ)vT4(}GX%q~h3EYwbR?$d6|xnvg_e@4>dl5l+%FtPbGqa`;Uk##t$#g&CK4GO
zz%my0ZR1Fv@~b2_>T0cBP)ECz-Uc^nW9e+`W4!=mSJPopgoe3A(NMzBd0mR?$&3XA
zRL1}bJ2Q%R#bWHrC`j_)tPKMEyHuGSpdJMhT(Ob(e9H+#=Skp%#jzj=BVvc(-RSWB
z{_T`UcEeWD{z`!3-y;_N|Ljr4%f;2qPSM%n?_s%GnYsM!d3p)CxmudpyIPqTxjH!i
z;}A+!>>N;pko++K5n~I7m4>yco2%Zc$59RohB(l%KcJc9s^nw^?2JGy>O4#x5+CZH
zqU~7kA>WE)ngvsdfKhLUX0Lc3r+In0Uyn}LZh<B}tw~~op<%&6ZK$@{8{=Zp*i|%F
zZ}3rdI&4S~#s=DgeBdT9_4h0F!aG!WO(mBH%M3NEe1bfe__#10=mcJ<jMs)BUJ*N=
zp8U~dE7~xbY6zc5$>m?n){&LHNJws546du%pi<WMsZ-!qFNu(vP96a$!(Lj5W>a=j
zyH8<T$vq;f9t>CD{^Qx%kFe@kX*$B!DxLa(Y?BO32sm8%#_ynjU-m>PJbabL`~0Ai
zeJm<6okftSJUd2!X(>}i#KAh-NR2!Kg%c2JD=G|T%@Q0JQzqKB)Qc4E-{ZF=#PGZg
zior4-caR<X)}~{E8-pUei}(b%o`Ve^0YhfvU+P@IHM2QDBJP4uUh~coeprjY^TKz2
z!|BNT(TYhiSgJ(@L}2B~NqtIKyEBWEsA}4{Xr(44M~15KRx$l5Z{e&uztqoklC4=V
zFc%7N8h)x>B-Jj;l}Xb_!)TjB`jC}})6z~3AsRE&t~CO&)g{dqM0iK;lvav8?kE1<
zmCrHxDZe?&rEK7M4tG-i!`Zk-*IzSk0M0&Ul8+J>*UD(A^;bAFDcz>d&lzAlw}b##
zjfu@)rAou-86EN%8_Nv;%bNUmy*<6sbgB9)ZCihd<UdQD)c;hif5?<r?9ac71sDEj
z`uqe9xd%r7+4#Pv8U|EI@kzg(nO&Oa!j(T8l5ijbg(npoY9jsf{n2-a5D4SU=gb=l
z%D;$)oJ|2L`JCcZV>Sh_VT2iGFv+T8p&Z&wO02nKtdx?eZh^=*<>SZHSn(Pv)bgn{
zb15>YnVnJ^PO025c~^uK&W1C1XTs1az44L~-9Z-fU3{VvA?T<G*%^wVJ7p*1cD?>&
zdpi&S`mZ|$tMuN{{i|O}fAx#*KkroHe;6z^7c*x`2Rk!a2L~HB$A4@(Rz*hvM+og(
zJW+4;S-A$#+Gec-rn8}at+q5gRrNy^iU?Z4Gz_|qzS~sG_EV#m%-VW!jQ>f3jc-Vq
zW;~>OqI1Th&*fx#`c^=|A4GGoDp+ZH!n0_fDo-ks3d&GlT=(q<l6V8rL1%CRP%o0V
zlDM*^+@K7!3|z9#@0Z^~)CQXqbq=LZi$d~qY3@t;uHlXs>zr(?Qw`PHvo3PoU6YJE
zu{35)=P`LRm@+=ziAI)7jktM6KHx*v&WHVBYp<~UtR3c?Wv_{a0(k&NF!o#+@|Y6Y
z>{||-i0v8N2n<X=PO~9utU9VscgB7EO!#ooNvCS<6*g*&HU4h#-dR1n@?!$lj_%84
z&q*iwEH`Vvj!k3>tXRrVx~#Z1JMA3C2ki}OkJ4W`WjZIuLByNUEL2HqqKrbi{9a8`
zk-w0I$a<6;W6&X<&EbIq<nC@7D?CHc(O;3wGtTlp#FtvAx6PpRma09YJ(la!o?xpz
z;}PK=J@6pi?)oKv-({rt#wp&^9Ngm!8K(MRuMy+i#t>ul`;nvc+D~{g5al{0oOSp~
zhg;6nG1Bh-XyOBM63jb_z`7apSsta``K{!Q{}mZ!m4rTmWi^<*BN2dh#PLZ)oXIJY
zl#I3@$+8Fvi)m<}lK_}7q~VN%BvT^{q~ayRA7mwHO;*r0ePSK*OFv_{`3m+96HKgt
z=nD-=Pv90Ae1p)+SPLT&g(Fdqbcc(Vnk5SFyc|Tq08qS;FJ1K4rBmtns%Su=GZchE
zR(^9W-y!{QfeVPBeHpaBA{TZpQ*(d$H-*GI)Y}>X2Lk&27aFkqXE7D?G_iGav2r&P
zx3V=8GBGi8agj5!H?lDMr`1nYmvKZj!~0{GMPb!tM=VIJXbTk9q8JRoSPD*CH@4I+
zfG-6{Z=Yb->)MIUmXq-#;=lNCyF1G*W+tW6gdD||kQfW$J_@=Y9KmMD!(t#9-fPcJ
z>%&KQC-`%E`{y^i!1u=rJP_hhGErM$GYE3Y@ZzzA2a-PC>yaoDziZT#l+y)tfyR}U
z5Epq`ACY|VUVISHESM5$BpWC0FpDR<q{<w)6T;j_As8b7jRn{=EDJ}JE}S}X$Po!=
zR>K&qi?G-q%Rd8UwIq&`d(Mqa<@(fH!OfNIgFICEG?j_Gj7FS()kY^P(I!zbl`%HB
z7Rx=q2vZFjy^XypORT$^NJv_`Vm7-gkJWYsN5xg>snt5%oG?w1K#l_UH<>4@d0G@3
z)r?|yba6;ksyc+5+8YZ?)NZ+ER!4fIzK>>cs^(;ib7M}asT&)+J=J@U^~ffJ>65V#
zt_lyUp52t`vT&gcQ%a6Ca)p8u6v}3iJzf?zsx#e9t)-1OtqD$Mky&Lpz6_v?p0|y4
zI{Nq9z89OxQbs<pj(heDRy=aDy}3Bqa%U0*yhS+rkm7UjQIJtgq-^Em0TT<XQRI9I
z$jtH|L?US5gE_XQQRSE#t_z6EB=)(DYpr3_0h#fWZCashM~0MIy^KFUK5gL%bn%UB
zxObd0ehaON%xvM{hWag3AH$8%YcJng%Z;U*Ki~PSjJPchs10r^nHej}otX>qX)UYj
z<P*L5tm1|1$h2k0bIJx85Ai~|NLtmBu+T6V?J$dDY1V7CFqbl~)^EG{gf+zg9+(LR
z<*~aPRDyX0q_G(Wk{X=uP4TI$z13Sy(F~^m#xd888gnt@SeT&z`tgi`X#XCvBeNb7
zqa|sv^!>(BGu`28f8C^e9R2jf0Turq;v+fPCWD*z8!8-Q-_s`ILgwo@mtnjpC_D$J
zCz7-()9@8rQ{4qy<5;*%b<?^|(wiJHTNY-~SEs7pYhnMfcn`Clh}W+-!O@8EkNd=!
z_(Y4mbgHn>vX3k$grUQ{Bt;B#w))A+7ih631uN?!_~?i^g+zO^l<DV%@M8k*{5uEJ
zAJknby{g5kf=sn-=SgH&nr$PPSSa}1+(|1n!JyyM!4=+=Fm2qE;S6#i0QvN?%PgAd
za=<tvN;7Gn9ea{mxbI~Z$aJ)wTuIL9br5=ODnW;r;L^|)@<~-sK{fT|Wh?<|;)+;u
zwOLj8{uTsmnSRR(Y82lzwjTYOUvq_qH||+HVtQXkic9_LN$QZ{Kw4F`bddNeeWoA8
zFJ6RCO^G+qNu*KtE1*5mU0x^>GK$>O1T1$6VdF~<N4sBkfy`#xHaO+PZ1$Zn3MM;h
zDSA#R9z53ibz2?w65#L}OLqjyBy~7h4VaGdgR#GILP-(ln68S^c04cM3e$lnSU_(F
zZm3e`1~?eu1>%FKR6~Px%M`ibJG*~uQ>o^r9qLo*`@^ry@KX^$LH0>NGPL%MG8|;8
z@_)h2uvB1M!qjGtZgy~7<q8Az3Cb?GC4S$`8By0G`gAIm+CJd0>-O=GUa`&;xEFvC
zwIt?+O;Fjwgn3aE%`_XfZEw5ayP+JS8x?I|V3ARbQ5@{JAl1E*5a{Ytc(UkoDKtD#
zu)K4XIYno7h3)0~5&93}pMJMDr*mcYM|#(FXS@Pj)(2!cl$)R-GwwrpOW!zZ2|wN)
zE|B38xr4_NBv|%_Lpnm$We<_~S{F1x42tph3PAS`0saF^PisF6EDtce+9y6jdITmu
zqI-CLeTn2%I3t3z_=e=YGzUX6i5SEujY`j|=aqv#(Q=iWPkKhau@g|%#xVC2$6<{2
zAoimy5vLq6rvBo3rv&^VqtaKt_@Vx^gWN{f4^@i6H??!ra^_KC-ShWC(GBNt3o~T^
zudX<0v!;s$rIflR?~Tu4-D=%~E=glv+1|pg*ea30re-2K@8EqQ{8#WY4X-br_!qpq
zL;PRCi^e~EClLpGb1MrsXCqfD2m615mt;EyR3W6XKU=4(A^gFCMMWgn#5o1~EYOH*
zOlolGlD;B!j%lRFaoc)q_bOH-O!r}g1Bhlhy*dRoTf-bI%`A`kU)Q=HA9HgCKqq&A
z2$_rtL-uIA7`PiJfw380j@M4Fff-?(Xe(aR`4>BZyDN2$2E7QQ1}95@X819fnA(}=
za=5VF-%;l}aHSRHCfs(#Qf%dPue~fGpy7qPs*eLX2Aa0+@mPxnS4Wm8@kP7KEL)8s
z<l&yJZ8Hg)Zm*Sj4(oBxZ9dCQJ+J1~sJquUnYngL&F@-ds6T_QS(b6?*4Q`mI`<l5
z=JLFJZM{b2e`)BQ7Vq46Q&<ph`)<Lk()aWz)=oIgeK@N$dN)Qir<E!#EK!#q(brX8
zRcA$1{duVpm*`Hi5ZyqoY_~Wd_1{yDQzeuakeI#Y6HT@3sE8C<y7u;2h0VV8S8d(b
z`o@7rhg;A$u&1wQyXe-L`F(Oz9n0YcA2QAYm*Y?TO>@tNmawLHST-FS4h%20%lVvd
zkXpxWa43E`zX{6-{2c+L9C`l(ZRG8`kO9g7t&hx?>j~5_C;y5u*Bvl79)Bq?@T7bN
z=G2?QDa0J3VwCfZG0BjOFP>xz4jtv3LS>jz#1x~b9u1*n9>Y6?u8W?I^~;N{GC<<w
za-$&yDJMGF;?PMK^^p7`?%v+-H&~`iif%?O(aenFpyM(*#hoPV-lQWw2O5zRwy82S
zv(ORx-(HD0PA?+VAI8r^9qEJ;IObxo&RPhmNg|h$%v(@pB%);Lgc`V}0<g|vh>1y}
zc&Wz{L`kJUSt=oA=5ZHtNj3PSB%w5^=0(U7GC^zUgcdkujo>ruzyBurtTjKuNf1-+
z<?S!nf0b<|KYXj>zn~oZFXCbR&xq&W{ar~T`@fNef5M$u^-C92HMBo=*``D8Q^ktX
z(qT{_R=*<y(QRR<=cP*#$rNdWyW|{_!%R7B*;~-j^WVh32I1m{H2AqfhOh=^$36Z4
zo;^4UXQDUFy>EI?-R9nNUFNR#{(Qb;27bM14bjI`c#4RiinHbnS445Jy^%krK%kpE
zFw%RVQd6kqsNbiBtH*#jiPu3(%}P7Vhs0G9&Dwb4E-hXO!|whZ!O$J-PU@j#;GrzN
zwP9o=l~Nv}4OPvv5rVNoFN>Oj0TC%P>ykicmFOx*dyCs@7XBH|w1k2hb`|3|i^GEL
zyg7PRl9<Vir;;}%o1e}82;)6wONlPSHEJt9e1cD!jw(;vnBgJz(qi(spG6X|*Z^=p
zgkdia)uB;qU}1LO=rA9a<zY8A7wzeGrR^}MV7LEeiOE_UdI?2ZO{7}NV|@%`FD1$r
z7SzfxB|#a1nM87$)h4F(h~5Zrxi7&Uk{+=%*QSbEt~sDs8q{*X*|~~L(cJ&alN>eV
ztQ1z)v~NwH$ebcMSKc-4D=?G^3sKVG47ZWldhR@SHCr}SwWuj5t!W$&HAA*Wo_9tM
zw5vs`2clw`z@~R-#W8d4B8!rFtO}+-$-{6f_`O-^-EhGraqg%$D618&<9KG``D|Rb
zQJ&TSE3cfgf8i}I^DLu+-z{{;QM>K3I9~3R9!0~=Y`A1=6`CF#XVH@MWO?3@xa6ev
zdw08_9L=>3%)iXA(_CE@ipRQ{Tb+@mxoN^3ktgmt^mJ(u#=_Plt?5qMZOA3&I1&NU
zOG+0XTsIkbhGsp(ApF2MphRG^)>vqagn!-%pRnppa%`-l@DLS0KUm8*e9jGT0F%0J
z*-6E@Z*YyeZ{eP<Z|R=TU(rcsEdEVO$n_dAGidpxAEXyW1_85q`y7uRQ!{6?E&)`6
zqTX;Ts^Wo720nn<<g}CpJ5Fq;Ptvd1b**tya?IvwiouQTtH35*(>7DGmxQedo}^+w
zM~>&E$5&SW6MxP##J56<C;RbEi@Y>Eo@0P34XG})MLCuhMyDFf**?tziO?_Ad&Jhd
z`jok^B{3ff*7cydrxYjdxX`14`S+34kW^$fxDmNn2%fsQ6+Zou0%U{3Y>L}UIbQbw
z*E#{Von}~UEAL?vvihW)4?Kr-R?_?JSN?B?QzhUWj==1VNEieTMuTJ#-nl*c@qP+`
zGk@aE0oAD5!9_fO=tDQ<t_;py##UpzDgzZ!uzlSnk{DvEWesm2qR_*)rts2}2y47p
z^xYRoz}y%4+XPe$gHUeS>At9g0rKTr{Z0t~S#oy5?F3&aWm<s(Lt*OX<rX_yV<J5}
z`oiifQg(ieomc3~k6n^Be({K4A%pQ(tSz+dpU|DKiO09F@6l(p#vg`6Xn>+igqKi|
zK9W3KRS|1so|~dx%90o9+FVuN7)O@by^mL=IX_m^M87i&kT1^#9TCpI@diZ_p$uW3
zbA+-ER9vJ{ii?QIZF=cf<TwJ5#kprBZ!2`MoSesBx+GO==l2u>ZT3#vJEKC|BQhNd
zGmxBDLEMn<M$7V3{JR(unAgVJJK~gdua8TY6nq2)W`TVWmV5&!B~CC5OVJ9!@(T5i
z@P{0`1Qv<HZ|EYNgNM3@ud7Nu(gF3Uu$qhBx!orEiSaHTgIn-_Apg~5mU=OEssDuo
zKz|)Y!vAbCWgRU3%OMO){%}}SL>uc*AET~k8g-P-K+S~_(+GE9q6jyIMka(dr}(H%
z$*z;JDnyI@6BQ7KGcrv03Hn(abJ_-vqS>5~m*;ZJmH$W`@csQ8ejiC8S#sYTB;AoF
zXsd!kDTG#3FOo-iJJpd$C~@8}GQJ$b1A85MXp?1#dHWQu@j~i4L*LG40J}+V=&-(g
zh~Hzk(l1$_y}PX}Ypluyiib0%vwSqPaJdy<Zvo%U(D}HyI8J<9sjIEdrF;a5%`Uf4
z@j9=PP<2F=PVc-k&gh&jQ4!~1LUg4Ujs`(BKTr!aeAL+YL)FdOm-jerRHrp88Z)mQ
zAWybRVG?evi6_F6vT+`&e1xjuHvGh$@{`7{d=uf>9EZ;?+;lFF8%Kb7cwPD17C}@N
z2OF;}QCM4;CDx~d;XnunQAx5mQbL#);}H57I+uB9^v|cmZwuXGkoH-cAJ%nIjSO$E
z{BpYdC9poyO5pvdL+ZPWFuK}c8WGEq-#I3myONq^BL%uG`RIoSBTEK9sAeU4UBh7f
zzM$s|&NtAGN&>`lp5Ruc%qO^oL;VGnzo9A8{fQn@YoORA>qw;^n2pydq>;Ji9(sPH
zLGsEeTIH?_6C3uyWoW(gkmM(RhFkiDuQPXmL7Oes(+4)YIHt+B@i`*%0KcgL&A#ua
zAjb8l_tO^Ag!ai3f54t?<K+&aOWzbv0c#i2n>@{aoW%&Hdst}dglRzQlS=M{O!=?l
z<st41Z<X$n<h4m?FUxq+^`tMtEn0JjEwTYhuoq>*xY2vJ?+#!70RO8<&N^R4p+f=z
z*&_e}QT%6-R5Wt66moGfvorp$yE|3=-2_(y`FnL0-7A?h%4NMZ#F#Rcb^}971t5ib
zw<20w|C?HVv%|)Q)Pef8tGjwQ+!+<{>IVjr@&SRVO*PyC?Efnsq;Eq{r;U2)1+tgp
z)@pZ}gJmzf{m=K@7YA_8X#XK+)F465h%z38{V-K8k%&_GF+g^s&9o6^B-&|MDFI)H
zj1ofQL>W(MJLOu3xkkJZV@$}GEG~XBz~WvRjxhT0$jKKZKjuKi$rmR-al}Hb3xDL)
z^xGG2?5+vUAo4I;$(JgeVQe9+e)vvJ={pO~05f|J={%dsSLVcF>@F9p4|nYK&hMua
zWjNvRod}l~WmGo|LX2j#w$r$y?v^H?Gu(_?(WR_%D@1I@$yMTKqD=Ca2<gxxi^@>)
zWBQmx#A$gMrHe^A8kxAgB}c2R5)14G6%HfpDf$(Di|p8ntcN;Hnk)DR1;toC9zo77
zcWb?&&3h65(b<ccjTWmfOL(f^AmD-(*=w5-{<SE0RQ0tcc)lRDeDfQ5Xn9O}3bu={
zmJZGBo?+jDZ7ad80oyqpuIL7@@k)5rBemDehK8mqH+O!!)L*<+RxUdZp~Srl!{GzA
ztDA-JvC_LO@7_Y(X9tjCE9W}r(O<iU>LAte%hstI9o%hZ*{y=8t$^!y2E~t<W2;rn
zY}+YgthWBBNkU!lMRXIfpPm=BD?XS`tChYjrkD&ivnb>z^XUY2N2NChy;EIBmf(Kl
zfU~&jf*}p(r;#MP4x5dI>i`vjo`w?`9^5(vfFjmWp`Ch!2Ig}rkpS|T%g@2h-%V~R
zg!*o7OZSU-%)M8D>F^|z+2F|!u1mOt?5^zG%;{^CrV^J?diz9AmF!UsO?Pl79DKvD
zo-2==yjbcF5oJY!oF?g)BKmC8-v|iL6VT|Gj!Gk5yaXfhs&GeR)OkZ}=q{exBPv)&
zV!QTQBMNs>QQ))>(rZOn0PK+-`|7vKvrjky3-Kmuf8uJ`x6&wsA5S(tMf=m;79Hzv
za%lZ(OhM&ZUCHt<WHM{IVoZIGA_lI-Z@E!>M~FRd#Uk<I_Y&v<gZXMTM{4K+KMl}Z
zJSEc3>3Iy%oXe^)!Jci39D(a$51WER+%gIZYP)!}nDtDw_FgPL3e>1ilFN=M(j~V`
zjOtRhOB8bX8}*FD0oy}+s@r4XQT;OFH__cEn-G<U@I6w_V7c*_&BNwv=^R%8f{M2Y
zv@?)zDSH@}S#qh~k^?fC6WB7hXu~9jbYt-H-2*xDE>#aYHpJDI4&Zo4y2>uJdbPYe
zOMGMvbA6#(p00i1{t~^;RaHmgZtE@we39mFaO0r|CJ0zUk$|1Pp60Q&$A;dm>MfP#
zkfdw?=^9;jsLEXsccMOi<+0-z|NZ<QD|7#&39tAQ5)<BDA90WCaHex+e-XISu2OPw
zX&SGY(oV;Vi$GDF3CLZN%A9@|Kx#ECyWXu?#f>b(#wwkcO)nVxJxkF3<L`?%HzqAe
zp2w~+DmvSjgP}@Yzy1enu&YG_S}U>g(OvW4`m36ytfPx5e-ujFXf($)cVOn|qt9LL
zNr!InmcuVkxEg8=_;E)+`>n2Y0eAIDrklnE=T9Pyct>^4h$VDDy>}JiA=W9JE79<6
zv%hpzeJC)TGX|(gP!MGWRhJV}!fa1mcvY%jC^(tbG3QIcQnTy&8UpPPvIekWM!R?R
zKQanRv+YZn%s4bqv1LBgQ1PWcEa;-MVeCk`$^FLYR~v%9b-@&M%giqnFHV;5P5_et
z@R`%W>@G<6GYa=JZ)JsNMN?47)5Y3@RY`EVOPzxj;z6bn#jZv|D?Fn#$b}F!a}D9{
ztB_roYj%34c-@~e<Bb^byl$up%GSTMk`*>hWM_z;B{G5;udhY`rBH0|+u#!&KLdnw
z;!A%tG{%Ua;}OW<LH7q0yToQzb}HU3^R?8irQEQ}xQ~jYz9={pa-R?@@=D#YDY67P
zA*zM+SOo2L^HNfNpxC|M%>$BG`B#^8#K$1wX2K$m`OwL-6;hmh{aiuyTz;U|EKES=
z9UsxUpT^ZZyWk0;GO;Fe=hC`kPSL&1GWS7kGX0>+votm@V-lg&OR>0*!Iay>_|5OT
zF0w~t01mupvy4&HYKnrG?sOsip%=<>nK}Bxth~}g)?=Ax94l_=mC{M@`bqiKtV5vf
zIP!>8I;zHdxsaVt9K?{lX<Q!renxPOe3H|(E)>Cc$%kKfIwh&WM__JhsA?o$!dzxP
znoRU<t+v_L(`H04w<LiTQQ)Pk<mETquNt<;8T2RJOP-lIMG8r14u5#DzR-v-`RrMJ
zM)*~9kI$6G^R_F6eBbww^*k53E`Q_KJ1L@d0>4ZdzeN3-W{6h~QQSos{-!W@sIMaM
z4o?97?W5*cL~5%q+T@>q%L{Yvw(a2l&68hI0Ra*H=ZjU!-o@3(*7hIKo?I<hU$o;^
z0m|-;4cZ|Zq`^rWQ4+5R4jd$Ssf2Z;ggZu}3saAzm@Cqo*(A|g?P%$hK1H1c^_qBN
zIyEJ!dBD20U)xJzYisL@x{br-b#L$M%kI_(^=p8+J4d!D(ji0tm-&fL&gq|=TVDhH
zua6~(AC|-cNCo_}>7$gfB(Vlr!62-_R-+T;I0eiE^><*1_t|scfB{r9+a%UxP~CBr
zl1!X^l01w8o(|2da~Mca)>Mn}&rF!PhsP_RIU~7)B~VwKIruwlUIlOI5-yd4ci^m{
zBT(H*GvKNt=l7a~GUco)C*2t~7>2t?;V{gJm=WNtIhm4x%KY>Rm(EC^w3uA{0^_>p
zM;Na<+I<&KwZOUKM-b0y6;HRov=GeEi&CqEG9^F_GR*0RSM3ukm2c2s{)0<%{+g78
zOyKO%^P(-(U09FO!75Pg@xA{p+1$*cD!3=CgW4NO*p}&H8&K`(HL&$TH2N-bf%?JL
zVEWs;@_UDD7IoM&P^(k-U?Gs*sk=bLm+f1p$ggYKeR_7W>Zz|Dl{{o*iYiB1LHq`?
ztT)b^6Pgk!Kn~ozynV`O(hsUI52|g{0{cwdQ+=&@$|!y8{pvUC_a5zCemee6?E{;P
zVE9;@3w92Nu9m_|x24gtm23{ST8B<ok)5(u*|3@P%kHPFNP^26t5y{A8W-@Tx8I($
zR_9DM(F9UL4>p;;iJlhaiH2DVcnYqot`tv>!xiUJXFEIMMP(ZV!_onqyQtB_&x}j9
z?LXw;&z%kyYjyP8CQ6X);-QW^?P1w}&HgM}irG~pOJ()IwwaDp!i2$|_{Ggvw$-%K
zp=8N>0Fv-n%W6{A8g-tu7{73N#KzURZl;sb^L*d%leKXp2Ai(ZvO96T#6*!73GqCU
z&U-NB*0p@?f;m~1MUN}mfdpBS5Q-dbhZ$$OWW=?t8bT+R5^vMUy$q$xY}ABi60bb_
z9;fj~2T2Ogtg8EDNr4j96{@+9bRP#Li7YDK1Jh8|Mo%NON|bYXi~D(W8oiC2SSE#p
z=yQ0EP*}Z)$K$v?MJp8s=xroI@gSp&y!De;aik!U7?>3!sup&HY{6!eElc+?ZW*|3
zjJ;Nx>Kn@)3WP`{R821FpY6p1)yeJPi6yfq=EffesCZjO$#c;p!sc8{$>M-i#@fCt
zw?GQV4MTSvDH(NlD2S*g-YnxCDp*%|z9^+|HQ(#XI0Pa8-Io=pz8C&Lp?23Y5JopL
z!z_O3s+AY&`HT%KO}EB73{oTar{hg)6J7*KI;_Gy%V%-oO3t+vcyZ<w#%_E>?;&%L
z3t4A%Ltf=2+f8qITmoRfolL;I__Q8Z&K9*+_f#Sue$2C;xTS@%Z*z-lOAF-+gj1C$
zKEpt`_qg;q^41dggeNsJv#n=5i+6Wyf?4P_a=>s9n(ET_K|*zvh633Mv3Xm3OE!n`
zFk^y65tStyk4aamG*+=5V^UePR2e0Fbt7g$({L1SjOel~1^9SmP2zGJ)RZX(>6u4^
zQ78wF_qtS~6b+t&mKM=w&Dt=k(oWMA^e&V#&Y5dFDc>oUn+OU0guB~h3};G1;X=v+
zs_8IR_~Y}&zD^=|P;U_xMA{Ekj+lHN@_n-4)_cHNj0gY4(Lx1*NJ^z9vO>+2_lm4N
zo5^}vL2G%7EiPINrH-qX77{y2c*#;|bSa~fRN2)v=)>U@;YF}9H0XR@(+=C+kT5_1
zy?ZhA&_&mTY7O~ad|LX+%+F{GTgE0K8OKaC2@NlC1{j4Co8;2vcUbGpA}+hBiDGCS
zl~yxngtG}PI$M*JZYOi{Ta<*0f{3dzV0R}yIV7V>M$aX=TNPo|kS;!!LP3-kbKWj`
zR;R%bSf%+AA#LMkG$-o88&k4bF-uIO1_OrXb%uFp((Pkvl@nVyI&^-r5p}XQh`9wL
zKWA0SMJ9X|rBICxLwhS6gCTVUGjH&)@nofEcSJ-t4LTj&#NETb#Z;1xu(_?NV@3WH
z;c(@t$2zlY@$o5Gy1&pvja&AM`YXr3aFK|wc+u?%JGHLRM$J2vK<!+-k054D)p4?D
zuBs*5Uh&-fcg<k8T3?WZ>N~}5@!jdKBlA>;10A(*-o2>n_hIQ7&>E>TKcQoWhx7um
zx+JKx)mAsP3Kg{Prb(Z7b};vw&>Tl_WN)E^Ew#Ro{-Otsclp%Ud%bb`8?%r>kLpjh
z@2<($JO9+%V+To>{K?m76vT>8qAxhypYw;Yl^JH@v9^QeU01$3lyvRt^C#(Kr#1&2
ziOa@LG9p6O=jO6YCVm-d1OB+_c<QxmWgG@GQ8xIJzp@sh{kRv)>858dtHm>!h6DUQ
zj?dKJvwa2OUJ@qv4!>l1<N=~t9w@Yj+E2++1rI}?cBwbS8D~TR62}sT=r>I?bS$Rj
zdUU&mofGqgLqZ2jGREYM>;ubg@~XE>T~B)9tM*t-GmFJLO%^tMWh-iWD9tiYqN>eZ
zuCTF%GahsUr#3r3I5D*SaA<cZd+-|6N`I>75=3lfE!SpchB~1Xk>a7Ik!R%vTAqhO
z#H?Q}PPN8~@>ZQ^rAm^I=*z>a(M4Hxj+BKrRjJcRr42J@DkVoLhUeVWjEI~+)UCRs
zja$08$Ff@s9!r47##j1A5^B6br{<%L5uW&8t%_te(<jb<koi^d3JR#aLkW~VEIqJ8
z<u7Ch{}SxRmVqoBIK{S|r>t@c|4Fane;UzM<g`qjcPx`$^+|h+Of8|tKRQSCsh8SM
zX-G?eZ(|juU2Ozxl<6#gNl<m#66aZ@o_yw`e}Jj_%`cGhV^b*%Pi5Y$+I>{jKhXfC
zQa|k^)d*t}!<)K)(nnDxQh+Q?e@YftzoGIIG?V?~$cDY_;kPF>N}C9u7YcZzjzc7t
zx3Xi|M5m@PioC>dCO$ia&r=5ZLdGE8PXlgab`D}>z`dy(+;Q%tz^^s*@5D)gll+QL
z6@O3@K6&zrhitg~{t*EQ><jJhiYMYf!UyeY-=zgd8lUo`i^Y?ysR8hWj}BlwEE3!%
zUk$(QyzQlD@lgbNXzaZdN(B}qVE(8d@7+IB_s@BdwC8#12)<{ZCniYDv|C<59>-YN
zy&k{89XF*^mdeRJ<OD=%fC2EFCh_D0l&v<#d4kVLDUR`)%hS3DYFd-6MqSS}Z$$YQ
zVucT&8n1^$)O!n!Sp&T`rowjeJ07s@TUFF&d&wTp&yQqtFE@t8*<S_~VXy_vSC&OM
zf6N=L;mw}FfLr)Z>p{#;EAFi_U<7}|>dl^*QFg**9wzlA#N9!`Qnc68+XRbO-Za=t
zy@wz`mi0MmgE?4b>L$q&<Yiv@3^}R$UeEhUDOn}c?D}#xx@zmW<3TYrHsdi`q^!p0
z<@Xv_@;27lFMX-=l8%KQp!26NC&w<>!%B!6MC7JjyG#Qvwj{d8)bdF<CVrJMTj@ii
zdha(WjgEJ1S?C6#<=_dC56R1~%o=U}`0jc!<xOgW`%!+7ZAwTD`nC{4NAe0|2wH;8
zJuB~Y9?sQuOhcj}BVKRivwqLnceSiRq`?AW`EgQgyPP}4$+D3^wN4aF5Y95k`JRfY
zDH|;R>`hA`LWSv+lBIs(3~hKSQ^0Se!@QOt;z5`!;Wjy1l8w=(|6%GPeK)b)2&Ula
zoJ#7UYiJf>EDwi%YFd4u5wo;2_gb`)QdsyTm-zIX954I&vLMw&_@qLHd?I~=2X}%1
zcd?XuDYM)(2^~9!3z)1@hrW`%-TcpKB1^;IEbz=d0hv4+jtH;wX~%=2q7YW^C67Fk
zyxhyP=Au*oC7n_O>l)aQgISa=B$Be8x3eCv5vzC%fSCn|h2H#0`+P1D*PPuPJ!7Hs
z{6WlvyS?!zF-KfiP31)E&xYs<)C03BT)N6YQYR*Be?;bPp>h?%RAeQ7@N?;|sEoQ%
z4FbO`m}Ae_S79!jErpz<Ys$E3Px+tQxaSltK6h^T0MGjz4SqrJ;}A4U8a$3neFCCq
z##n}WPFZQMW21*u4g50b2wQ}F5g(lQ`PmWa*s?|J1S5i(GL)WNDGrm8?Lw*c`C8GJ
z?D653Y{^uM{vWyoPyTs*fdq*sP~eh3UDU(`<a8s<m1W+OS%DdnZF+?q1khJcrc9)3
z5x<T?`h>DJ)d`-!A8BZ+ASx>I%lITl;$st<;keU6oXJgVi?CJUCotEY>)blbj&;Qh
zN*IKSe7UpxWPOCl1!d0I*VjT?k6n3opl8el=lonT&1Xt8T{(7rpV(?%jE~nEAx_mK
z2<?RpfJiye<OPI(x`nuE>x=-+Sl-h<%IAsBz1ciQ_jr9+nX57O=bO_%VtCzheWy<v
z_LW0P&vH9{hD`cr>A}*Sw!kN-S9_+tM}G?KEqqx1H036ELVw3Ja0!*Kr-Q<HTGGAk
zWu>o>)t*<du!W~yWOKN*7a-*P_EtPEPa<xvDV(ru7ru(NBxwc4+1ekxW{sdPdv5^^
z?+TqI!9Rgoct<OXHJvwG7NT%lM7R8y_n;HAMRgbaIo0r6AFDEuzM%98zAOH-$aS@b
zWB!W~g#@CSpa7D1M08VZuLP9QhM4@ExaKZcJhV>?aj2$x;CajQ@t`vbVbNp1Oczu@
zIKB+{5l$S;n(ny4#$RSd#g$@+V+qpAU&pBORg2o@QMHYLxS;zGOPnTA`lURgS{%VA
zujqnT8gx7vw18%wg2)A>Kn|F{yCToqC2%)srDX&HV#^`^CyAG4XBxu7QNb(Ngc)kN
zPoAhkoqR;4K<!d<L!hHwjd$Y36b)oW*{TkCg@Gd`9Rv}EJ)LgJdXYv;o7X~PM=M=_
zRqG7qQxtXUd;Aj0&n4wsWNmh|W*571UHI^|c}`AaY7(YMO<vfd{0J;tpa+LGlYt2S
zR0tw}e)GK8ik?aJW~OR$Qa-a&JTKJG(+vlOEvKaFWg@&^fM--*^3@9nE3O9LG_co=
z4@)M3Rys9_bT7WChiD}D*F<%-l>UlU%%|t2D8CYQ2tS2|N#4ya9zsd~cIR=9X1m~a
zq1vs3Y@UjgzTk#$YOubL*)YvaAO`Tw+x8GwYPEqbiAH~JNB?Q@9k{nAuAbv)M=kKn
zMgOOeEKdf8OTO|`sVCnx_UqR>pFDlXMXG*KdhoM9NRiwYgkFg7%1%0B2UWn_9{BBW
zi(Ynp7L|1~Djhg=G&K=N`~Bgoz}Bu0TR6WsI&MC@&)~>7%@S4zHRZxEpO(sp7d)R-
zTm)))1Z^NHOYIU?+b2HZL0u1k>{4VGqQJAQ(V6y6+O+>ftKzA`v~wyV{?_@hx>Wy#
zE(L|zidSHTux00of7+wJ4YHnk%)G~x)Cq^7ADk{S-wSpBiR2u~n=gpqG~f=6Uc7^N
zxd$7)6Cro%?=xyF>PL6z&$ik^I_QIRx<=gRAS8P$G0YnY@PvBt$7&%M`ao@XGWvuE
zi5mkN_5kYHJCgC;f_Ho&!s%CF7`#|B`tbUp4>88a8m$kE_O+i@pmEOT*_r0Ph<Fxp
z*JPTyb}n(oW843=9{v)cH5UL?5p`NVkNc#8yD4_&H5Bfir)yryF>CjRvYxN*d5+w5
z<+S)w+1pvfxU6u{0}0sknRj8t^$uf?FCLg<%7SQ-gR~Y6u|f!Abx5U{*KyZ8o(S{G
znhQx#Zs_b8jEk`5jd9CUYo>05&e69Ys&-x_*|!PoX$msbdBEGgPSpIl93~>ndH;t5
z?g>S+H^$HtoWcj4>WYo*Gu;Y#8LcoaP!HO?SFS&F9TkZnX`WBhh2jea0Vy%vVx~36
z-!7X*!Tw{Zdsl3qOsK&lf!nnI(lud){Cp$j$@cKrIh@#?+cEyC*m$8tnZIbhG~Zb8
z95)0Fa=3ddJQjW)9W+G{80kq`gZT`XNM=8eTkr^fzdU%d5p>J}v#h&h$)O+oYYaiC
z7~hr4Q0PtTg(Xne6E%<Hr!+_GI?3MP*%m9bH)P>E@0lhv-CW^o0@EI3>0ZbxAwd2Q
zkaU2c{THdFUnut_q0l+0DpJ5KMWNTa^<MGbU>i@v%r`<c`N-|erW1o-!Y=1aaMgf4
z%0)4v&<ZH_OW+V8u@6Oio6)Dj{{F93oq0+ms>~}fxdmmVFzq6{%vbv?MJ+Q86h6qf
zKiGz6Vrb>!7)}8~9}bEy^#HSP)Z^_vqKg2tAfO^GWSN3hV4YzUz)N3m`%I&UEux{a
z>>tz9rJBg(&!@S9o5=M@E&|@v2N+w+??UBa3)CDVmgO9(CkCr<m@k`63K-Fp8P@Lh
zz&C^Qy(MDhkn-ut^x<Ff+HMq_C5>+a1(#<deJVPi99ZL8y4ms|{N1092G?Mn4ArS~
z3ox$V+23Qaaj*MW=bsE;2Ak8khWJu!{u$WM4W|h-<mHz47F6#-6B{#M4b9EjALqA2
z9xiuWv%fB8c|F((Z)dxmx1nnoUGlP-)^lH=V}!hDc^}uKxdk8W33h&pRlqvdG@UN|
z`L}}bodMY&!++~eQvW`;`M(r|3p+Tty14!=tdcXbvR836a(4Y+MJHN1Tk1%BgH7O7
zC<C@kV2&VY*(35Q(zpez&|wW&Nrq|MCD9EG;-YC4w5Vrk^j06Zzc<tS*crm>edYE(
z7=AAYEV$R1hHyNrAbMnG^0>@S_nLgY&p9vv_XH7|y*X)!GnkY0Fc_(e)0~)Y5B0?S
zO)wZqg+nr7PiY<ueR=clCq+DKrXr;?k`*J{psbqN8mbIJK1(`s#J@F+M2tPZDUM3K
zX%138E51AHh+`(9D1-Q_WEE~Kf$$dIg#$T_$}$1RGR+v$bWXE3uP)o=l6_}nsy@T7
zEWY&-p<V0I(GcOW)Vi|TRZ``O<!fJj^EVfH$SuuowrHudk=j?M&D2N%@6sB;oFUqc
zyexyVRaJ{~<FwPwNGf!p%*4!Eac8^URj6l?v@A1X5Oouu&cGRU{(Y<<7*egLN++Dp
z3ZIR?$<mcIGb+nAB8lawfHfUgS3fGP`so<1$U_1=L*9swj5zZ=HNDG56_HC0fw8rq
zwHVjM-DJz4u)W~V<W-w$Umjl8dAcz~w$;wIG%megy1o#jDm#Ncp=Zuz>Me}!Rb@(l
zV=3>ZI(0z_siWqdi(P_*0k&+_l5k``E8WC(s`@v6N3tCfOjJkZ3E2+js++(KEL|!7
z6JZg>9o=$0`A#$_E(Rn7Q78lD1>F}$MhL@|()$cYY`aSA3FK&;&tk3-Fn$m?|G11=
z8+AqH86^TNcY64-<)aD>Edj$nbSh>V#yTIi)@m1b2n%j-NCQ51$9C^L6pt|!FCI>S
z>LoMC0n<0)p?dWQRLwQC%6wI02x4wAos$QHQ-;4>dBqO9*-d+<429tbfq7d4!Bz~A
zw@R_I;~C=vgM@4fK?a|@=Zkm=3H<rzz2z)62b4zWSL@8P8nvqmK-YT*lVXadRk0yP
zO>1<#sg`7IM7zB#6JKC*lUC)sA&P)nfwMko15q^^TlLnl5fY75&oPQ4IH{}dT3fc%
z!h<Taxuf{7ua&lj=6Jt(I<NBnlSiZ;YOP?Y>+Ty;cx9$M$}mW~k$k(($-MeP_DwDJ
zXi|*ZdNa$(kiU?}x0*G^XK!i{P4vJzF|aR+T{)yA8LBH!cMjJGpt~YNM$%jK0HK@r
z-Au8gN>$8)y;2q-NU&vH`htwS%|ypsMWjg@&jytzR(I|Tx_0(w74iE~aGx%A^s*&-
zk#_zHpF8|67{l$Xc;OU^XI`QB5XTUxen~bSmAL6J;tvJSkCU0gM3d#(oWW$IfQXE{
zn3IE<Axwdw6p1e;9ExGoabTwSHIO2MiKE3(j{Ro?ip$Z^a&WnO-YiOA;Cw-pfI$}7
zkF*&~1Z{-!F=*5R$K00NLB={`xSgk&c@aXOUW92cOle>WgD|FFf_r2i$iY`bA~B0m
zA9y069nq|>2M~U#o)a3V_J?v!I5Y|FZVrj|Ib<YKyA%vh3X0=9Okz(9J+4u!!wvn{
zSl3>zwDCPTFEP<}#;<c{_*SS6&Q)Hz_mB@~pU{1QuWP48cT@cVxkWSw{n}){!8ayP
zpHAvQ?l7=0s3ki9<Q}0*r%AqYZaJe6FpuDIPp8a_zu6P+HQ8T#<h2p}fptfG+CT7i
zwWQN>MDK$4+z+?k5&t!TFS*)Iw)D3Ij}!|C2=Jft4F4=K74tMRar>_~W~mxphIne&
zf8?4b?Aez>?UUN5sA$RU7H7n!cG5_tRB*;uY!|bNRwr&)wbrjfH#P{MU;qH>B0Lf_
zQL)-~p>v4Hz#@zh+}jWS`$15LyVn_6_U0`+_<*bI*WTCO+c&>4pO0TIhypN%y(kYy
zbpG4O13DpqpSk|q=%UyN5QY2pTAgF@?ck2}gbs*@_?{L>=p77^(s)ltdP1s4hTvR#
zbVEL-oMb~j$4?)op8XBJM1hEtuOdwkMwxzOf!Oc63_}v2ZyCOX3D-l+QxJ?adyr<H
zfWU}j9?GGyFHf>SiIJ$W&@WV>oH&K3-1w<073L3DpnPP)xVQVzJG{i)57QSd0e;Nk
z4Nk0q<cBX`AOooVXkcHeKnBRWRG>cUDTVj@R-&%Z>&u6)a5x3E!|b;-$@ezGJ?J9L
zJ#_Lt*u#&vpp2IxBL7fA$a~aJ*1&wKioHc#eC(TR9Q<>9ymdbA?RFnaPsa)iPg7Z;
zid$y8`qji`WmJ5nDcKSVb}G$9yOPDUv?h1UiI_S=v%J8%S<83{;qMd0({c8>lc=7V
zv$okC+*w{557!ohpAUMyBHhKLAwzs&D11ENhrvr_OtsnS!U{B+CmDH-C=+po+uSqt
z+WVVXl8fKe5iCZoP;>}4OVen6_|uw8*ff-r;)O2W+6p7BPT7sT<|Qv=6lgV<EYm;Y
zpjDzNpX2<>#3`Ch${(-Wy#6NA$YanDSFV_3aa=PAn%l@^<HEfJe~!$&tD|Xn@$&I~
zJZpvzRt&D$4WDbe8IY7BnwE{axroNe@Wy7OZ5L)j7w(7!&9sIS7rNCA6oTYTa!@Km
zU;2WdqPMmpott<zhy)26x#eBweKGlMij7&wQDF6sj&OC^ZZ4Ozsq7_5vha+tkeDvZ
z0yqo3a*K&db?}RadQoax5}8b3@AcQAPv9g!?p;RrmRmdM7O~iprw@3&qvcEg1_F<G
z*dXeH1LdsJO0&7jZOPhZ8B~PCe1$aC7UvH|@<i>l(XxVdh!TyFFE&->QRkk@GKyy(
zC<Od}Rw$gMVIl_qOzojnonQPER$i^&N<i(F$!6f|B1cPJrlBLrr0rTW!@{^;D*Ir&
zmt+AacbYHHL=`P5i$uUlbQGnw<jfNWZ#@$GMOZ8zoi!NaxZZ}X^3<7h*O_S8v&K$n
zx7}s@Qe~gd#aQqo#U(07r>3N%PhyJf^y9iSI;o|)q9U-;Akk>;M>C8E6=3T!vc?1(
zyKE(2vV5X_-<HvOEk@-}EBNyo{R4W<_n%a0%pR(`g3iD_;w{}Kze17fjA4e#E={@d
z-Fj2WiZ?d@A#OcKPtN2f6cz8f2K1IL_At!Qh}ZcH$E7S+6;AsES!{L9y}3mziy7K+
z9K7_KvoQxX-q^h#gL}=^m|A?)?nh?SqYW}6rJjvZ>HDSB2>a6LR9MvCfda}}+bZ>X
z+S(fTl)S}<ZXHr1`C@tmV+rPRRd3ObpK9!vJ=qIVvFVnqETxAIaWUCyyfn5KsXxvE
z#f3aL-}K#o#<v{7{;05jljE|9d9x;7u`^F}#HKwp-Sv?SWR0f4+jb8;JD{h%{U${I
zG~g{i^qNH*Fl>)HZM`YM`uzRw>!i~X71Kb^FnwAlOM;!g_+l~ri;+f44XrdZb4Lj%
zLnTNWm+yi8c7CSidV%@Y+C$j{{Yom*(152<DOH)51yS7JLF4YtX({R!G&+_XKkk%1
zwjr;G+L^6WoTD{78zz=c*M-gw#-`Hqdp5XL?)o56imx`}l{{(Uu7iO6naYF#y$qgo
zg@8c%0?vms*<CK#e$uAa4_@WTYUEU760Fx5y&dLzs`vS#(-=#Bq@EhMbg&*wtyCH2
z4xRBcs)|}Bg}Pt4mYNbEgYJreWz^j{k7vW|+vz``l%2O~Vr-uSfi{!lb)^|X>77jE
z9jJKoT4E%31A+HcljnWqvFsatET*zaYtpHAWtF|1s_}q8!<94D>pAzlt1KT6*zLQF
z+QCva$ffV8NM}D4kPEFY+viR{G!wC<ud1TZi|JGhO?hAFnZ1Yt+12GaQ2(8wBb2w9
zn&G|-zNA06;S}1<gMiHS&Bo4bh4bO8FbWg(W0b<J@`&7-@Npr%DQAl8bydgn=i2dl
zv3%c%XP^;nGu+{1hxJRes?b)Ey-WMT_?H#-V`t+#c<Hc`!{DazoC$cjSE;*#wRs9=
zTVB+;m-+D*td@4d!;6eGH;c%s?o+PisahgD2$~EIN?YofzY$Xm6SK}s@m5{T2tQdo
zj7p<S%X)N-dnp}HV650)KKRWM+V@8-7?LPon@NUhiYoMKGQs^kjbyy{8N?zF@6$wy
zhxeI^RR6e0y_lrE`>cp_=a#|l?MwO^f4^EqV7OCWWFn3rmjW=&X+g|Pp(!m2b#9mg
zf|*G(z#%g%U^ET)RCAU^ki|7_Do17A<T4@C(n!sagpvoie`W<^g2WM1eY((?7VU}e
zuXDL5`6N`)toe{}7K^5)5vCkhi?%3^#m#HIrMqT&QW4hEiPt*mo(DLZv^B+0L(`L6
zpu`(pl)N+wC83K@Lbc+F*~GwcqqMiN@<Vb<gzVspHq)YQFE2!Ym?-kcplRk@(6Vt{
zRo}3o<g%gUu`x1sm&T~h9Z|_05zlstZEjoDvT0h&LM${Yo(m^E99ST6T>da$cv$~(
zHG#hw<kLI_Y5ZG*ZXXzbxx$Ix${C_0fJ%8lTbC08HA~)#+`BHy$v!mf)d75}B2HPV
z8|dRi+;r9k%o{Sl9evyZm##t}B#ffMp3=--5yh7bN8M-v;y`uki|w3JG3q7%f&;B-
zL#Sly1M=*C!W)=HyV<$;6K?XbB{MC|Fx=Kor}B%WqQ#Ys{vNDlp|vRHoiCQgGE8c6
z%pvPTUH;YG2Oeo%r0`kGmNU52g)>*H+aJSX`fwUs+fCgF0bc3Yz3eQqR@qIogSt10
znM-VrdE@vOy!0O4tT{+7Ds-+4yp}DT-60aRoqOe@?ZqeW1xR{Vf(S+~+JYGJ&R1<A
zotgX#YSmc=LkoYF*qpp_Yps^89~5S);VH4|%hrwU7FAwrq)JPDXqve*RbyHh1cpB}
z=*ke%b92WLtwXX&_;GK#zOJ0Z$R5<!rA5)z2>-*anVaMt_zSKsob;XbReSb02#(OZ
z#D3Aev@!944qL=76Ns-<0PJ;dXn&sw6vB9Wte1{(ah0OPDEDY9J!WVsm`axr_=>uc
zQRIf|m;>km2Ivs`a<#Kq@8qn&IeDumS6!2y$8=YgK;QNDcT<o7wAnyq?f0O3>U}8B
zepl6erp@*v{>?ixmx1RS_1r<z_JNI4ZnRXAxJ){9EB7WO`|nNdi_DjhS4`7Aw&4fu
zv^%#>kQC<(hHfN%u_tsNcRo^O<2n71wFlb-^F2vLUoIfB|Hjxm#aY&*+um7eR@%00
zR;6vT(zb2ewr$(CwbHgKRf#X(?%wBgzk8qWw=d@1x>$40h?wIUG2;Jxys__b)vnPF
z{VWvLyXGjG4LRo}MH@AP-GOti6rPu^F04vaIukReB|8<7&5cebX<)Zk(VysCOLBuL
zW9pEvRa--4vwT?k6P??+#lGMUYE;EsaU~=i_|j!1qCVS_UjMVhKT%Cuov<?vZ?iw*
zmW^!ka<gY3z`$TSc{r0cs+yL`16dX(nwnB?Rpfjb$6fI1_o6QQULI2mV$93MnPW`}
zFwWH@!FuchVCPK5wBTm@<Hvsr<3Oy!iux~MEbt|ass3kS{Lh2q|B}alc?JK9;;2Em
zqKu$^K*+2wm@9KY6%HhVz%0g2`$pCEBB&z~#3JMx`&o5nqMhEHs%&1$?<MP(tcER!
z)g^H7%Iu+Ja*(fuOJAUn%ec5-Pn~vgznHi<aRF!res#l7U3R*?ce!1|$@1Ob6aXzp
zL{T;G(xGDCFtv4R(bdS^NT7ltY5A&Ba_o;(yt_ticBu@V+qU38J>R;6*~rP0)s5eX
zxVhGZv+qtpZ{_FDf9p{m`ravh=h>mPMVR7J-U@%MaAOU2eY@`s<z5qh=$hmIRG}6G
zU#b?|0F5UnPu#W{0#EfEiw|F3IuxQ@$Vk{jc6b-7h4*MM9ure~vya&3qtwTVia%sP
zg*P&y<cX6bcPq}5x1$KnSEbLKt#pg&xg0Yio<8&E77XlHV$QGl5ZSQ-dP$Klv5Y!)
zQsM0>-M3Oi>oRtT?Y&9o({nn~qU4FaEq|l^qnkXer)Cf0IZw;GaBt)}EIen=1lqeg
zAHD~nbloktsjFh&*2iYVZ=l1yo%{RK#rgTg8a2WRS8>kl03$CS(p3}E-18`!UpyOg
zcH=`UYwn0b@K1`E&aQ%*riO|F-hq;S;kE7UwYd~Ox(u)>VyaE7DA6h_V3_kW2vAR}
zBZi_RC*l3!t;JPD;<*z1FiZt;=KK-xuZ`j>?c5oxC^E2R=d`f68!-X=Xw2ONC@;@V
zu|Svg4StiAD$#wGarWU~exyzzchb#8=V6F<6*nAca@x}!zXN}k1t78xaOX1yloahl
zC4{Ifib;g}#xqD)@Jej<+wsP+JlAn)&WO=qSu>9eKRnm6IOjwOiU=bzd;3R{^cl5*
zc9kR~Gd9x`Q$_G^uwc4T9JQhvz3~XG+XpwCgz98Z>Pez=J{DD)((r(!ICFKrmR-;}
zL^`7lPsSmZT?p&QpVY&Ps~!n($zaAM8X@%z!}!>;B|CbIl!Y={$prE7WS)cgB{?+|
zFnW-KRB-9zM5!L+t{e~B$5lu-N8Yvbu<+|l;OcJH_P;}LdB~2?zAK67?L8YvX})BM
zW1=g!&!aNylEkx#95zN~R=D=_+g^bvi(`m0Cxv2EiSJ>&ruObdT4&wfCLa2Vm*a{H
z8w@~1h9cs&FqyLbv7}{R)aH=Bo80E3&u_CAxNMrTy_$&cgxR10Gj9c7F~{hm#j+lj
z#){r0Qz?MaCV}f2TyRvb=Eh|GNa8M(rqpMPVxnYugYHqe!G`M@x(;>F%H46LGM_cU
z{*0k6-F<ov2>!7r3;j{KOaDxrV16WUIiFAfcx?^t*}ca4B8!-d?R|$UxwV8tyHdKL
zhx;7%0Zn#qtx;S)REtEP-meAlV8*1qGFbRJ*eeX&+hsiLF*g9%r0Zl`L^Kn`4I)ul
z32#3pg6Mu$LEI@<nu$kXW9H~cwnU){(CC&Ml|W26QDm5m=Nop&A@WJ1gbGMgM3&wt
zvdRZ;sEJhTwIZ_u53P|1pbo{$7__CzMyU#gkx2-r5skCfiGiZX=Y>hssUb?T$di_z
zHgaB3zw;*0Lnzo$a~T_cFT&y%rdb*kR`|6opI#Pbq~F%t%*KnyUNu|G?-I#~C=i#L
zEfu}ckXK+#bWo11e+-E$oobK=nX!q;YZhp}LSm6&Qe-w0XCN{-KL}l?AOUNppM-)A
zyTRT@xvO=k&Zj|3XKebEPKZr<kRMoF0jexE6hc`vUr}h0FH$)-s3A{X8^*J#fgHXu
zM3#udPBd2_Z@_^Pl@sFAKy=0;A7i1O%{vZ5ykcA|#=arAz-M>JDrta?GFKYrlpnSt
zA8VzCoU+3vT$%E;kH)pzIV7ZD6MIRB#w`0dViS6g^&rI_mEQjP!m=f>u=Hd<bF2Fu
zjd#JxF}i+npNSrCDWNJXZZQ?Hg|1K|xF!=ST0~R<N~e<5&4_&)W9<(5qRgOs*)<wW
z-Ozc?fEtUj@}gRe7f^Qx0XCFn09u_cS}?lTKi*ozXF?xRnz%$&p_5C8o-$nBeM7--
z<c1F6z}=x(<?JDY(0p1o7z01yw$PDrC`;3DId$s(Qg?$VjDGl?GEkeH+@MB<5%8Ty
z)<oG`(^r30WtK3cvwm1Ha3P9krn5bW_IU5UgL?uD4v)s6<C>04PU^cb>f|JhZ19Vl
zkx66rj+G-*9z{b6?PBfYnZ4m6(y*&kN`VB?SiqFiJ#@hegDUqAh4f!+AXW*NgLQGs
z>XrzVFqg&m>FT^*5DAgmMCMuFkN4y*!rK^eevG!HFvs7nC672ACBBu<xC}#!%4nyR
zu`{!C)3#VlJQVI+sh83uRB^y7%8V|pO`l;)r;=xRa4=+ummoK9jh5>5h(+#G@{0J-
zPLsJ{ohQEr2<Z}HEMSgM^Z4711`JcjM(~<mavPGzvYrK=|J*9oxfXWGz6Bgd+Ald}
zA1i3wO7Zheh1|Tj&8T$u2jCMUhNaaTu}o$aG=Riy+~1jV2MlDh13q~G!>N|PmEHw9
znQ`qe-xyv93I;Ym=WnoVU8dau&S^(*Wp=}PSGw;&DtaKz-);y)zjD|@-RT`*6nowj
z7B%)h3>Lro-}5THC@BLymu<VEV;K%w;ZRtle)8xR;2dd~f~fAeSEmO6;fg+M20{jh
z3G3Sh?}bBocp|~HW0BX@W<=Orqd*6f$*u0eyw1yk2Xy<3?%-=+P@Li3fh}&agfGk*
z_mU!MQS}8VQV<)tN%GhJoTr0+#hQm~M3KqQ7lxt=M3c#jr-)ckix*LjC10Zb$n7yh
z;%`%5S7@YDV+o7USj=5#2r?4v%crC{#!_PpOG1W})?1RB{o%KS-0BL=deB4`)x?~9
zE#iBQ#pO<GRaG=_CLaV&BT7s+#C0LS{J3DHYQWpofC!#fQVZ3h&ulFUqvK!25kP&5
zp<#6$#f?X_CC}{{bH~Xk5rei%DD*-qct?PrT%ab#`Lqu{7}|tC!Whia<;~k=9WP19
zsU>L&3~kh8M}ZrZGtYKAmrT^cym$^O!$eeK$q5X2JF1w5a}4Z6yJ<=8&J?(m6U?;+
z{+*B;P@yGffMz;OSfm7NDhkGR5|7&~FNvel8Yj{F!DWnHG>%?ReZ$1w5I$Bt_u|4v
z-ow>!SF!pCGrD&K8=-<;Gp@oB<@9C&%>vPHrp4s<yX~UAVO7~^_4fBweMd@lg8OxK
zZ!im6v7H%KN>QEJj2FdedjC=0FqD>EG?NCf=KQKVd^stDZP7KNCAP-uEO*!?vg<OZ
zYT7cCmeX>wvdp&Dm3h5Cldn!cIOL@u>1!HSfK+~kn-9Ekr|MWNApAJCJ5&5#izmjm
z$CI|Boo@;O?Z(Bo9ejP>bbH|jRKn7W3y0L1!O6v$RUtt;%5R#**`+39c$JuO`SMU+
zbzu$7Eu`JQ+ri_ap{w(R_juHcw0X8~e$48TzBX%Yd+HkSSYt2){)+rYm48G^^G#W*
zFiC0%tJs0q3%fX_Mt8A=!ODeM?}<UZC<-odR!q{S<g#9(X%EbmaF-g&3o$_rp&=E|
zwGOv{<jVGP%cO+veHDR1!eARv>KLDt@ot6_%a<c`Ep?D}(MUlUR3!D82CJs`3wsRE
zpGEgHMfWsM`4DFYMJkp1gFVK2a!=vR9<kFL>AdLgJ7jCqh_1O`#DT`IGhP2LIMhF*
z=l?}r%Tl#)!CpcItYE2!^N8bo`z9X(%0NK9Dgg^cA|rsz?aR+dD6=;#tvNhT5W}1;
zFG@_F2cO&7Pdp1;l<I<yU@D2NQOQvV7vo%2z2to%>J8?TYlI(VI8nbx_FIGRX^Z(d
zyWyJi58uPgr>8w$ugIGhX1kr*po@^F>fn<Q4?%xu9)tm+p+P7Sx*w(>tO1j&ocjyK
za8Z*GGvQt+q~@R@Y=LdQt&v=8-&4WOU^_-YOuT9Fx-H7c;7%(nzWD(B%>dgQ<PWr4
zTa=j4*EtMt{}Fvxt-Z*-FpBKRJ<8K;gxkhRA2N}~8Ic<;P;z2dojkAcT5c<Li`4>^
zU6~0sR24(ANJ?U>HZ#m8%EmD1X{uL{<PuwTs{?fd(rx=JkZfM|F~;`?Kd*qyMv2M#
z>igUzdbi+JN=G9t`kZMGk!iLCQQiVMhOP&(*~gU(d+&V4$(z=>4zqh(GX+9C&;~g2
z9K2$`gyTRJpG_)fYq=9sG^1I{*I=s%0NX^}8!mJVc?y$OYM^n!x(2<we1yCUuF~u)
z0H>jw$$;}n&dh%D;St+FA;eW=+<x|k22(XDy;9*D^lR=ugTEC@1R3kf*Lm{kD6JL|
z6B;Ft`ii=4MxS~H)pt3W@J)RuDlI$=ra#W^v+QlqE6Dfa1Kj%VelPYTEDl58o=Ocm
zL}d7*kkYQvn2r+766l4Nb&kmf{GriioV<dTU{qZ@<uni5gDE%A1hxn%obe~p!Nx2Y
z{m~(to2w<fudy>28j#G^YLi@Gdk*H#r-#6u?7sF7#_pv?WS^K7feY1F^;!;$rgU%J
zS$lZ(hmo$F>zg$V^`25cS|=QKO1Qj((VZ;&RB*9t<wa{kHEk=RrB^HW**2>S;OXa7
zy(n<$4O;q>q5{{H>n}1-PoFt;=5Ap+$K8LoiaJV7w8Gb%y5icLxGD~6=6hgYQv`ZI
z2Opn57nS-1{bJUr(syi^;dv+XcX8?rQRLbhfk1py8M(gkz{TH#=lTd;K=dr!mwk2s
z#XnC){9$x)tjD0cUQ90|hE2BkJ9+_tIVobRGD6OQ-uKJ#4fQy!4P;tSC6Az)q?c>E
zXt(59YUKD?U}Ssn(3hs&fD$i3I*L_Et-%lx%HDe%#|)*q+ZM-v%Ds3u1LPpPKe-q}
zc!9Rt)FvptekA2s+NXxF7I;sH1CNPpN@RT+-*|6h*ZWL{jgu9vth{q)u=E<7D(F06
zN~UUfzhsK)`=W%Z-vr#IIVwmdb(q7k+FX-lciYO%NE!xl25SV53Hwdql-3>8y5X1U
zW<CX#Hu*w;O)7SOvEt9trNCs(_iJp}|3bOtO<_$^YZg<{phM~mb?VH{7SF!s=a%zn
zEQAGi{WUPR?nh|U(NVia0-Wlce<XA@g}7+`rHdOe`wc&pc7WH!XE1=l?KZDlKQFkh
z>a3_Qfp2Z;jVX+N+1?`(dx-EJL)%oQsI0G3S=ad&v{dzNal~flHvq(0HjY!v;oE>n
z4gQSa2FdJI52Weu$+lED4VYSW;D`5Zn`C#@7Hxa1Ls*#TLBjje(%NYFF+4uOc~dK!
zlnyxE4NWVz0c8yx`=sP2t)fHW(PPKZPp{SCwT-on2sEM9tyGO4AW7|R;Iw5|n1KpV
zR^S>`h}rxcNv2u+7H6<T_;dAO+!UIe_>rCvMLMV3p*H#WcN}}t0@Us{w}{20i<-v>
zyos+Ev_>@CA**@JrZ6Jzm=pWd6ys`c!7-@jf<~3;!|A_`221MFp-IPg28<e7-y9j3
zKd^|_DNXY(aTik6=08y#K0?|j)Od;bOze!77`#z`C>ABf<tk&ULTvXCwqG@zK<07V
zHX9cP8>6kj-Y#eaRcQ!t!|0SRtkQK^pz;YiTC@@lJ4MDpI(++<XdWx%inbDy`FdTV
z+{1E0vkx9N{JE^IVw9JW0bEM!SK!Ko5sdY&f{S3Rs{PU0i=En2r9s-r7J=f>=}nTC
zRb4Ak&K16t*d-P(s5zPs+vbqk1u>e5Y&a!;cO<Ct$W!&{m-Wo<yi5I1!2zxWu?=rw
zm(q?KU=I9Lx<6W)uv(zg7wewIgIs*EUz3Y`0T3?^=5XM>(x;E4A4}_Cgp_VoIFwhA
z-o^7)=BRYu)zLT8>-5os4@Ss8R&I^?#p?bY1H-c;$NNdXK%RNCJHh)2LhC?B9yL2y
z(P-1t9f~NV0_bQ{4zF|-e^9LG9qqevchug76wtFn95+@{PtD)XESnR2u}QuG0jYoh
z0df4#&dz_FStgOPG0?LVGW&{znCUzHU%*b1f~F+)7aefg7_j76Vb|2WuG#1oYH_~4
zrzy#g1WMQ#gof`)Ar((3)4m3mARX~3(I<D4_oEkInTI)ez7)Z8HO=7<ox|!x54sOf
z=THUbq;3@?ysY%YB+iUi=Yu@ivlZ)Tj8YE6_DOgSk&1d}4bqGEW;wO=&7A>j=>-BC
zR@&7dF70|)q>tI$wIr?&;>+!pE`i6CkomA1zEb&JOkmg9!>#z-nB{%!&T@S-2@Q)9
z)ekri>9QUuaHM{bWu&pZ+3|z@e2YjVG^?8F$0qad4oO9UI|R~2)ujGKZiX)9P2;pk
z-kPg%FQ23x*$PhgM_1uIBbuz3<i8s7tjEqtG7;9;T7iUlAQ5zVdvT1vHdKGt@w>YC
z#9Rz(hzqTU{b28?PeO)PZWzB~VXM5)*}eUt_|uff_A8M4v&@iY{kshk{7dHX1vgHs
zC%vd9vD^c;%!7NNz=JX9Q{?$~G@6h!`N>72MR*!Q{xE7IV*?trmw>3qWCP*?>qb01
zqe|3!Y0nv<V~WfV;wMXa&Hf#CT`4hFPx93+D84q3i=8lD)iv7Z%fT%4H>7sp|Md9c
z4J5EJA%TD-;emh%|L2kLpA^g>)i56v6HIU8h7M+KSWYw~HHz3`ILj*{==jD(l33>r
zmOdINZ8^Jo?ll^~q@{^5l#*3f`ETncJmo?iRLz*=W=o3MJ!K^xjVcw*H}p63#p4XX
z1)|C%{Y&)IpRIk5oMVsUi6oyKAFy8MH$@|Zpjr^lxlMX3O{0AZTjc{gso{KRuo30V
zUJxq2K=_CwV*Qx_D!hJCBTuQ}5oMNrWUBNVaa8zyMg5lrXgv8Zw@rm5NAcFplYa>P
zmUNB>EB|r?#Z!Gq^`<qlhUz&zeCpX9Xlq8O!{4UV6?j|emNrwVR#B>(HZl__UJ*K5
z=>`{UTlt0;Y+LmP1Wb19IWK(SIWDrqh=+K81c`t@BCS|2#@K0u5eEwQ7CG92=Axx4
zQ?CPaVE5!XY`2r!Ce@m(tRtB=&+c>a09WzP-Ys!~i;V0hEq}PU8n1a;bVbJ17rYW1
zjz|KkLZo<P_)!`+Y~=f8fvILgpzg9n37p0nhxOX2Ut?8C{cvx7)$xg)?xrSA{Oq8c
z3df|{QDC>O7-S6oQp_ocIzS43P@CJJxQ$k;$!fS3*V)m|VtBIEgCtU@W`AG9VMU_d
znB-Zs3I)I(Wg=xj)Wcx03h}U3i5{D@*udPLg?Jx7dp&KEIwJiW=eh}Ps<NmA;|WfD
zB6FhfzPXO6Zwm@5zrP`#ic)M9i5A=h>#FxbsS?F}7z<;<5RP6-UAD+_An$s3y-JAC
zh{JlAX3e^CDJl1gJDbH`e=hD88ER_6+Mw8CwK&^|$BnzA|AvDV`#xF^z9b6iWb)0@
z+gir=oSUaVcJi%1k+9!pd`(3|h~4}!NM7NHPNV6rI<VQEC&7(9#U;&M@K>(W4~Ie5
zl@(Xg2`OSq|HJRUg3qgr-c!}9@W?pEJXKtxP7f(aE2Es33gRSu#~<W}f-wiApsH)A
zWF#bMlZv1>XiCIpV-J;JLM{(@qK2wEvsi@6-9(cyXX!6YS0n7;TK0Ldf*JGmlvrF0
zGQ+Z509rmWa)O}r`z2W3!6u{^ZQrY`KR#VlTRmllG2v$R!7%B~IU@XnNi!E1qM$J8
z%{XFU4vy_*M0tKjDY3E*7N!d<N%r>%&vnx5qr#=!IKWZfoRo8j=7ji1{xW?g^)A|7
zaaA5Rg6rwCF?y33Kz-90z!ze`@5N916S)(fHPa>{F`UEF8N5PTNjbo)PF5W_YLB*#
z?o`qxQTIzokhSdBa1QGmn9b;O#g}y_4d*j*j`cx^bk(=%QwiFxlAhFSNhO0$g|ue>
zDh=<LRDe}?)z@9OfO+D$UXV2%`?R6VdH`1;XKVjRaZ0mK3um)Wg<1o`pjXy_RY7CZ
zj>p|hUow5Knbclx8V;+^H6N_GHwOi!S>Qxv&}FeG-?F7bbOWud`NCE6Tv-~ud&PS6
z;F*l>WT4zvv39&RTmCZQLE67$bwxRykz(UkGzx}(C23?iLR}S-43{WT80c$J*Q`XT
zVy-3mu&#j}wp^p0G%NAiIVP2_PN{*!R%t7*IJ<sUQ=7`jt~mVehIR){w{f<k@QJ-V
z3aYFu3Uyx2q@>BVvWVD#wxNRyF9aXsIAl)YpxfQr$d%Rt20U@UE}@w?|8^FMT%k36
zcGi_Mw+vMvA@#}0SfIiy0<HUTe4Gu7pqM~sQ>KEKwQ|`iR++|PF2;LtiH7ea($I{z
z32QPp-FlEQ**K_A<O|+yO(APcJ5t)Et`i%nKV6URh^Ob0MT~>@OC943z`Qy7wC~&v
z*a`z;(`5(e#M|qb4bkN6sWR_|(7W~8<)GnX)cJAt``gu8gqP(AheO-SjJMYlQsGs0
z!;RBZwy>bfw)!(Abmna(pwAh^-;&+#$vChUEXs5QOQi8TZfgQHK$tspm+rc%ee0gy
zjTq5y20IJ`i{ogd8l?~8Sbt^R_6Fx*!n6~Jl#rIt@w@qu2eHeyEKhrzqLtEPdFrzy
z9*I^6<V{*j8HbkD?M2Pra^S`Q0B@J1TGzbRR|e63^El0dzC00rHc<THNsDE-D>dIZ
z)8Gdw1V^@xGue9trS?=(#e5(O#tCJv9fRvP=`a{mnOTboq<-W$-ES7)!Xhi*#}R#6
zS&7hR(QeUetr=$Pt6uV%N&}tC;(iKI>U!y$j6RW&%@8W|29wXe@~{QlQ0OjzS;_>q
z(B!=<WUOPkt8EuGms!~D3!L04nqGP%cHc;YZF<fkV|6TchtAJpQRUu0_+&q-w4l|}
zBDKPjB2f^myI=ymz#OxNr2{nHozyEu8zoI#7lCB%f`C4>A71r|@CmR7eWdu9n0;OJ
zP@VOOo#T+N$s{`3m`3Li+HA4owg&>YqCwsA5|E$b;J&v#6RbT$D!x$Yaflo92wU?A
zvgD8g(aY`g7}Y2^2i31ocm&k9Km`NQipEsjU>MuRzD35*Jk7^Q(O;M32!gt1cEB@-
zBOHd@@Qo{fQ^7o{FiNdS)_vTi<r9pK{f_Gjg>P8toqZ`iNi^1-4(hp+s751}Tf34b
z_UYQ1q0~*jIp9pRIpI8ue}$|~uu0#p>-y8t{yEwB(8yAjMXrJ{`{rp7*-wlh8&bso
zHV`LnAF7Bw+w}Wm9ii3U@lEvcc-i$0&h+eUmlQuREzg!ao)ZjwThhqIKA})}akyX7
zcbuIw9K}9aUZ;hvAxk~rqpk?bYMWr<A61b%6raG2tU{$Csat$#*_A0e_-LIRQUbIR
z5izsZK<TKj>-@b-pMTR8))ggQa$kBv=Ii<kT>nobKCR0?S&g*+Al2J`VR7he{}0Pu
zae7LYa!OoTOk8?ma)M@Ta%NxQacV~KMw&)}fkmF7wvmagnTbWo))`Kofr)`-pNe99
zMnam7vRRs5LTXHWNqTzhfQo90dTdg<=@9teXaX2tyziuRI?UOxKZ5fmd%yNGf%Kis
zEDdSxjSP&;Y#smYU$Dk>Sr0J42D)@hAo|7QaAGz(Qp*{d%{I-#UsBYP2*yY8d0&$4
zI^(<X%+u-JrI2b+aUBZjy4b?SnKRoh1Gfo`ar21#-NCg0rx?Iq4p>l62Q-y4>!>S{
zn;iO%<duByQsi~++S#+j?WbKymLj<{JG7)3mL0UmBwVa9JaV6qhBqz;b!kYqp<+EK
z<UGgx$o18t?|5M@Jaj>>={D42;(0h@P{>EZnIzpFV|^F%-OJADQz(1GpUqqg#t!*i
zcK}eD_qV$RmK}-y_}f$Xy7B+hY~f4s{iCD7zq%C|SepGu`+>h6TI}dUGS3%oOYsZ0
z#rWTU&aeMhM%=(r(8kK@3rr|wW^MFE;dK5&^Z!>`JV{CWi^Gq?3jz~C-5hFFwLJ@e
zSm3z9mnI+vIcF+RjyOL!VuZP3rJDjPSm4vYolnm)H;BIz!?dLyE0^5(pm)5*>2clW
zaI^*Z;p6iGZW~Gr0(Eh+%8Jkz{S9{}=}Ewi6W0wF3|BbVb?CR2x>4xST?woP;Mz8L
zDfs+0L9ga3jcM)zCC=`-ah9#oulxt9bZq9zH*fJK$bhT=%(2bPMY~}cPfTyE{_4p+
zc}3pPX`B04z+T>XwRQ4$(`U~037JrmN`)3F8vu_OcBE}M&B;1Vd%|I|1tni?f_b&$
z5wpdJ6F*oif)r=IzB$ytT72GuZi$y>H0p_#amQcJLZ^4KZySOUrRyXy3A2(i=$zB9
znZnGFLC34k?N@s@`)u8aZN({9Hfe}|^@Xk(TmCqNBR*Bter>opM!SGiDU8ShK6FNp
zvod~z>Tj!GOXB^#R>6}_D@j67f5cNc#P;yMV}`S*A_OmXk_BIq3I$C}3M~aPU)agY
zWC+0JA-)}O@e4XTtjzen&g=J0GIVNjG`_gS6ErXj3cGxeDN*4xEk0PNzfzO@6gb&N
zB$S-WV-@efQWs%UX$AVjFN5M@8U>+?Mcqg?@=Z-R`~n~;mQGVJT_vBL|3^fHxZ?#T
zE(Sd`8%2WHG)TcNaCHmv_Id%D+K}H3s&c`bxKs(_ScZzyCTpv<w?kGoFkjKtHzcuQ
zIu441jr<s6<VX7OkK$+Y1B*bOp@yIC!P#{wLn^v0|Bl)EYbY}PGKwkw8iFTZ*WXgQ
ze~sLK8-j9r_Fo|T|1xHSBKiMnhavoF+N1&FeApgpAvhz40xH~xJm_3XYX&U-+m?>U
zHv~yhtKF9G{s+GC*7>_D@F+qEq@YmXiKTV(j#X7^?WpvIg!Yxi6uBAhh7<91{8vFL
zfT?<Z)(colBs2~zs!J-Zq(O}kSlT;wOG5k^>Y~vwmE;(WOL!V5Ag&#@U$mP~T=*#_
ze#QynX>tO#4IJqSj^UB>8ubSEn>Nk!Z?jZE01CJCYuY`1S<pQHecJu^dzChGa4@qr
zk+uD+H0QTB`8u)TX!NfrMv}Jdf-cI)=L}nW)wy9VK{pe6Vi$oysIM=XKRu%iOP{X4
zDtu)cD?o7`ZJWOHb{PAeKu0W}__iN@Cxj`xgw_FDayXgnl2i7J4!Y9#4-#H(ASx>3
zf%2eyXaWoAQUw)KYO;wi<&+R3_7E%h(7F?xq!8l>!^3Jqj_t<WC0t4eSHR;>NPrG=
z+y2S-0j;(AilOo;>SCQu#;Cn?<qA7_N^F6rce3c8$&};ags@L&0|L$XKdlo8>y4Eu
za`??!yHz)qFH1Z(3KMqgn+B$&t+5s0zY|}<1kB^Q8FEAumh;^;Yr~amTx1K2%2JUk
z@7uIE&0DVch|1R=ro5rjr)w!iU{_09PqfhnGqhAN^$^oz#wVNdTRQ!8^nF};4<uct
zwZovAW7=MlX>);Jz#=dTBTMMW7icnZ$dK1E0UEgP4&DNk9MFoKOhtAkVUR`d_vc!x
zc|1mY&%{PBxepp^JPHmFDBQ8t@DD-3!C)-ZhGJt)?{)^0MvC%RzI;4}>XoOUF;6~j
z{S20Ra%PaiGvM$pFbH;N6)b1J(N;{+Gp^^Qk34JAuPKH}Ap}fen!WlC5vrQ0$pnyq
z5poi8VG>>PnGw2^-CY3XdG3<;|0xU}#WBPqn{mO=z0RwL=MXn3=;oA(1C@<e6In5f
z1e+}aDnEd666$7kg+5U5vD~A8i}q*cIJYyE1fCWQm&GJV`}DKL1qmwSO1!pemBpjG
z#AdS{10p9)DnuAVXTbBd0f!nUO|_3~7W~0}h+*?{KMH4|6(tvqhxey^^vp+#Y|_;Q
zjQ&MM$bzRJehRR(9+B@R;Y96rElBNqv!M>V^6F;ogwB4EBUpltu=)(MC@To2kSPbL
zDdGz<wI1jlx=O$BJoAGP)#JZq^8cFcot4r|e_@{kzCJv>|C<@`&!MmQ<xg3ge9aGA
zy)O>*e>H>2Qkwa~K%;yZw;SnM<=qwNHu-Dh$r(}-d}T}u!=UOAkzvEOiZ6>{)t$$#
zlAmjO$1)&1Zh^zdh8uhmZ>OBA1T4%s9Jex_y4|ifY_=XoX6UzpP;MuC5su(6%;)NI
z4d#4<Nt;r+l9kgf<wwG!m4p3gPe*k#2$OSu=+2H?1N1S<#75kgc&atFu;rU5nKbMy
z`uPyDmHtqaf`!bRh+Sua&O1GV$Z|#1dw3G@AhzNO>aW<*)L6o7w?MY2+jRx6-3S4i
zC(~)A`|)5(s?)pBvTfYjwvr@Z-Dx-F7uq}z#WJB6&}0TIi6sGXFWOxD!As%cUg)_A
zI)sRCf-5kPBU|rVm0A{!s=W2){AJwvShr6Tsvbg|NrXi!7zoMde_n>-+XFX0fiQy~
zjRp|;6~pR()0a>ETtC7mZD|i$Emj!r-gq!yhAFdV1uR*M<4O?t83N1JRT~8Cy8Vha
z+STlcw&CoCJt$k^#ar+~DBmvtC5tr{(>|W6wHq*NSE!^#8*rs>!oYj%fl9~Nu*d4t
zdk!|mGJehKW8xJE5ZOcHRfp4plI+l1Pct;rK={=P`YH8&1hNW*YE)4yF2@wa7JFaL
zLHJH6<OiXMoo<Qk*U5oz?T?5WmL9j)fc9kG0LHv5;%Ut_hr?{b>ZWc1j|n<NdIa~}
zB{R>Q55Znh#>tV`!~N7l<k5R^lou2gH!_mOWos-%g)Nd|fq3p#K|FH%iqRdqxe1~W
zj{~zZT%zo#(4Io6NK5;?8{Ai-cRGgEvzOn@R=OqX@f0#4Q}KxzDh#Zw^1IUYJn;#?
zlbHeFj?lwpy3u!xJl}5{Qemv{3=El3@CCjV9PkoEED`{8zsbhFfc;+!?ys?aLJW5&
z`lU)GzsCFjAhP~#wf|b#ovgk(9ewq|F#5+*|IZ~pDQ-#vgb^i3_LaGysaeB{`mFz|
zQ5j+-$v@Pep|!T?k0VxbT$&IQ^O;2(RqM?+PYOnHNmN>Y_05Cq%|8I-yN}yf@EzDG
zB<NKpy$xZ2a6m8Tv407#|7)I)EPfffJfi!%k{zOROfYDWB&RW`at@4h#t?BaxFd>L
z(b0sjh+ui^*s(rg)=l8fU<%cPfba<7y?>}j3R83$2KHzWbVF*`!x^V8JY`D0<jydS
zxT$Gbj}}5>itC?ZSTYH|w3lUD#$5G$@!v(Lphex2O1;%>w;Qh$t7YF3<pT`_f^zR;
zR1q({r+OxY#toWVg<#y?VT=!dPJ-fUXZ?1}Ug%i3lH%97cn^;ztzdIH{I2r5jIm<=
zHNA*~!a$oDwt~q7aDwU9)p0p}i_(@;%L{0<(SvBH2b;_qm@Es2v#?umUg7&Ui~O&*
z@&n!UbL0!_8S+IS`(Ld<lGb01xc<2e{ZoPb+ea9nX5or*i0a*An4nGu5*!5Nr&5w0
zYv=&~En>EjFuySPC$>~%<GP-U6gWHcM%o(a#gK&NB|vAEO~s=Qa^2le0!g5AQKvTl
z_j11M=cC&zkJsyVP8F|-v2#NPpf>EspW}@Ctn1Bghd<L-L!a3`-+pp$CDnnsROgZs
z79blSNnsMIMT+0ux#?Ky;OJ--%Zg*b8wm6xVy^6z!h*RlJ_IpztNGFIPDnYnNbU9X
zZ+MV+Di6DR@<w_XSq^wHeF1as###)&Vu*VE*TJ{E!<)bSuJ<82-{ksZo}W4Je-P|r
z;3eJ|U^><IKSTMDySY(B=G;B$VaDv3Nd38oegl4zd?u}MQ|hnz^2_Ba3oX=+d@Zn#
zLIV>5*HVJ=tZK~8oMi<ZZ~%y=mkk$j%ZQp0<PXbg{ic_7!^14hTPCTm-c!zw9b_3k
zAwSz{_;=2}umn6p+K3sVXu7vbgAEvAMU!@{swuYNtzO9B7=*J5o69urY))E|h0n=J
zULj3(Rjh|tVat32cBhs@zKr_j*5hP-tT53ouYUrKqZ`4WuJrA$N_Q6<wLgx!!KAtt
z7~onYcLcob?u<n8T8|^R-QA`wF;F0XtJ&Qxqe{)^U~w02Kr{+M^$WdLrY2)7S_V9Q
zV;bB-QgcZ#lTPhc{&KB#Hhudm4>Z@9IxfFLSk~>p9cT9gOSPLyP!^bOah`U-6{}C_
zmyhS7S_-tYDm|9C6(Wu<F-Mb{IvU%y6)u>2Qe=*g5@{**z@#Ekz3Y{o7fw!^4z$yi
z&=a^zmtOpsRO0lFr&c=khr)cL2v9LFKX<l2;ZM~w+X0fh@x)f0jra3?6KFbIZfoOS
zx={KQx*#g!(WmSfnMdb$rWzck(2u#QeQ>RDdE}tWlOgpR%}oWHCeJ4;(9U_HeJYl!
zwz$p|t6?#eCju@0{IF0gbk>So3C{Ror~J<?pd(XIT&nLXRm)3UPUf5QxJ!*%OG{Ua
z%2P@UnA-yHc6|F!xLlPZqxIW6;%wKHV6yv|ep!Ix@)%M;0VbQ1fWu;;RTQ=zZ}pbm
znz<$75-pMpHAlcURVx@fwJVw+^t8TMe`0TQKHatj$9JQo98Sl>TpuOW!G@^?lBVrf
zf?%rDK2E3x=xGC)J_lEk{(ESh-Uw*#k-n4l42f3oC3BJX0-2NMZo?P)-6y1v+?|+<
zfFHX8(bw;H@;6K!?=!B#eZrkowcdn7)roPT=WM@MK?>T-cUa$oQdYp&3YRdWu~rhA
z@rZK<myC(rL2ATY75g-4-mKn~`?o<C^^?kXkhTz8A3+|?{h~>mqj8Ftz-*@`&iH|)
zC(H;QiqYx4{Mz@rm`qs~*Ue~4EHM^J7i{QnL~t)O)tnwIQC;23p}TBoc=9rcuS!cQ
zQgl)_F@t9{c)ESLtAcg1AbCXqVS%i1ZZRiy$*?Bu=r2ad13e|ZeWV=3pSL>YAk>X&
zQZAY4kJD`CYrK-nNti&;uJ*e{cRILOFk@z?B@fNO(exjUhf!b=yuC`@(RS#ko1HA+
zOwsym7?F)}ufcD5&IV+qr+i7Mo3)6M2oI)*3?@-%ah^0rL#0PIn}XmOTP9Xsg5C;t
zqkFe6yT##_ZG5KuhVQY)89LfWOeXpXVNWX2PmiRqq<$C!<^WlyO~Q=pk${$DsWY-7
zZ->4<+c@KPgKzKosGPF+&Q*>L>WaN6_FC~SP<ZpBnC$B+RGfykL)Fu_pT5&unrQ(9
zXqxy9!_0LxU74cuW$chi-to@!vRn2-u7v~?{fa?PMScB$<}G)<%&u}@uHF45Ydh-W
zLr`NH0!`4lUPvzSgediVi%s`YB=Ysai{>~3gH7bvg6>QgPzp`&QTpf3W>HjxDxj!y
zZb`O;&XZzI2YJ4!^Mq5~Vz7lLv`S<ORJr0r?Lj>tN|TSP@jdF}@9<l?ghA9D7U2yx
zhwy|}(G#CP?ki$qlg4!a;ED<lsWtmPZfj_C;#P@87nL2vV*6cnGWTw1*sM|pU-T{p
ziq0l;C>;ql?u*#Q+_E}~hak(3B%AQNq)t7PKgAWTYp>EJz^VIj67KcZ3^vvZ7{b;;
zcOOArcAw2$T+$UwIib|pt3i#NAuP#3?Z@Oaz?Mt(H&u7HZu!03kV7`t5IRcf7hwck
zf{Ujp*YsH;dvcW0q|=o$;z#Cg52;n5t1phY44To!sQ99h`iVzXd+v(L%?A$Ks|Ne;
z7fby7IVUXqN8gzsnL-<HBQ9W7)aYIs0J2Ah@hzf?rf~0)zj2MlD|SYSyu;bM&x^h}
zeQrQ*yu&I_2$#gjtJnZbK8+PtR2&(;v4DRue<$rnw-cI`Iy74$YU9(rbZGVd;-60v
zxor4;Clv5d7&T&@;>s?uIv>=Qh!qAxoe{fRaI&EcSGCTdggq-Qq?DU%SBOu<YXzE*
zE6&b{O`lAA=hXUqlqX$e>mmO5cRa9NW}V>A0IH#pxch)!$2p8=^-XYjsB%$S$U5nI
zlJEMBb!BZ_O4@87cE<dv__vK$x2H_%WjhE<EjPJpa(d8v{6Unn0nm!JA*y<?QM!xg
z5Wyw8418y#>YUBH7}Y_MF$+(~gdf-!7)D-D)+O{*18TC{HGZFF+`%IPcmK{O{YxR>
zSfJHSeQCChuPUAWe_x~gy*f!!wvt_tL-Dp=nUm+juu;4L6N1IIG4dsVMa<MkLuW`M
zyfwg_qB+%=cOJ~yh2M?%)hnj|d=W#Gy}{;CE3qr+F~fVzIn(yk+2~X4{SGeI8y(4V
zWcYBW3jdX{8%3z2Fo2ps(veV$i`)Byq9d-hf8zut426xP!|Z5<k-TfgL}LHq1zu-}
ze+KJ?Ixz2&5d{Kxsl-h!#4KH9o!VT%3Ah$4I`LxF3ZC4mGg(y`v&ONAK3e-8pwLVM
zpiE0YKMPbVUzO3W;$F`yt6*J_gW8y_6vR79IBIQYc1tK2C0KgH1$&L{2qL(l8796n
z+H3S`>t#T^p7p1n*Tx2a!YaivBTqLsSJAF=kJej?@QWf)Y-8Ks>WkC456{B#hW-ML
zI+f23(}F=MeSdbWQ>R98TOzv#Haw}ua+17H=P5|~#BDmoEPkzl#lBTvCoyj`XU|IS
zHn?dXbq>rqUW8^kQN01zL~6!Vxn4!$Pu|F&#<tpdQ$*ULqS(cCI-C+<v>XbiF{{>T
z)&khW&2Y?d8^jC|phWKQ4!CM9b66+l*<QD`I@jge!wSk56`;k~z))#xKlu}|l)krl
zYGNxnZN;~2lIrSVSjX6;I~M!W@dxmm%_!$z%)zNnibf4J%|RbmD<;qz_;uTKvG903
zIH3^UBo_dHE|oOQs$(<xLT&;;zXd#8?MXNX5ymG0`Reh2=KQ3RKY7a<jc=@;%p|n?
zb_>HTdPm+)M|e5yT)I32Q~2ENVJ*ZH;JF^Y907{XNHLoQ+85J~!w@3h_5d04o=~|1
zCBAvjnXMn`S#qMkPZE}9#RX`%al{`J=oFKk(aJYT&Ss`4iBrXa_pQ=3lS1IUFA|Rr
zgnh;c8nkGH)|*yyoUZ?tE1XKwkF$n6`sdkf^7)(wZ<dSSO-hlnK5-4bktl&EO5#Vo
z{40N%+R(|b|Ez2d^q0tYzh;Q_myZ7NznLM*))xOiD!NN~LgA~9=j9zE(PR1viEtYf
zN->52xtm86N>o&&jG_@#ue(B`xPM|8oGz94>*kl17-|d^y0`D=&hScq6gGQ%Z6|LU
zG@<~h-R{xW)y7k1x7XFw!TWW~HPC^bCO_;xG#A4he?=xkLjS=~U!uR+q>vqJxCN~J
z+I}|P5RTv*qRT{k2N^Kz8OX*mz$hYR!aYq-f5<K>bN4R4=omUVP19L|)EZq?O0#B9
z<ZS02mhcJ-b}Y%{4Qxhzlg-{D+hQFYcL*j#EqJ$Jl25iSI)@+*Y=Nyy7@XHDvyPMB
zW5{F~vwuP+F8mygvLb1|_=@i+BbiR;0Hw8QT3hiVKzG%{JYEb$_Tsqte%`zFFfIB$
zC6hMM7AZA*+vsG=OGn2(N<zGaSAjiiEw|P{@oPi;Y-1}v)`Ka_tVK550DpeVEZ2G?
zl2K=$*nWJg-jPwC9i#W=><3G&oAZ`UeIqZWlujz8UNNSK#<zuu<;-x++3U3Y_c8-c
z<h>{=_c`*(&TwlIr3ZpC0sfS5Jy?;t+&wb1g4Q91r<sL5h9#5@pv47(WGhj_*IhRB
za6J})IdgD2+&4jTdbDe654vB+DnXC$QNvB&mg=Y(h4A~ozp4etqQK=TD>RNiEt1|L
zisgH;)V()S&(TSB|1yAxZLH%BY`nnhUw_6sz~zdKCCc!ZV*Ws6`U4u|CBpv4pYIX1
z<V30hNf*cj$cL29@Iyk2@`YMnDm353j;@tUQpZqyccsaLh^W8&tD)g<mK`IGm_DF1
znArN}n9&U4oogrEHt_DB<4S!F2So|JKRj*A)8#zkA|pN`QZcT5jpOVGQK76-7T1MM
z@#XFB2n&eRR%Hj*YTDzGlvU2e=;<J|unP%JBU0Itaen}9a4IZ8;QvsZDpN)sNcwq<
zAp(+RAohnVLV5T)GLSKcHbUlZ042--&0OuxV0w>5*)5C*N#D}gj<@pdZxtw!`<O=j
zm;aRp2lV&G5`S~N|5<hZ%kNdubXZV9_(;T<s1rtl9o)qu@HIf*L<3GNl!I*fDdt-!
zE|@D^r!1-zr=@;0|EKF6rt_idun4|UvA=NA@pVwp<dytYaNS!}#c-`&vN$1ZI(sP_
zVB^xmdx!7y`HJnEa%+Xd%|L3v70o8)q|3c^(hF-G^ib?NNoosn54AZ+d+RDWyaBZt
zOl80?!WTV#R^}heLfA!InD0t6oI7GGO0gZ)hfq#xw~PWWDIz}Xfn->5aFVQ^Jj?1W
z+EsBx6>WV`%wnP@Fp{XlqFkbHf%LfCgIi_|w?uPPjHAgOF+lDnAb+WEB+i_53PFmu
zj!=umx@ez9mVxC&jA_RtKRfQG>Cz`A77S2SpOt7%Rt*}fG|yO+2t7CMuK$^}D#i}k
zZmO9yUwK6%!LbRsULVnxUxfxso5KFES=!WCm>y&YSR@0CS|iON0v59pkQ7dVA{j*+
zmcRtD@lxXuFq@#$DKKSal#<a{JTy9yd#gIlCrg{@9<!Ou-OQR!-@U(S$yF<k)MK*l
z(VSiMXQLZb*5t)V3dnldHur+e(!`+QPFAm}EE4K0W{xQXTZzF3QZ&}cuMk=4%hTpO
zwi4@6;1W&uYMj~gILgFYNQ?eiuwYUI=18+AzyE<va#g(Kd0vLy)MP)TYpf|?Go$2K
zkP8LwIPa3xP;gpX!<r|Bv}`s|dj(e4Tmr#?r}?g`3Mod9snJW)&84To-*3#`ax+M|
z_^WhkRjzfwBE8<Q-H*m!R&?QWAVqSJvO@p3>ApSJLw58m_NIJ?z;eD3Z8u*-#}EaK
zyG~L>-7laE`Y}{g#FPs9YA-wT4>X>xRNtTHp8_rhvWA|eJH(!o-<P#w&W)P6m-08D
zAN6|tWpB#-K?Gi5b0RL$9~ggG2yE-((>G~C&tvHB9$UEJI{ngD>QjBz=wl~x-j1MB
z4)L_#jZSvaQkbmVbN)4{#^r&ZmfhhV%?tet3`xJ;#jI}DsS94qc&s)#2kXv5pkt;K
zaY6emqzF1JWMxI(7h}mk*MQ5C8WLAol60!DPj|u0jMrLTkU7G?ud**S@bYx-vp$+r
zMVXWc4H}2=yF+YML9!k~LT(|<#By?F2bS~weMi9dD@DA&k#0e&MM1YT!qoQDeNLwB
zA;{KvwSzP?-K(>@_b@4vTkIX7xwj}ckrusCw!k=#;Krt6;}3q4d*)?c{>I|C2I^4p
zR(o48TqHbw?4Z`c`>?P{`cT;FpJoFW1wJ3IVO#5Q`wsB>o>zsRDDATmct`aaYQbTL
zJVlHeok9_?w83#Z*J<xOX-65VwyDpd(4q{Wt@AQCq<031sMX3-c0X!VDYJ4@%vCtA
z0;jmXUDjE|Iz&(;{@Kh`CO_{4QYI%}><UiEPO#7dgXBy=O>(_BMs-;N;mNeq{;f3S
zSy{i5hNY5s`c#)~KhQZ{0_hNmrMD2b7CLC2+x#<EkS7~P_v!{%oCB~p_G&Eiz2iBZ
zlQTemW-Ldif1TN}{#1LvQs>EmLcNa8V1Q=jz@e~VV)Yq!Z|$nv$TEG3j6K4opW+mH
z3~z?*H$qobb652kQ}ZHFHUVj$%JAwS-Ie=Vh&Iivx3hjMCZ1k)4dRjdhxRb17P;Gz
zZCsB4J=l1S8`O|(g!8c$aOMaYeUoCJj&n#kbDxe(^GQ)E)$Rq+i-wbPKeaQvL!`Y-
zcL<JKpxB=nIH3&a#g2`dr=lb8)fRk>=QOLcWBdDq_`HLow9P5BG2EMY$v;w9cR$C{
zMv)5zrmYv!uzHFAxDI>aftAp&ad>GYoPt!d;A*$s)^6E5l5ct#&O7A0p^8J1ceXa)
znIq{NgKbbOSC`6E_af2bCoI(gD@(krDr^mDVw>cRz3zJ^&9kbuf6)J@Cd#zbnko5m
zdyD^j^!9J7`oH!u{~wlOl7jYM(OcdI^#*5Y>BjUumq<zxN^6u~Bt)h^QT(Cfc%IqB
zgD*#oRgB3=KMQ&aWrO&hL0${OUD&=M!k9VZO=oo+XHW3De7wEC!|ovb@-(bH9T+MO
zi4U;~z9>_g&tx<#_pkzQL3{!g?50d=#eCov*uIw$N*glXJe1F{FuUF_wCElS)Z2X=
z8&w0?WkCX%HfL)#n-m1tiLy!jDMqH$LikJF=#lu@<N1lNp4!gV_zK#`x#PG7JS!;{
zk3?Xn+P?E9VjgWhlqo-vN%o-rHW1bb=#~rK&0qIC*mgs(Lj|WTD1ts$q@E7x*SbAW
zPMY)-!<Ii(B#FGK9RLajoEcsYv;zW}D;bqOLZqWKZhyKA6*WpycJJe?LOG;<bp;OE
zHGNfPK+(}|zvKz0gL`qpO2HUU5Y?lQCTb&f@29&+2{JGtQsr$23p8Xje)Q>k5%&vN
zOEmQQ^n*t^76E;JhHPzQqbY0+m8GQ9;~dJLLZ@*sqVX0ui5yz%8Hyn87vqUisY_0-
zDtUu5haWdOvDBOX9Y;=s;7ul^_xLxfU(?k(HStRfk0Ab!pY(scal?Nz{Qu?etFHNA
ztD=60Y>dte)hUle1IUyYIFgMxgGpvx%Odv4q;WPV?Zj<0pph+zWMfSd=SIUcB_#7^
zgNlm4(v!WIBm4?kpvZnCvp?TXW7~Azs3LT8Gh<0Ew=&W*e+4X_xQ{(e+UCESTaWwz
zd1ly>%|#A|W%fgeL_3gAwxjeb?Wi3rAR3U#9Rie*)dfz7YxUK;ex+a4F>@qyQAL0^
zZncndzG56R<hQ`x2qO_p-Kjfu^rW-VDTbb$e%2Uvp2D5KqW4j6y_HQn$z;4)!)kWx
z)x5QVJOzi(?K<Or!gr?)X1Ge8cuMkg)8g5TJx2##8m}!&7uXxREjK$BjAoTZoW*mg
zHT|C7Y1F`rn`Np%hg+)FNDoYi`Xvf55@!t$pz9q?G(&}mNY<b*3%Dosy0Kd-Hw}Vv
zu#;znR&3A9vZslTMC4R%ZVWeGy;3Qfd#*HAJnS3J0t)yZTSS{KsnG`^VWw&+iQ5vs
zB)sQP(DdCzq6YG$3%i-EFFNWh*g8i1WOA7@vzAqo_t(70>$F&?R4SOX>&%UDdBid6
zIn=GRfcto+s-%gMB)Wx7!_Z+SS)f3IG!&s%P2eNfHI6~E*=>e`^RpvJQY?T95IOKL
zeX-_BCdRE#f06_QAoDyMH;#IIBnT#PWSOtks+PCo`04X-brsea32I~@X(Bwl*Q`$c
z{Al@04k=Mmd0}}ts=u%dCO;qn-;qh>Hr7bB6!NOVxy@Yi#GK2vusj7iU9757HTqN~
zNMoKeZY}o)nA*{CqTTPKnWi*JgZFZj&EjD$V;O9zqHV#tB#r<Nn?2cryrbR;j9V{R
zV!d;qg`=y>5Ur$<wCdo=M6|X(P-`bd8W<n4858HV4NmCm+wKn0gv$EoB)BcUT3Pnp
zaBZcrO&n-rQJ{~Xry#j}o$R4Ot3dMV3GHkJ(ueEk)79apPhdr>V3To8iP<t}?!wAo
zrFzp*lR>-bO*Gl_d%qc2$SoU`Hu-6*hWbuWzAn(83_jZ%>P{PY3XVV!q$~ALE^GC(
zdIGgR(HnV8Rn*P^7b8#AzONo*U_W}{Ne!=#*qNJIRZzapu_fOkvki(|8NDg>&D=OZ
zL3G)1WS*8CFh`-sb*#8*hIN7WDjw6<$D&T|B>JPi`K!*5DF(O*^A+r*Jfnt))c8|M
zQKtgEytAqpy@~XZGnVYMJmZSG0U~uvP?i*?DhgDOSYtx6s%6u*vL$SW87`&xJ9<xG
z{s<4#jkbOff>cmDLrPHI@G7Pb*cizPGf|!5th41a2ijel>Xfk3i?7Bd*{|)@>|ZBi
zH6gO9a2Yd&_ZeKmNQC^e&S$cl!3D2oBCX)C;Ve{0qc|4+*fwK!x{=QYtb#3QD1|Yi
z%r?t<GmO4Y<tI<1%d6r4f1P~=P+iH^HSX^2F2OyxdkC%x?(XjH65N9Xch}$^+})iJ
z91{3%-ekVaki2<Q|Eaol?xpCp+D><$-Mjbli1fF(C?V&w#;Gq3-**P<A%e0%OwEI9
zrP`mzbfBUdQQDf{a+RaoaLHlRp;54rCPe(KYDVcTA|8W*j|lCr75JIBd}06bo@g$Z
zz4ZGRVzN8F2;!k`A66emgVWZy7I123+?*y&s5OBAy#&2uh;2tExvD_DO^CQ}=C8<P
z_U0;OyOh)OV&XolT4XgvsvOqBi$hqEv<117!HKuzX6lGZMCm=)(B1HnXjhdF;5Y@?
zI_->gsGPPsXN(0fb?pIDc{s6b<9{t%6D*47A9ZHlc4rEGU<}u;tiom3^lA-&)1i=j
z|I#)cctK)AH-b2*a3Wm%Gt*;#GWjNF6q0q^Evid`6G2yhMg_4TaMUK&x<oXxXczPl
z%-ZQ#p8TeyR63qVoREi~N`RbqGwC&@!&snwgmimgMvXl(F$F#oO;01zlTW!hLIl(#
z@8TBcY3kw4GE}JTt`YRp22bD3!O}iO!;PGHpVnhAsUL6fg0Rq+<j7Mu$WV{__Oy9N
z_N>*D*5+KtlF#!)86A7pn~&yvD-Rh%`@(o!Wc#9t=t;(9_y*(MWS;4cPU&cJcE+h}
z6fZHrjH@7{6~n40#qgL(yA-oVrt;Kcu=fV1WQ0QY`_I8lVds$PYR7KDvhsTbkC8q6
zct`{-n;z2!($SBZ?;(ZMu1sY(VY)KJ@%p)!LEBL+M{ck-$kHEx=3N+%$#msc!LKD>
z?(7`Owu6Iuf-Nb|5wFxCm}U)Du@JO|nHV?%8lk(y3x-=F_d}u8>#AU~<NS)YOSR-N
z<k~a@X#ZS87O$1-yVJ`J#nPMmW^|scYtwIV<T_3|U(s^|0;5cXxm!3y_B0AFyt~Ji
z_EV(K!Z~M_8DOq4+@9jzR4mq_>iWtSD6|VuV&YM<ym*@-{DPmlzSN`*Y3CyOCK<;e
z88kOnlD%G}sGK~PARAZIS3Xi~g^J*+`U4b_Sghfd)>=#_v-HDjZ4mS|L2%K2K}Mhz
zVb)f#Q>%4Du>|ea6cbNYrpi<6A!rSmbeh7+xGZ{-TPG);DG9qg=>9!44ScDdh49-_
z;|KUp*RQ-So$jyV%Ss5FnJa^|LYAl%8niBhd%(W!x$Rpq@pcp6(XF^fHFRF2KQP>$
zo@`Qi&QlkFxp%0@2)7RlN4+NzCWo{?_x}5$E?kh!!UM3Vg9R+=xPLWty|S}5Gt_qg
z+-v~8k*0?Bf0^Q+IZS56Ny~Q$pap&c2NUt&f7P9P+zEz*>bOO!5J8(uhIJ#%lgMNl
z3<nDRB&AC6;w$hY)fQSY)4a$Q-RVI(*V?61f%O?f1<-YsrT_-6tHo~BJ8|mZ6FeuV
z1yp1hPcaF=G35Xm#pd+NWfbBL0toGLEA=^!F%4<%kq&(+k&F3}{Y)&RD2>;y^@Yht
z_Dko1D=J@nc@`zIXz6dWsr`Kdt!m8`gGlx59A(t5ZjDVmrsjl#0wT@It~$j=uGRM!
z@XJK@Q})NA_sQpEZkNduP-h{cP|l+Qqwr{g--LeHY2&||4dJFD34ZCj7@+4ZH4}La
zjfr1gHXr8j#pp<fM*6041|Mdvt^i(5dG#}nN*jK}`(;x`0w(VPbNH^0-UyL4oc<Zk
zkQ!BMoJx$wr~EkBuP${9#?n$O6C%b=c>Oa+gkiuHYf$a+VGA${f!~LtdO!~|X+>{b
zY8=`^(0d9`z1f!nNzD`;4&65cNlg)@h5m5oOj&gG%ms<rLbYBBV7vqam|(<yZPULr
z;g5y7u&%u!K#<JP%HGt$)XDJozDW6se>lXlc+jou#n#`d_l6}hwB+CG5k*Sr36Yrz
zP2B)Pq#G?*Iwb)FJiXU@lTvTrdR&WRpV8sUz(Sx3C%f;BHSLY@I$!TqSg!%IetroG
zD$gu&K<>-imH@Bh&}f!zwO-`w8Dt>MMZ>8V@{X1g?!2BS0S;GtXTW(%@{L=6uC*fB
znj>TvA9Cj80~Hn`A5GSVpyqA$*6rlEa`u=Z!{-DRtCo0{jnK|3KxpDEi3&^DwWNg4
z%|~wf=EtEq^ku$fbX{@*EYr&TP@j@?OyLdVKVk*&H23K=xzmgV8p0Y|jK+@cNaPE1
zovLSR73MssgV04G7S-h7L}ID!!8|-X7U6-7?t~caWg)yk6*s=m)9us~kZ7pC6I1+@
zd&wXW<RBl3k1SJ%Qr4mEh(on>Px{8Z>47wN=yJJ;BgQ&`z)H7hxm}Jq_9GiAq)9R-
z7<EdEl%XD~CPXGv>(@1=H+oqdJ(YFEq(LiJW=s}h(Yx~}5%_cQ&3xV0VUT%{sXE!%
zVMqItDE@pLL%E2I2<48s8InBVbnt|shpL|$wrvbdWe<tuH@WY2@qFO7bF!c%vB;yL
z@F~+OW*Cro7Vjc@#$+DO7yPIzkY5Ip$&+@oFg9UVtL&v9mt5B?K+*2l#=n$vX0(NE
zKpt+(O?A#qwMKqV7*jUuMWj&p1RhuO4wGTbHylNMxwoxS1cPV$98V%tPvol~U39|R
zl6O=iz_49l$b5MhSWd!UNfU$~usFK-I0tovqfWiD=<JHt{yqW)=GS5xqW}T*0RnYV
z{EOcD!&s;e>!LJMr$c+e86OWy77OJ6k_2&3KMqL9=QFd2QUVwwR8X*sgj}5OpiFWK
zkiv)DX__mAlH9kRszqfgqLLvBrDbP&mL;Amd=_UXSF4&!?$+*0ZswW?9oH!-BQgjS
z*IQf1yzUikvx`UPXLZi2UvHaGMOee-cPA0<z3;w?@(~X1Rp5N1PkNLiJlf7t<UV;j
zSrn?ig_q%As?CjkJiE}XlQPSCZJM6e&%Jk`)EOjq_flvpmK**2!^^Qfzn3qzS+-d;
zwn#D%K4TF^&zQc9o|><iA|p84V%fO?yOTi+ljPR!j`!4}BQ+j04vUbvI%hQ*obvRj
z?_+U*VGQ3!iIjFM*1NV%sonVkJrD+Srv&3qv%#atS0f@{XXQkY)os76n0>C5fni_Q
zcj2Hhbit;RZ5t^!?2;o_*D4W$VcsfIc+m?Z?b!Uv2;-s&XYSCUiczc2-b0I0g-hNj
z@xi1}g6j<*=Dr7UMa-%w&YN`cBbWT>BQ~p;QyS!^#eQ><Gii@ys*X7`k0Lo$s4Yh=
zqPDBeFrP~hoHx5$6bo|@85*wdFWK*0YSi}ZG8#UkbEmb=^pEC3f1Sv!=`G{4iXU`}
z^q1)|D1{0xGtnN1=q<&XN><J|e@nKE6%EmC=@=U&$70q;su0=0BwNm+KO1H<0@Lqz
zzAi_b7DBzIlhJO)Gu0^Fz0@76t?O=AhaIUt(btIGz=|Na*;|-$^p?g33xNfF22!6X
zq~6&4y`>q9dy!?Nrh+?bfo*_kEe;nyR%9=3OTAD90?RT8#Bk}X#Pkr(TqBF2&!V=`
z^iWLr%Yk96POnG@bEb?cv#Uk)5}bP0=~;%g>Sm{t#hoNp#yeFj7UxuD?en)EXw2%=
zTS`>YY)#O023TqIXj@8o2KAM29NQM4Q<wYRYR*SEi&k~-q|}5TXA!e3s~EDVH8P`E
zmY9X7(i4{ybD@<=9a|bQS}Y8`&;rQ>H=;sYP$pcqtRoxg?ZK@CWy{=P7(uI7%TOp;
zP-^!<qe8@8toDzkVXNiC>0wmMVv-f2E>6tEj7ZTG#-KaZMuUUgl1|nl&p%3Dc8tZ4
zW{0iAY38oin5YwiQlKRrH8RP-h95fX$>v!l2*6R~)3vTQ7V(gjstAxGVc>U<8Jwb)
zPTqZIfoIV>X`vA2EuAW0Ghj||3;hwn0w`nHnL~5Xr-xuSDNmuyhoZWBBa|hf3)-7$
z6nhe93c?Vv(WT4=mKowy$9Fu8Y)h5yEW6z&zzB7;Yf(a|ei#jb>!ayFWo?MkgWxQK
z47{-ws_k4#8xv#$x229MEUK#x*X1k=2QLLnaWhYREFj!ta9&)3I+w+wuB-hQ0SFLZ
zlvuP9c*O0k+Bm_8bPyfY2o>Ts&0yRSIg4c@Rv71IVHGS{L3?%!54(HvY;tru5FCHC
z9_ER%i7@?-Tq&gCLBVg_3g3?9Gu6P$T^70*)YqUQTN$IHtc4g5UG7WN_J&c!4-lZ&
z0a=#~p%2D>Wvx?z(9bP0Z<&FgpEnI^CYsg{+)}t}Teb>kj&)7NNmPz4Zv@MJA2cA4
zE{uQ3IbdMxWrxK|%90Rdmx)yBJ3FI$YLuF4DF~35POQtBilKK{44PuvYIHjt?~mW&
zzNwc$LazTnX6dO-hE|>Wu0KO)5xDdvCq>WTfkeI85j!LDvSNHy0&TTnCpr_Y@_<W&
zQ(b+Sd>=eYt;}dhqY5=4^QRl&pzt9Bed!EmviR=h>B6ynC7MGc`x^9c*)$$|imA)E
z9KmcfaDlPY6j0i|;UW8=8oO5$aRyZaYTM*qBd?3;u=u(KdjqYJ_fLd`tRoym(-gX)
zqoT2Ua$jR%Ibg0>jte$VWiyOhLaYcnGe^pQ(V0O%I}YnENL<hjALq0hM{FF<?rudT
zbbG~j1B3+0?vjIT-cMn>$+J%d>ulP(v~JZtnH_w<RIr&7<u7;~+lTYU@H4?GEgU~-
zR!K^6@XKqwBMo)W$i4@-_QZ-QmyVBFJ4f)3cxyoE!%_79*4v;V{$Viw{GT|Ol;NmZ
z+YT|*IkvDqe3*B++Z^42SnGm>Yk$}A_Os<zQGe?_9v~BPY5jcYu-<ou5Nm^wf%`A~
z&vu1@EZG>Qn5BbzOkG2(!baa2N({4d%BrLdzn_qpUhmGmod2kf3s)xrh|=VU=smdZ
ze#hs3hAI5A(;4e45x>FbZjXU=hACbM{;p^<kDm1ks0Is2gdui+!mSDlP!iM*a<BG`
zjrBT(VL$&ABlsF0+(x-j#}10Det0jxj?86akm>HFvP31DF<gp^W9jsd@?R9OHH#v}
zMy<G*S-o(4k*V1ClP+ofqr-r+HjLr<`s7WQ^~dF#=GM2=hZPG$K6;|qo*q;kY(#X{
zFfFd{-9q?3+_^%fl($}jfKaPw(ZRy;5u0-MVMnrgDeQOnl8~2)fiBjk5Tmtd<8ziO
z26CD)xF7Yh6!aURLF)G!K|zgAYA^ed5LwhIg<&v+rgWHoZXm-oI~=j$L}6gp)CeOr
zHJ2@grxZ`MOjTQs=nHoS-#Y1Kp)pdzae!SZJ|BkY=&CULnrhH<C4(D0SjCBg;E2f~
z-et>z6_lHCVuZC63Xv9`wzN@Y6rcuoPF<~3V<@&m2~m3D5&4GW7GA+XXs{sPo!wDK
z85d-&4Og)(j6Q8x3f?Ooxm7VJf?Nw>3_s3fV9y_1xSDfCy31yB<u1e5^t!M^93C=E
z{z8n&*~Nx?e^9USF8!O$N3>hkr2LI_&)xUpcLxXfuNl6z9z^w)MF}E8U)#3YWS4&8
z{-CVR?>0{F?ccm>oP#mMTY-&w90y~vwccFmV3Wd60@~aufc|xzwLI_AA^-goYhcMf
z>+D@$bjnFLRX|X?6oMyaW_}(z!Ys&@5~HmlWUY|}!wJnBP8YPsWvf1%(iPjQZ2#s7
zd=-ANqy%pCwL5&H8<nOu@vXrn1BFmw^%lWZN+*Yu95oEVNo^uErUA33R$12ciP4kI
z<z=<GSv8W}a48ke#7$DN{i*uOkGil=BPUDe8Ab*|$yn-bb0c_t_5!mt!5DB2YArk3
zosslqNQ4zOtEuHgQslH#%#?E;8VjzWEVNEl%c*Sz&6gnBc&=Fm8u5Po1d=N&(s;^*
z3r4*PS8yLHme3UkP*^X5N^LY-wF9Z)VlbgOM7ks)cWH;V*%QOP%GrxX#+<@<3p?dN
zVU;JFY%)oc7jt9F$F2lpHIotGziboRa_H}m$cva@RFi#@V%rO>Tzs{Ux(<1et1ny>
z?C%$W*FgAI%!nl0a{QuH&7L*c<K!rTGU5(_9lPLN>r$DOVP-67{8fQkKPfPD$L+Lv
zSnj#tSMG<%-tcmKzH8dSPFO)VC^+Dw0|si;bY^#=`Ilum<yf^iCkC>3dEF5!JrA9J
z^7-aQuXu7vwaQBlnT>)~G|scmodeOzMFBpiJ_`6WePZh+=vMX276uFz4Vd%}>sndc
z95j(>Uq_*mC-r*$6iUb)5mCYRy8>n-Y?K==<R#pKJHp1*YyDG02Bf$0UBno~t<HKb
zMQ1wjpKN1Qzxfx_C%E$|JaRVCZr%XGLo7y}C4Dw$YMSUaQRjC}jf!hXs@3_zTZXk9
zUJ;dOLLHfBf53MMmzI872pNJ_0*PA69xpy2M|YI3RXLUBMtz3WG|rYfw9>}9iFFRN
zB_u(i5p)JpS@Is*ArpnM&nOOwsI6t6IAmTNaVm+)*gWI?2fN{+=&1n$oGYcUGS!0y
znn-1<Fy$A#LeYAUQ1{g*73)vkmsm{!MMp%JpFnY)`FA+36a^I*YPJvG3l->azfTgI
zyHQk7RQGW=l@WF&jO?B1KXJa9;4BdKc<ts@U_E||BOkanC2UNvN%=Li3!0bp9BJof
zDvv^)yJ-VzEqr5>fcpq35}=O+x=GE;TGw}Ub3M+AbPW8_LG;zZ%{IenPEAQ0yCE`_
z5medk+}GQkcA+x*kGZgwAC&01r6-zsp<h>Cxwld`4~iEZGot%8<4p%sS7d>FR_YB`
z1Ifjyuvj`fc|U|FGJ>_SBP*e_IMD*V%9fftjgs&{b6*4#VT3Vun6n`CvL$#d*2ygL
z)7eoDSMZ1NGifW#;&EW?%%%0BG5R6&cx8T(iz?c$ah{_eCRo%Dp%dN0c9w$xeo))f
z!{R2?4ug`a98BH;1&H}cNC!iP7dTNKFKcpxcOl6#wP-S<UIVQ~vPQ8_DD}9|Ys+Cy
zU}#9I#)Nt=nbJBcvS`cFJD{pdRH=xl<MK+MT%v#<wA4m=K@{Imi4eYq%*bVo&W4K4
zm&=skX-v-5lCsSd*It(3aV0(3w45Hza3DX+FS!Le*$_8n;E!7CHzDMgpF1z9%~~tK
zy#;NK^_J(jAUsfcq+RJFoI2r(dqjEQm8i5b=vF;2zg?A#Kd^NJX%mmJU@j13>COy%
z!JYwOs<?l2Np^rIJjNf0-ZXAjl6oa*WtFQcRWUV{J(ca>HXEGr4S3cKrNjJ=%MF4T
z@!bVaWe=0&6`nIQ;)FZc{l;u(ho}|4c%t0S8wEmM$g~?uCNTxxtk^R4o;IIHXg4Nb
zZhIyY?230y#03^WP!{XWxKemhpfBjbwIDOpx8d|`8Pt~dI`s(SzLBSax8yVhRmu9{
zw$*00x8`h$)GaBWP=7&dA{3Isa5b890UcZ}9{lKpxjTOUjiBd@0mQR5q$sBg0u@Iy
zwll8RkI|Pv!)|-}!4Q;*3w)M>C<U=T1*~O6L=&E&)R%C!`xEXu$AmNLS2k$dx9+0i
zWZr;437ub1?lDZ3l?0|XvM4LN*|J?ybUx1O36$TC<a3f$*`u}<S55^Fc*C!Ll5`y+
za23Wrm%XpIM4qGh44V2y^IL6gQESo|xW_DrN)j6|_>tQ|Yfu<k`}Krfa&FdG@WG1@
zwyIR-(?H!Q*PPUC0fMdUX|RE#FqH}tArT!^gWGzH>Y*dE7B89}m%)-8C#3~yUl6@M
z@$xCS^_0V!62E%u6hMI}Baijc^H8CqqH=??%n$8DrN(@_lxx_H?j+3I+s>0uS4W->
zq0;-tBt+ZUCJDUZPCC#K`72}x<h4^_Fa6|a`b{nCAUBAmU*NaqvD6u4sO3b@mh4E~
zrucRZFEhMSj0Z89ZjR)wMaI=Yk~lR+t$z(RzNF>S)J822;Tq5LaYD!CkRo6su~3oN
zg&ag$fC3ZxSR5uvsAWN7eFh2^)f87O^;9TTDscs|OpfUC5ghp1K49VjDrt>4fKO=L
zLxxhlumLD^ZNtMYZExK9PV1gvZsMjXa&<%d^2M4I|F-IW|5xsB0rGy*D60s$dYsg6
zMdyH$$qnp@ADG-=TiGN!GTMc$NnfrNngX>@GClAFT;EKG&5U1Bb*)IV83-ppR>OmP
z;mE%>wS^m>hiH7_YYVSpTmR5U_95QXcNL(22X&|AmEtABFNSh^r+yF3YBOQc4!O80
zW_5fFeqSWTBALo%V#({BIC-%Lq^vp1z-V;gLfX5<o0tEBVL0@DFUceaQhQonwKK)2
z&0X@&e4AdYrn)q`z5tVgl~*Bo+J%CkU>Rua>+TgW*Re+49!T|9sLVQu&ivPtDwn<#
zB=%%^7~>Vd1WyRru7m;?SybRpu<w?vO}IR>TdTkp!CqN?qy2_^y(`WSe9uYa9qE|o
zcGg`Ff;qg;-$@F&9QY~YAiHAU+kZCb9ucTo{Gb6k#xmH@V2*O=2$V9hv3N!FG!${7
zTp-rnDN>xcgi;~=_Mxb*sFFSwD6?;CdR1Cbi8F3{DehvaW-t1+1l`nx@J2Uuss#I}
z7YEQopO?lmS-vrY<18fFZQj;RUYHV1%R8M@0Tkd>SU5a}8CH-r{t1(N7NT#$sq)^w
zmVCLx`_@z>k8<ve&h!y>uq?b|oJ{kgpSC_o3O$%4V2RH#rTN1lnS2uTuJCihJod=<
zbK*b<K&B~Q;e;>D&;BL?vnWrN{SD(*)sBR6Em-F63?LK}2oSl&aN^HYHdZan2q(BF
z)D7u<lJ0O;J05y5nSuHAQNeEPGuad2w+US)L}BLRtHSBB4;rILk^KHnm#@&&PWgna
z=2(<euz2Lojj1kci-{q^0?f7tUS2+yl6i)dVnpDHYByGd>S5-tMDl2IECM|7gx%2>
zc};Ho`i;kR%Dy)GUpF~6W1Ki*Wd%6#FMi5xBe)PX;SaussO4z3-v?U!<o`%f%i(W@
zKYodCeaiprbn_cTzRC9h!zwjkBb?=5n5xJGjR5fk{&0h^|HE!o_U=DE)BR5kxJUaC
zxKtsZVEqJO6LNAxm=rvq21QUELR*=f&GBc-*_=hsNpH11h(o1vLkT+(4PQ2tyswV+
zW0H0I#C5a0#<jO<zm(O{{tf6=Ul;`X6i#*W0i~oWQwedTD?9~;Qi3ua^Y)=v%^+{d
zrVD$wOD`sT4RPbnqS1=u2&Go7g}LLJaUik%@Ok<=d-t|O^@Gei;<iIgFb0Y4d#4(s
z@WR&JIK#%xxhBn>u2?q%8AwgJaANO0!?)r6)*$^idCj}7^=gi;C5G{41QB@Q*c8MR
zn@7|~dhs0<3%J0Tf=dI8%-XKKYj#sRI^D}q0b6V;M(o(HwO9@8wBzAG+cAYdG<Gpg
zCoU<NGH2tkyT`cqNWI7nr@vW?{_^Q=wfXE@5yg!vgtPlhA|3;QWUn#=V=4Yda{S;<
zC3->z_#F+444xshfBlAac=NZ;*fOTY9TtZ05z^pR5AEUigsEZVK|3P%EN69l9T#rt
ztMj^w%zcjN9ADJ>WP_UYuZX&jZR@ji&u>=*IXGQau?w2zE-No+$nTgu_GgZsa&$M#
zZYvI)dh>Bd=#L)dh+N*aEL{^5`qD^U_KpbEKUE%6$K7WS@R1G!nIcLmnv5J+Ack3a
z2%04+f%{()h=i%kj`tsqCkKKoh%KE`ZGs_5p$zYHg~mcPi@d*l{hE-c6mFY*IgBX*
zL6~^BD26Gh26+p)EPJ2IL;Sue$6HLwX#VB^s1h4Q+Hww|5(zlpA&M+;`=Svm=S+;v
zJkHERRBWx#%q|GpK%F+Rc$V1Q(oO+`kKp_?Haa3}B9gaq1r)nI#4!25hPe^VDlLJ6
z5!=XtON&dC5`5o5js^}ccFq*%Q{E2ZcqcfHG;3~hzIV1Smr2JnUrzA}qvJS0pHByD
zCj6^D|3`QKV-Mkn7l`7C+;{KiDa87OI_;q(s#HJaMS4T(P0Ely98^+ZR5*wy_!G56
z3+J?z-u?HtV2|%ah$ea<Kj%a^7tjhVf!*5gt@7BP^6rg|obmH}0e{$BAS%yJpwKUf
z6;uzhr&gLw4$jvlhKDyaEuN$+uu;v_p0s(>4I0FGlLpsR$NLzoiQt?zYqY;)WuKzk
zX&zj^7gwX#;?y|AsCmpgmqu;LL}sQV%xExYp;~&@;1uwbc*ZH@^yP4QVY8iniz)@m
z`NT(X?G-$aA(h8Yb5{k|ODM1t4fD*k+EhMk&aPsfdgTiZ`crm;aE@iffH$0xl)xzk
zP;cf1mo~EIT*L1pFr>c)6bMypnY#=C1<hejy7FZer-~j=`LQaSVqn8yeq@3>chd$F
z%xSI__^fdrclZD!Ywh;nrQKS)Gv4n`Ga?-lrHjRFhZVaU8$}1Fr&DC&0+5EHg+pD*
z&pKO@6Taone5>3KFT+$B7Il<7`8grSj`|R;58(C6<DN^vJd)1O;x;VGW%WJ{{{TVg
zH25PA&$1!bk$qGC&E=453;i<0#EEk@CAw)r(e9_MpqJko;l9mc$tLtk>d48Z%;pV6
zj;G<~o22D(mZ@K0+17Z31aLV+Ib~<-!z5<ka0P%(F%5j68h)Gp<qiQ3wGo0!zFv1I
zK2mRc%2LFV?*o<^QwM3RG=c6qY=M{15}%k<kbi=4EgtbV^!O+CpfL*%o()za^D5n5
z;j`&T7sflZ+)RuzI|fq%!83^HED%bbx58ng;_L8n;$1l@J5BmM2+ixMerXw`lq}<n
z_@e^d5vjhHRyjV6v0awS2fAXL%_*kF$+9JrOd~X!J$cP>SSzQzTB0}{rh&2duz%ly
zaG}^#dJ9k$#eoF^;`w!0|1(z1zu5!@L<V%mQAT@2fRkZP+4aj|qbQSvLkEE`t2d=*
zm71D<J1ANdYD(+m1D%3qWMdQ}^5lP3zT^Jp2-Z?dS~cq%{v(28mM@V(WxjgXrq=a>
z@tL*vL%QefR>d1{NE>i|3C`dpl0@?KUi{TkiN<hw@=}t~!mRTNUTEx6NwxkyB=++=
zq;`QsjvL6&`Cy3k5S6?EwjRBdJgu%oo5X8R5<PPyc5sh*1?JZ%{v3D<dPs?pxkHR`
z6Aq4TDuX4vp5$*RB#HFV622trnR%?Dz+7h<F=>6mGNRUDey67%i8-Y4@?C?4BK3S)
zfr7HErec}l`_~GWBpfXk`;cTxqhQ@?lDsP1%O4g~b66sRNmD#`1VWS0+t5BO78E2&
zICkZ`iPxc*m11BQxRt7dE1Ik0(P7<}s}!ezaiQ@+*Mlw==xGFmqi$4i>jy2&9mUsA
z*j>?_P%uwoz{<j4S+$IFQiS8TpvW?t)vH8RP|t{L_oOqcvQa_P$x6EA5?E31q&B~<
zNG&$xiUDbxzcjJ$aR@GAB^RlJCy1Db>pMh_#KrelvNTR1Opo6mb0SRdK0M!Onk`Fp
z=ys4!Z0vaFCTK~5b`EdIQS#2A*Qxqp3-@B7aA|=0WBE1wz(P~(nkuXl$tH%v&|#9R
zeLm0olbua(?JgZv2G?R6yz3gVQMwP#Y?)mq-k6@gOK|{k8!R#T#dqf~3JgcyYV_!1
zp9v$!CMgIg^wGUhsG`m7QN0#1VZJ^W5m6TdZ-x>ULth(W{8-URkIild7h~&lW-x6#
zkamVW=Fm$^>gUSsTS%jcc8$w;GJ85Mm6ERkFl=0h8YO#a*X7vZdhL(N<z)d*lWz6T
zsIDrO>Z^$yXf-l)ch{DbY`+M4q6{fN>WVq;uQz|Q)ZP2YT2wh+vZ<uFNsM$_3WPnn
zscO}z*~OS$S4{P;tsEYIhHX9Z^&t7<><qvKu^Vw;cP2yfMsdFVFt-46=DzQRa3v<X
z=_A>+$wOqNyK`2r(RlH>u<W%9)q%q&N-nHZa!jNBr(Ukl(NKNXyme>ebaK2avbVcg
z{@;W^5h;qUc)ExRI?u}9`&={vL4h#9%kfVg8oSDKpXrtx)=Dkv95RS`c6_Ya%CPQC
zTS5MSS`B|Ys|SBOr^kwpi#7i^XAT5X7Z2tT*1m^K5{>uKVM+tlmjz}bI(8LGIh*ms
zsMRF~<K~gl^+qu(+^z#2j-3c!H$?Z_B(gzJR;7?X3mn5n6SWMK?*@bzhNs}#C#>)Z
zhf64Z9Si<mve8z-H=w@I#QUfO9G_Lp56&>FjJH1?Ww#3?_{~Ehqr&!d1@{PteLg{|
z77qv)uM`QvK+3m{7!R~TPcnJ&7Vd@$JSpSW?&Q|)()t24_zF+GMe1DJe9u=JL((pz
z4@A;xoiw;3?LGCEciG5$Z{N|`rA>OUUZZTmgJoTfSjMXtou~^{@2Gdt3#}aVPkp&$
z;<LS<{)^1f_j7#l8LjB8fVr6nFgMfvI&l5sl=;`w7LkgY{|PNp-#~vtlCOm(NQIe0
zKNN=9`l<wsiP*F!55nJCm`6S6`=m^d><#mYqWv~IR4PWq6R@TK>G(xHnxscc2G>Kz
zna3IzOUIMP6YyJPT55w=uM}j6{e%$j8MAVCg2K`y>GEQHGW+Q1C~P&o&OS8KcHC@N
z=WVu!LBgQ8k675M3KmokUnj4A2`EwxIHITBFM{dT(;41?F>3Zo@~au76RvQJs*KoS
z&L@-VLeWtdWPLNQgrr$_l(4LdjNv_DW?{dFzQj%)S2oXPWW_8#V2>5y%Hx-?O<S+O
zAJlzFF=t*d{)V}K=SsO{;;oAIYfDyMT}`DIrZ(1!IIkF!8PbzP2;`7N(s_LyQqy@c
zTRSyUXO3v2Cd_Px6&VxwqvN9DOW_9}rRD8{n{xEbCUC)vidXE+zBa|+W3_Z1`WZ|z
z2Izu=7MiKz1)oR{;@rp1*x=W|P{@^(r%`Yut6wGe&#lfjei9AwVO4EtN~^J8Xz0Fn
ziBf;ydSa#<5K^QeFmnNmdx_H}=~_O)%savA>f->d(WT$~az&0U;asF!k=o??sn0dY
zP~Sai?n7|WSX9ty2<<9(n`Ys=AX@RNRjzxYcMjsFZ?*klo(9`Xy0pz%+dO3^(+0==
zbA1P2Ogj6>A;Xc#xtnp7B~iZ?OK=h>aDmEqi5QqA&V7UYaQwbvoMw%fid2k?v=$&W
zU9LC1N7!8#Q-W<rkKRG-<+G|!R$qNc9LFF228l-q5!;h6NRe`5A9)h_tKW5zwrw)2
zpIMR8`>fmkA|V1){F$W1nSN@5^O7TnxTnpys|30Y$U>gDEnU0u7`$EzCUgxKF=SKK
zc(M!e{m6AkXWHEu3NF(2SA@7<23J^(Jg^;%h5KGp(c)gN$N7PNs6sUOs-M(%hY-0?
z|B;LE-P5z_yS}s1J{j;76a!AP{;PNwe>?_)&boGne>lMWCEi7uGGMK$fW+GXaJzP@
zLeKG9htxxEMuTA+D1<>_B7;wzX8q{haH4_P(6W0v8!dhg{dEgbRwR;)&j-;kT{BT*
zGF5alYiw*J#lFCK_w@1W)i+2V*HX%u9(Z`}>My23@3YcyD46nzA%%NuA<zN4Cv0Sl
zg?c)ovBc{3X|ku&(uw-a5lLDTRIFeXOGY_Hnt}aVE=Hagh(_;-cljGykF^LLFw3>6
z$lONl=$>A5cNf{XG<uYGWm_~mnz56E@{}3Ppvk+;6b!r?EVFIt3MBtV^kKjWn>kwN
zKJmz+b(iE7?Za|mYx@aj!F+AgUP^!_!U^+IR_LR7^Wd6_?3V!V5M8Vknv-+Y*0=VB
z3RDkWb~q(Xg>VWlaH=;l$s&6kowW8sh+In-9=`2&@$jt{s5oin8d<4-abf1&S1-yY
z4Xll-Q5$CpVd1vYSL)4;BBv`+o2Uw73krO-6KUK|T~D`hx1+))!2)*!D_zF}$3nUF
z@+Bco^6H5c!eU*o;#dsv6N7QlCIKiGMYk#s&zjCk;|@N&6P?8zHiT>2<9Z~6OW+dy
z1;en?LH?maVakQZ=w<717oPTVD5{odQy#<P@H^gv1&f;x8JXrU@d_g*a9<ZX8-sP*
z_4+z!yx<khePt3IWKz91K#NQw#cnBc=8t_$OCsh)I3X`c{~_@U9b)7tQLhn`P!-(H
zhoEE8>~CajBt5Rs?}0C1?oiNK3OWSt#y7$R%ayCbDQ7oAH<-&`Wp2>)fn@T+)hdW?
zvE+)d2_$+7ALBDazH-i|WSMsT%KI8p;uxa*y6SzABt(4(r{>`#y^}+@uNBzb65Cdz
zz%0=Yndh4^T4e5FymIO<wDH23NYK^bn{A>P2e;OLU$IhxNx)$Py!MR08zX)l`2XVJ
z^~^~xQbAU_TL8%u;DbF~QB3)XgcU}tLY7)W0SyEOdbQ!8*+P<|dL`kJ9q|#!JE2iF
z2P|F)Gcm)p=B!P3ckkv1x081a-vK`zC7nzWwj4fZ4YttY<JSc0jSj5x1<oBoXm@;h
zS3Qsl7-a6~;Q()(l%gho7C&6coa8|^%H<hoL@70cS|t)J2wOatYm`iP-GV>{*0j83
z`PT;>OuT#X3hZf2Y|#0OO*KdOdF<`w8GXTMqD!jidZDjP_B-7vFClC@%wCpeyiVBR
z-jHXmyT>GNns9^GS}Ruz7(N+Gs|YythV2@4+Vsb`i=eGpP)ZXpdFz-;FN8{;cCt`v
zc+QT8%U1bDX*pG@Uj@NNt;c*Ds=wF$3*_JHS9k(r_YmL_=>d2n_*Y@<gba<W?F_|C
z?d%;C9rb?H{~vF^y(*T9sH%Wd^3^uBH6{}9@9O6z`~`HN1WN>vV3A``LM;>6=Nn|z
zre+N07A%UrbNF+fy2fh#6N|1jjqmfH-t*^9**oh)QB;1kEqHS}+ypo@-}EWd{rd6h
z%$flx&-P89`bb8uk&YOaJsvhT3Wg!wx(1MR<Jfs<GM#-X)I2;kvkKQNMCF*RVjl$G
zJEjoXsPqV=dd@F+4cPZ5XIE|xLArFt8t;^PUptp*6l={Ws@JF}My{k=nKUSul&fP4
zF#rw`Fff(MyLG=2=iFUk*D^9o6C6ry!Rf}<oj047N_7;cR~|$eN-?Z!F4JgE=7@~T
z9!AocI895eFVJ*s8K+|NWTwIm%28h^)~GNCOS>S$J~<4L!=WM+XbG8e#Rw9dqM9!@
z+#_6QHns5>W898fQL8nHugDl&2EBr0Q&x_YDt@cktT5=HQP5iCd`p4gHB$_A!2NZi
zfd&6%=r+PKc<L^qtYRC46&Hb7Jk45!trmMzGMu<CFdX8V6pd?*9M8e7J2Po&t%(tK
zZribb46IQ%jbdsD9^PrE3~Up6dUuGQZtJjZFtIBMcJFQrO#L}{e-cdCyl#k#<cD>F
zcD>}A2!}ZrljP{g7lSURAIQNm87b5}hmrWXJFAsVr&+soJYUbIW<3f`8Rn&64AN|n
zSdEEN^c|s2!F}}qI+8?SVwkqY15P7FqL;E!ycf$J%{gv!1HO@T*!_;91hNgu4&Yv_
zLVv=T^B%)U-s|Imj%(pjRp^!<7P~u*P@4{oI(<@|8!tD9aMICh#2eS4$eGG3v%|!D
z3A9hb5HtqpqehMMa#N!Ts_sj&kZ`-;{^vSa$2KvUzQTu(^Rn+6Ub!urJ5;1XyfGF+
zPk&ug5Jz{R?Xt?FQ>0Rd;JiS)`RxM2aDHoU{Tt$KM~`fJ4=u@MHp~=H1h{{0>(l^Z
z)`#oM8@Fg94%5>@ozPzIKn4u?<Bv})qn<8Vi&J`$+QNjILO$C4kOsH~Y+d>Z9^Kdq
zb>z6+;*Il{_Z$%8;%)VaMOgBcyqA`}UcP78_o$yfdftM9!cK-<QcjlNP0It6onG{r
z;)EdUxHd<B)Z4GU<QYTzHrT}icEfmSN0^g4ABz{OL%im?nCniEzHbzI2p>_c98twa
zHqXs$;lCQr75r$Jq!!*D1TBMN$&{KKiwJy76a<FvnXoOXhw~bVOugB)@nxCBw7odJ
zQ?^QnO*cjcBNOH%OgEGCA&arY;DmI<i!J><cP(2Ft={12iWn#311^tDI)%f2@^dX6
zfpnc->O*8aAD0)##01^2jiQZ=S6PyL9<tv!;=U68eGG{Q;z{}LS^X6-Msxi-Mk~77
zI~ZF28=FE#+^|%)09w$e`4Y>z`dPCX(PcIvRFR%Q%oq&J*9@-?yiy6KV#!b`ri50d
zRQ+HHJA+XuO_7QOd(_ieE<QbtrZ=^Ex3&X!0$U^zAx4r|pyj9sjDlF8XNwYf551)L
z1Z}W*A0tpd+%J*6XiTswvw|Gv&TW_Q`piC@TbM?TRj#Krz0#*sAq#e?795|)L<4~Z
zQkQ6=4Ru+Z7#l+Sw0Rm=Jlv^?Ly;s56@(4fP!Go1bFfi7dt&w>+CfY<*sY!`#?Q6B
zy5398or>DtM&>Pt;fqQzX%#y7TO~D@!Q8N`jsznSaHVV@QII_GY`mUV{i<lbTfkD5
z<tAR$WqpLKT!JTNE@gESmGEU#_T46curtQfDY;fioL~Fdik7sqUx@jlO~-ZES3+`K
ztt$+JgpTEIR^z15puV$zU=RT8I6zC$?CMt`7^2hK`w!7FwZqJSos!uUv|rZxuy^F7
zFgVbIkJ9Dx6qx|-FLE_tiuufsHJ-r!-lX*CCVr5B=4=5Ni<p0H(!Wf*KOC!nSzf+V
zT(h2hh4v^%jRtGqxva#B%7Mqoe(1r1B}<l?9AgP>gy`NP(A}J%X}?5&&wsZWPQiBz
zc?)>svRp9m2Q!__B)myK^VmyYTJ!dL1hE0?7sFX%XPzI+HQT~=qMN2?g-TJ)yv&^o
zP-?RkV&wTaPG0K7dqAKQ@lbwGb<gK6wepteD{9V5OZjvohuy${<*HXXC2p}H^C?e6
z`6b-#P{K)wnkxd4>9HunYmN}@dk%i*Y6CgtG26<8lS=_zY90qI7DfB}ire6El{#mc
z;nEwoLQ&~Dc`v!lIOL$!8Cqc^q1h(sj5ncZeba?%Dy69??%`Jp?ZZZ>TN*R4Ep}sI
zw{?js2HG>`K26%gY%2}$aMg~J`MfG&2;w$5vc%2GLM?tmm92FD7>Lt&#@luqnUb7n
zMTH2f?x*aH%6_dW3+wKB{N5x-bY8Q7_w;nlC+dFhl!&BN&Ff1*S?}lyRicHzJ65=f
zO#y?AA+n$PMh7kEH#NpfC>Lnwc{{Z)Vlk`VfVXgIAuJw^YU76nsxsw4)XG69SOl3M
zXsToc7Sjz)_Km2o@OS4l8Pk|X#8Bcodlqp{eX(rt5%t!Csf6D|iO(IUR*jxn8u2KO
zQ2ElC42(){N+<T^m8EQdLCd;i%VN#UMk(Zt+-k5%GQ_6lE7I+)<$53VKu1_3Li~XF
z_iiOt4|T%}SZxeJ|JMHaYq$E(w$guDY#hCwdWG~TrwNq@ECt@fqi2{+Uki?0=|Zji
z;x(0;=){|x9vmv@c!+a!51=(rV~1BMwqN%mqBn&(PbFc{q|>?>x3X&7oo+mgooiaS
zIvzb95Qu_Akw-&VCsEKR{6ZwE1sQ^Dq&q8pmb6%CggTRbctH9@U2Nq8LLNW}pd=Wl
z)2ye3h=#^9CL^`Tj0Z|w$>T;#V)NRoh|No=l@&1z-e+UkRuibQ&9wG2&Ky}hRs@pk
z&{u^6Votln-4}O_cY$AM;?jnlE9nfz_he1h*m+5^E44Gg@Gffy)%TbyGEpeMe`{2)
z5*7nD8Bstj#>{{T1EU_vd5^`35WIP5gh(GPDeFoGC)=FJWY{fZomyNDEx}y7*y@Q+
zE!*X`kfss8HWb@hx<i6J^{P&*RcmtZ*cF@oZapy)PhJa~z>{mGnzB$zNE*{{roGJ)
z74vfpFx-*xmyL|>aP{5|H_RRB2nK&RUyU)Q5Nyxk0h)N4isUHfG~i4EXs`76b>R{p
zaTE$B^0yjYa0Dz4T!#L-BNMU4i_Hbr=KTo*#^mn;q#H-@)7~#Sw!W<g@en5$^^RmS
zoP%>zJV<O|`;^4m{kdqdI5GJc7j>yR2QRWHPVe)!r_j!+mZ)-gCwne;e2sekE2s#u
zBB@|AlL)>RmIfI%!jyQ9yJ=36Y=kjt3Ss$!7>SBfYIXZ3iz10mkjP@voHl-|)^tIh
z#IY2OH0SyP1y$O`Gex+}Lv)?dR?e$O)x$1IK~c<aJDU5vogRFA<01Cly?eN$N9>ET
zQ>(H{FhP9X=x~9~8;=t1n2V;CyWI65+}B__iGq-W+!Er~oYCPvy%Po`*xl&OqhjBD
zAY4Ky{Ib^XLF8{~54CQ6@9!S7KA#DyA;cCC4>(OU)<D{(ES-F8!GnpHI9yX@Kf!C<
z-19l+(pZ44tuX|fryb77_MGtLfz}e|X!_WM+tWm~PX*El-4Ol$5<^=?(d291+ujib
z{qnuw1tI808=x22(d)^*;AJ1UFooua%sK*@d|*W=sX#|BHxJ1Mm2>A_lDLI*%?VKI
zVF7!a^&(NWCGBf}7T177CBQTaEqJ;4=I>8sWt6@0_tP^XfDa+y^Fs#!aMb<(TLYk)
zx#~9>06Tw+{0|I*1`1Fvhk^oP1X%b0y#E*V9xyumxR8KO1iyck6;%?Xmy{C&9Mu1N
zvW7l2DgnShC<8udfX|;-p6~a!#s5ntD<~%^CaS3PLRRdr2;|R*0khqY3km3(U>e}N
zwVm<bIG?8gyf*zMMaPd6Kf?9@6BQt2>0c5a{ypIj35H*oP5cau-UI%12Jj*Mk^K9u
z))ybJ{`#KRAIyIO{HY7|XQcJ#IqF>voJ9l7^EQBze{cRjuUcPVz+e9f@cF6^u)cF~
z6?Akk0mQyF)&CjT`8ng>v6_7`fMyBsA^DRIaIf`s2IS#4jFNwr;g6Th=XhX6ZYx@V
zyea@v)Bg=m7ho&?4W782u7QQ2G9diCgteuijJ377qs{N3@iw)WdI2E!fL{82L-^0D
z))&xce+LbS`D@{54>(sQW@=$5sIPBmZ!fEBrEC1B(!%q+kHG7QeUG4h2e9Y;J?{hn
zQPbb#UG)!X4uGk{$kf;o5I!3aO8)nGSMbC)-2qeyHX!eee`XwTul2o0`YrVH_LKmK
zMOgf|jOV*DHmd+K4g{#3?<2;aSFJBS#&6MOtd0L`EsWV6g`ordOsoK9{(da#&#TtA
z6CeWen_Bpr?A`B+&$(K^f(v-Wjsc?p(Vu{Td#x`v;OB2J0fzz|bS*4?kG9e&6WRl)
z%y)o+>F@1i2j~~SK@+mJcK9y4VI!++Y6Y;l{uJAI-UTFP8_1>rZA1zv>UYV6Kd)L}
zU(Vk`|L6juE{6J!{}(;|Icfk-UP(0oRS1Ae^Cu+WUhA7G{9DvN9*Q5>-!uLDig>QM
z`zLg*ZvsF><~J4bqgwyl@bg^b@F$)FU_k#3-rt)3zbPI*uZ`#Wc|TdaRDa9z&m+!r
z*_@wnvv2-y^87IX|8@fXYyQ4(ZatU1`3Y$J_P>kZJV*JS>iZ-4{rWB&^T+jl9<$W_
zTPeSXuz8;Nxrof4$!mSne@*<So4{X|>(7j@&*7g7gZzZ2H25WNe}Vn+a>?{-Z~R_w
z&m}m1qM{o93)FuQ<anO{=TZkhnb1xC1=C+0g#e|q`K$23bE@Z&=6_NFoBtEle~CN)
z9R7L8^q=ra7XJkQqb2?+fckT)=do9RQZ+gJ3#vaV?SEC*^YE2FNtT@d1<5}LvwU8n
z=h6Otl3~056WL#Pqn~3wk2UoZ^UUX;Fn=`2AJBjN_{-+rbC%~pjefEm`~AZ5AGBXX
z96iT;9#G*YW>46!nEyV!!gHSIhx~u?BuD(h^XuU8ua5jb=X`!t`zNPZ^#A7k{c!c%
zr}ii2dCvdF{Edh0^GrW?VEjq2llLzO{yIwiz68(R$9@tF6#hc+=PdDW48PAy^4#6y
zCy{UIFGRm|*MEB4o^PT5L=LX_1^L&`^au3sH`JdO;`!F)Pb#<Sf1>&ybLsOPyPvR&
zHU9+rW5D=_{k!J{cy8DK$wbij3)A!WhriU_|0vLNTk}tv^QK>D{sQ}>K!4o+VeETu
zbo_}g(fTj&|GNqDd3`;%qx>XV1sDeYcrynq2!C%?c_j@FcnkclF2e+b1PDE++xh+1
F{{tUq7iIte

literal 0
HcmV?d00001

diff --git a/samples/client/petstore/scala/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/scala/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..b7a364739551
--- /dev/null
+++ b/samples/client/petstore/scala/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue May 17 23:08:05 CST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
diff --git a/samples/client/petstore/scala/gradlew b/samples/client/petstore/scala/gradlew
new file mode 100755
index 000000000000..9d82f7891513
--- /dev/null
+++ b/samples/client/petstore/scala/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/samples/client/petstore/scala/gradlew.bat b/samples/client/petstore/scala/gradlew.bat
new file mode 100644
index 000000000000..72d362dafd89
--- /dev/null
+++ b/samples/client/petstore/scala/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/samples/client/petstore/scala/settings.gradle b/samples/client/petstore/scala/settings.gradle
new file mode 100644
index 000000000000..5452c701c0e2
--- /dev/null
+++ b/samples/client/petstore/scala/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "swagger-scala-client"
\ No newline at end of file
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 f7e82cd1b61c..3208eb938d55 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,8 +1,8 @@
 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.model.ApiResponse
 import io.swagger.client.ApiInvoker
 import io.swagger.client.ApiException
 

From 92d4f5df226a841a9394a2f158170a4b174556e2 Mon Sep 17 00:00:00 2001
From: clasnake <classical.zhu@gmail.com>
Date: Mon, 6 Jun 2016 22:11:16 +0800
Subject: [PATCH 093/139] Add build folder in the sample scala client into
 gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7ac37b155293..5eba3895f59f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,7 @@ samples/client/petstore/java/retrofit/build/
 samples/client/petstore/java/retrofit2/build/
 samples/client/petstore/java/retrofit2rx/build/
 samples/client/petstore/java/default/build/
+samples/client/petstore/scala/build/
 
 #PHP
 samples/client/petstore/php/SwaggerClient-php/composer.lock

From 5adb80bd1b448405a889af1d6f891e200a302a48 Mon Sep 17 00:00:00 2001
From: clasnake <classical.zhu@gmail.com>
Date: Mon, 6 Jun 2016 22:22:07 +0800
Subject: [PATCH 094/139] Delete the build folder.

---
 .../reports/tests/classes/PetApiTest.html     | 121 -----------
 .../reports/tests/classes/StoreApiTest.html   | 101 ---------
 .../reports/tests/classes/UserApiTest.html    | 121 -----------
 .../build/reports/tests/css/base-style.css    | 179 ----------------
 .../scala/build/reports/tests/css/style.css   |  84 --------
 .../scala/build/reports/tests/index.html      | 150 --------------
 .../scala/build/reports/tests/js/report.js    | 194 ------------------
 .../build/test-results/TEST-PetApiTest.xml    |  11 -
 .../build/test-results/TEST-StoreApiTest.xml  |   8 -
 .../build/test-results/TEST-UserApiTest.xml   |  12 --
 .../build/test-results/binary/test/output.bin |   1 -
 .../test-results/binary/test/output.bin.idx   | Bin 36 -> 0 bytes
 .../test-results/binary/test/results.bin      | Bin 605 -> 0 bytes
 .../test/jar_extract_2499683789472893630_tmp  |   0
 .../test/jar_extract_2588204703609432255_tmp  | Bin 10545 -> 0 bytes
 .../test/jar_extract_5992752952754193465_tmp  | Bin 596 -> 0 bytes
 .../test/jar_extract_6315988328729383060_tmp  | Bin 2287 -> 0 bytes
 .../test/jar_extract_899015300961717389_tmp   | Bin 572 -> 0 bytes
 18 files changed, 982 deletions(-)
 delete mode 100644 samples/client/petstore/scala/build/reports/tests/classes/PetApiTest.html
 delete mode 100644 samples/client/petstore/scala/build/reports/tests/classes/StoreApiTest.html
 delete mode 100644 samples/client/petstore/scala/build/reports/tests/classes/UserApiTest.html
 delete mode 100644 samples/client/petstore/scala/build/reports/tests/css/base-style.css
 delete mode 100644 samples/client/petstore/scala/build/reports/tests/css/style.css
 delete mode 100644 samples/client/petstore/scala/build/reports/tests/index.html
 delete mode 100644 samples/client/petstore/scala/build/reports/tests/js/report.js
 delete mode 100644 samples/client/petstore/scala/build/test-results/TEST-PetApiTest.xml
 delete mode 100644 samples/client/petstore/scala/build/test-results/TEST-StoreApiTest.xml
 delete mode 100644 samples/client/petstore/scala/build/test-results/TEST-UserApiTest.xml
 delete mode 100644 samples/client/petstore/scala/build/test-results/binary/test/output.bin
 delete mode 100644 samples/client/petstore/scala/build/test-results/binary/test/output.bin.idx
 delete mode 100644 samples/client/petstore/scala/build/test-results/binary/test/results.bin
 delete mode 100644 samples/client/petstore/scala/build/tmp/test/jar_extract_2499683789472893630_tmp
 delete mode 100644 samples/client/petstore/scala/build/tmp/test/jar_extract_2588204703609432255_tmp
 delete mode 100644 samples/client/petstore/scala/build/tmp/test/jar_extract_5992752952754193465_tmp
 delete mode 100644 samples/client/petstore/scala/build/tmp/test/jar_extract_6315988328729383060_tmp
 delete mode 100644 samples/client/petstore/scala/build/tmp/test/jar_extract_899015300961717389_tmp

diff --git a/samples/client/petstore/scala/build/reports/tests/classes/PetApiTest.html b/samples/client/petstore/scala/build/reports/tests/classes/PetApiTest.html
deleted file mode 100644
index 832cc577c495..000000000000
--- a/samples/client/petstore/scala/build/reports/tests/classes/PetApiTest.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<meta http-equiv="x-ua-compatible" content="IE=edge"/>
-<title>Test results - Class PetApiTest</title>
-<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
-<link href="../css/style.css" rel="stylesheet" type="text/css"/>
-<script src="../js/report.js" type="text/javascript"></script>
-</head>
-<body>
-<div id="content">
-<h1>Class PetApiTest</h1>
-<div class="breadcrumbs">
-<a href="../index.html">all</a> &gt; 
-<a href="../packages/default-package.html">default-package</a> &gt; PetApiTest</div>
-<div id="summary">
-<table>
-<tr>
-<td>
-<div class="summaryGroup">
-<table>
-<tr>
-<td>
-<div class="infoBox" id="tests">
-<div class="counter">4</div>
-<p>tests</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="failures">
-<div class="counter">0</div>
-<p>failures</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="ignored">
-<div class="counter">0</div>
-<p>ignored</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="duration">
-<div class="counter">8.201s</div>
-<p>duration</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</td>
-<td>
-<div class="infoBox success" id="successRate">
-<div class="percent">100%</div>
-<p>successful</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div id="tabs">
-<ul class="tabLinks">
-<li>
-<a href="#tab0">Tests</a>
-</li>
-<li>
-<a href="#tab1">Standard output</a>
-</li>
-</ul>
-<div id="tab0" class="tab">
-<h2>Tests</h2>
-<table>
-<thead>
-<tr>
-<th>Test</th>
-<th>Duration</th>
-<th>Result</th>
-</tr>
-</thead>
-<tr>
-<td class="success">PetApi should add and fetch a pet</td>
-<td>2.414s</td>
-<td class="success">passed</td>
-</tr>
-<tr>
-<td class="success">PetApi should find pets by status</td>
-<td>2.665s</td>
-<td class="success">passed</td>
-</tr>
-<tr>
-<td class="success">PetApi should find pets by tag</td>
-<td>0.567s</td>
-<td class="success">passed</td>
-</tr>
-<tr>
-<td class="success">PetApi should update a pet</td>
-<td>2.555s</td>
-<td class="success">passed</td>
-</tr>
-</table>
-</div>
-<div id="tab1" class="tab">
-<h2>Standard output</h2>
-<span class="code">
-<pre>finding by tags
-</pre>
-</span>
-</div>
-</div>
-<div id="footer">
-<p>
-<div>
-<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
-<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
-</label>
-</div>Generated by 
-<a href="http://www.gradle.org">Gradle 2.6</a> at Jun 6, 2016 9:57:03 PM</p>
-</div>
-</div>
-</body>
-</html>
diff --git a/samples/client/petstore/scala/build/reports/tests/classes/StoreApiTest.html b/samples/client/petstore/scala/build/reports/tests/classes/StoreApiTest.html
deleted file mode 100644
index 3de64cc1941d..000000000000
--- a/samples/client/petstore/scala/build/reports/tests/classes/StoreApiTest.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<meta http-equiv="x-ua-compatible" content="IE=edge"/>
-<title>Test results - Class StoreApiTest</title>
-<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
-<link href="../css/style.css" rel="stylesheet" type="text/css"/>
-<script src="../js/report.js" type="text/javascript"></script>
-</head>
-<body>
-<div id="content">
-<h1>Class StoreApiTest</h1>
-<div class="breadcrumbs">
-<a href="../index.html">all</a> &gt; 
-<a href="../packages/default-package.html">default-package</a> &gt; StoreApiTest</div>
-<div id="summary">
-<table>
-<tr>
-<td>
-<div class="summaryGroup">
-<table>
-<tr>
-<td>
-<div class="infoBox" id="tests">
-<div class="counter">2</div>
-<p>tests</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="failures">
-<div class="counter">0</div>
-<p>failures</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="ignored">
-<div class="counter">0</div>
-<p>ignored</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="duration">
-<div class="counter">3.613s</div>
-<p>duration</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</td>
-<td>
-<div class="infoBox success" id="successRate">
-<div class="percent">100%</div>
-<p>successful</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div id="tabs">
-<ul class="tabLinks">
-<li>
-<a href="#tab0">Tests</a>
-</li>
-</ul>
-<div id="tab0" class="tab">
-<h2>Tests</h2>
-<table>
-<thead>
-<tr>
-<th>Test</th>
-<th>Duration</th>
-<th>Result</th>
-</tr>
-</thead>
-<tr>
-<td class="success">StoreApi should delete an order</td>
-<td>2.357s</td>
-<td class="success">passed</td>
-</tr>
-<tr>
-<td class="success">StoreApi should place and fetch an order</td>
-<td>1.256s</td>
-<td class="success">passed</td>
-</tr>
-</table>
-</div>
-</div>
-<div id="footer">
-<p>
-<div>
-<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
-<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
-</label>
-</div>Generated by 
-<a href="http://www.gradle.org">Gradle 2.6</a> at Jun 6, 2016 9:57:03 PM</p>
-</div>
-</div>
-</body>
-</html>
diff --git a/samples/client/petstore/scala/build/reports/tests/classes/UserApiTest.html b/samples/client/petstore/scala/build/reports/tests/classes/UserApiTest.html
deleted file mode 100644
index 450651fcea95..000000000000
--- a/samples/client/petstore/scala/build/reports/tests/classes/UserApiTest.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<meta http-equiv="x-ua-compatible" content="IE=edge"/>
-<title>Test results - Class UserApiTest</title>
-<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
-<link href="../css/style.css" rel="stylesheet" type="text/css"/>
-<script src="../js/report.js" type="text/javascript"></script>
-</head>
-<body>
-<div id="content">
-<h1>Class UserApiTest</h1>
-<div class="breadcrumbs">
-<a href="../index.html">all</a> &gt; 
-<a href="../packages/default-package.html">default-package</a> &gt; UserApiTest</div>
-<div id="summary">
-<table>
-<tr>
-<td>
-<div class="summaryGroup">
-<table>
-<tr>
-<td>
-<div class="infoBox" id="tests">
-<div class="counter">6</div>
-<p>tests</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="failures">
-<div class="counter">0</div>
-<p>failures</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="ignored">
-<div class="counter">0</div>
-<p>ignored</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="duration">
-<div class="counter">10.898s</div>
-<p>duration</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</td>
-<td>
-<div class="infoBox success" id="successRate">
-<div class="percent">100%</div>
-<p>successful</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div id="tabs">
-<ul class="tabLinks">
-<li>
-<a href="#tab0">Tests</a>
-</li>
-</ul>
-<div id="tab0" class="tab">
-<h2>Tests</h2>
-<table>
-<thead>
-<tr>
-<th>Test</th>
-<th>Duration</th>
-<th>Result</th>
-</tr>
-</thead>
-<tr>
-<td class="success">UserApi should authenticate a user</td>
-<td>0.559s</td>
-<td class="success">passed</td>
-</tr>
-<tr>
-<td class="success">UserApi should create 2 users</td>
-<td>1.912s</td>
-<td class="success">passed</td>
-</tr>
-<tr>
-<td class="success">UserApi should create 3 users</td>
-<td>2.355s</td>
-<td class="success">passed</td>
-</tr>
-<tr>
-<td class="success">UserApi should fetch a user</td>
-<td>0.594s</td>
-<td class="success">passed</td>
-</tr>
-<tr>
-<td class="success">UserApi should log out a user</td>
-<td>2.130s</td>
-<td class="success">passed</td>
-</tr>
-<tr>
-<td class="success">UserApi should update a user</td>
-<td>3.348s</td>
-<td class="success">passed</td>
-</tr>
-</table>
-</div>
-</div>
-<div id="footer">
-<p>
-<div>
-<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
-<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
-</label>
-</div>Generated by 
-<a href="http://www.gradle.org">Gradle 2.6</a> at Jun 6, 2016 9:57:03 PM</p>
-</div>
-</div>
-</body>
-</html>
diff --git a/samples/client/petstore/scala/build/reports/tests/css/base-style.css b/samples/client/petstore/scala/build/reports/tests/css/base-style.css
deleted file mode 100644
index 4afa73e3ddcf..000000000000
--- a/samples/client/petstore/scala/build/reports/tests/css/base-style.css
+++ /dev/null
@@ -1,179 +0,0 @@
-
-body {
-    margin: 0;
-    padding: 0;
-    font-family: sans-serif;
-    font-size: 12pt;
-}
-
-body, a, a:visited {
-    color: #303030;
-}
-
-#content {
-    padding-left: 50px;
-    padding-right: 50px;
-    padding-top: 30px;
-    padding-bottom: 30px;
-}
-
-#content h1 {
-    font-size: 160%;
-    margin-bottom: 10px;
-}
-
-#footer {
-    margin-top: 100px;
-    font-size: 80%;
-    white-space: nowrap;
-}
-
-#footer, #footer a {
-    color: #a0a0a0;
-}
-
-#line-wrapping-toggle {
-    vertical-align: middle;
-}
-
-#label-for-line-wrapping-toggle {
-    vertical-align: middle;
-}
-
-ul {
-    margin-left: 0;
-}
-
-h1, h2, h3 {
-    white-space: nowrap;
-}
-
-h2 {
-    font-size: 120%;
-}
-
-ul.tabLinks {
-    padding-left: 0;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    overflow: auto;
-    min-width: 800px;
-    width: auto !important;
-    width: 800px;
-}
-
-ul.tabLinks li {
-    float: left;
-    height: 100%;
-    list-style: none;
-    padding-left: 10px;
-    padding-right: 10px;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    margin-bottom: 0;
-    -moz-border-radius: 7px;
-    border-radius: 7px;
-    margin-right: 25px;
-    border: solid 1px #d4d4d4;
-    background-color: #f0f0f0;
-}
-
-ul.tabLinks li:hover {
-    background-color: #fafafa;
-}
-
-ul.tabLinks li.selected {
-    background-color: #c5f0f5;
-    border-color: #c5f0f5;
-}
-
-ul.tabLinks a {
-    font-size: 120%;
-    display: block;
-    outline: none;
-    text-decoration: none;
-    margin: 0;
-    padding: 0;
-}
-
-ul.tabLinks li h2 {
-    margin: 0;
-    padding: 0;
-}
-
-div.tab {
-}
-
-div.selected {
-    display: block;
-}
-
-div.deselected {
-    display: none;
-}
-
-div.tab table {
-    min-width: 350px;
-    width: auto !important;
-    width: 350px;
-    border-collapse: collapse;
-}
-
-div.tab th, div.tab table {
-    border-bottom: solid #d0d0d0 1px;
-}
-
-div.tab th {
-    text-align: left;
-    white-space: nowrap;
-    padding-left: 6em;
-}
-
-div.tab th:first-child {
-    padding-left: 0;
-}
-
-div.tab td {
-    white-space: nowrap;
-    padding-left: 6em;
-    padding-top: 5px;
-    padding-bottom: 5px;
-}
-
-div.tab td:first-child {
-    padding-left: 0;
-}
-
-div.tab td.numeric, div.tab th.numeric {
-    text-align: right;
-}
-
-span.code {
-    display: inline-block;
-    margin-top: 0em;
-    margin-bottom: 1em;
-}
-
-span.code pre {
-    font-size: 11pt;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    padding-left: 10px;
-    padding-right: 10px;
-    margin: 0;
-    background-color: #f7f7f7;
-    border: solid 1px #d0d0d0;
-    min-width: 700px;
-    width: auto !important;
-    width: 700px;
-}
-
-span.wrapped pre {
-    word-wrap: break-word;
-    white-space: pre-wrap;
-    word-break: break-all;
-}
-
-label.hidden {
-    display: none;
-}
\ No newline at end of file
diff --git a/samples/client/petstore/scala/build/reports/tests/css/style.css b/samples/client/petstore/scala/build/reports/tests/css/style.css
deleted file mode 100644
index 3dc4913e7a07..000000000000
--- a/samples/client/petstore/scala/build/reports/tests/css/style.css
+++ /dev/null
@@ -1,84 +0,0 @@
-
-#summary {
-    margin-top: 30px;
-    margin-bottom: 40px;
-}
-
-#summary table {
-    border-collapse: collapse;
-}
-
-#summary td {
-    vertical-align: top;
-}
-
-.breadcrumbs, .breadcrumbs a {
-    color: #606060;
-}
-
-.infoBox {
-    width: 110px;
-    padding-top: 15px;
-    padding-bottom: 15px;
-    text-align: center;
-}
-
-.infoBox p {
-    margin: 0;
-}
-
-.counter, .percent {
-    font-size: 120%;
-    font-weight: bold;
-    margin-bottom: 8px;
-}
-
-#duration {
-    width: 125px;
-}
-
-#successRate, .summaryGroup {
-    border: solid 2px #d0d0d0;
-    -moz-border-radius: 10px;
-    border-radius: 10px;
-}
-
-#successRate {
-    width: 140px;
-    margin-left: 35px;
-}
-
-#successRate .percent {
-    font-size: 180%;
-}
-
-.success, .success a {
-    color: #008000;
-}
-
-div.success, #successRate.success {
-    background-color: #bbd9bb;
-    border-color: #008000;
-}
-
-.failures, .failures a {
-    color: #b60808;
-}
-
-.skipped, .skipped a {
-    color: #c09853;
-}
-
-div.failures, #successRate.failures {
-    background-color: #ecdada;
-    border-color: #b60808;
-}
-
-ul.linkList {
-    padding-left: 0;
-}
-
-ul.linkList li {
-    list-style: none;
-    margin-bottom: 5px;
-}
diff --git a/samples/client/petstore/scala/build/reports/tests/index.html b/samples/client/petstore/scala/build/reports/tests/index.html
deleted file mode 100644
index 6393b7719327..000000000000
--- a/samples/client/petstore/scala/build/reports/tests/index.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<meta http-equiv="x-ua-compatible" content="IE=edge"/>
-<title>Test results - Test Summary</title>
-<link href="css/base-style.css" rel="stylesheet" type="text/css"/>
-<link href="css/style.css" rel="stylesheet" type="text/css"/>
-<script src="js/report.js" type="text/javascript"></script>
-</head>
-<body>
-<div id="content">
-<h1>Test Summary</h1>
-<div id="summary">
-<table>
-<tr>
-<td>
-<div class="summaryGroup">
-<table>
-<tr>
-<td>
-<div class="infoBox" id="tests">
-<div class="counter">12</div>
-<p>tests</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="failures">
-<div class="counter">0</div>
-<p>failures</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="ignored">
-<div class="counter">0</div>
-<p>ignored</p>
-</div>
-</td>
-<td>
-<div class="infoBox" id="duration">
-<div class="counter">22.712s</div>
-<p>duration</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</td>
-<td>
-<div class="infoBox success" id="successRate">
-<div class="percent">100%</div>
-<p>successful</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div id="tabs">
-<ul class="tabLinks">
-<li>
-<a href="#tab0">Packages</a>
-</li>
-<li>
-<a href="#tab1">Classes</a>
-</li>
-</ul>
-<div id="tab0" class="tab">
-<h2>Packages</h2>
-<table>
-<thead>
-<tr>
-<th>Package</th>
-<th>Tests</th>
-<th>Failures</th>
-<th>Ignored</th>
-<th>Duration</th>
-<th>Success rate</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="success">
-<a href="packages/default-package.html">default-package</a>
-</td>
-<td>12</td>
-<td>0</td>
-<td>0</td>
-<td>22.712s</td>
-<td class="success">100%</td>
-</tr>
-</tbody>
-</table>
-</div>
-<div id="tab1" class="tab">
-<h2>Classes</h2>
-<table>
-<thead>
-<tr>
-<th>Class</th>
-<th>Tests</th>
-<th>Failures</th>
-<th>Ignored</th>
-<th>Duration</th>
-<th>Success rate</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="success"/>
-<a href="classes/PetApiTest.html">PetApiTest</a>
-<td>4</td>
-<td>0</td>
-<td>0</td>
-<td>8.201s</td>
-<td class="success">100%</td>
-</tr>
-<tr>
-<td class="success"/>
-<a href="classes/StoreApiTest.html">StoreApiTest</a>
-<td>2</td>
-<td>0</td>
-<td>0</td>
-<td>3.613s</td>
-<td class="success">100%</td>
-</tr>
-<tr>
-<td class="success"/>
-<a href="classes/UserApiTest.html">UserApiTest</a>
-<td>6</td>
-<td>0</td>
-<td>0</td>
-<td>10.898s</td>
-<td class="success">100%</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div id="footer">
-<p>
-<div>
-<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
-<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
-</label>
-</div>Generated by 
-<a href="http://www.gradle.org">Gradle 2.6</a> at Jun 6, 2016 9:57:03 PM</p>
-</div>
-</div>
-</body>
-</html>
diff --git a/samples/client/petstore/scala/build/reports/tests/js/report.js b/samples/client/petstore/scala/build/reports/tests/js/report.js
deleted file mode 100644
index 83bab4a19f36..000000000000
--- a/samples/client/petstore/scala/build/reports/tests/js/report.js
+++ /dev/null
@@ -1,194 +0,0 @@
-(function (window, document) {
-    "use strict";
-
-    var tabs = {};
-
-    function changeElementClass(element, classValue) {
-        if (element.getAttribute("className")) {
-            element.setAttribute("className", classValue);
-        } else {
-            element.setAttribute("class", classValue);
-        }
-    }
-
-    function getClassAttribute(element) {
-        if (element.getAttribute("className")) {
-            return element.getAttribute("className");
-        } else {
-            return element.getAttribute("class");
-        }
-    }
-
-    function addClass(element, classValue) {
-        changeElementClass(element, getClassAttribute(element) + " " + classValue);
-    }
-
-    function removeClass(element, classValue) {
-        changeElementClass(element, getClassAttribute(element).replace(classValue, ""));
-    }
-
-    function initTabs() {
-        var container = document.getElementById("tabs");
-
-        tabs.tabs = findTabs(container);
-        tabs.titles = findTitles(tabs.tabs);
-        tabs.headers = findHeaders(container);
-        tabs.select = select;
-        tabs.deselectAll = deselectAll;
-        tabs.select(0);
-
-        return true;
-    }
-
-    function getCheckBox() {
-        return document.getElementById("line-wrapping-toggle");
-    }
-
-    function getLabelForCheckBox() {
-        return document.getElementById("label-for-line-wrapping-toggle");
-    }
-
-    function findCodeBlocks() {
-        var spans = document.getElementById("tabs").getElementsByTagName("span");
-        var codeBlocks = [];
-        for (var i = 0; i < spans.length; ++i) {
-            if (spans[i].className.indexOf("code") >= 0) {
-                codeBlocks.push(spans[i]);
-            }
-        }
-        return codeBlocks;
-    }
-
-    function forAllCodeBlocks(operation) {
-        var codeBlocks = findCodeBlocks();
-
-        for (var i = 0; i < codeBlocks.length; ++i) {
-            operation(codeBlocks[i], "wrapped");
-        }
-    }
-
-    function toggleLineWrapping() {
-        var checkBox = getCheckBox();
-
-        if (checkBox.checked) {
-            forAllCodeBlocks(addClass);
-        } else {
-            forAllCodeBlocks(removeClass);
-        }
-    }
-
-    function initControls() {
-        if (findCodeBlocks().length > 0) {
-            var checkBox = getCheckBox();
-            var label = getLabelForCheckBox();
-
-            checkBox.onclick = toggleLineWrapping;
-            checkBox.checked = false;
-
-            removeClass(label, "hidden");
-         }
-    }
-
-    function switchTab() {
-        var id = this.id.substr(1);
-
-        for (var i = 0; i < tabs.tabs.length; i++) {
-            if (tabs.tabs[i].id === id) {
-                tabs.select(i);
-                break;
-            }
-        }
-
-        return false;
-    }
-
-    function select(i) {
-        this.deselectAll();
-
-        changeElementClass(this.tabs[i], "tab selected");
-        changeElementClass(this.headers[i], "selected");
-
-        while (this.headers[i].firstChild) {
-            this.headers[i].removeChild(this.headers[i].firstChild);
-        }
-
-        var h2 = document.createElement("H2");
-
-        h2.appendChild(document.createTextNode(this.titles[i]));
-        this.headers[i].appendChild(h2);
-    }
-
-    function deselectAll() {
-        for (var i = 0; i < this.tabs.length; i++) {
-            changeElementClass(this.tabs[i], "tab deselected");
-            changeElementClass(this.headers[i], "deselected");
-
-            while (this.headers[i].firstChild) {
-                this.headers[i].removeChild(this.headers[i].firstChild);
-            }
-
-            var a = document.createElement("A");
-
-            a.setAttribute("id", "ltab" + i);
-            a.setAttribute("href", "#tab" + i);
-            a.onclick = switchTab;
-            a.appendChild(document.createTextNode(this.titles[i]));
-
-            this.headers[i].appendChild(a);
-        }
-    }
-
-    function findTabs(container) {
-        return findChildElements(container, "DIV", "tab");
-    }
-
-    function findHeaders(container) {
-        var owner = findChildElements(container, "UL", "tabLinks");
-        return findChildElements(owner[0], "LI", null);
-    }
-
-    function findTitles(tabs) {
-        var titles = [];
-
-        for (var i = 0; i < tabs.length; i++) {
-            var tab = tabs[i];
-            var header = findChildElements(tab, "H2", null)[0];
-
-            header.parentNode.removeChild(header);
-
-            if (header.innerText) {
-                titles.push(header.innerText);
-            } else {
-                titles.push(header.textContent);
-            }
-        }
-
-        return titles;
-    }
-
-    function findChildElements(container, name, targetClass) {
-        var elements = [];
-        var children = container.childNodes;
-
-        for (var i = 0; i < children.length; i++) {
-            var child = children.item(i);
-
-            if (child.nodeType === 1 && child.nodeName === name) {
-                if (targetClass && child.className.indexOf(targetClass) < 0) {
-                    continue;
-                }
-
-                elements.push(child);
-            }
-        }
-
-        return elements;
-    }
-
-    // Entry point.
-
-    window.onload = function() {
-        initTabs();
-        initControls();
-    };
-} (window, window.document));
\ No newline at end of file
diff --git a/samples/client/petstore/scala/build/test-results/TEST-PetApiTest.xml b/samples/client/petstore/scala/build/test-results/TEST-PetApiTest.xml
deleted file mode 100644
index cc2e356f55ee..000000000000
--- a/samples/client/petstore/scala/build/test-results/TEST-PetApiTest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="PetApiTest" tests="4" skipped="0" failures="0" errors="0" timestamp="2016-06-06T13:56:37" hostname="clasnake-MacBook-Pro.local" time="8.201">
-  <properties/>
-  <testcase name="PetApi should add and fetch a pet" classname="PetApiTest" time="2.414"/>
-  <testcase name="PetApi should update a pet" classname="PetApiTest" time="2.555"/>
-  <testcase name="PetApi should find pets by status" classname="PetApiTest" time="2.665"/>
-  <testcase name="PetApi should find pets by tag" classname="PetApiTest" time="0.567"/>
-  <system-out><![CDATA[finding by tags
-]]></system-out>
-  <system-err><![CDATA[]]></system-err>
-</testsuite>
diff --git a/samples/client/petstore/scala/build/test-results/TEST-StoreApiTest.xml b/samples/client/petstore/scala/build/test-results/TEST-StoreApiTest.xml
deleted file mode 100644
index 0944febda9b6..000000000000
--- a/samples/client/petstore/scala/build/test-results/TEST-StoreApiTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="StoreApiTest" tests="2" skipped="0" failures="0" errors="0" timestamp="2016-06-06T13:56:46" hostname="clasnake-MacBook-Pro.local" time="3.614">
-  <properties/>
-  <testcase name="StoreApi should place and fetch an order" classname="StoreApiTest" time="1.256"/>
-  <testcase name="StoreApi should delete an order" classname="StoreApiTest" time="2.357"/>
-  <system-out><![CDATA[]]></system-out>
-  <system-err><![CDATA[]]></system-err>
-</testsuite>
diff --git a/samples/client/petstore/scala/build/test-results/TEST-UserApiTest.xml b/samples/client/petstore/scala/build/test-results/TEST-UserApiTest.xml
deleted file mode 100644
index 4773a968d0e5..000000000000
--- a/samples/client/petstore/scala/build/test-results/TEST-UserApiTest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="UserApiTest" tests="6" skipped="0" failures="0" errors="0" timestamp="2016-06-06T13:56:51" hostname="clasnake-MacBook-Pro.local" time="10.902">
-  <properties/>
-  <testcase name="UserApi should fetch a user" classname="UserApiTest" time="0.594"/>
-  <testcase name="UserApi should authenticate a user" classname="UserApiTest" time="0.559"/>
-  <testcase name="UserApi should log out a user" classname="UserApiTest" time="2.13"/>
-  <testcase name="UserApi should create 2 users" classname="UserApiTest" time="1.912"/>
-  <testcase name="UserApi should create 3 users" classname="UserApiTest" time="2.355"/>
-  <testcase name="UserApi should update a user" classname="UserApiTest" time="3.348"/>
-  <system-out><![CDATA[]]></system-out>
-  <system-err><![CDATA[]]></system-err>
-</testsuite>
diff --git a/samples/client/petstore/scala/build/test-results/binary/test/output.bin b/samples/client/petstore/scala/build/test-results/binary/test/output.bin
deleted file mode 100644
index 51c4ba6dd66e..000000000000
--- a/samples/client/petstore/scala/build/test-results/binary/test/output.bin
+++ /dev/null
@@ -1 +0,0 @@
-
finding by tags
diff --git a/samples/client/petstore/scala/build/test-results/binary/test/output.bin.idx b/samples/client/petstore/scala/build/test-results/binary/test/output.bin.idx
deleted file mode 100644
index dfffe31d6255ce161034f51b7dfff3bcf73779a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
QcmZQ%Vq|4N1OL$g0Eo>G`Tzg`

diff --git a/samples/client/petstore/scala/build/test-results/binary/test/results.bin b/samples/client/petstore/scala/build/test-results/binary/test/results.bin
deleted file mode 100644
index a2b463d4a3dbe53dbf45eb3df60789f20a0bd3d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 605
zcmZQ(X6g<|EpaT!3`s36VPIekRb#L{$-=k@BB)TDkzbmVqL7#Z#Ca(SX{ja2848IC
z1*s(r?}Q-A-OU-8XQL`FEl5c$NrkHWEeuf?XvDyRW^7s}&`h9N#R^H43dJRfC8fm-
zFGV2Aqh~X)&PO#CMR`eLI>UArh}zgo3|u{-#i>Oo{wUnS#yJNn3iAle1EoO4440tV
zOV}8=7o#amEG@}M%`3@FhIj<5emzuunJEL$JT&z=`RNMzr6oW=LyQ)HxU8;&ffrqA
za#1SCP$RI)Vul}l5T$Jl417408bg(Ch6Z`RF$4cxGzY-L9Bls-DTtwSycpPfgG=&@
zQc;2?_6ZZ)N|-P#YzlG`lYx<jh~_+n{Gt?KIKAM67?yN~fnx!>u9VcAR8U;Q6mNyP
IF^7o(0G=Maj{pDw

diff --git a/samples/client/petstore/scala/build/tmp/test/jar_extract_2499683789472893630_tmp b/samples/client/petstore/scala/build/tmp/test/jar_extract_2499683789472893630_tmp
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/samples/client/petstore/scala/build/tmp/test/jar_extract_2588204703609432255_tmp b/samples/client/petstore/scala/build/tmp/test/jar_extract_2588204703609432255_tmp
deleted file mode 100644
index 407a6ed065bd255fcc8bee40e43ab9e049919e09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10545
zcmcJV3wRt=701ur$!;>qY}(Cc+onlVHrYHjAx)FgHqC~#yV-7;Z9;95rfnqDO|osb
zO*UzEQ(9g=@PQ9}q9}@@D2f&eC=x-dD2i556h%=KMNt$*Q4~c%&z-yJ%<bIlNACCe
z^-Fd;|M~y!+;h&HnS0yQFWqwr0NP2I!0OCcVj|HxGn>w)CX=n<(M)zGF_w+ZrpL0W
zsdQT*5CXfq2HQG&4<(K!S|<|e1Fbto4<*O4p?<-!Zu@DyY=|?+uED{!&|rV4J49gV
z+0a5LAh6^tM<KWfEVo_T8sjtq)wvO7lKUs{x>^V5lm=1<(uwTsOcF<Njvmh@GsMy4
zB7N(2`iaBgSmp85dfKz8xVF(<9XL8t8d#C8>S*_=6=8q4Aal4guwu<c>q-=#x-&7-
zKDyUcMf@>`T9;gjVRM%H)tzlMQR4KfiEx+{L`L?P5B057oxV-P(Wp3<s;Zs{R(Fi2
z>MuXA#;q!~dV-LMvz!o@>Zu(iLDds(?o*ZK1gQxtTCsD)?@u@yr&Be(2huB5#h29m
z;X*|zbY_+>Eh+GBx<Vh@j~w4D9xqaq<$VQvCiku%-CIAn$30x(+D6)y{l!H}PsNNs
ztb0opcfX$$7dYHU%8sS0LYuwLpeGV8cPef@S$c7WQ+GBE`1_Q=u9ibRu>wcU?mAD{
z6(P=w?(8KkZl$ir*W_u4l&wwZ#p98%r_HOXQGZz3wzpf`)@thO50A7{eS=qRi~32y
z)_p_e+tv&-K5;tAG9KMuM0OH~*XJfKhoi10;wdUx9dXwTY;D5vFFWp-y#U9*qRw-q
z2*+>k?6vZH3YXO;kstM{{;imoo_*cpyIU$c+Eq{SKwZR`cP14#=d&*y_cfT;*Sx!B
z%v<R2)@=8wg9){AL*;OBl*B#tCH~-%V$wtWuC{PvWyhh^r8Q-KpX#i0VE&>+!J>C3
zrl%*42PVgcqk+scfr7?paF~GatlA8WO(ZgzLMTP4@$6C$p+y4?mKMVj@E{|5FqI+T
zpD);j?mDbl$I&(dBx<>isCgZDSU6ZzgXK^`2U}?|#!O>u0b@*qDyXK$)fS^}8ubN?
zx(0rzrN)587&nda1&nbG>Y<SugBIhEX&hR>IHW-{v{2(3i*Y!XOH#~8l06f6T!XdH
zPL1m@vKWao8IGD}ab#mbjO+&Jpyo{$W6U&)BO421WJ7R1HFjH!x@i<gHWtLlZh;6j
z_E?N@(<qK?EQpca3frjh0*i6TG>Rh|3u0vB&`XVd7UQs<i>$stWbwELJ76a@_G4sm
zLS|%5vpBLkjqEPiP0f2O#+YdoM^>ki9fpgjal~TOO`|xnI*sf;NKoUb#TYk@;>hYW
zvg5Fy8V^{EL#9z2S)E2U1&66|!eShb=OP<lAhLK|gEUN2;}MK3UY8kJ(=3i`oJKYa
zN2&P|i!o*z#gUEE$R3BwsPS@(Q8$g^$i``8uY}i7<7+L(xM>teHclgZ6}*8O-)J!o
znMQGB<215Y!&|8Ftpp0krY5JSGD!jfdjkmCnlpj*_S0-<*?k&Z1Mi?iz7unTmEf^?
z@D(O^Df7<{4X$OL_i~!i(>1t`Y47JWqit(&J<~qOX+~$(;0C6BnA42rtHF&-`zWUw
z{Z)gTnD%i_Gg_zyH#6;%oMv=L4Q^rDr#a1Nf*PD)+O3>s^f?VqGVOLwGg_GjcQWm>
zoMv<@4enyv=Q+)2NE*yB?F*b1rT3x+_cHB^oMyBX4Nfub%baF(4Gr#N+E+QvXbc+M
z&$O>|nsM)I@Bq`k$!W&zt-)!geVfyww6ZmLkZIrLG~))<;31}cpVN$cP=kk=_CroH
zZZi!YVcL&5&A5{^c$8^B#aktj9v?iIOl$BMJN9!tKX=Tm*~gjoOHRwx>=R7;HK*lj
z_DQDwmeX=I`xMiD&uO`ueVS>1<g{GPKEt#>b6T!upJm!#IW1SS&oS-qoR+KE=b83T
zPRrHo3rzbrr{!w)MW(&PX{=@m7#hJhNNYTex+DtI3OJ3`EO9ZdkkeSr5|wGioW^RF
zXiRf+8mn2dglS7TjnynEW15%KSj`e2)0S}>t68#wX%(EtYL-+ot%}oF&5~-S;rpc}
zF05vWpJ_Fm#%h)Xm{v!iC_6Qfok^v!<(4-FEelO{6knR_?EPGDo<<r-5c@Z2BH-#u
zrBhjaHB%b#SwhYw_-5%O_-5$}P$58vvbA@5=33H55$*U=-!nCikDRjJDO`6BC1z5I
z(TU_B{e{!%O{J3;&Q6XdXL3i>GYeA!+q=S|CA4k8uEB7KE}FYTwug}+v9<KUMbIq4
z%Pr;?V2e&9F!g^Kimj~Xw<01_$CBf_FbBp)!OIU-e+Z)`oDJP}pb~+X9V+|u7l1Et
z;vzzot1|oa7dv9{z|`!_STdHP1z6F~)|f-7ObRP9oK8<=6Le<>m!U=T8zlvPaDWr=
zses!;z4)nt8~1(A!@qTcf`0&9O$~EUb^^aS$a?&}3>|nByiksx^qUWl5wgMfj!h65
zxMu?^M4ZZ#s4s?71*=4yb8cHC#}73kPTgYXRSyj!PSdT6yq;z_SHx+(W09P-&~}F7
zV3}#EorCl8&ucw;_<U`EjUrBG{(RXvA?OluHs{ZmowEhPB2IL%^V$kA5l7FTFZ=bx
zVY`TPVg7vCIXmDLHcsUn4CJ5JAbR+G?Sdf@XK(&|**U}TN)hMc{Q0tT_Q9(}oUz5u
zYaEgy&cXcovR_XM4v9FE`SWGxq+#j|XTBe<o`aeE^U9!y&sP>^MVw>#^JV88hf77A
zEAr>d&bbm^E#kaxvGckLUN7RjDSy7~*K;+zS;To;{(RXv*TCEH`NE!G^Zl@S4&HTp
zp1%5Scn^+k$rssZoZW%Xv1`S=_sQ@!A@4dd?*p>D>&3he$?|Rx^FAWWyHU*hm@Mxm
zG4B&HyiUx=&0^lCWOy{cw}^S4k>#Bb^KO&nofPx#kmcPe=6z0<cbAxVw+xTwcTUW^
zM}|l9d#{-HC0X7nG4Cs~y!*twugUW67xTU$%X>h~`<4uk=J&Li_Z=A?&F_O^-uGmA
z4~cm{kmWrr=KV;P_lTJH6ItG)V&2bWcr?F{iFv<};f0X*xS01V86K{5;0ZDBH?q7Z
z#k}9i@}3g&{vgYHTFm>CEbkdH?=LdE^D!UKig|yN;nDm)C+7V_miN4v_b*xA3u4}X
zWO*-&dH<E<;dYSdeVjOCc$i<@M;G#(GCaCd;S%$TWO=HXS0c;P#Jo~j-V!m-Bg-oj
z^U7s-G`~JEZ@CPQ=68jdw^Ei@Ddw$`<yDJ$=g9K>VqUE*FCgaC%kXG^8%QJmrt9-o
z?5=dT*x58knoS(tJjR1;d)c}uM;rbdO>S|&E@xJo?k24WSZD4NFo0?Y<W}`9`2P%z
f^*t!0o38Vrh-}8s5=5%_Q=EYkvIP$)PJsUb;nrq|

diff --git a/samples/client/petstore/scala/build/tmp/test/jar_extract_5992752952754193465_tmp b/samples/client/petstore/scala/build/tmp/test/jar_extract_5992752952754193465_tmp
deleted file mode 100644
index 3e1bb0634afebb49f94fe39d81e5c4938811ff83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 596
zcmah`O-sW-5PjRGjg8T2{ivUa5U}mRpdM2SDinmEhidPexYR9aBFRSlTb>jT{s4cJ
zIEn40LCUf-%)B=<`*yy6KED8*W1rz9@p-`QI1QDY2>a4YRLp(VPeWhHC_J+!{_w_1
zo^>#Wk-LE1b;taL+W`+p_MJBtzH;VDuA*1*_z+6v^kz_DmcwwgV2}=tq4`HD)a$4c
zSdem>(;2E=N%MOQ<yL!Wq6Wi21<MSF|Mau`fG3HL6{@weT8rVJH5FEv?qp5tSTnGS
zbp}m6$%LUj_YZ~F%|4pMYuC}EU}(4z?Pkbh$-O|_XNIBf%23><6Hmm`Ol=@XAy;Wk
zs4<Ar*cW}7Q7eONwc0UCB#%L-l`}e|m+Tfr7kLcSI`1$$A85Q$vV?82CP4&X1DoWV
VbgOyBL>W62mB{brehGWz@eAj8oiP9a

diff --git a/samples/client/petstore/scala/build/tmp/test/jar_extract_6315988328729383060_tmp b/samples/client/petstore/scala/build/tmp/test/jar_extract_6315988328729383060_tmp
deleted file mode 100644
index 0539403de97cd71d5d0abbb3e9fede0e71f84f08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2287
zcma)-ZCBbz6vyu*nP4EO!Lo{0>|i3IRSLBAvF;{_71Vl^mR4I%PhhErDp(S_r@Q?~
z`}k`2?2G*X`=R#i4HV0<*|WUJ%-oy%yZ2`1&+zv@fBppkX*eV>V^_@!Gudi49P6@{
z)GM~rGONx`yHRzlX5*d@2!XB5<MsWz`QA)kn2odKVWnQHIvZPGy7s%-uIbIE#~WK4
z1V(SdJ`f0u+=%vpNMQVn7M43<1frj^w`y-Luzs@Wc3!m38m7~3)vyY!d~j+u;ld(0
z$Q&`kaon_`%qnTeD#$CrsQSJ<tWGp;ucpFML}$8Szg<@+mS1H8d{{a%%jwFAc$+Yh
zleB{fVOgI-6DLP8!ux58G2LKIyRdi`%yEHfJ<m*m=f@(8=Z(ll{q?#aWOZo_DWyUQ
z<9IC*ApxGx2VzVNVxCmU&}B-e-?fLM59;Np5Yw|kKeZS$b<7)^Wc=<Z##teQj8eK3
z8A_g}>)G^v{N7|H9SCwoE2Jtu8nbf(7szQ!iW+1%Zroj2dYQT`*5!EcRmM-l=~-r|
z_Un=`Z|EV)mX65I-gxTlq_BNH8uL>v#&mA+y_vo{zKeODYl<!!gwi+aivzUFn(_{9
zF&_IEABhg};aq{~L7wwz_Txi*Z)wVr591?S&UbEnQ&Y$g+P;_^ci*?MFSNyA`r~-e
z<=e=Q@?22);rU@?<;}EoL=rq_NOX-^uU0SjMCS~{x5p%wV}vi2=hO*<sBu0)=8`X0
z>ek%-7nkLT_?U+HdOkw)+S_Nk!0k;vlu`wrI|$O0zFS_svc4}UjHBWV$0YKM_&#XP
z_;B=2n9uQPJxr7-s-TQz^Xls2gL+v#RqZPR{Cwh+K)9o><h5kg>V;|BJ{Tr&YyPI5
zHxj2Z$S~@M5l{#S&beh1U_D{}*N+Ibd0iV%r(4_bE?~$IhH<yRL?4yyQCV*)E5jt*
zcB$z;YP&~mdsEvo%m8z#SRb|1qjtQh9T`-ZbE$YAmG4n`Zz?ZC0v28BZXZ?XQ3Y?R
zAj2};bE#AxRqRnkZ>lIm1|GQ7!#=9iqe|XXNrqKecPTutA*We%T2|xCjZO63bX_k-
zXddeLGERm^@U@%s8v^2{)v%l`84OtS0|h)wQFUFa47qM)+;Sn?{I*6QwBN-0tz@<=
zvvN^;>JE5g?pux8llEn$*81d;t}j3W{$jJ;s@8TaH#BnGRb$DrEoAjZqv@FLm5zcP
z>Rp`z0}dM@;KToe0M0T5aoj~Ki8H~OF8l$ZA92A!9!I(BgfX~<RskQe<8l3A_zK6H
zaAYue5~e)h=wR>++_{E1Ty@)?{RJ2Q-?j?cHT?OT=YJjuPQZc(yfj$b%bi{BZrJCx
z(?1PVIRp1SDz6Myc@@??;LYC#s{9DHJYfCTfnd}=o{9U-8BF3Hm9+3XY@^B^->fcq
isBEuOWDNx9u6Wq*c!uBrXIH`!K7JdQPtd_rfPVq7pOYy7

diff --git a/samples/client/petstore/scala/build/tmp/test/jar_extract_899015300961717389_tmp b/samples/client/petstore/scala/build/tmp/test/jar_extract_899015300961717389_tmp
deleted file mode 100644
index 74d2409d2e0ba550401e032be317d63ed5a7be59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 572
zcmah`!AiqG5Pj38iHXr_)mE(_LXg^n6+N~TROl&qY3+TRF1nB=CE0+#<w^122l!Fq
zB-Tq+%Ca-eyf<%Wc0NAe-T_>qNjOad5sFTdMOw{d=X#RrL<D+}MS)gvbm7f{v6s#*
z5Mku6AorFCH}R94-bYGz``rb!EZij=uTZsM5bEEg<#G!qq4BHh^MXw<dx~H06Uwc#
zu?riHg9_FOM}NzCK`7GH!UmUmd8tQew*G59m#kvT!6vo|hJI8j;fKBIM|p7LHl9jC
z&5wBpW05E^3FRm^gsQJ1d6&&5GFfEop?Zjf&JsqQVVos_9H^XH8RjcAPEg|62o|rF
z`0%i7_c*#LV!&>{z-_;x_RPr=>TF$x7{Cs8**Ex_MaD%L`y7?n9~6EKhwSkM&2W_3


From 08f86ae0b67c4f589ad932bbfe593679f95bee34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= <Paul-Ebermann@gmx.de>
Date: Mon, 6 Jun 2016 20:30:44 +0200
Subject: [PATCH 095/139] instructions about how to paste YAML or JSON code

Hopefully that will make issues easier to read.
---
 .github/ISSUE_TEMPLATE.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9f573cea1891..9a56dca7f029 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -13,7 +13,19 @@ Also please indicate in the issue title which language/library is concerned. Eg:
 
 ##### Swagger declaration file content or url
 
-<!-- if it is a bug, a json or yaml that produces it. -->
+<!-- if it is a bug, a json or yaml that produces it.
+    If you post the code inline, please wrap it with
+    ```yaml
+    (here your code)
+    ```
+    (for YAML code) or
+    ```json
+    (here your code)
+    ```
+    (for JSON code), so it becomes more readable. If it is longer than about ten lines,
+    please create a Gist (https://gist.github.com) or upload it somewhere else and
+    link it here.
+  -->
 
 ##### Command line used for generation
 

From 3c919974a7d622967b5657f418ff40717c8a9c49 Mon Sep 17 00:00:00 2001
From: Takuro Wada <taxpon@gmail.com>
Date: Tue, 7 Jun 2016 08:30:17 +0900
Subject: [PATCH 096/139] Fix 'isOauth' to 'isOAuth' in python template

---
 .../src/main/resources/python/configuration.mustache      | 4 ++--
 samples/client/petstore/python/README.md                  | 2 +-
 .../petstore/python/swagger_client/configuration.py       | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/python/configuration.mustache b/modules/swagger-codegen/src/main/resources/python/configuration.mustache
index 2a26c651d7d2..3d2e8db228bd 100644
--- a/modules/swagger-codegen/src/main/resources/python/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/configuration.mustache
@@ -219,7 +219,7 @@ class Configuration(object):
                     'key': 'Authorization',
                     'value': self.get_basic_auth_token()
                 },
-{{/isBasic}}{{#isOauth}}
+{{/isBasic}}{{#isOAuth}}
             '{{name}}': 
                 {
                     'type': 'oauth2',
@@ -227,7 +227,7 @@ class Configuration(object):
                     'key': 'Authorization',
                     'value': 'Bearer ' + self.access_token
                 },
-{{/isOauth}}{{/authMethods}}
+{{/isOAuth}}{{/authMethods}}
         }
 
     def to_debug_report(self):
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index 453d140f1f74..891785820de7 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-06-05T23:15:10.095+09:00
+- Build date: 2016-06-07T08:27:42.099+09:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/swagger_client/configuration.py
index 50b38c61d56f..5fbb46a607f3 100644
--- a/samples/client/petstore/python/swagger_client/configuration.py
+++ b/samples/client/petstore/python/swagger_client/configuration.py
@@ -221,6 +221,14 @@ class Configuration(object):
         :return: The Auth Settings information dict.
         """
         return {
+
+            'petstore_auth': 
+                {
+                    'type': 'oauth2',
+                    'in': 'header',
+                    'key': 'Authorization',
+                    'value': 'Bearer ' + self.access_token
+                },
             'api_key':
                 {
                     'type': 'api_key',

From 483dba2aff3435385b9c694332e0b4f3256460d6 Mon Sep 17 00:00:00 2001
From: Jim Schubert <james.schubert@gmail.com>
Date: Mon, 6 Jun 2016 21:24:08 -0400
Subject: [PATCH 097/139] [swagger-codegen-ignore] Skip file case test Windows

There doesn't appear to be an excellent way to resolve a case sensitive
test on Windows, so conditionally skipping the test on Windows.

See #3047
---
 .../codegen/ignore/CodegenIgnoreProcessorTest.java  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java
index 784fcfe84809..ef30ca48331c 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java
@@ -1,6 +1,7 @@
 package io.swagger.codegen.ignore;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.*;
@@ -17,6 +18,7 @@ public class CodegenIgnoreProcessorTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(CodegenIgnoreProcessorTest.class);
 
     private Boolean allowed;
+    private Boolean skip = false;
     private final String filename;
     private final String ignoreDefinition;
     private final String description;
@@ -35,6 +37,11 @@ public class CodegenIgnoreProcessorTest {
         return this;
     }
 
+    CodegenIgnoreProcessorTest skipOnCondition(Boolean condition) {
+        this.skip = Boolean.TRUE.equals(condition);
+        return this;
+    }
+
     CodegenIgnoreProcessorTest ignored() {
         this.allowed = false;
         return this;
@@ -73,6 +80,10 @@ public class CodegenIgnoreProcessorTest {
 
     @Test
     public void evaluate() {
+        if(this.skip) {
+            return;
+        }
+
         // Arrange
         try {
             // Lazily setup files to avoid conflicts and creation when these tests may not even run.
@@ -97,7 +108,7 @@ public class CodegenIgnoreProcessorTest {
                 // Matching filenames
                 new CodegenIgnoreProcessorTest("build.sh", "build.sh", "A file when matching should ignore.").ignored(),
                 new CodegenIgnoreProcessorTest("src/build.sh", "**/build.sh", "A file when matching nested files should ignore.").ignored(),
-                new CodegenIgnoreProcessorTest("Build.sh", "build.sh", "A file when non-matching should allow.").allowed(),
+                new CodegenIgnoreProcessorTest("Build.sh", "build.sh", "A file when non-matching should allow.").allowed().skipOnCondition(SystemUtils.IS_OS_WINDOWS),
                 new CodegenIgnoreProcessorTest("build.sh", "/build.sh", "A rooted file when matching should ignore.").ignored(),
                 new CodegenIgnoreProcessorTest("nested/build.sh", "/build.sh", "A rooted file definition when non-matching should allow.").allowed(),
                 new CodegenIgnoreProcessorTest("src/IO.Swagger.Test/Model/AnimalFarmTests.cs", "src/IO.Swagger.Test/Model/AnimalFarmTests.cs", "A file when matching exactly should ignore.").ignored(),

From 3ae48b179a2308f19c40410f4b530c312997194b Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Tue, 7 Jun 2016 15:15:20 +0800
Subject: [PATCH 098/139] replaced global license file with default LICENSE

---
 .../io/swagger/codegen/DefaultCodegen.java    |  6 ++-
 samples/server/petstore/rails5/LICENSE        | 38 +++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

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 39729dd14e10..8304849a14c4 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
@@ -792,7 +792,11 @@ public class DefaultCodegen {
         importMapping.put("LocalDate", "org.joda.time.*");
         importMapping.put("LocalTime", "org.joda.time.*");
 
-        supportingFiles.add(new GlobalSupportingFile("LICENSE", "LICENSE"));
+        // we've used the .swagger-codegen-ignore approach as 
+        // suppportingFiles can be cleared by code generator that extends
+        // the default codegen, leaving the commented code below for 
+        // future reference
+        //supportingFiles.add(new GlobalSupportingFile("LICENSE", "LICENSE"));
 
         cliOptions.add(CliOption.newBoolean(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG,
                 CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC).defaultValue(Boolean.TRUE.toString()));
diff --git a/samples/server/petstore/rails5/LICENSE b/samples/server/petstore/rails5/LICENSE
index 309973afd74f..8dada3edaf50 100644
--- a/samples/server/petstore/rails5/LICENSE
+++ b/samples/server/petstore/rails5/LICENSE
@@ -175,27 +175,27 @@
 
    END OF TERMS AND CONDITIONS
 
-      APPENDIX: How to apply the Apache License to your work.
+   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.
+      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 {yyyy} {name of copyright owner}
+   Copyright {yyyy} {name of copyright owner}
 
-      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
+   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
+       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.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

From 012797adf160bb565ff7c9206a6dcd1b97fd596b Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Tue, 7 Jun 2016 23:53:41 +0800
Subject: [PATCH 099/139] add naming convention for vendor extension

---
 CONTRIBUTING.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4cf901c2d3fb..f94dfe8d93a4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,11 +42,14 @@ Code change should conform to the programming style guide of the respective lang
 - Swift: https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/Swift_Programming_Language/TheBasics.html
 - TypeScript: https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines
 
-
 For other languages, feel free to suggest.
 
 You may find the current code base not 100% conform to the coding style and we welcome contributions to fix those.
 
+For [Vendor Extensions](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#vendorExtensions), please follow the naming convention below:
+- For general vendor extension, use lower case and hyphen. e.g. `x-is-unique`, `x-content-type`
+- For language-specified vendor extension, put it in the form of `x-{lang}-{extension-name}`. e.g. `x-objc-operation-id`, `x-java-feign-retry-limit` 
+
 ### Testing
 
 To add test cases (optional) covering the change in the code generator, please refer to [modules/swagger-codegen/src/test/java/io/swagger/codegen](https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen/src/test/java/io/swagger/codegen)

From 3ae39c95625bfd564c3db111b5b56cfcafbc5897 Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Tue, 7 Jun 2016 22:39:34 +0200
Subject: [PATCH 100/139] support joda in feign and use it in sample

---
 bin/java-petstore-feign.sh                    |  2 +-
 .../Java/libraries/feign/ApiClient.mustache   |  3 +++
 .../Java/libraries/feign/pom.mustache         | 14 +------------
 samples/client/petstore/java/feign/pom.xml    | 18 +++-------------
 .../java/io/swagger/client/ApiClient.java     | 20 +++++++++---------
 .../io/swagger/client/FormAwareEncoder.java   |  2 +-
 .../java/io/swagger/client/StringUtil.java    |  2 +-
 .../java/io/swagger/client/api/FakeApi.java   |  7 ++++---
 .../java/io/swagger/client/api/PetApi.java    |  2 +-
 .../java/io/swagger/client/api/StoreApi.java  |  2 +-
 .../java/io/swagger/client/api/UserApi.java   |  2 +-
 .../model/AdditionalPropertiesClass.java      |  2 +-
 .../java/io/swagger/client/model/Animal.java  |  2 +-
 .../io/swagger/client/model/AnimalFarm.java   |  2 +-
 .../io/swagger/client/model/ArrayTest.java    |  2 +-
 .../java/io/swagger/client/model/Cat.java     |  2 +-
 .../io/swagger/client/model/Category.java     |  2 +-
 .../java/io/swagger/client/model/Dog.java     |  2 +-
 .../io/swagger/client/model/EnumTest.java     |  2 +-
 .../io/swagger/client/model/FormatTest.java   | 21 ++++++++++---------
 ...ropertiesAndAdditionalPropertiesClass.java | 12 +++++------
 .../client/model/Model200Response.java        |  2 +-
 .../client/model/ModelApiResponse.java        |  2 +-
 .../io/swagger/client/model/ModelReturn.java  |  2 +-
 .../java/io/swagger/client/model/Name.java    |  2 +-
 .../java/io/swagger/client/model/Order.java   | 12 +++++------
 .../java/io/swagger/client/model/Pet.java     |  2 +-
 .../swagger/client/model/ReadOnlyFirst.java   |  2 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../java/io/swagger/client/model/Tag.java     |  2 +-
 .../java/io/swagger/client/model/User.java    |  2 +-
 .../io/swagger/client/api/FakeApiTest.java    |  7 ++++---
 .../swagger/petstore/test/StoreApiTest.java   |  6 ++++--
 33 files changed, 75 insertions(+), 91 deletions(-)

diff --git a/bin/java-petstore-feign.sh b/bin/java-petstore-feign.sh
index 063b85f70a16..e28439842d9b 100755
--- a/bin/java-petstore-feign.sh
+++ b/bin/java-petstore-feign.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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-feign.json -o samples/client/petstore/java/feign"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-feign.json -o samples/client/petstore/java/feign -DdateLibrary=joda"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache
index 61781ac9b705..be2e2d5e3ab1 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache
@@ -9,6 +9,7 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
 
 import feign.Feign;
 import feign.RequestInterceptor;
@@ -129,6 +130,8 @@ public class ApiClient {
     objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
     objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
     objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    objectMapper.registerModule(new JodaModule());
     return objectMapper;
   }
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
index 03323a65a036..df5b965984e3 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
@@ -149,19 +149,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-joda</artifactId>
-      <version>2.1.5</version>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>${jodatime-version}</version>
-    </dependency>
-
-    <!-- Base64 encoding that works in both JVM and Android -->
-    <dependency>
-      <groupId>com.brsanthu</groupId>
-      <artifactId>migbase64</artifactId>
-      <version>2.2</version>
+      <version>${jackson-version}</version>
     </dependency>
 
     <dependency>
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
index 164399be4a6a..6d055959b5ee 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -100,8 +100,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
     </plugins>
@@ -149,19 +149,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-joda</artifactId>
-      <version>2.1.5</version>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>${jodatime-version}</version>
-    </dependency>
-
-    <!-- Base64 encoding that works in both JVM and Android -->
-    <dependency>
-      <groupId>com.brsanthu</groupId>
-      <artifactId>migbase64</artifactId>
-      <version>2.2</version>
+      <version>${jackson-version}</version>
     </dependency>
 
     <dependency>
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
index 303927d064ee..790e401a3d7c 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
@@ -9,6 +9,7 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
 
 import feign.Feign;
 import feign.RequestInterceptor;
@@ -18,11 +19,11 @@ import feign.slf4j.Slf4jLogger;
 import io.swagger.client.auth.*;
 import io.swagger.client.auth.OAuth.AccessTokenListener;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-17T17:16:23.375+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class ApiClient {
   public interface Api {}
 
-  private ObjectMapper objectMapper;
+  protected ObjectMapper objectMapper;
   private String basePath = "http://petstore.swagger.io/v2";
   private Map<String, RequestInterceptor> apiAuthorizations;
   private Feign.Builder feignBuilder;
@@ -42,16 +43,8 @@ public class ApiClient {
       RequestInterceptor auth;
       if (authName == "petstore_auth") { 
         auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
-      } else if (authName == "test_api_client_id") { 
-        auth = new ApiKeyAuth("header", "x-test_api_client_id");
-      } else if (authName == "test_api_client_secret") { 
-        auth = new ApiKeyAuth("header", "x-test_api_client_secret");
       } else if (authName == "api_key") { 
         auth = new ApiKeyAuth("header", "api_key");
-      } else if (authName == "test_api_key_query") { 
-        auth = new ApiKeyAuth("query", "test_api_key_query");
-      } else if (authName == "test_api_key_header") { 
-        auth = new ApiKeyAuth("header", "test_api_key_header");
       } else {
         throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
       }
@@ -135,6 +128,13 @@ public class ApiClient {
     ObjectMapper objectMapper = new ObjectMapper();
     objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
     objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+    objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    objectMapper.registerModule(new JodaModule());
+    return objectMapper;
+  }
+
+  public ObjectMapper getObjectMapper(){
     return objectMapper;
   }
 
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 fccefc933cea..082c11e0032c 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-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+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 4a4c14468b5e..bc13cd205d56 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-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+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/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
index 82ec4afc25f4..c40f87ebdaec 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
@@ -2,8 +2,9 @@ package io.swagger.client.api;
 
 import io.swagger.client.ApiClient;
 
+import org.joda.time.LocalDate;
 import java.math.BigDecimal;
-import java.util.Date;
+import org.joda.time.DateTime;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public interface FakeApi extends ApiClient.Api {
 
 
@@ -37,5 +38,5 @@ public interface FakeApi extends ApiClient.Api {
     "Content-type: application/xml; charset&#x3D;utf-8",
     "Accept: application/xml; charset&#x3D;utf-8,application/json; charset&#x3D;utf-8",
   })
-  void testEndpointParameters(@Param("number") BigDecimal number, @Param("_double") Double _double, @Param("string") String string, @Param("_byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("_float") Float _float, @Param("binary") byte[] binary, @Param("date") Date date, @Param("dateTime") Date dateTime, @Param("password") String password);
+  void testEndpointParameters(@Param("number") BigDecimal number, @Param("_double") Double _double, @Param("string") String string, @Param("_byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("_float") Float _float, @Param("binary") byte[] binary, @Param("date") LocalDate date, @Param("dateTime") DateTime dateTime, @Param("password") String password);
 }
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 b568770101b4..2f8c942bd74a 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
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public interface PetApi extends ApiClient.Api {
 
 
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 4ac08793f6c7..98085dca2308 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public interface StoreApi extends ApiClient.Api {
 
 
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 4ebcce8981c5..f114d5f23c9f 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public interface UserApi extends ApiClient.Api {
 
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index af4699c1cf50..c15373b66c8b 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -13,7 +13,7 @@ import java.util.Map;
 /**
  * AdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class AdditionalPropertiesClass   {
   
   private Map<String, String> mapProperty = new HashMap<String, String>();
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
index 36a1e8433126..c1c1a4116071 100644
--- 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Animal
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class Animal   {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
index e5ba3d20af25..28a7b9c3be48 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * AnimalFarm
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class AnimalFarm extends ArrayList<Animal>  {
   
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
index f5e4c25b5cfe..455f93dc4f6d 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * ArrayTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class ArrayTest   {
   
   private List<String> arrayOfString = new ArrayList<String>();
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
index aea43d75c5ea..f300be5fcad7 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Cat
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class Cat extends Animal  {
   
   private String className = null;
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 27adc7a820cd..c299f04c7dd4 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Category
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class Category   {
   
   private Long id = null;
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
index dcf82945e15c..372d5bcb4f61 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Dog
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class Dog extends Animal  {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
index 5291f51c1749..f038af89dda8 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * EnumTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class EnumTest   {
   
 
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
index 3be249333df3..06545402ab90 100644
--- 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
@@ -6,13 +6,14 @@ 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 org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 
 
 /**
  * FormatTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class FormatTest   {
   
   private Integer integer = null;
@@ -24,8 +25,8 @@ public class FormatTest   {
   private String string = null;
   private byte[] _byte = null;
   private byte[] binary = null;
-  private Date date = null;
-  private Date dateTime = null;
+  private LocalDate date = null;
+  private DateTime dateTime = null;
   private String uuid = null;
   private String password = null;
 
@@ -195,34 +196,34 @@ public class FormatTest   {
 
   /**
    **/
-  public FormatTest date(Date date) {
+  public FormatTest date(LocalDate date) {
     this.date = date;
     return this;
   }
   
   @ApiModelProperty(example = "null", required = true, value = "")
   @JsonProperty("date")
-  public Date getDate() {
+  public LocalDate getDate() {
     return date;
   }
-  public void setDate(Date date) {
+  public void setDate(LocalDate date) {
     this.date = date;
   }
 
 
   /**
    **/
-  public FormatTest dateTime(Date dateTime) {
+  public FormatTest dateTime(DateTime dateTime) {
     this.dateTime = dateTime;
     return this;
   }
   
   @ApiModelProperty(example = "null", value = "")
   @JsonProperty("dateTime")
-  public Date getDateTime() {
+  public DateTime getDateTime() {
     return dateTime;
   }
-  public void setDateTime(Date dateTime) {
+  public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 22d0e33388f8..10af02572556 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -6,20 +6,20 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.joda.time.DateTime;
 
 
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   
   private String uuid = null;
-  private Date dateTime = null;
+  private DateTime dateTime = null;
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
   
@@ -42,17 +42,17 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass dateTime(DateTime dateTime) {
     this.dateTime = dateTime;
     return this;
   }
   
   @ApiModelProperty(example = "null", value = "")
   @JsonProperty("dateTime")
-  public Date getDateTime() {
+  public DateTime getDateTime() {
     return dateTime;
   }
-  public void setDateTime(Date dateTime) {
+  public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
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 226aa300ca8c..fc3989285146 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 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.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class Model200Response   {
   
   private Integer name = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 1dcd3c9b99b7..408b2536a1bb 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ModelApiResponse
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class ModelApiResponse   {
   
   private Integer code = null;
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 d5bf9048c8af..e7b24a568e65 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class ModelReturn   {
   
   private Integer _return = null;
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 4984f5e60b21..fae7beeef93c 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
@@ -11,7 +11,7 @@ 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")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class Name   {
   
   private Integer name = null;
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 4a08d38f3b00..893d121daa25 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
@@ -6,19 +6,19 @@ 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;
+import org.joda.time.DateTime;
 
 
 /**
  * Order
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class Order   {
   
   private Long id = null;
   private Long petId = null;
   private Integer quantity = null;
-  private Date shipDate = null;
+  private DateTime shipDate = null;
 
   /**
    * Order Status
@@ -98,17 +98,17 @@ public class Order   {
 
   /**
    **/
-  public Order shipDate(Date shipDate) {
+  public Order shipDate(DateTime shipDate) {
     this.shipDate = shipDate;
     return this;
   }
   
   @ApiModelProperty(example = "null", value = "")
   @JsonProperty("shipDate")
-  public Date getShipDate() {
+  public DateTime getShipDate() {
     return shipDate;
   }
-  public void setShipDate(Date shipDate) {
+  public void setShipDate(DateTime shipDate) {
     this.shipDate = shipDate;
   }
 
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 8e6e02a37d35..d426d6c216e4 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
@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * Pet
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class Pet   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 02ded2afd7db..ddfa45b5dbdd 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ReadOnlyFirst
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class ReadOnlyFirst   {
   
   private String bar = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
index 1bc8d287a76c..b7dd8dc42ca0 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * SpecialModelName
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
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 359f3c1d8fad..2bcfcc68c927 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Tag
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class Tag   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
index 3cb71c1a7fbb..a6be090fd124 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * User
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T22:20:02.809+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
 public class User   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/FakeApiTest.java b/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/FakeApiTest.java
index 5a5df9a3ee65..504e027829f2 100644
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/FakeApiTest.java
@@ -1,8 +1,9 @@
 package io.swagger.client.api;
 
 import io.swagger.client.ApiClient;
+import org.joda.time.LocalDate;
 import java.math.BigDecimal;
-import java.util.Date;
+import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -40,8 +41,8 @@ public class FakeApiTest {
         Long int64 = null;
         Float _float = null;
         byte[] binary = null;
-        Date date = null;
-        Date dateTime = null;
+        LocalDate date = null;
+        DateTime dateTime = null;
         String password = null;
         // api.testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
 
diff --git a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java
index ca14be28a800..92a3a951eb58 100644
--- a/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ b/samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -4,13 +4,14 @@ import feign.FeignException;
 
 import io.swagger.TestUtils;
 
-import io.swagger.client.*;
+import io.swagger.client.ApiClient;
 import io.swagger.client.api.*;
 import io.swagger.client.model.*;
 
 import java.lang.reflect.Field;
 import java.util.Map;
 
+import org.joda.time.DateTimeZone;
 import org.junit.*;
 import static org.junit.Assert.*;
 
@@ -39,6 +40,7 @@ public class StoreApiTest {
         assertEquals(order.getId(), fetched.getId());
         assertEquals(order.getPetId(), fetched.getPetId());
         assertEquals(order.getQuantity(), fetched.getQuantity());
+        assertEquals(order.getShipDate().withZone(DateTimeZone.UTC), fetched.getShipDate().withZone(DateTimeZone.UTC));
     }
 
     @Test
@@ -63,7 +65,7 @@ public class StoreApiTest {
         Order order = new Order();
         order.setPetId(new Long(200));
         order.setQuantity(new Integer(13));
-        order.setShipDate(new java.util.Date());
+        order.setShipDate(org.joda.time.DateTime.now());
         order.setStatus(Order.StatusEnum.PLACED);
         order.setComplete(true);
 

From 7916f5243d714ea38b07b4174f2e7721fb1b709f Mon Sep 17 00:00:00 2001
From: Takuro Wada <taxpon@gmail.com>
Date: Tue, 7 Jun 2016 00:37:49 +0900
Subject: [PATCH 101/139] [Python] Fix bug of test files about packageName

---
 bin/python-petstore.sh                        |  2 +-
 .../main/resources/python/api_test.mustache   |  8 +--
 .../main/resources/python/model_test.mustache |  8 +--
 samples/client/petstore/python/README.md      |  2 +-
 .../client/petstore/python/docs/FakeApi.md    |  8 +--
 samples/client/petstore/python/docs/PetApi.md | 72 +++++++++----------
 .../client/petstore/python/docs/StoreApi.md   | 32 ++++-----
 .../client/petstore/python/docs/UserApi.md    | 58 +++++++--------
 .../__init__.py                               |  0
 .../api_client.py                             |  0
 .../apis/__init__.py                          |  0
 .../apis/fake_api.py                          |  0
 .../apis/pet_api.py                           |  0
 .../apis/store_api.py                         |  0
 .../apis/user_api.py                          |  0
 .../configuration.py                          |  2 +-
 .../models/__init__.py                        |  0
 .../models/additional_properties_class.py     |  0
 .../models/animal.py                          |  0
 .../models/animal_farm.py                     |  0
 .../models/api_response.py                    |  0
 .../models/array_test.py                      |  0
 .../models/cat.py                             |  0
 .../models/category.py                        |  0
 .../models/dog.py                             |  0
 .../models/enum_class.py                      |  0
 .../models/enum_test.py                       |  0
 .../models/format_test.py                     |  0
 ...perties_and_additional_properties_class.py |  0
 .../models/model_200_response.py              |  0
 .../models/model_return.py                    |  0
 .../models/name.py                            |  0
 .../models/order.py                           |  0
 .../models/pet.py                             |  0
 .../models/read_only_first.py                 |  0
 .../models/special_model_name.py              |  0
 .../models/tag.py                             |  0
 .../models/user.py                            |  0
 .../{swagger_client => petstore_api}/rest.py  |  0
 samples/client/petstore/python/setup.cfg      |  2 +-
 samples/client/petstore/python/setup.py       |  2 +-
 .../python/swagger_client.egg-info/PKG-INFO   | 12 ----
 .../dependency_links.txt                      |  1 -
 .../swagger_client.egg-info/requires.txt      |  4 --
 .../swagger_client.egg-info/top_level.txt     |  3 -
 .../test/test_additional_properties_class.py  |  8 +--
 .../petstore/python/test/test_animal.py       |  8 +--
 .../petstore/python/test/test_animal_farm.py  |  8 +--
 .../petstore/python/test/test_api_response.py |  8 +--
 .../petstore/python/test/test_array_test.py   |  8 +--
 .../client/petstore/python/test/test_cat.py   |  8 +--
 .../petstore/python/test/test_category.py     |  8 +--
 .../client/petstore/python/test/test_dog.py   |  8 +--
 .../petstore/python/test/test_enum_class.py   |  8 +--
 .../petstore/python/test/test_enum_test.py    |  8 +--
 .../petstore/python/test/test_fake_api.py     |  8 +--
 .../petstore/python/test/test_format_test.py  |  8 +--
 ...perties_and_additional_properties_class.py |  8 +--
 .../python/test/test_model_200_response.py    |  8 +--
 .../petstore/python/test/test_model_return.py |  8 +--
 .../client/petstore/python/test/test_name.py  |  8 +--
 .../client/petstore/python/test/test_order.py |  8 +--
 .../client/petstore/python/test/test_pet.py   |  8 +--
 .../petstore/python/test/test_pet_api.py      |  8 +--
 .../python/test/test_read_only_first.py       |  8 +--
 .../python/test/test_special_model_name.py    |  8 +--
 .../petstore/python/test/test_store_api.py    |  8 +--
 .../client/petstore/python/test/test_tag.py   |  8 +--
 .../client/petstore/python/test/test_user.py  |  8 +--
 .../petstore/python/test/test_user_api.py     |  8 +--
 .../petstore/python/tests/test_api_client.py  | 28 ++++----
 .../python/tests/test_api_exception.py        | 16 ++---
 .../python/tests/test_deserialization.py      | 12 ++--
 .../petstore/python/tests/test_order_model.py |  6 +-
 .../petstore/python/tests/test_pet_api.py     | 30 ++++----
 .../petstore/python/tests/test_pet_model.py   | 22 +++---
 .../petstore/python/tests/test_store_api.py   |  6 +-
 77 files changed, 258 insertions(+), 278 deletions(-)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/__init__.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/api_client.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/apis/__init__.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/apis/fake_api.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/apis/pet_api.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/apis/store_api.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/apis/user_api.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/configuration.py (99%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/__init__.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/additional_properties_class.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/animal.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/animal_farm.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/api_response.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/array_test.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/cat.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/category.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/dog.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/enum_class.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/enum_test.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/format_test.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/mixed_properties_and_additional_properties_class.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/model_200_response.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/model_return.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/name.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/order.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/pet.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/read_only_first.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/special_model_name.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/tag.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/models/user.py (100%)
 rename samples/client/petstore/python/{swagger_client => petstore_api}/rest.py (100%)
 delete mode 100644 samples/client/petstore/python/swagger_client.egg-info/PKG-INFO
 delete mode 100644 samples/client/petstore/python/swagger_client.egg-info/dependency_links.txt
 delete mode 100644 samples/client/petstore/python/swagger_client.egg-info/requires.txt
 delete mode 100644 samples/client/petstore/python/swagger_client.egg-info/top_level.txt

diff --git a/bin/python-petstore.sh b/bin/python-petstore.sh
index ef120089f451..0fe89ea39eda 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-with-fake-endpoints-models-for-testing.yaml -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 -DpackageName=petstore_api"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/resources/python/api_test.mustache b/modules/swagger-codegen/src/main/resources/python/api_test.mustache
index a301d64722a7..f0f07f7189e4 100644
--- a/modules/swagger-codegen/src/main/resources/python/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api_test.mustache
@@ -8,16 +8,16 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.apis.{{classVarName}} import {{classname}}
+import {{packageName}}
+from {{packageName}}.rest import ApiException
+from {{packageName}}.apis.{{classVarName}} import {{classname}}
 
 
 class {{#operations}}Test{{classname}}(unittest.TestCase):
     """ {{classname}} unit test stubs """
 
     def setUp(self):
-        self.api = swagger_client.apis.{{classVarName}}.{{classname}}()
+        self.api = {{packageName}}.apis.{{classVarName}}.{{classname}}()
 
     def tearDown(self):
         pass
diff --git a/modules/swagger-codegen/src/main/resources/python/model_test.mustache b/modules/swagger-codegen/src/main/resources/python/model_test.mustache
index 3533fa110634..9e1b72b14a07 100644
--- a/modules/swagger-codegen/src/main/resources/python/model_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model_test.mustache
@@ -10,9 +10,9 @@ import unittest
 
 {{#models}}
 {{#model}}
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.{{classFilename}} import {{classname}}
+import {{packageName}}
+from {{packageName}}.rest import ApiException
+from {{packageName}}.models.{{classFilename}} import {{classname}}
 
 
 class Test{{classname}}(unittest.TestCase):
@@ -28,7 +28,7 @@ class Test{{classname}}(unittest.TestCase):
         """
         Test {{classname}}
         """
-        model = swagger_client.models.{{classFilename}}.{{classname}}()
+        model = {{packageName}}.models.{{classFilename}}.{{classname}}()
 
 {{/model}}
 {{/models}}
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index 891785820de7..7bf57caa2b81 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-06-07T08:27:42.099+09:00
+- Build date: 2016-06-07T00:29:52.148+09:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/samples/client/petstore/python/docs/FakeApi.md b/samples/client/petstore/python/docs/FakeApi.md
index 6853fa0bee91..166566130757 100644
--- a/samples/client/petstore/python/docs/FakeApi.md
+++ b/samples/client/petstore/python/docs/FakeApi.md
@@ -1,4 +1,4 @@
-# swagger_client.FakeApi
+# petstore_api.FakeApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 
@@ -17,12 +17,12 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.FakeApi()
+api_instance = petstore_api.FakeApi()
 number = 3.4 # float | None
 double = 1.2 # float | None
 string = 'string_example' # str | None
diff --git a/samples/client/petstore/python/docs/PetApi.md b/samples/client/petstore/python/docs/PetApi.md
index fb69778f6115..109b264942fc 100644
--- a/samples/client/petstore/python/docs/PetApi.md
+++ b/samples/client/petstore/python/docs/PetApi.md
@@ -1,4 +1,4 @@
-# swagger_client.PetApi
+# petstore_api.PetApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 
@@ -24,16 +24,16 @@ Add a new pet to the store
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.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
+api_instance = petstore_api.PetApi()
+body = petstore_api.Pet() # Pet | Pet object that needs to be added to the store
 
 try: 
     # Add a new pet to the store
@@ -73,15 +73,15 @@ Deletes a pet
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 pet_id = 789 # int | Pet id to delete
 api_key = 'api_key_example' # str |  (optional)
 
@@ -124,15 +124,15 @@ Multiple status values can be provided with comma separated strings
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 status = ['status_example'] # list[str] | Status values that need to be considered for filter
 
 try: 
@@ -174,15 +174,15 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 tags = ['tags_example'] # list[str] | Tags to filter by
 
 try: 
@@ -224,17 +224,17 @@ Returns a single pet
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure API key authorization: api_key
-swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY'
+petstore_api.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'
+# petstore_api.configuration.api_key_prefix['api_key'] = 'Bearer'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 pet_id = 789 # int | ID of pet to return
 
 try: 
@@ -276,16 +276,16 @@ Update an existing pet
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.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
+api_instance = petstore_api.PetApi()
+body = petstore_api.Pet() # Pet | Pet object that needs to be added to the store
 
 try: 
     # Update an existing pet
@@ -325,15 +325,15 @@ Updates a pet in the store with form data
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 pet_id = 789 # int | ID of pet that needs to be updated
 name = 'name_example' # str | Updated name of the pet (optional)
 status = 'status_example' # str | Updated status of the pet (optional)
@@ -378,15 +378,15 @@ uploads an image
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 pet_id = 789 # int | ID of pet to update
 additional_metadata = 'additional_metadata_example' # str | Additional data to pass to server (optional)
 file = '/path/to/file.txt' # file | file to upload (optional)
diff --git a/samples/client/petstore/python/docs/StoreApi.md b/samples/client/petstore/python/docs/StoreApi.md
index 537009bde523..6b71a78659d1 100644
--- a/samples/client/petstore/python/docs/StoreApi.md
+++ b/samples/client/petstore/python/docs/StoreApi.md
@@ -1,4 +1,4 @@
-# swagger_client.StoreApi
+# petstore_api.StoreApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 
@@ -20,12 +20,12 @@ 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
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.StoreApi()
+api_instance = petstore_api.StoreApi()
 order_id = 'order_id_example' # str | ID of the order that needs to be deleted
 
 try: 
@@ -66,17 +66,17 @@ Returns a map of status codes to quantities
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure API key authorization: api_key
-swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY'
+petstore_api.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'
+# petstore_api.configuration.api_key_prefix['api_key'] = 'Bearer'
 
 # create an instance of the API class
-api_instance = swagger_client.StoreApi()
+api_instance = petstore_api.StoreApi()
 
 try: 
     # Returns pet inventories by status
@@ -114,12 +114,12 @@ 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
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.StoreApi()
+api_instance = petstore_api.StoreApi()
 order_id = 789 # int | ID of pet that needs to be fetched
 
 try: 
@@ -161,13 +161,13 @@ Place an order for a pet
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.StoreApi()
-body = swagger_client.Order() # Order | order placed for purchasing the pet
+api_instance = petstore_api.StoreApi()
+body = petstore_api.Order() # Order | order placed for purchasing the pet
 
 try: 
     # Place an order for a pet
diff --git a/samples/client/petstore/python/docs/UserApi.md b/samples/client/petstore/python/docs/UserApi.md
index 1975c1fe7f39..4009418b13c9 100644
--- a/samples/client/petstore/python/docs/UserApi.md
+++ b/samples/client/petstore/python/docs/UserApi.md
@@ -1,4 +1,4 @@
-# swagger_client.UserApi
+# petstore_api.UserApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 
@@ -24,13 +24,13 @@ This can only be done by the logged in user.
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.UserApi()
-body = swagger_client.User() # User | Created user object
+api_instance = petstore_api.UserApi()
+body = petstore_api.User() # User | Created user object
 
 try: 
     # Create user
@@ -70,13 +70,13 @@ Creates list of users with given input array
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.UserApi()
-body = [swagger_client.User()] # list[User] | List of user object
+api_instance = petstore_api.UserApi()
+body = [petstore_api.User()] # list[User] | List of user object
 
 try: 
     # Creates list of users with given input array
@@ -116,13 +116,13 @@ Creates list of users with given input array
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.UserApi()
-body = [swagger_client.User()] # list[User] | List of user object
+api_instance = petstore_api.UserApi()
+body = [petstore_api.User()] # list[User] | List of user object
 
 try: 
     # Creates list of users with given input array
@@ -162,12 +162,12 @@ This can only be done by the logged in user.
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.UserApi()
+api_instance = petstore_api.UserApi()
 username = 'username_example' # str | The name that needs to be deleted
 
 try: 
@@ -208,12 +208,12 @@ Get user by user name
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.UserApi()
+api_instance = petstore_api.UserApi()
 username = 'username_example' # str | The name that needs to be fetched. Use user1 for testing. 
 
 try: 
@@ -255,12 +255,12 @@ Logs user into the system
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.UserApi()
+api_instance = petstore_api.UserApi()
 username = 'username_example' # str | The user name for login
 password = 'password_example' # str | The password for login in clear text
 
@@ -304,12 +304,12 @@ Logs out current logged in user session
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.UserApi()
+api_instance = petstore_api.UserApi()
 
 try: 
     # Logs out current logged in user session
@@ -346,14 +346,14 @@ This can only be done by the logged in user.
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.UserApi()
+api_instance = petstore_api.UserApi()
 username = 'username_example' # str | name that need to be deleted
-body = swagger_client.User() # User | Updated user object
+body = petstore_api.User() # User | Updated user object
 
 try: 
     # Updated user
diff --git a/samples/client/petstore/python/swagger_client/__init__.py b/samples/client/petstore/python/petstore_api/__init__.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/__init__.py
rename to samples/client/petstore/python/petstore_api/__init__.py
diff --git a/samples/client/petstore/python/swagger_client/api_client.py b/samples/client/petstore/python/petstore_api/api_client.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/api_client.py
rename to samples/client/petstore/python/petstore_api/api_client.py
diff --git a/samples/client/petstore/python/swagger_client/apis/__init__.py b/samples/client/petstore/python/petstore_api/apis/__init__.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/apis/__init__.py
rename to samples/client/petstore/python/petstore_api/apis/__init__.py
diff --git a/samples/client/petstore/python/swagger_client/apis/fake_api.py b/samples/client/petstore/python/petstore_api/apis/fake_api.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/apis/fake_api.py
rename to samples/client/petstore/python/petstore_api/apis/fake_api.py
diff --git a/samples/client/petstore/python/swagger_client/apis/pet_api.py b/samples/client/petstore/python/petstore_api/apis/pet_api.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/apis/pet_api.py
rename to samples/client/petstore/python/petstore_api/apis/pet_api.py
diff --git a/samples/client/petstore/python/swagger_client/apis/store_api.py b/samples/client/petstore/python/petstore_api/apis/store_api.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/apis/store_api.py
rename to samples/client/petstore/python/petstore_api/apis/store_api.py
diff --git a/samples/client/petstore/python/swagger_client/apis/user_api.py b/samples/client/petstore/python/petstore_api/apis/user_api.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/apis/user_api.py
rename to samples/client/petstore/python/petstore_api/apis/user_api.py
diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/petstore_api/configuration.py
similarity index 99%
rename from samples/client/petstore/python/swagger_client/configuration.py
rename to samples/client/petstore/python/petstore_api/configuration.py
index 5fbb46a607f3..76f1f57c7842 100644
--- a/samples/client/petstore/python/swagger_client/configuration.py
+++ b/samples/client/petstore/python/petstore_api/configuration.py
@@ -82,7 +82,7 @@ class Configuration(object):
 
         # Logging Settings
         self.logger = {}
-        self.logger["package_logger"] = logging.getLogger("swagger_client")
+        self.logger["package_logger"] = logging.getLogger("petstore_api")
         self.logger["urllib3_logger"] = logging.getLogger("urllib3")
         # Log format
         self.logger_format = '%(asctime)s %(levelname)s %(message)s'
diff --git a/samples/client/petstore/python/swagger_client/models/__init__.py b/samples/client/petstore/python/petstore_api/models/__init__.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/__init__.py
rename to samples/client/petstore/python/petstore_api/models/__init__.py
diff --git a/samples/client/petstore/python/swagger_client/models/additional_properties_class.py b/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/additional_properties_class.py
rename to samples/client/petstore/python/petstore_api/models/additional_properties_class.py
diff --git a/samples/client/petstore/python/swagger_client/models/animal.py b/samples/client/petstore/python/petstore_api/models/animal.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/animal.py
rename to samples/client/petstore/python/petstore_api/models/animal.py
diff --git a/samples/client/petstore/python/swagger_client/models/animal_farm.py b/samples/client/petstore/python/petstore_api/models/animal_farm.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/animal_farm.py
rename to samples/client/petstore/python/petstore_api/models/animal_farm.py
diff --git a/samples/client/petstore/python/swagger_client/models/api_response.py b/samples/client/petstore/python/petstore_api/models/api_response.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/api_response.py
rename to samples/client/petstore/python/petstore_api/models/api_response.py
diff --git a/samples/client/petstore/python/swagger_client/models/array_test.py b/samples/client/petstore/python/petstore_api/models/array_test.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/array_test.py
rename to samples/client/petstore/python/petstore_api/models/array_test.py
diff --git a/samples/client/petstore/python/swagger_client/models/cat.py b/samples/client/petstore/python/petstore_api/models/cat.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/cat.py
rename to samples/client/petstore/python/petstore_api/models/cat.py
diff --git a/samples/client/petstore/python/swagger_client/models/category.py b/samples/client/petstore/python/petstore_api/models/category.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/category.py
rename to samples/client/petstore/python/petstore_api/models/category.py
diff --git a/samples/client/petstore/python/swagger_client/models/dog.py b/samples/client/petstore/python/petstore_api/models/dog.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/dog.py
rename to samples/client/petstore/python/petstore_api/models/dog.py
diff --git a/samples/client/petstore/python/swagger_client/models/enum_class.py b/samples/client/petstore/python/petstore_api/models/enum_class.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/enum_class.py
rename to samples/client/petstore/python/petstore_api/models/enum_class.py
diff --git a/samples/client/petstore/python/swagger_client/models/enum_test.py b/samples/client/petstore/python/petstore_api/models/enum_test.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/enum_test.py
rename to samples/client/petstore/python/petstore_api/models/enum_test.py
diff --git a/samples/client/petstore/python/swagger_client/models/format_test.py b/samples/client/petstore/python/petstore_api/models/format_test.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/format_test.py
rename to samples/client/petstore/python/petstore_api/models/format_test.py
diff --git a/samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/mixed_properties_and_additional_properties_class.py
rename to samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
diff --git a/samples/client/petstore/python/swagger_client/models/model_200_response.py b/samples/client/petstore/python/petstore_api/models/model_200_response.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/model_200_response.py
rename to samples/client/petstore/python/petstore_api/models/model_200_response.py
diff --git a/samples/client/petstore/python/swagger_client/models/model_return.py b/samples/client/petstore/python/petstore_api/models/model_return.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/model_return.py
rename to samples/client/petstore/python/petstore_api/models/model_return.py
diff --git a/samples/client/petstore/python/swagger_client/models/name.py b/samples/client/petstore/python/petstore_api/models/name.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/name.py
rename to samples/client/petstore/python/petstore_api/models/name.py
diff --git a/samples/client/petstore/python/swagger_client/models/order.py b/samples/client/petstore/python/petstore_api/models/order.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/order.py
rename to samples/client/petstore/python/petstore_api/models/order.py
diff --git a/samples/client/petstore/python/swagger_client/models/pet.py b/samples/client/petstore/python/petstore_api/models/pet.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/pet.py
rename to samples/client/petstore/python/petstore_api/models/pet.py
diff --git a/samples/client/petstore/python/swagger_client/models/read_only_first.py b/samples/client/petstore/python/petstore_api/models/read_only_first.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/read_only_first.py
rename to samples/client/petstore/python/petstore_api/models/read_only_first.py
diff --git a/samples/client/petstore/python/swagger_client/models/special_model_name.py b/samples/client/petstore/python/petstore_api/models/special_model_name.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/special_model_name.py
rename to samples/client/petstore/python/petstore_api/models/special_model_name.py
diff --git a/samples/client/petstore/python/swagger_client/models/tag.py b/samples/client/petstore/python/petstore_api/models/tag.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/tag.py
rename to samples/client/petstore/python/petstore_api/models/tag.py
diff --git a/samples/client/petstore/python/swagger_client/models/user.py b/samples/client/petstore/python/petstore_api/models/user.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/models/user.py
rename to samples/client/petstore/python/petstore_api/models/user.py
diff --git a/samples/client/petstore/python/swagger_client/rest.py b/samples/client/petstore/python/petstore_api/rest.py
similarity index 100%
rename from samples/client/petstore/python/swagger_client/rest.py
rename to samples/client/petstore/python/petstore_api/rest.py
diff --git a/samples/client/petstore/python/setup.cfg b/samples/client/petstore/python/setup.cfg
index c9eef8726d60..26b7a359d580 100644
--- a/samples/client/petstore/python/setup.cfg
+++ b/samples/client/petstore/python/setup.cfg
@@ -4,7 +4,7 @@ verbosity=2
 randomize=true
 exe=true
 with-coverage=true
-cover-package=swagger_client
+cover-package=petstore_api
 cover-erase=true
 
 [flake8]
diff --git a/samples/client/petstore/python/setup.py b/samples/client/petstore/python/setup.py
index 2029c83372c0..b15651ff2b5d 100644
--- a/samples/client/petstore/python/setup.py
+++ b/samples/client/petstore/python/setup.py
@@ -25,7 +25,7 @@
 import sys
 from setuptools import setup, find_packages
 
-NAME = "swagger_client"
+NAME = "petstore_api"
 VERSION = "1.0.0"
 
 # To install the library, run the following
diff --git a/samples/client/petstore/python/swagger_client.egg-info/PKG-INFO b/samples/client/petstore/python/swagger_client.egg-info/PKG-INFO
deleted file mode 100644
index 494a1526640e..000000000000
--- a/samples/client/petstore/python/swagger_client.egg-info/PKG-INFO
+++ /dev/null
@@ -1,12 +0,0 @@
-Metadata-Version: 1.0
-Name: swagger-client
-Version: 1.0.0
-Summary: Swagger Petstore
-Home-page: UNKNOWN
-Author: UNKNOWN
-Author-email: apiteam@swagger.io
-License: UNKNOWN
-Description:     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \&quot; \ 
-            
-Keywords: Swagger,Swagger Petstore
-Platform: UNKNOWN
diff --git a/samples/client/petstore/python/swagger_client.egg-info/dependency_links.txt b/samples/client/petstore/python/swagger_client.egg-info/dependency_links.txt
deleted file mode 100644
index 8b137891791f..000000000000
--- a/samples/client/petstore/python/swagger_client.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/samples/client/petstore/python/swagger_client.egg-info/requires.txt b/samples/client/petstore/python/swagger_client.egg-info/requires.txt
deleted file mode 100644
index 86355123cfff..000000000000
--- a/samples/client/petstore/python/swagger_client.egg-info/requires.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-urllib3 >= 1.15
-six >= 1.10
-certifi
-python-dateutil
diff --git a/samples/client/petstore/python/swagger_client.egg-info/top_level.txt b/samples/client/petstore/python/swagger_client.egg-info/top_level.txt
deleted file mode 100644
index 01f6691e7caf..000000000000
--- a/samples/client/petstore/python/swagger_client.egg-info/top_level.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-swagger_client
-test
-tests
diff --git a/samples/client/petstore/python/test/test_additional_properties_class.py b/samples/client/petstore/python/test/test_additional_properties_class.py
index f2370e4ea21f..de3d2bcd8b6f 100644
--- a/samples/client/petstore/python/test/test_additional_properties_class.py
+++ b/samples/client/petstore/python/test/test_additional_properties_class.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.additional_properties_class import AdditionalPropertiesClass
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.additional_properties_class import AdditionalPropertiesClass
 
 
 class TestAdditionalPropertiesClass(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestAdditionalPropertiesClass(unittest.TestCase):
         """
         Test AdditionalPropertiesClass
         """
-        model = swagger_client.models.additional_properties_class.AdditionalPropertiesClass()
+        model = petstore_api.models.additional_properties_class.AdditionalPropertiesClass()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_animal.py b/samples/client/petstore/python/test/test_animal.py
index 83c8f872250f..7db98a101702 100644
--- a/samples/client/petstore/python/test/test_animal.py
+++ b/samples/client/petstore/python/test/test_animal.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.animal import Animal
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.animal import Animal
 
 
 class TestAnimal(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestAnimal(unittest.TestCase):
         """
         Test Animal
         """
-        model = swagger_client.models.animal.Animal()
+        model = petstore_api.models.animal.Animal()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_animal_farm.py b/samples/client/petstore/python/test/test_animal_farm.py
index 637d259b1e8a..e4ecbf504782 100644
--- a/samples/client/petstore/python/test/test_animal_farm.py
+++ b/samples/client/petstore/python/test/test_animal_farm.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.animal_farm import AnimalFarm
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.animal_farm import AnimalFarm
 
 
 class TestAnimalFarm(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestAnimalFarm(unittest.TestCase):
         """
         Test AnimalFarm
         """
-        model = swagger_client.models.animal_farm.AnimalFarm()
+        model = petstore_api.models.animal_farm.AnimalFarm()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_api_response.py b/samples/client/petstore/python/test/test_api_response.py
index 6ee0ef03ae9f..9c62f641cd79 100644
--- a/samples/client/petstore/python/test/test_api_response.py
+++ b/samples/client/petstore/python/test/test_api_response.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.api_response import ApiResponse
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.api_response import ApiResponse
 
 
 class TestApiResponse(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestApiResponse(unittest.TestCase):
         """
         Test ApiResponse
         """
-        model = swagger_client.models.api_response.ApiResponse()
+        model = petstore_api.models.api_response.ApiResponse()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_array_test.py b/samples/client/petstore/python/test/test_array_test.py
index 7d2e9ff9fe9a..a5509779cc54 100644
--- a/samples/client/petstore/python/test/test_array_test.py
+++ b/samples/client/petstore/python/test/test_array_test.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.array_test import ArrayTest
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.array_test import ArrayTest
 
 
 class TestArrayTest(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestArrayTest(unittest.TestCase):
         """
         Test ArrayTest
         """
-        model = swagger_client.models.array_test.ArrayTest()
+        model = petstore_api.models.array_test.ArrayTest()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_cat.py b/samples/client/petstore/python/test/test_cat.py
index 8baccfa294d3..3a9f7f1b75db 100644
--- a/samples/client/petstore/python/test/test_cat.py
+++ b/samples/client/petstore/python/test/test_cat.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.cat import Cat
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.cat import Cat
 
 
 class TestCat(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestCat(unittest.TestCase):
         """
         Test Cat
         """
-        model = swagger_client.models.cat.Cat()
+        model = petstore_api.models.cat.Cat()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_category.py b/samples/client/petstore/python/test/test_category.py
index ff57ffb1f7de..f4f437966750 100644
--- a/samples/client/petstore/python/test/test_category.py
+++ b/samples/client/petstore/python/test/test_category.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.category import Category
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.category import Category
 
 
 class TestCategory(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestCategory(unittest.TestCase):
         """
         Test Category
         """
-        model = swagger_client.models.category.Category()
+        model = petstore_api.models.category.Category()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_dog.py b/samples/client/petstore/python/test/test_dog.py
index cb44931140e0..6bac6d65c30f 100644
--- a/samples/client/petstore/python/test/test_dog.py
+++ b/samples/client/petstore/python/test/test_dog.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.dog import Dog
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.dog import Dog
 
 
 class TestDog(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestDog(unittest.TestCase):
         """
         Test Dog
         """
-        model = swagger_client.models.dog.Dog()
+        model = petstore_api.models.dog.Dog()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_enum_class.py b/samples/client/petstore/python/test/test_enum_class.py
index 488e8306c8f0..6d9c50255dfd 100644
--- a/samples/client/petstore/python/test/test_enum_class.py
+++ b/samples/client/petstore/python/test/test_enum_class.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.enum_class import EnumClass
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.enum_class import EnumClass
 
 
 class TestEnumClass(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestEnumClass(unittest.TestCase):
         """
         Test EnumClass
         """
-        model = swagger_client.models.enum_class.EnumClass()
+        model = petstore_api.models.enum_class.EnumClass()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_enum_test.py b/samples/client/petstore/python/test/test_enum_test.py
index bbe985aeeaf0..aa8d86a6d787 100644
--- a/samples/client/petstore/python/test/test_enum_test.py
+++ b/samples/client/petstore/python/test/test_enum_test.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.enum_test import EnumTest
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.enum_test import EnumTest
 
 
 class TestEnumTest(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestEnumTest(unittest.TestCase):
         """
         Test EnumTest
         """
-        model = swagger_client.models.enum_test.EnumTest()
+        model = petstore_api.models.enum_test.EnumTest()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_fake_api.py b/samples/client/petstore/python/test/test_fake_api.py
index fb4804858295..cddf28289ba1 100644
--- a/samples/client/petstore/python/test/test_fake_api.py
+++ b/samples/client/petstore/python/test/test_fake_api.py
@@ -28,16 +28,16 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.apis.fake_api import FakeApi
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.apis.fake_api import FakeApi
 
 
 class TestFakeApi(unittest.TestCase):
     """ FakeApi unit test stubs """
 
     def setUp(self):
-        self.api = swagger_client.apis.fake_api.FakeApi()
+        self.api = petstore_api.apis.fake_api.FakeApi()
 
     def tearDown(self):
         pass
diff --git a/samples/client/petstore/python/test/test_format_test.py b/samples/client/petstore/python/test/test_format_test.py
index 966a0887f0ab..2c3d0039dce8 100644
--- a/samples/client/petstore/python/test/test_format_test.py
+++ b/samples/client/petstore/python/test/test_format_test.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.format_test import FormatTest
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.format_test import FormatTest
 
 
 class TestFormatTest(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestFormatTest(unittest.TestCase):
         """
         Test FormatTest
         """
-        model = swagger_client.models.format_test.FormatTest()
+        model = petstore_api.models.format_test.FormatTest()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py
index f19e0211af75..90f13e029e25 100644
--- a/samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/test/test_mixed_properties_and_additional_properties_class.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass
 
 
 class TestMixedPropertiesAndAdditionalPropertiesClass(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestMixedPropertiesAndAdditionalPropertiesClass(unittest.TestCase):
         """
         Test MixedPropertiesAndAdditionalPropertiesClass
         """
-        model = swagger_client.models.mixed_properties_and_additional_properties_class.MixedPropertiesAndAdditionalPropertiesClass()
+        model = petstore_api.models.mixed_properties_and_additional_properties_class.MixedPropertiesAndAdditionalPropertiesClass()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_model_200_response.py b/samples/client/petstore/python/test/test_model_200_response.py
index 74519b4bac58..0b30fa81c896 100644
--- a/samples/client/petstore/python/test/test_model_200_response.py
+++ b/samples/client/petstore/python/test/test_model_200_response.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.model_200_response import Model200Response
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.model_200_response import Model200Response
 
 
 class TestModel200Response(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestModel200Response(unittest.TestCase):
         """
         Test Model200Response
         """
-        model = swagger_client.models.model_200_response.Model200Response()
+        model = petstore_api.models.model_200_response.Model200Response()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_model_return.py b/samples/client/petstore/python/test/test_model_return.py
index 54c9422545d8..149d658c7cf0 100644
--- a/samples/client/petstore/python/test/test_model_return.py
+++ b/samples/client/petstore/python/test/test_model_return.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.model_return import ModelReturn
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.model_return import ModelReturn
 
 
 class TestModelReturn(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestModelReturn(unittest.TestCase):
         """
         Test ModelReturn
         """
-        model = swagger_client.models.model_return.ModelReturn()
+        model = petstore_api.models.model_return.ModelReturn()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_name.py b/samples/client/petstore/python/test/test_name.py
index be10b1ddd783..ae3b6106d62b 100644
--- a/samples/client/petstore/python/test/test_name.py
+++ b/samples/client/petstore/python/test/test_name.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.name import Name
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.name import Name
 
 
 class TestName(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestName(unittest.TestCase):
         """
         Test Name
         """
-        model = swagger_client.models.name.Name()
+        model = petstore_api.models.name.Name()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_order.py b/samples/client/petstore/python/test/test_order.py
index 21c2b4830d94..e2a1290ffc78 100644
--- a/samples/client/petstore/python/test/test_order.py
+++ b/samples/client/petstore/python/test/test_order.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.order import Order
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.order import Order
 
 
 class TestOrder(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestOrder(unittest.TestCase):
         """
         Test Order
         """
-        model = swagger_client.models.order.Order()
+        model = petstore_api.models.order.Order()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_pet.py b/samples/client/petstore/python/test/test_pet.py
index fc0ce0a727ca..9148c0ac1195 100644
--- a/samples/client/petstore/python/test/test_pet.py
+++ b/samples/client/petstore/python/test/test_pet.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.pet import Pet
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.pet import Pet
 
 
 class TestPet(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestPet(unittest.TestCase):
         """
         Test Pet
         """
-        model = swagger_client.models.pet.Pet()
+        model = petstore_api.models.pet.Pet()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_pet_api.py b/samples/client/petstore/python/test/test_pet_api.py
index 8ea0c9c0acd9..c9ef2d87c45e 100644
--- a/samples/client/petstore/python/test/test_pet_api.py
+++ b/samples/client/petstore/python/test/test_pet_api.py
@@ -28,16 +28,16 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.apis.pet_api import PetApi
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.apis.pet_api import PetApi
 
 
 class TestPetApi(unittest.TestCase):
     """ PetApi unit test stubs """
 
     def setUp(self):
-        self.api = swagger_client.apis.pet_api.PetApi()
+        self.api = petstore_api.apis.pet_api.PetApi()
 
     def tearDown(self):
         pass
diff --git a/samples/client/petstore/python/test/test_read_only_first.py b/samples/client/petstore/python/test/test_read_only_first.py
index ea7a0ad76e88..3579ebefb489 100644
--- a/samples/client/petstore/python/test/test_read_only_first.py
+++ b/samples/client/petstore/python/test/test_read_only_first.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.read_only_first import ReadOnlyFirst
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.read_only_first import ReadOnlyFirst
 
 
 class TestReadOnlyFirst(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestReadOnlyFirst(unittest.TestCase):
         """
         Test ReadOnlyFirst
         """
-        model = swagger_client.models.read_only_first.ReadOnlyFirst()
+        model = petstore_api.models.read_only_first.ReadOnlyFirst()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_special_model_name.py b/samples/client/petstore/python/test/test_special_model_name.py
index e76bc9bbf9b1..1991883e3c17 100644
--- a/samples/client/petstore/python/test/test_special_model_name.py
+++ b/samples/client/petstore/python/test/test_special_model_name.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.special_model_name import SpecialModelName
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.special_model_name import SpecialModelName
 
 
 class TestSpecialModelName(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestSpecialModelName(unittest.TestCase):
         """
         Test SpecialModelName
         """
-        model = swagger_client.models.special_model_name.SpecialModelName()
+        model = petstore_api.models.special_model_name.SpecialModelName()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_store_api.py b/samples/client/petstore/python/test/test_store_api.py
index ecce38463b5a..0278685372bf 100644
--- a/samples/client/petstore/python/test/test_store_api.py
+++ b/samples/client/petstore/python/test/test_store_api.py
@@ -28,16 +28,16 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.apis.store_api import StoreApi
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.apis.store_api import StoreApi
 
 
 class TestStoreApi(unittest.TestCase):
     """ StoreApi unit test stubs """
 
     def setUp(self):
-        self.api = swagger_client.apis.store_api.StoreApi()
+        self.api = petstore_api.apis.store_api.StoreApi()
 
     def tearDown(self):
         pass
diff --git a/samples/client/petstore/python/test/test_tag.py b/samples/client/petstore/python/test/test_tag.py
index db35da374aed..c86dcbb1d5f1 100644
--- a/samples/client/petstore/python/test/test_tag.py
+++ b/samples/client/petstore/python/test/test_tag.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.tag import Tag
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.tag import Tag
 
 
 class TestTag(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestTag(unittest.TestCase):
         """
         Test Tag
         """
-        model = swagger_client.models.tag.Tag()
+        model = petstore_api.models.tag.Tag()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_user.py b/samples/client/petstore/python/test/test_user.py
index e57b3600f0e4..328c07baa888 100644
--- a/samples/client/petstore/python/test/test_user.py
+++ b/samples/client/petstore/python/test/test_user.py
@@ -28,9 +28,9 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.user import User
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.models.user import User
 
 
 class TestUser(unittest.TestCase):
@@ -46,7 +46,7 @@ class TestUser(unittest.TestCase):
         """
         Test User
         """
-        model = swagger_client.models.user.User()
+        model = petstore_api.models.user.User()
 
 
 if __name__ == '__main__':
diff --git a/samples/client/petstore/python/test/test_user_api.py b/samples/client/petstore/python/test/test_user_api.py
index 88c2f8629834..032d00af3156 100644
--- a/samples/client/petstore/python/test/test_user_api.py
+++ b/samples/client/petstore/python/test/test_user_api.py
@@ -28,16 +28,16 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.apis.user_api import UserApi
+import petstore_api
+from petstore_api.rest import ApiException
+from petstore_api.apis.user_api import UserApi
 
 
 class TestUserApi(unittest.TestCase):
     """ UserApi unit test stubs """
 
     def setUp(self):
-        self.api = swagger_client.apis.user_api.UserApi()
+        self.api = petstore_api.apis.user_api.UserApi()
 
     def tearDown(self):
         pass
diff --git a/samples/client/petstore/python/tests/test_api_client.py b/samples/client/petstore/python/tests/test_api_client.py
index 61c57cb7e460..972175835f38 100644
--- a/samples/client/petstore/python/tests/test_api_client.py
+++ b/samples/client/petstore/python/tests/test_api_client.py
@@ -12,8 +12,8 @@ import time
 import unittest
 from dateutil.parser import parse
 
-import swagger_client
-import swagger_client.configuration
+import petstore_api
+import petstore_api.configuration
 
 HOST = 'http://petstore.swagger.io/v2'
 
@@ -21,20 +21,20 @@ HOST = 'http://petstore.swagger.io/v2'
 class ApiClientTests(unittest.TestCase):
 
     def setUp(self):
-        self.api_client = swagger_client.ApiClient(HOST)
+        self.api_client = petstore_api.ApiClient(HOST)
 
     def test_configuration(self):
-        swagger_client.configuration.api_key['api_key'] = '123456'
-        swagger_client.configuration.api_key_prefix['api_key'] = 'PREFIX'
-        swagger_client.configuration.username = 'test_username'
-        swagger_client.configuration.password = 'test_password'
+        petstore_api.configuration.api_key['api_key'] = '123456'
+        petstore_api.configuration.api_key_prefix['api_key'] = 'PREFIX'
+        petstore_api.configuration.username = 'test_username'
+        petstore_api.configuration.password = 'test_password'
 
         header_params = {'test1': 'value1'}
         query_params = {'test2': 'value2'}
         auth_settings = ['api_key', 'unknown']
 
         # test prefix
-        self.assertEqual('PREFIX', swagger_client.configuration.api_key_prefix['api_key'])
+        self.assertEqual('PREFIX', petstore_api.configuration.api_key_prefix['api_key'])
 
         # update parameters based on auth setting
         self.api_client.update_params_for_auth(header_params, query_params, auth_settings)
@@ -45,8 +45,8 @@ class ApiClientTests(unittest.TestCase):
         self.assertEqual(query_params['test2'], 'value2')
 
         # test basic auth
-        self.assertEqual('test_username', swagger_client.configuration.username)
-        self.assertEqual('test_password', swagger_client.configuration.password)
+        self.assertEqual('test_username', petstore_api.configuration.username)
+        self.assertEqual('test_password', petstore_api.configuration.password)
 
     def test_select_header_accept(self):
         accepts = ['APPLICATION/JSON', 'APPLICATION/XML']
@@ -139,17 +139,17 @@ class ApiClientTests(unittest.TestCase):
                     "status": "available",
                     "photoUrls": ["http://foo.bar.com/3",
                                   "http://foo.bar.com/4"]}
-        pet = swagger_client.Pet()
+        pet = petstore_api.Pet()
         pet.id = pet_dict["id"]
         pet.name = pet_dict["name"]
-        cate = swagger_client.Category()
+        cate = petstore_api.Category()
         cate.id = pet_dict["category"]["id"]
         cate.name = pet_dict["category"]["name"]
         pet.category = cate
-        tag1 = swagger_client.Tag()
+        tag1 = petstore_api.Tag()
         tag1.id = pet_dict["tags"][0]["id"]
         tag1.name = pet_dict["tags"][0]["name"]
-        tag2 = swagger_client.Tag()
+        tag2 = petstore_api.Tag()
         tag2.id = pet_dict["tags"][1]["id"]
         tag2.name = pet_dict["tags"][1]["name"]
         pet.tags = [tag1, tag2]
diff --git a/samples/client/petstore/python/tests/test_api_exception.py b/samples/client/petstore/python/tests/test_api_exception.py
index 96ca4e7bfbca..8df2b681f014 100644
--- a/samples/client/petstore/python/tests/test_api_exception.py
+++ b/samples/client/petstore/python/tests/test_api_exception.py
@@ -3,7 +3,7 @@
 """
 Run the tests.
 $ pip install nose (optional)
-$ cd swagger_client-python
+$ cd petstore_api-python
 $ nosetests -v
 """
 
@@ -12,25 +12,25 @@ import sys
 import time
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 
 
 class ApiExceptionTests(unittest.TestCase):
 
     def setUp(self):
-        self.api_client = swagger_client.ApiClient()
-        self.pet_api = swagger_client.PetApi(self.api_client)
+        self.api_client = petstore_api.ApiClient()
+        self.pet_api = petstore_api.PetApi(self.api_client)
         self.setUpModels()
 
     def setUpModels(self):
-        self.category = swagger_client.Category()
+        self.category = petstore_api.Category()
         self.category.id = int(time.time())
         self.category.name = "dog"
-        self.tag = swagger_client.Tag()
+        self.tag = petstore_api.Tag()
         self.tag.id = int(time.time())
         self.tag.name = "blank"
-        self.pet = swagger_client.Pet()
+        self.pet = petstore_api.Pet()
         self.pet.id = int(time.time())
         self.pet.name = "hello kity"
         self.pet.photo_urls = ["http://foo.bar.com/1", "http://foo.bar.com/2"]
diff --git a/samples/client/petstore/python/tests/test_deserialization.py b/samples/client/petstore/python/tests/test_deserialization.py
index e1d7e250b4bc..143f22b64bd4 100644
--- a/samples/client/petstore/python/tests/test_deserialization.py
+++ b/samples/client/petstore/python/tests/test_deserialization.py
@@ -11,13 +11,13 @@ import time
 import unittest
 import datetime
 
-import swagger_client
+import petstore_api
 
 
 class DeserializationTests(unittest.TestCase):
 
     def setUp(self):
-        self.api_client = swagger_client.ApiClient()
+        self.api_client = petstore_api.ApiClient()
         self.deserialize = self.api_client._ApiClient__deserialize
 
     def test_deserialize_dict_str_pet(self):
@@ -45,7 +45,7 @@ class DeserializationTests(unittest.TestCase):
 
         deserialized = self.deserialize(data, 'dict(str, Pet)')
         self.assertTrue(isinstance(deserialized, dict))
-        self.assertTrue(isinstance(deserialized['pet'], swagger_client.Pet))
+        self.assertTrue(isinstance(deserialized['pet'], petstore_api.Pet))
 
     def test_deserialize_dict_str_int(self):
         """ deserialize dict(str, int) """
@@ -96,10 +96,10 @@ class DeserializationTests(unittest.TestCase):
             "status": "available"
         }
         deserialized = self.deserialize(data, "Pet")
-        self.assertTrue(isinstance(deserialized, swagger_client.Pet))
+        self.assertTrue(isinstance(deserialized, petstore_api.Pet))
         self.assertEqual(deserialized.id, 0)
         self.assertEqual(deserialized.name, "doggie")
-        self.assertTrue(isinstance(deserialized.category, swagger_client.Category))
+        self.assertTrue(isinstance(deserialized.category, petstore_api.Category))
         self.assertEqual(deserialized.category.name, "string")
         self.assertTrue(isinstance(deserialized.tags, list))
         self.assertEqual(deserialized.tags[0].name, "string")
@@ -145,7 +145,7 @@ class DeserializationTests(unittest.TestCase):
             }]
         deserialized = self.deserialize(data, "list[Pet]")
         self.assertTrue(isinstance(deserialized, list))
-        self.assertTrue(isinstance(deserialized[0], swagger_client.Pet))
+        self.assertTrue(isinstance(deserialized[0], petstore_api.Pet))
         self.assertEqual(deserialized[0].id, 0)
         self.assertEqual(deserialized[1].id, 1)
         self.assertEqual(deserialized[0].name, "doggie0")
diff --git a/samples/client/petstore/python/tests/test_order_model.py b/samples/client/petstore/python/tests/test_order_model.py
index e411ca0103d3..710f3c175a92 100644
--- a/samples/client/petstore/python/tests/test_order_model.py
+++ b/samples/client/petstore/python/tests/test_order_model.py
@@ -3,7 +3,7 @@
 """
 Run the tests.
 $ pip install nose (optional)
-$ cd swagger_client-python
+$ cd petstore_api-python
 $ nosetests -v
 """
 
@@ -11,13 +11,13 @@ import os
 import time
 import unittest
 
-import swagger_client
+import petstore_api
 
 
 class OrderModelTests(unittest.TestCase):
 
     def test_status(self):
-        order = swagger_client.Order()
+        order = petstore_api.Order()
         order.status = "placed"
         self.assertEqual("placed", order.status)
 
diff --git a/samples/client/petstore/python/tests/test_pet_api.py b/samples/client/petstore/python/tests/test_pet_api.py
index 300a7bee7833..4b749fc044a8 100644
--- a/samples/client/petstore/python/tests/test_pet_api.py
+++ b/samples/client/petstore/python/tests/test_pet_api.py
@@ -3,7 +3,7 @@
 """
 Run the tests.
 $ pip install nose (optional)
-$ cd swagger_client-python
+$ cd petstore_api-python
 $ nosetests -v
 """
 
@@ -11,8 +11,8 @@ import os
 import time
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 
 HOST = 'http://petstore.swagger.io/v2'
 
@@ -20,8 +20,8 @@ HOST = 'http://petstore.swagger.io/v2'
 class PetApiTests(unittest.TestCase):
 
     def setUp(self):
-        self.api_client = swagger_client.ApiClient(HOST)
-        self.pet_api = swagger_client.PetApi(self.api_client)
+        self.api_client = petstore_api.ApiClient(HOST)
+        self.pet_api = petstore_api.PetApi(self.api_client)
         self.setUpModels()
         self.setUpFiles()
 
@@ -30,13 +30,13 @@ class PetApiTests(unittest.TestCase):
         time.sleep(1)
 
     def setUpModels(self):
-        self.category = swagger_client.Category()
+        self.category = petstore_api.Category()
         self.category.id = int(time.time())
         self.category.name = "dog"
-        self.tag = swagger_client.Tag()
+        self.tag = petstore_api.Tag()
         self.tag.id = int(time.time())
         self.tag.name = "swagger-codegen-python-pet-tag"
-        self.pet = swagger_client.Pet()
+        self.pet = petstore_api.Pet()
         self.pet.id = int(time.time())
         self.pet.name = "hello kity"
         self.pet.photo_urls = ["http://foo.bar.com/1", "http://foo.bar.com/2"]
@@ -50,22 +50,22 @@ class PetApiTests(unittest.TestCase):
         self.foo = os.path.join(self.test_file_dir, "foo.png")
 
     def test_create_api_instance(self):
-        pet_api = swagger_client.PetApi()
-        pet_api2 = swagger_client.PetApi()
-        api_client3 = swagger_client.ApiClient()
+        pet_api = petstore_api.PetApi()
+        pet_api2 = petstore_api.PetApi()
+        api_client3 = petstore_api.ApiClient()
         api_client3.user_agent = 'api client 3'
-        api_client4 = swagger_client.ApiClient()
+        api_client4 = petstore_api.ApiClient()
         api_client4.user_agent = 'api client 4'
-        pet_api3 = swagger_client.PetApi(api_client3)
+        pet_api3 = petstore_api.PetApi(api_client3)
 
         # same default api client
         self.assertEqual(pet_api.api_client, pet_api2.api_client)
         # confirm using the default api client in the config module
-        self.assertEqual(pet_api.api_client, swagger_client.configuration.api_client)
+        self.assertEqual(pet_api.api_client, petstore_api.configuration.api_client)
         # 2 different api clients are not the same
         self.assertNotEqual(api_client3, api_client4)
         # customized pet api not using the default api client
-        self.assertNotEqual(pet_api3.api_client, swagger_client.configuration.api_client)
+        self.assertNotEqual(pet_api3.api_client, petstore_api.configuration.api_client)
         # customized pet api not using the old pet api's api client
         self.assertNotEqual(pet_api3.api_client, pet_api2.api_client)
 
diff --git a/samples/client/petstore/python/tests/test_pet_model.py b/samples/client/petstore/python/tests/test_pet_model.py
index d2bd3c9ca3d2..52cb55061dac 100644
--- a/samples/client/petstore/python/tests/test_pet_model.py
+++ b/samples/client/petstore/python/tests/test_pet_model.py
@@ -3,7 +3,7 @@
 """
 Run the tests.
 $ pip install nose (optional)
-$ cd swagger_client-python
+$ cd petstore_api-python
 $ nosetests -v
 """
 
@@ -11,22 +11,22 @@ import os
 import time
 import unittest
 
-import swagger_client
+import petstore_api
 
 
 class PetModelTests(unittest.TestCase):
 
     def setUp(self):
-        self.pet = swagger_client.Pet()
+        self.pet = petstore_api.Pet()
         self.pet.name = "test name"
         self.pet.id = 1
         self.pet.photo_urls = ["string"]
         self.pet.status = "available"
-        cate = swagger_client.Category()
+        cate = petstore_api.Category()
         cate.id = 1
         cate.name = "dog"
         self.pet.category = cate
-        tag = swagger_client.Tag()
+        tag = petstore_api.Tag()
         tag.id = 1
         self.pet.tags = [tag]
 
@@ -40,29 +40,29 @@ class PetModelTests(unittest.TestCase):
         self.assertEqual(data, self.pet.to_str())
 
     def test_equal(self):
-        self.pet1 = swagger_client.Pet()
+        self.pet1 = petstore_api.Pet()
         self.pet1.name = "test name"
         self.pet1.id = 1
         self.pet1.photo_urls = ["string"]
         self.pet1.status = "available"
-        cate1 = swagger_client.Category()
+        cate1 = petstore_api.Category()
         cate1.id = 1
         cate1.name = "dog"
         self.pet.category = cate1
-        tag1 = swagger_client.Tag()
+        tag1 = petstore_api.Tag()
         tag1.id = 1
         self.pet1.tags = [tag1]
 
-        self.pet2 = swagger_client.Pet()
+        self.pet2 = petstore_api.Pet()
         self.pet2.name = "test name"
         self.pet2.id = 1
         self.pet2.photo_urls = ["string"]
         self.pet2.status = "available"
-        cate2 = swagger_client.Category()
+        cate2 = petstore_api.Category()
         cate2.id = 1
         cate2.name = "dog"
         self.pet.category = cate2
-        tag2 = swagger_client.Tag()
+        tag2 = petstore_api.Tag()
         tag2.id = 1
         self.pet2.tags = [tag2]
 
diff --git a/samples/client/petstore/python/tests/test_store_api.py b/samples/client/petstore/python/tests/test_store_api.py
index 42b92d0879c0..b7e80281707e 100644
--- a/samples/client/petstore/python/tests/test_store_api.py
+++ b/samples/client/petstore/python/tests/test_store_api.py
@@ -11,14 +11,14 @@ import os
 import time
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 
 
 class StoreApiTests(unittest.TestCase):
 
     def setUp(self):
-        self.store_api = swagger_client.StoreApi()
+        self.store_api = petstore_api.StoreApi()
 
     def tearDown(self):
         # sleep 1 sec between two every 2 tests

From df11034c46f9407f3136a6a639353179bf02111e Mon Sep 17 00:00:00 2001
From: Takuro Wada <taxpon@gmail.com>
Date: Wed, 8 Jun 2016 09:25:35 +0900
Subject: [PATCH 102/139] Add venv and .python-version to .gitignore

---
 samples/client/petstore/python/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/samples/client/petstore/python/.gitignore b/samples/client/petstore/python/.gitignore
index 1dbc687de014..a655050c2631 100644
--- a/samples/client/petstore/python/.gitignore
+++ b/samples/client/petstore/python/.gitignore
@@ -44,6 +44,8 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+venv/
+.python-version
 
 # Translations
 *.mo

From fccc30eb1190b78667f3b4268d056e126d575755 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Wed, 8 Jun 2016 21:20:03 +0800
Subject: [PATCH 103/139] add info about pulling latest master

---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f94dfe8d93a4..2e76422c0dd6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,6 +2,7 @@
 
 ## Before submitting an issue
 
+ - If you're not using the latest master to generate API clients or server stubs, please give it another try by pulling the latest master as the issue may have already been addressed. Ref: [Getting Started](https://github.com/swagger-api/swagger-codegen#getting-started)
  - Search the [open issue](https://github.com/swagger-api/swagger-codegen/issues) and [closed issue](https://github.com/swagger-api/swagger-codegen/issues?q=is%3Aissue+is%3Aclosed) to ensure no one else has reported something similar before.
  - The issue should contain details on how to repeat the issue, e.g. 
    - the OpenAPI Spec for reproducing the issue (:bulb: use [Gist](https://gist.github.com) to share). If the OpenAPI Spec cannot be shared publicly, it will be hard for the community to help

From baed578010332a020d3d722dce6cb5f62b862d98 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Wed, 8 Jun 2016 21:21:39 +0800
Subject: [PATCH 104/139] file an issue ticket

---
 CONTRIBUTING.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2e76422c0dd6..a40a96f7b389 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,11 +4,8 @@
 
  - If you're not using the latest master to generate API clients or server stubs, please give it another try by pulling the latest master as the issue may have already been addressed. Ref: [Getting Started](https://github.com/swagger-api/swagger-codegen#getting-started)
  - Search the [open issue](https://github.com/swagger-api/swagger-codegen/issues) and [closed issue](https://github.com/swagger-api/swagger-codegen/issues?q=is%3Aissue+is%3Aclosed) to ensure no one else has reported something similar before.
- - The issue should contain details on how to repeat the issue, e.g. 
-   - the OpenAPI Spec for reproducing the issue (:bulb: use [Gist](https://gist.github.com) to share). If the OpenAPI Spec cannot be shared publicly, it will be hard for the community to help
-   - version of Swagger Codegen
-   - language (`-l` in the command line, e.g. java, csharp, php)
- - You can also make a suggestion or ask a question by opening an "issue"
+ - File an [issue ticket](https://github.com/swagger-api/swagger-codegen/issues/new) by providing all the required information. 
+ - You can also make a suggestion or ask a question by opening an "issue".
 
 ## Before submitting a PR
 

From 691aa53d5af958a6613139ca77bbc6038eeea6ca Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Thu, 9 Jun 2016 00:47:49 +0800
Subject: [PATCH 105/139] [Java][okhttp-gson] fix java doc for okhttp-gson
 (#3077)

* fix java doc for okhttp-gson

* add ci test for javadoc

* fix return type for java doc

* fix warning/error with javadoc

* fix error/warning in javadoc

* fix 2 warnings related to docstring

* remove trailing space for okhttp tmeplate
---
 .../codegen/languages/JavaClientCodegen.java  |    2 +-
 .../resources/Java/Configuration.mustache     |   34 +-
 .../main/resources/Java/apiException.mustache |  107 +-
 .../Java/auth/Authentication.mustache         |    9 +-
 .../okhttp-gson/ApiCallback.mustache          |   64 +-
 .../libraries/okhttp-gson/ApiClient.mustache  | 2177 +++++++++--------
 .../okhttp-gson/ApiResponse.mustache          |   58 +-
 .../Java/libraries/okhttp-gson/JSON.mustache  |  144 +-
 .../okhttp-gson/ProgressRequestBody.mustache  |    8 +-
 .../Java/libraries/okhttp-gson/api.mustache   |  256 +-
 .../okhttp-gson/auth/HttpBasicAuth.mustache   |   52 +-
 .../libraries/okhttp-gson/modelEnum.mustache  |   22 +-
 .../okhttp-gson/modelInnerEnum.mustache       |   32 +-
 .../Java/libraries/okhttp-gson/pojo.mustache  |  144 +-
 .../Java/libraries/okhttp-gson/pom.mustache   |   17 +-
 .../client/petstore/java/okhttp-gson/pom.xml  |   17 +-
 .../java/io/swagger/client/ApiCallback.java   |   64 +-
 .../java/io/swagger/client/ApiClient.java     | 2175 ++++++++--------
 .../java/io/swagger/client/ApiException.java  |  109 +-
 .../java/io/swagger/client/ApiResponse.java   |   58 +-
 .../java/io/swagger/client/Configuration.java |   36 +-
 .../src/main/java/io/swagger/client/JSON.java |  144 +-
 .../src/main/java/io/swagger/client/Pair.java |    2 +-
 .../swagger/client/ProgressRequestBody.java   |    8 +-
 .../java/io/swagger/client/StringUtil.java    |    2 +-
 .../java/io/swagger/client/api/FakeApi.java   |  364 +--
 .../java/io/swagger/client/api/PetApi.java    | 1668 ++++++-------
 .../java/io/swagger/client/api/StoreApi.java  |  816 +++---
 .../java/io/swagger/client/api/UserApi.java   | 1540 ++++++------
 .../io/swagger/client/auth/ApiKeyAuth.java    |    2 +-
 .../swagger/client/auth/Authentication.java   |    9 +-
 .../io/swagger/client/auth/HttpBasicAuth.java |   52 +-
 .../java/io/swagger/client/auth/OAuth.java    |    2 +-
 .../model/AdditionalPropertiesClass.java      |  140 +-
 .../java/io/swagger/client/model/Animal.java  |  140 +-
 .../io/swagger/client/model/AnimalFarm.java   |   66 +-
 .../io/swagger/client/model/ArrayTest.java    |  175 +-
 .../java/io/swagger/client/model/Cat.java     |  175 +-
 .../io/swagger/client/model/Category.java     |  140 +-
 .../java/io/swagger/client/model/Dog.java     |  175 +-
 .../io/swagger/client/model/EnumClass.java    |   28 +-
 .../io/swagger/client/model/EnumTest.java     |  178 +-
 .../io/swagger/client/model/FormatTest.java   |  545 +++--
 ...ropertiesAndAdditionalPropertiesClass.java |  175 +-
 .../client/model/Model200Response.java        |  101 +-
 .../client/model/ModelApiResponse.java        |  175 +-
 .../io/swagger/client/model/ModelReturn.java  |  101 +-
 .../java/io/swagger/client/model/Name.java    |  186 +-
 .../java/io/swagger/client/model/Order.java   |  282 ++-
 .../java/io/swagger/client/model/Pet.java     |  282 ++-
 .../swagger/client/model/ReadOnlyFirst.java   |  128 +-
 .../client/model/SpecialModelName.java        |  101 +-
 .../java/io/swagger/client/model/Tag.java     |  140 +-
 .../java/io/swagger/client/model/User.java    |  351 +--
 samples/client/petstore/python/.gitignore     |    2 -
 samples/client/petstore/python/README.md      |   14 +-
 .../python/petstore_api/configuration.py      |   14 +-
 57 files changed, 7494 insertions(+), 6514 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
index 73930a838782..16c9f9ae12b9 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -261,7 +261,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         writeOptional(outputFolder, new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
         writeOptional(outputFolder, new SupportingFile("gradle.properties.mustache", "", "gradle.properties"));
         writeOptional(outputFolder, new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
-        writeOptional(outputFolder, new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java"));
+        supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java"));
         supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java"));
 
         final String authFolder = (sourceFolder + '/' + invokerPackage + ".auth").replace(".", "/");
diff --git a/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache b/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache
index 4629c4e17be4..ea6cccb7d854 100644
--- a/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache
@@ -2,21 +2,25 @@ package {{invokerPackage}};
 
 {{>generatedAnnotation}}
 public class Configuration {
-  private static ApiClient defaultApiClient = new ApiClient();
+    private static ApiClient defaultApiClient = new ApiClient();
 
-  /**
-   * Get the default API client, which would be used when creating API
-   * instances without providing an API client.
-   */
-  public static ApiClient getDefaultApiClient() {
-    return defaultApiClient;
-   }
+    /**
+     * Get the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @return Default API client
+     */
+    public static ApiClient getDefaultApiClient() {
+        return defaultApiClient;
+    }
 
-  /**
-   * Set the default API client, which would be used when creating API
-   * instances without providing an API client.
-   */
-  public static void setDefaultApiClient(ApiClient apiClient) {
-    defaultApiClient = apiClient;
-  }
+    /**
+     * Set the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @param apiClient API client
+     */
+    public static void setDefaultApiClient(ApiClient apiClient) {
+        defaultApiClient = apiClient;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/apiException.mustache b/modules/swagger-codegen/src/main/resources/Java/apiException.mustache
index b9a62a6b231d..740ed4143abc 100644
--- a/modules/swagger-codegen/src/main/resources/Java/apiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/apiException.mustache
@@ -5,65 +5,74 @@ import java.util.List;
 
 {{>generatedAnnotation}}
 public class ApiException extends Exception {
-  private int code = 0;
-  private Map<String, List<String>> responseHeaders = null;
-  private String responseBody = null;
+    private int code = 0;
+    private Map<String, List<String>> responseHeaders = null;
+    private String responseBody = null;
 
-  public ApiException() {}
+    public ApiException() {}
 
-  public ApiException(Throwable throwable) {
-    super(throwable);
-  }
+    public ApiException(Throwable throwable) {
+        super(throwable);
+    }
 
-  public ApiException(String message) {
-    super(message);
-  }
+    public ApiException(String message) {
+        super(message);
+    }
 
-  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    super(message, throwable);
-    this.code = code;
-    this.responseHeaders = responseHeaders;
-    this.responseBody = responseBody;
-  }
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        super(message, throwable);
+        this.code = code;
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
 
-  public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    this(message, (Throwable) null, code, responseHeaders, responseBody);
-  }
+    public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(message, (Throwable) null, code, responseHeaders, responseBody);
+    }
 
-  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
-    this(message, throwable, code, responseHeaders, null);
-  }
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
+        this(message, throwable, code, responseHeaders, null);
+    }
 
-  public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    this((String) null, (Throwable) null, code, responseHeaders, responseBody);
-  }
+    public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+    }
 
-  public ApiException(int code, String message) {
-    super(message);
-    this.code = code;
-  }
+    public ApiException(int code, String message) {
+        super(message);
+        this.code = code;
+    }
 
-  public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
-    this(code, message);
-    this.responseHeaders = responseHeaders;
-    this.responseBody = responseBody;
-  }
+    public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(code, message);
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
 
-  public int getCode() {
-    return code;
-  }
+    /**
+     * Get the HTTP status code.
+     *
+     * @return HTTP status code
+     */
+    public int getCode() {
+        return code;
+    }
 
-  /**
-   * Get the HTTP response headers.
-   */
-  public Map<String, List<String>> getResponseHeaders() {
-    return responseHeaders;
-  }
+    /**
+     * Get the HTTP response headers.
+     *
+     * @return A map of list of string
+     */
+    public Map<String, List<String>> getResponseHeaders() {
+        return responseHeaders;
+    }
 
-  /**
-   * Get the HTTP response body.
-   */
-  public String getResponseBody() {
-    return responseBody;
-  }
+    /**
+     * Get the HTTP response body.
+     *
+     * @return Response body in the form of string
+     */
+    public String getResponseBody() {
+        return responseBody;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
index 265c74cb76f9..592b55c2552c 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
@@ -6,6 +6,11 @@ import java.util.Map;
 import java.util.List;
 
 public interface Authentication {
-  /** Apply authentication settings to header and query params. */
-  void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
+    /**
+     * Apply authentication settings to header and query params.
+     *
+     * @param queryParams List of query parameters
+     * @param headerParams Map of header parameters
+     */
+    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache
index bfc1aedbc113..3b554fefeff4 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache
@@ -11,39 +11,39 @@ import java.util.List;
  * @param <T> The return type
  */
 public interface ApiCallback<T> {
-  /**
-   * This is called when the API call fails.
-   *
-   * @param e The exception causing the failure
-   * @param statusCode Status code of the response if available, otherwise it would be 0
-   * @param responseHeaders Headers of the response if available, otherwise it would be null
-   */
-  void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders);
+    /**
+     * This is called when the API call fails.
+     *
+     * @param e The exception causing the failure
+     * @param statusCode Status code of the response if available, otherwise it would be 0
+     * @param responseHeaders Headers of the response if available, otherwise it would be null
+     */
+    void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders);
 
-  /**
-   * This is called when the API call succeeded.
-   *
-   * @param result The result deserialized from response
-   * @param statusCode Status code of the response
-   * @param responseHeaders Headers of the response
-   */
-  void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders);
+    /**
+     * This is called when the API call succeeded.
+     *
+     * @param result The result deserialized from response
+     * @param statusCode Status code of the response
+     * @param responseHeaders Headers of the response
+     */
+    void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders);
 
-  /**
-   * This is called when the API upload processing.
-   *
-   * @param bytesWritten bytes Written
-   * @param contentLength content length of request body
-   * @param done write end
-   */
-  void onUploadProgress(long bytesWritten, long contentLength, boolean done);
+    /**
+     * This is called when the API upload processing.
+     *
+     * @param bytesWritten bytes Written
+     * @param contentLength content length of request body
+     * @param done write end
+     */
+    void onUploadProgress(long bytesWritten, long contentLength, boolean done);
 
-  /**
-   * This is called when the API downlond processing.
-   *
-   * @param bytesRead bytes Read
-   * @param contentLength content lenngth of the response
-   * @param done Read end
-   */
-  void onDownloadProgress(long bytesRead, long contentLength, boolean done);
+    /**
+     * This is called when the API downlond processing.
+     *
+     * @param bytesRead bytes Read
+     * @param contentLength content lenngth of the response
+     * @param done Read end
+     */
+    void onDownloadProgress(long bytesRead, long contentLength, boolean done);
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
index 4c8e304ed972..ac140471567f 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
@@ -67,1073 +67,1234 @@ import {{invokerPackage}}.auth.ApiKeyAuth;
 import {{invokerPackage}}.auth.OAuth;
 
 public class ApiClient {
-  public static final double JAVA_VERSION;
-  public static final boolean IS_ANDROID;
-  public static final int ANDROID_SDK_VERSION;
+    public static final double JAVA_VERSION;
+    public static final boolean IS_ANDROID;
+    public static final int ANDROID_SDK_VERSION;
 
-  static {
-    JAVA_VERSION = Double.parseDouble(System.getProperty("java.specification.version"));
-    boolean isAndroid;
-    try {
-      Class.forName("android.app.Activity");
-      isAndroid = true;
-    } catch (ClassNotFoundException e) {
-      isAndroid = false;
-    }
-    IS_ANDROID = isAndroid;
-    int sdkVersion = 0;
-    if (IS_ANDROID) {
-      try {
-        sdkVersion = Class.forName("android.os.Build$VERSION").getField("SDK_INT").getInt(null);
-      } catch (Exception e) {
+    static {
+        JAVA_VERSION = Double.parseDouble(System.getProperty("java.specification.version"));
+        boolean isAndroid;
         try {
-          sdkVersion = Integer.parseInt((String) Class.forName("android.os.Build$VERSION").getField("SDK").get(null));
-        } catch (Exception e2) { }
-      }
+            Class.forName("android.app.Activity");
+            isAndroid = true;
+        } catch (ClassNotFoundException e) {
+            isAndroid = false;
+        }
+        IS_ANDROID = isAndroid;
+        int sdkVersion = 0;
+        if (IS_ANDROID) {
+            try {
+                sdkVersion = Class.forName("android.os.Build$VERSION").getField("SDK_INT").getInt(null);
+            } catch (Exception e) {
+                try {
+                    sdkVersion = Integer.parseInt((String) Class.forName("android.os.Build$VERSION").getField("SDK").get(null));
+                } catch (Exception e2) { }
+            }
+        }
+        ANDROID_SDK_VERSION = sdkVersion;
     }
-    ANDROID_SDK_VERSION = sdkVersion;
-  }
 
-  /**
-   * The datetime format to be used when <code>lenientDatetimeFormat</code> is enabled.
-   */
-  public static final String LENIENT_DATETIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
+    /**
+     * The datetime format to be used when <code>lenientDatetimeFormat</code> is enabled.
+     */
+    public static final String LENIENT_DATETIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
 
-  private String basePath = "{{basePath}}";
-  private boolean lenientOnJson = false;
-  private boolean debugging = false;
-  private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
-  private String tempFolderPath = null;
+    private String basePath = "{{basePath}}";
+    private boolean lenientOnJson = false;
+    private boolean debugging = false;
+    private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
+    private String tempFolderPath = null;
 
-  private Map<String, Authentication> authentications;
+    private Map<String, Authentication> authentications;
 
-  private DateFormat dateFormat;
-  private DateFormat datetimeFormat;
-  private boolean lenientDatetimeFormat;
-  private int dateLength;
+    private DateFormat dateFormat;
+    private DateFormat datetimeFormat;
+    private boolean lenientDatetimeFormat;
+    private int dateLength;
 
-  private InputStream sslCaCert;
-  private boolean verifyingSsl;
+    private InputStream sslCaCert;
+    private boolean verifyingSsl;
 
-  private OkHttpClient httpClient;
-  private JSON json;
+    private OkHttpClient httpClient;
+    private JSON json;
 
-  private HttpLoggingInterceptor loggingInterceptor;
-
-  public ApiClient() {
-    httpClient = new OkHttpClient();
-
-    verifyingSsl = true;
-
-    json = new JSON(this);
+    private HttpLoggingInterceptor loggingInterceptor;
 
     /*
-     * Use RFC3339 format for date and datetime.
-     * See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
+     * Constructor for ApiClient
      */
-    this.dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-    // Always use UTC as the default time zone when dealing with date (without time).
-    this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-    initDatetimeFormat();
+    public ApiClient() {
+        httpClient = new OkHttpClient();
 
-    // Be lenient on datetime formats when parsing datetime from string.
-    // See <code>parseDatetime</code>.
-    this.lenientDatetimeFormat = true;
+        verifyingSsl = true;
 
-    // Set default User-Agent.
-    setUserAgent("{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{artifactVersion}}}/java{{/httpUserAgent}}");
+        json = new JSON(this);
 
-    // Setup authentications (key: authentication name, value: authentication).
-    authentications = new HashMap<String, Authentication>();{{#authMethods}}{{#isBasic}}
-    authentications.put("{{name}}", new HttpBasicAuth());{{/isBasic}}{{#isApiKey}}
-    authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"));{{/isApiKey}}{{#isOAuth}}
-    authentications.put("{{name}}", new OAuth());{{/isOAuth}}{{/authMethods}}
-    // Prevent the authentications from being modified.
-    authentications = Collections.unmodifiableMap(authentications);
-  }
+        /*
+         * Use RFC3339 format for date and datetime.
+         * See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
+         */
+        this.dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        // Always use UTC as the default time zone when dealing with date (without time).
+        this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        initDatetimeFormat();
 
-  public String getBasePath() {
-    return basePath;
-  }
+        // Be lenient on datetime formats when parsing datetime from string.
+        // See <code>parseDatetime</code>.
+        this.lenientDatetimeFormat = true;
 
-  public ApiClient setBasePath(String basePath) {
-    this.basePath = basePath;
-    return this;
-  }
+        // Set default User-Agent.
+        setUserAgent("{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{artifactVersion}}}/java{{/httpUserAgent}}");
 
-  public OkHttpClient getHttpClient() {
-    return httpClient;
-  }
-
-  public ApiClient setHttpClient(OkHttpClient httpClient) {
-    this.httpClient = httpClient;
-    return this;
-  }
-
-  public JSON getJSON() {
-    return json;
-  }
-
-  public ApiClient setJSON(JSON json) {
-    this.json = json;
-    return this;
-  }
-
-  public boolean isVerifyingSsl() {
-    return verifyingSsl;
-  }
-
-  /**
-   * Configure whether to verify certificate and hostname when making https requests.
-   * Default to true.
-   * NOTE: Do NOT set to false in production code, otherwise you would face multiple types of cryptographic attacks.
-   */
-  public ApiClient setVerifyingSsl(boolean verifyingSsl) {
-    this.verifyingSsl = verifyingSsl;
-    applySslSettings();
-    return this;
-  }
-
-  public InputStream getSslCaCert() {
-    return sslCaCert;
-  }
-
-  /**
-   * Configure the CA certificate to be trusted when making https requests.
-   * Use null to reset to default.
-   */
-  public ApiClient setSslCaCert(InputStream sslCaCert) {
-    this.sslCaCert = sslCaCert;
-    applySslSettings();
-    return this;
-  }
-
-  public DateFormat getDateFormat() {
-    return dateFormat;
-  }
-
-  public ApiClient setDateFormat(DateFormat dateFormat) {
-    this.dateFormat = dateFormat;
-    this.dateLength = this.dateFormat.format(new Date()).length();
-    return this;
-  }
-
-  public DateFormat getDatetimeFormat() {
-    return datetimeFormat;
-  }
-
-  public ApiClient setDatetimeFormat(DateFormat datetimeFormat) {
-    this.datetimeFormat = datetimeFormat;
-    return this;
-  }
-
-  /**
-   * Whether to allow various ISO 8601 datetime formats when parsing a datetime string.
-   * @see #parseDatetime(String)
-   */
-  public boolean isLenientDatetimeFormat() {
-    return lenientDatetimeFormat;
-  }
-
-  public ApiClient setLenientDatetimeFormat(boolean lenientDatetimeFormat) {
-    this.lenientDatetimeFormat = lenientDatetimeFormat;
-    return this;
-  }
-
-  /**
-   * Parse the given date string into Date object.
-   * The default <code>dateFormat</code> supports these ISO 8601 date formats:
-   *   2015-08-16
-   *   2015-8-16
-   */
-  public Date parseDate(String str) {
-    if (str == null)
-      return null;
-    try {
-      return dateFormat.parse(str);
-    } catch (ParseException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  /**
-   * Parse the given datetime string into Date object.
-   * When <code>lenientDatetimeFormat</code> is enabled, the following ISO 8601 datetime formats are supported:
-   *   2015-08-16T08:20:05Z
-   *   2015-8-16T8:20:05Z
-   *   2015-08-16T08:20:05+00:00
-   *   2015-08-16T08:20:05+0000
-   *   2015-08-16T08:20:05.376Z
-   *   2015-08-16T08:20:05.376+00:00
-   *   2015-08-16T08:20:05.376+00
-   * Note: The 3-digit milli-seconds is optional. Time zone is required and can be in one of
-   *   these formats:
-   *   Z (same with +0000)
-   *   +08:00 (same with +0800)
-   *   -02 (same with -0200)
-   *   -0200
-   * @see https://en.wikipedia.org/wiki/ISO_8601
-   */
-  public Date parseDatetime(String str) {
-    if (str == null)
-      return null;
-
-    DateFormat format;
-    if (lenientDatetimeFormat) {
-      /*
-       * When lenientDatetimeFormat is enabled, normalize the date string
-       * into <code>LENIENT_DATETIME_FORMAT</code> to support various formats
-       * defined by ISO 8601.
-       */
-      // normalize time zone
-      //   trailing "Z": 2015-08-16T08:20:05Z => 2015-08-16T08:20:05+0000
-      str = str.replaceAll("[zZ]\\z", "+0000");
-      //   remove colon in time zone: 2015-08-16T08:20:05+00:00 => 2015-08-16T08:20:05+0000
-      str = str.replaceAll("([+-]\\d{2}):(\\d{2})\\z", "$1$2");
-      //   expand time zone: 2015-08-16T08:20:05+00 => 2015-08-16T08:20:05+0000
-      str = str.replaceAll("([+-]\\d{2})\\z", "$100");
-      // add milliseconds when missing
-      //   2015-08-16T08:20:05+0000 => 2015-08-16T08:20:05.000+0000
-      str = str.replaceAll("(:\\d{1,2})([+-]\\d{4})\\z", "$1.000$2");
-      format = new SimpleDateFormat(LENIENT_DATETIME_FORMAT);
-    } else {
-      format = this.datetimeFormat;
+        // Setup authentications (key: authentication name, value: authentication).
+        authentications = new HashMap<String, Authentication>();{{#authMethods}}{{#isBasic}}
+        authentications.put("{{name}}", new HttpBasicAuth());{{/isBasic}}{{#isApiKey}}
+        authentications.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"));{{/isApiKey}}{{#isOAuth}}
+        authentications.put("{{name}}", new OAuth());{{/isOAuth}}{{/authMethods}}
+        // Prevent the authentications from being modified.
+        authentications = Collections.unmodifiableMap(authentications);
     }
 
-    try {
-      return format.parse(str);
-    } catch (ParseException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public Date parseDateOrDatetime(String str) {
-    if (str == null)
-      return null;
-    else if (str.length() <= dateLength)
-      return parseDate(str);
-    else
-      return parseDatetime(str);
-  }
-
-  /**
-   * Format the given Date object into string.
-   */
-  public String formatDate(Date date) {
-    return dateFormat.format(date);
-  }
-
-  /**
-   * Format the given Date object into string.
-   */
-  public String formatDatetime(Date date) {
-    return datetimeFormat.format(date);
-  }
-
-  /**
-   * Get authentications (key: authentication name, value: authentication).
-   */
-  public Map<String, Authentication> getAuthentications() {
-    return authentications;
-  }
-
-  /**
-   * Get authentication for the given name.
-   *
-   * @param authName The authentication name
-   * @return The authentication, null if not found
-   */
-  public Authentication getAuthentication(String authName) {
-    return authentications.get(authName);
-  }
-
-  /**
-   * Helper method to set username for the first HTTP basic authentication.
-   */
-  public void setUsername(String username) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof HttpBasicAuth) {
-        ((HttpBasicAuth) auth).setUsername(username);
-        return;
-      }
-    }
-    throw new RuntimeException("No HTTP basic authentication configured!");
-  }
-
-  /**
-   * Helper method to set password for the first HTTP basic authentication.
-   */
-  public void setPassword(String password) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof HttpBasicAuth) {
-        ((HttpBasicAuth) auth).setPassword(password);
-        return;
-      }
-    }
-    throw new RuntimeException("No HTTP basic authentication configured!");
-  }
-
-  /**
-   * Helper method to set API key value for the first API key authentication.
-   */
-  public void setApiKey(String apiKey) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof ApiKeyAuth) {
-        ((ApiKeyAuth) auth).setApiKey(apiKey);
-        return;
-      }
-    }
-    throw new RuntimeException("No API key authentication configured!");
-  }
-
-  /**
-   * Helper method to set API key prefix for the first API key authentication.
-   */
-  public void setApiKeyPrefix(String apiKeyPrefix) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof ApiKeyAuth) {
-        ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
-        return;
-      }
-    }
-    throw new RuntimeException("No API key authentication configured!");
-  }
-
-  /**
-   * Helper method to set access token for the first OAuth2 authentication.
-   */
-  public void setAccessToken(String accessToken) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof OAuth) {
-        ((OAuth) auth).setAccessToken(accessToken);
-        return;
-      }
-    }
-    throw new RuntimeException("No OAuth2 authentication configured!");
-  }
-
-  /**
-   * Set the User-Agent header's value (by adding to the default header map).
-   */
-  public ApiClient setUserAgent(String userAgent) {
-    addDefaultHeader("User-Agent", userAgent);
-    return this;
-  }
-
-  /**
-   * Add a default header.
-   *
-   * @param key The header's key
-   * @param value The header's value
-   */
-  public ApiClient addDefaultHeader(String key, String value) {
-    defaultHeaderMap.put(key, value);
-    return this;
-  }
-
-  /**
-   * @see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
-   */
-  public boolean isLenientOnJson() {
-    return lenientOnJson;
-  }
-
-  public ApiClient setLenientOnJson(boolean lenient) {
-    this.lenientOnJson = lenient;
-    return this;
-  }
-
-  /**
-   * Check that whether debugging is enabled for this API client.
-   */
-  public boolean isDebugging() {
-    return debugging;
-  }
-
-  /**
-   * Enable/disable debugging for this API client.
-   *
-   * @param debugging To enable (true) or disable (false) debugging
-   */
-  public ApiClient setDebugging(boolean debugging) {
-    if (debugging != this.debugging) {
-      if (debugging) {
-        loggingInterceptor = new HttpLoggingInterceptor();
-        loggingInterceptor.setLevel(Level.BODY);
-        httpClient.interceptors().add(loggingInterceptor);
-      } else {
-        httpClient.interceptors().remove(loggingInterceptor);
-        loggingInterceptor = null;
-      }
-    }
-    this.debugging = debugging;
-    return this;
-  }
-
-  /**
-   * The path of temporary folder used to store downloaded files from endpoints
-   * with file response. The default value is <code>null</code>, i.e. using
-   * the system's default tempopary folder.
-   *
-   * @see https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile(java.lang.String,%20java.lang.String,%20java.io.File)
-   */
-  public String getTempFolderPath() {
-    return tempFolderPath;
-  }
-
-  public ApiClient setTempFolderPath(String tempFolderPath) {
-    this.tempFolderPath = tempFolderPath;
-    return this;
-  }
-
-  /**
-   * Connect timeout (in milliseconds).
-   */
-  public int getConnectTimeout() {
-    return httpClient.getConnectTimeout();
-  }
-
-  /**
-   * Sets the connect timeout (in milliseconds).
-   * A value of 0 means no timeout, otherwise values must be between 1 and
-   * {@link Integer#MAX_VALUE}.
-   */
-  public ApiClient setConnectTimeout(int connectionTimeout) {
-    httpClient.setConnectTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
-    return this;
-  }
-
-  /**
-   * Format the given parameter object into string.
-   */
-  public String parameterToString(Object param) {
-    if (param == null) {
-      return "";
-    } else if (param instanceof Date) {
-      return formatDatetime((Date) param);
-    } else if (param instanceof Collection) {
-      StringBuilder b = new StringBuilder();
-      for (Object o : (Collection)param) {
-        if (b.length() > 0) {
-          b.append(",");
-        }
-        b.append(String.valueOf(o));
-      }
-      return b.toString();
-    } else {
-      return String.valueOf(param);
-    }
-  }
-
-  /*
-    Format to {@code Pair} objects.
-  */
-  public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
-    List<Pair> params = new ArrayList<Pair>();
-
-    // preconditions
-    if (name == null || name.isEmpty() || value == null) return params;
-
-    Collection valueCollection = null;
-    if (value instanceof Collection) {
-      valueCollection = (Collection) value;
-    } else {
-      params.add(new Pair(name, parameterToString(value)));
-      return params;
+    /**
+     * Get base path
+     *
+     * @return Baes path
+     */
+    public String getBasePath() {
+        return basePath;
     }
 
-    if (valueCollection.isEmpty()){
-      return params;
+    /**
+     * Set base path
+     *
+     * @param basePath Base path of the URL (e.g {{basePath}})
+     * @return An instance of OkHttpClient
+     */
+    public ApiClient setBasePath(String basePath) {
+        this.basePath = basePath;
+        return this;
     }
 
-    // get the collection format
-    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
-
-    // create the params based on the collection format
-    if (collectionFormat.equals("multi")) {
-      for (Object item : valueCollection) {
-        params.add(new Pair(name, parameterToString(item)));
-      }
-
-      return params;
+    /**
+     * Get HTTP client
+     *
+     * @return An instance of OkHttpClient
+     */
+    public OkHttpClient getHttpClient() {
+        return httpClient;
     }
 
-    String delimiter = ",";
-
-    if (collectionFormat.equals("csv")) {
-      delimiter = ",";
-    } else if (collectionFormat.equals("ssv")) {
-      delimiter = " ";
-    } else if (collectionFormat.equals("tsv")) {
-      delimiter = "\t";
-    } else if (collectionFormat.equals("pipes")) {
-      delimiter = "|";
+    /**
+     * Set HTTP client
+     *
+     * @param httpClient An instance of OkHttpClient
+     * @return Api Client
+     */
+    public ApiClient setHttpClient(OkHttpClient httpClient) {
+        this.httpClient = httpClient;
+        return this;
     }
 
-    StringBuilder sb = new StringBuilder() ;
-    for (Object item : valueCollection) {
-      sb.append(delimiter);
-      sb.append(parameterToString(item));
+    /**
+     * Get JSON
+     *
+     * @return JSON object
+     */
+    public JSON getJSON() {
+        return json;
     }
 
-    params.add(new Pair(name, sb.substring(1)));
-
-    return params;
-  }
-
-  /**
-   * Sanitize filename by removing path.
-   * e.g. ../../sun.gif becomes sun.gif
-   *
-   * @param filename The filename to be sanitized
-   * @return The sanitized filename
-   */
-  public String sanitizeFilename(String filename) {
-    return filename.replaceAll(".*[/\\\\]", "");
-  }
-
-  /**
-   * Check if the given MIME is a JSON MIME.
-   * JSON MIME examples:
-   *   application/json
-   *   application/json; charset=UTF8
-   *   APPLICATION/JSON
-   */
-  public boolean isJsonMime(String mime) {
-    return mime != null && mime.matches("(?i)application\\/json(;.*)?");
-  }
-
-  /**
-   * Select the Accept header's value from the given accepts array:
-   *   if JSON exists in the given array, use it;
-   *   otherwise use all of them (joining into a string)
-   *
-   * @param accepts The accepts array to select from
-   * @return The Accept header to use. If the given array is empty,
-   *   null will be returned (not to set the Accept header explicitly).
-   */
-  public String selectHeaderAccept(String[] accepts) {
-    if (accepts.length == 0) {
-      return null;
-    }
-    for (String accept : accepts) {
-      if (isJsonMime(accept)) {
-        return accept;
-      }
-    }
-    return StringUtil.join(accepts, ",");
-  }
-
-  /**
-   * Select the Content-Type header's value from the given array:
-   *   if JSON exists in the given array, use it;
-   *   otherwise use the first one of the array.
-   *
-   * @param contentTypes The Content-Type array to select from
-   * @return The Content-Type header to use. If the given array is empty,
-   *   JSON will be used.
-   */
-  public String selectHeaderContentType(String[] contentTypes) {
-    if (contentTypes.length == 0) {
-      return "application/json";
-    }
-    for (String contentType : contentTypes) {
-      if (isJsonMime(contentType)) {
-        return contentType;
-      }
-    }
-    return contentTypes[0];
-  }
-
-  /**
-   * Escape the given string to be used as URL query value.
-   */
-  public String escapeString(String str) {
-    try {
-      return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
-    } catch (UnsupportedEncodingException e) {
-      return str;
-    }
-  }
-
-  /**
-   * Deserialize response body to Java object, according to the return type and
-   * the Content-Type response header.
-   *
-   * @param response HTTP response
-   * @param returnType The type of the Java object
-   * @return The deserialized Java object
-   * @throws ApiException If fail to deserialize response body, i.e. cannot read response body
-   *   or the Content-Type of the response is not supported.
-   */
-  public <T> T deserialize(Response response, Type returnType) throws ApiException {
-    if (response == null || returnType == null) {
-      return null;
+    /**
+     * Set JSON
+     *
+     * @param json JSON object
+     * @return Api client
+     */
+    public ApiClient setJSON(JSON json) {
+        this.json = json;
+        return this;
     }
 
-    if ("byte[]".equals(returnType.toString())) {
-      // Handle binary response (byte array).
-      try {
-        return (T) response.body().bytes();
-      } catch (IOException e) {
-        throw new ApiException(e);
-      }
-    } else if (returnType.equals(File.class)) {
-      // Handle file downloading.
-      return (T) downloadFileFromResponse(response);
+    /**
+     * True if isVerifyingSsl flag is on
+     *
+     * @return True if isVerifySsl flag is on
+     */
+    public boolean isVerifyingSsl() {
+        return verifyingSsl;
     }
 
-    String respBody;
-    try {
-      if (response.body() != null)
-        respBody = response.body().string();
-      else
-        respBody = null;
-    } catch (IOException e) {
-      throw new ApiException(e);
+    /**
+     * Configure whether to verify certificate and hostname when making https requests.
+     * Default to true.
+     * NOTE: Do NOT set to false in production code, otherwise you would face multiple types of cryptographic attacks.
+     *
+     * @param verifyingSsl True to verify TLS/SSL connection
+     * @return ApiClient
+     */
+    public ApiClient setVerifyingSsl(boolean verifyingSsl) {
+        this.verifyingSsl = verifyingSsl;
+        applySslSettings();
+        return this;
     }
 
-    if (respBody == null || "".equals(respBody)) {
-      return null;
+    /**
+     * Get SSL CA cert.
+     *
+     * @return Input stream to the SSL CA cert
+     */
+    public InputStream getSslCaCert() {
+        return sslCaCert;
     }
 
-    String contentType = response.headers().get("Content-Type");
-    if (contentType == null) {
-      // ensuring a default content type
-      contentType = "application/json";
-    }
-    if (isJsonMime(contentType)) {
-      return json.deserialize(respBody, returnType);
-    } else if (returnType.equals(String.class)) {
-      // Expecting string, return the raw response body.
-      return (T) respBody;
-    } else {
-      throw new ApiException(
-        "Content type \"" + contentType + "\" is not supported for type: " + returnType,
-        response.code(),
-        response.headers().toMultimap(),
-        respBody);
-    }
-  }
-
-  /**
-   * Serialize the given Java object into request body according to the object's
-   * class and the request Content-Type.
-   *
-   * @param obj The Java object
-   * @param contentType The request Content-Type
-   * @return The serialized request body
-   * @throws ApiException If fail to serialize the given object
-   */
-  public RequestBody serialize(Object obj, String contentType) throws ApiException {
-    if (obj instanceof byte[]) {
-      // Binary (byte array) body parameter support.
-      return RequestBody.create(MediaType.parse(contentType), (byte[]) obj);
-    } else if (obj instanceof File) {
-      // File body parameter support.
-      return RequestBody.create(MediaType.parse(contentType), (File) obj);
-    } else if (isJsonMime(contentType)) {
-      String content;
-      if (obj != null) {
-        content = json.serialize(obj);
-      } else {
-        content = null;
-      }
-      return RequestBody.create(MediaType.parse(contentType), content);
-    } else {
-      throw new ApiException("Content type \"" + contentType + "\" is not supported");
-    }
-  }
-
-  /**
-   * Download file from the given response.
-   * @throws ApiException If fail to read file content from response and write to disk
-   */
-  public File downloadFileFromResponse(Response response) throws ApiException {
-    try {
-        File file = prepareDownloadFile(response);
-        BufferedSink sink = Okio.buffer(Okio.sink(file));
-        sink.writeAll(response.body().source());
-        sink.close();
-        return file;
-    } catch (IOException e) {
-        throw new ApiException(e);
-    }
-  }
-
-  public File prepareDownloadFile(Response response) throws IOException {
-    String filename = null;
-    String contentDisposition = response.header("Content-Disposition");
-    if (contentDisposition != null && !"".equals(contentDisposition)) {
-      // Get filename from the Content-Disposition header.
-      Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
-      Matcher matcher = pattern.matcher(contentDisposition);
-      if (matcher.find()) {
-        filename = sanitizeFilename(matcher.group(1));
-      }
+    /**
+     * Configure the CA certificate to be trusted when making https requests.
+     * Use null to reset to default.
+     *
+     * @param sslCaCert input stream for SSL CA cert
+     * @return ApiClient
+     */
+    public ApiClient setSslCaCert(InputStream sslCaCert) {
+        this.sslCaCert = sslCaCert;
+        applySslSettings();
+        return this;
     }
 
-    String prefix = null;
-    String suffix = null;
-    if (filename == null) {
-      prefix = "download-";
-      suffix = "";
-    } else {
-      int pos = filename.lastIndexOf(".");
-      if (pos == -1) {
-        prefix = filename + "-";
-      } else {
-        prefix = filename.substring(0, pos) + "-";
-        suffix = filename.substring(pos);
-      }
-      // File.createTempFile requires the prefix to be at least three characters long
-      if (prefix.length() < 3)
-        prefix = "download-";
+    public DateFormat getDateFormat() {
+        return dateFormat;
     }
 
-    if (tempFolderPath == null)
-      return File.createTempFile(prefix, suffix);
-    else
-      return File.createTempFile(prefix, suffix, new File(tempFolderPath));
-  }
-
-  /**
-   * @see #execute(Call, Type)
-   */
-  public <T> ApiResponse<T> execute(Call call) throws ApiException {
-    return execute(call, null);
-  }
-
-  /**
-   * Execute HTTP call and deserialize the HTTP response body into the given return type.
-   *
-   * @param returnType The return type used to deserialize HTTP response body
-   * @param <T> The return type corresponding to (same with) returnType
-   * @return <code>ApiResponse</code> object containing response status, headers and
-   *   data, which is a Java object deserialized from response body and would be null
-   *   when returnType is null.
-   * @throws ApiException If fail to execute the call
-   */
-  public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiException {
-    try {
-      Response response = call.execute();
-      T data = handleResponse(response, returnType);
-      return new ApiResponse<T>(response.code(), response.headers().toMultimap(), data);
-    } catch (IOException e) {
-      throw new ApiException(e);
+    public ApiClient setDateFormat(DateFormat dateFormat) {
+        this.dateFormat = dateFormat;
+        this.dateLength = this.dateFormat.format(new Date()).length();
+        return this;
     }
-  }
 
-  /**
-   * #see executeAsync(Call, Type, ApiCallback)
-   */
-  public <T> void executeAsync(Call call, ApiCallback<T> callback) {
-    executeAsync(call, null, callback);
-  }
+    public DateFormat getDatetimeFormat() {
+        return datetimeFormat;
+    }
 
-  /**
-   * Execute HTTP call asynchronously.
-   *
-   * @see #execute(Call, Type)
-   * @param The callback to be executed when the API call finishes
-   */
-  public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
-    call.enqueue(new Callback() {
-      @Override
-      public void onFailure(Request request, IOException e) {
-        callback.onFailure(new ApiException(e), 0, null);
-      }
+    public ApiClient setDatetimeFormat(DateFormat datetimeFormat) {
+        this.datetimeFormat = datetimeFormat;
+        return this;
+    }
 
-      @Override
-      public void onResponse(Response response) throws IOException {
-        T result;
+    /**
+     * Whether to allow various ISO 8601 datetime formats when parsing a datetime string.
+     * @see #parseDatetime(String)
+     * @return True if lenientDatetimeFormat flag is set to true
+     */
+    public boolean isLenientDatetimeFormat() {
+        return lenientDatetimeFormat;
+    }
+
+    public ApiClient setLenientDatetimeFormat(boolean lenientDatetimeFormat) {
+        this.lenientDatetimeFormat = lenientDatetimeFormat;
+        return this;
+    }
+
+    /**
+     * Parse the given date string into Date object.
+     * The default <code>dateFormat</code> supports these ISO 8601 date formats:
+     *   2015-08-16
+     *   2015-8-16
+     * @param str String to be parsed
+     * @return Date
+     */
+    public Date parseDate(String str) {
+        if (str == null)
+            return null;
         try {
-          result = (T) handleResponse(response, returnType);
-        } catch (ApiException e) {
-          callback.onFailure(e, response.code(), response.headers().toMultimap());
-          return;
+            return dateFormat.parse(str);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Parse the given datetime string into Date object.
+     * When lenientDatetimeFormat is enabled, the following ISO 8601 datetime formats are supported:
+     *   2015-08-16T08:20:05Z
+     *   2015-8-16T8:20:05Z
+     *   2015-08-16T08:20:05+00:00
+     *   2015-08-16T08:20:05+0000
+     *   2015-08-16T08:20:05.376Z
+     *   2015-08-16T08:20:05.376+00:00
+     *   2015-08-16T08:20:05.376+00
+     * Note: The 3-digit milli-seconds is optional. Time zone is required and can be in one of
+     *   these formats:
+     *   Z (same with +0000)
+     *   +08:00 (same with +0800)
+     *   -02 (same with -0200)
+     *   -0200
+     * @see <a href="https://en.wikipedia.org/wiki/ISO_8601">ISO 8601</a>
+     * @param str Date time string to be parsed
+     * @return Date representation of the string
+     */
+    public Date parseDatetime(String str) {
+        if (str == null)
+            return null;
+
+        DateFormat format;
+        if (lenientDatetimeFormat) {
+            /*
+             * When lenientDatetimeFormat is enabled, normalize the date string
+             * into <code>LENIENT_DATETIME_FORMAT</code> to support various formats
+             * defined by ISO 8601.
+             */
+            // normalize time zone
+            //   trailing "Z": 2015-08-16T08:20:05Z => 2015-08-16T08:20:05+0000
+            str = str.replaceAll("[zZ]\\z", "+0000");
+            //   remove colon in time zone: 2015-08-16T08:20:05+00:00 => 2015-08-16T08:20:05+0000
+            str = str.replaceAll("([+-]\\d{2}):(\\d{2})\\z", "$1$2");
+            //   expand time zone: 2015-08-16T08:20:05+00 => 2015-08-16T08:20:05+0000
+            str = str.replaceAll("([+-]\\d{2})\\z", "$100");
+            // add milliseconds when missing
+            //   2015-08-16T08:20:05+0000 => 2015-08-16T08:20:05.000+0000
+            str = str.replaceAll("(:\\d{1,2})([+-]\\d{4})\\z", "$1.000$2");
+            format = new SimpleDateFormat(LENIENT_DATETIME_FORMAT);
+        } else {
+            format = this.datetimeFormat;
         }
-        callback.onSuccess(result, response.code(), response.headers().toMultimap());
-      }
-    });
-  }
 
-  /**
-   * Handle the given response, return the deserialized object when the response is successful.
-   *
-   * @throws ApiException If the response has a unsuccessful status code or
-   *   fail to deserialize the response body
-   */
-  public <T> T handleResponse(Response response, Type returnType) throws ApiException {
-    if (response.isSuccessful()) {
-      if (returnType == null || response.code() == 204) {
-        // returning null if the returnType is not defined,
-        // or the status code is 204 (No Content)
-        return null;
-      } else {
-        return deserialize(response, returnType);
-      }
-    } else {
-      String respBody = null;
-      if (response.body() != null) {
         try {
-          respBody = response.body().string();
+            return format.parse(str);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /*
+     * Parse date or date time in string format into Date object.
+     *
+     * @param str Date time string to be parsed
+     * @return Date representation of the string
+     */
+    public Date parseDateOrDatetime(String str) {
+        if (str == null)
+            return null;
+        else if (str.length() <= dateLength)
+            return parseDate(str);
+        else
+            return parseDatetime(str);
+    }
+
+    /**
+     * Format the given Date object into string (Date format).
+     *
+     * @param date Date object
+     * @return Formatted date in string representation
+     */
+    public String formatDate(Date date) {
+        return dateFormat.format(date);
+    }
+
+    /**
+     * Format the given Date object into string (Datetime format).
+     *
+     * @param date Date object
+     * @return Formatted datetime in string representation
+     */
+    public String formatDatetime(Date date) {
+        return datetimeFormat.format(date);
+    }
+
+    /**
+     * Get authentications (key: authentication name, value: authentication).
+     *
+     * @return Map of authentication objects
+     */
+    public Map<String, Authentication> getAuthentications() {
+        return authentications;
+    }
+
+    /**
+     * Get authentication for the given name.
+     *
+     * @param authName The authentication name
+     * @return The authentication, null if not found
+     */
+    public Authentication getAuthentication(String authName) {
+        return authentications.get(authName);
+    }
+
+    /**
+     * Helper method to set username for the first HTTP basic authentication.
+     *
+     * @param username Username
+     */
+    public void setUsername(String username) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof HttpBasicAuth) {
+                ((HttpBasicAuth) auth).setUsername(username);
+                return;
+            }
+        }
+        throw new RuntimeException("No HTTP basic authentication configured!");
+    }
+
+    /**
+     * Helper method to set password for the first HTTP basic authentication.
+     *
+     * @param password Password
+     */
+    public void setPassword(String password) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof HttpBasicAuth) {
+                ((HttpBasicAuth) auth).setPassword(password);
+                return;
+            }
+        }
+        throw new RuntimeException("No HTTP basic authentication configured!");
+    }
+
+    /**
+     * Helper method to set API key value for the first API key authentication.
+     *
+     * @param apiKey API key
+     */
+    public void setApiKey(String apiKey) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof ApiKeyAuth) {
+                ((ApiKeyAuth) auth).setApiKey(apiKey);
+                return;
+            }
+        }
+        throw new RuntimeException("No API key authentication configured!");
+    }
+
+    /**
+     * Helper method to set API key prefix for the first API key authentication.
+     *
+     * @param apiKeyPrefix API key prefix
+     */
+    public void setApiKeyPrefix(String apiKeyPrefix) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof ApiKeyAuth) {
+                ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
+                return;
+            }
+        }
+        throw new RuntimeException("No API key authentication configured!");
+    }
+
+    /**
+     * Helper method to set access token for the first OAuth2 authentication.
+     *
+     * @param accessToken Access token
+     */
+    public void setAccessToken(String accessToken) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof OAuth) {
+                ((OAuth) auth).setAccessToken(accessToken);
+                return;
+            }
+        }
+        throw new RuntimeException("No OAuth2 authentication configured!");
+    }
+
+    /**
+     * Set the User-Agent header's value (by adding to the default header map).
+     *
+     * @param userAgent HTTP request's user agent
+     * @return ApiClient
+     */
+    public ApiClient setUserAgent(String userAgent) {
+        addDefaultHeader("User-Agent", userAgent);
+        return this;
+    }
+
+    /**
+     * Add a default header.
+     *
+     * @param key The header's key
+     * @param value The header's value
+     * @return ApiClient
+     */
+    public ApiClient addDefaultHeader(String key, String value) {
+        defaultHeaderMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * @see <a href="https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)">setLenient</a>
+     *
+     * @return True if lenientOnJson is enabled, false otherwise.
+     */
+    public boolean isLenientOnJson() {
+        return lenientOnJson;
+    }
+
+    /**
+     * Set LenientOnJson
+     *
+     * @param lenient True to enable lenientOnJson
+     * @return ApiClient
+     */
+    public ApiClient setLenientOnJson(boolean lenient) {
+        this.lenientOnJson = lenient;
+        return this;
+    }
+
+    /**
+     * Check that whether debugging is enabled for this API client.
+     *
+     * @return True if debugging is enabled, false otherwise.
+     */
+    public boolean isDebugging() {
+        return debugging;
+    }
+
+    /**
+     * Enable/disable debugging for this API client.
+     *
+     * @param debugging To enable (true) or disable (false) debugging
+     * @return ApiClient
+     */
+    public ApiClient setDebugging(boolean debugging) {
+        if (debugging != this.debugging) {
+            if (debugging) {
+                loggingInterceptor = new HttpLoggingInterceptor();
+                loggingInterceptor.setLevel(Level.BODY);
+                httpClient.interceptors().add(loggingInterceptor);
+            } else {
+                httpClient.interceptors().remove(loggingInterceptor);
+                loggingInterceptor = null;
+            }
+        }
+        this.debugging = debugging;
+        return this;
+    }
+
+    /**
+     * The path of temporary folder used to store downloaded files from endpoints
+     * with file response. The default value is <code>null</code>, i.e. using
+     * the system's default tempopary folder.
+     *
+     * @see <a href="https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile">createTempFile</a>
+     * @return Temporary folder path
+     */
+    public String getTempFolderPath() {
+        return tempFolderPath;
+    }
+
+    /**
+     * Set the tempoaray folder path (for downloading files)
+     *
+     * @param tempFolderPath Temporary folder path
+     * @return ApiClient
+     */
+    public ApiClient setTempFolderPath(String tempFolderPath) {
+        this.tempFolderPath = tempFolderPath;
+        return this;
+    }
+
+    /**
+     * Get connection timeout (in milliseconds).
+     *
+     * @return Timeout in milliseconds
+     */
+    public int getConnectTimeout() {
+        return httpClient.getConnectTimeout();
+    }
+
+    /**
+     * Sets the connect timeout (in milliseconds).
+     * A value of 0 means no timeout, otherwise values must be between 1 and
+     *
+     * @param connectionTimeout connection timeout in milliseconds
+     * @return Api client
+     */
+    public ApiClient setConnectTimeout(int connectionTimeout) {
+        httpClient.setConnectTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
+        return this;
+    }
+
+    /**
+     * Format the given parameter object into string.
+     *
+     * @param param Parameter
+     * @return String representation of the parameter
+     */
+    public String parameterToString(Object param) {
+        if (param == null) {
+            return "";
+        } else if (param instanceof Date) {
+            return formatDatetime((Date) param);
+        } else if (param instanceof Collection) {
+            StringBuilder b = new StringBuilder();
+            for (Object o : (Collection)param) {
+                if (b.length() > 0) {
+                    b.append(",");
+                }
+                b.append(String.valueOf(o));
+            }
+            return b.toString();
+        } else {
+            return String.valueOf(param);
+        }
+    }
+
+    /**
+     * Format to {@code Pair} objects.
+     *
+     * @param collectionFormat collection format (e.g. csv, tsv)
+     * @param name Name
+     * @param value Value
+     * @return A list of Pair objects
+     */
+    public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
+        List<Pair> params = new ArrayList<Pair>();
+
+        // preconditions
+        if (name == null || name.isEmpty() || value == null) return params;
+
+        Collection valueCollection = null;
+        if (value instanceof Collection) {
+            valueCollection = (Collection) value;
+        } else {
+            params.add(new Pair(name, parameterToString(value)));
+            return params;
+        }
+
+        if (valueCollection.isEmpty()){
+            return params;
+        }
+
+        // get the collection format
+        collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+
+        // create the params based on the collection format
+        if (collectionFormat.equals("multi")) {
+            for (Object item : valueCollection) {
+                params.add(new Pair(name, parameterToString(item)));
+            }
+
+            return params;
+        }
+
+        String delimiter = ",";
+
+        if (collectionFormat.equals("csv")) {
+            delimiter = ",";
+        } else if (collectionFormat.equals("ssv")) {
+            delimiter = " ";
+        } else if (collectionFormat.equals("tsv")) {
+            delimiter = "\t";
+        } else if (collectionFormat.equals("pipes")) {
+            delimiter = "|";
+        }
+
+        StringBuilder sb = new StringBuilder() ;
+        for (Object item : valueCollection) {
+            sb.append(delimiter);
+            sb.append(parameterToString(item));
+        }
+
+        params.add(new Pair(name, sb.substring(1)));
+
+        return params;
+    }
+
+    /**
+     * Sanitize filename by removing path.
+     * e.g. ../../sun.gif becomes sun.gif
+     *
+     * @param filename The filename to be sanitized
+     * @return The sanitized filename
+     */
+    public String sanitizeFilename(String filename) {
+        return filename.replaceAll(".*[/\\\\]", "");
+    }
+
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *
+     * @param mime MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    public boolean isJsonMime(String mime) {
+        return mime != null && mime.matches("(?i)application\\/json(;.*)?");
+    }
+
+    /**
+     * Select the Accept header's value from the given accepts array:
+     *   if JSON exists in the given array, use it;
+     *   otherwise use all of them (joining into a string)
+     *
+     * @param accepts The accepts array to select from
+     * @return The Accept header to use. If the given array is empty,
+     *   null will be returned (not to set the Accept header explicitly).
+     */
+    public String selectHeaderAccept(String[] accepts) {
+        if (accepts.length == 0) {
+            return null;
+        }
+        for (String accept : accepts) {
+            if (isJsonMime(accept)) {
+                return accept;
+            }
+        }
+        return StringUtil.join(accepts, ",");
+    }
+
+    /**
+     * Select the Content-Type header's value from the given array:
+     *   if JSON exists in the given array, use it;
+     *   otherwise use the first one of the array.
+     *
+     * @param contentTypes The Content-Type array to select from
+     * @return The Content-Type header to use. If the given array is empty,
+     *   JSON will be used.
+     */
+    public String selectHeaderContentType(String[] contentTypes) {
+        if (contentTypes.length == 0) {
+            return "application/json";
+        }
+        for (String contentType : contentTypes) {
+            if (isJsonMime(contentType)) {
+                return contentType;
+            }
+        }
+        return contentTypes[0];
+    }
+
+    /**
+     * Escape the given string to be used as URL query value.
+     *
+     * @param str String to be escaped
+     * @return Escaped string
+     */
+    public String escapeString(String str) {
+        try {
+            return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
+        } catch (UnsupportedEncodingException e) {
+            return str;
+        }
+    }
+
+    /**
+     * Deserialize response body to Java object, according to the return type and
+     * the Content-Type response header.
+     *
+     * @param <T> Type
+     * @param response HTTP response
+     * @param returnType The type of the Java object
+     * @return The deserialized Java object
+     * @throws ApiException If fail to deserialize response body, i.e. cannot read response body
+     *   or the Content-Type of the response is not supported.
+     */
+    public <T> T deserialize(Response response, Type returnType) throws ApiException {
+        if (response == null || returnType == null) {
+            return null;
+        }
+
+        if ("byte[]".equals(returnType.toString())) {
+            // Handle binary response (byte array).
+            try {
+                return (T) response.body().bytes();
+            } catch (IOException e) {
+                throw new ApiException(e);
+            }
+        } else if (returnType.equals(File.class)) {
+            // Handle file downloading.
+            return (T) downloadFileFromResponse(response);
+        }
+
+        String respBody;
+        try {
+            if (response.body() != null)
+                respBody = response.body().string();
+            else
+                respBody = null;
         } catch (IOException e) {
-          throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+            throw new ApiException(e);
         }
-      }
-      throw new ApiException(response.message(), response.code(), response.headers().toMultimap(), respBody);
-    }
-  }
 
-  /**
-   * Build HTTP call with the given options.
-   *
-   * @param path The sub-path of the HTTP URL
-   * @param method The request method, one of "GET", "HEAD", "OPTIONS", "POST", "PUT", "PATCH" and "DELETE"
-   * @param queryParams The query parameters
-   * @param body The request body object
-   * @param headerParams The header parameters
-   * @param formParams The form parameters
-   * @param authNames The authentications to apply
-   * @return The HTTP call
-   * @throws ApiException If fail to serialize the request body object
-   */
-  public Call buildCall(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames, ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    updateParamsForAuth(authNames, queryParams, headerParams);
-
-    final String url = buildUrl(path, queryParams);
-    final Request.Builder reqBuilder = new Request.Builder().url(url);
-    processHeaderParams(headerParams, reqBuilder);
-
-    String contentType = (String) headerParams.get("Content-Type");
-    // ensuring a default content type
-    if (contentType == null) {
-      contentType = "application/json";
-    }
-
-    RequestBody reqBody;
-    if (!HttpMethod.permitsRequestBody(method)) {
-      reqBody = null;
-    } else if ("application/x-www-form-urlencoded".equals(contentType)) {
-      reqBody = buildRequestBodyFormEncoding(formParams);
-    } else if ("multipart/form-data".equals(contentType)) {
-      reqBody = buildRequestBodyMultipart(formParams);
-    } else if (body == null) {
-      if ("DELETE".equals(method)) {
-        // allow calling DELETE without sending a request body
-        reqBody = null;
-      } else {
-        // use an empty request body (for POST, PUT and PATCH)
-        reqBody = RequestBody.create(MediaType.parse(contentType), "");
-      }
-    } else {
-      reqBody = serialize(body, contentType);
-    }
-
-    Request request = null;
-
-    if(progressRequestListener != null && reqBody != null) {
-      ProgressRequestBody progressRequestBody = new ProgressRequestBody(reqBody, progressRequestListener);
-      request = reqBuilder.method(method, progressRequestBody).build();
-    } else {
-      request = reqBuilder.method(method, reqBody).build();
-    }
-
-    return httpClient.newCall(request);
-  }
-
-  /**
-   * Build full URL by concatenating base path, the given sub path and query parameters.
-   *
-   * @param path The sub path
-   * @param queryParams The query parameters
-   * @return The full URL
-   */
-  public String buildUrl(String path, List<Pair> queryParams) {
-    final StringBuilder url = new StringBuilder();
-    url.append(basePath).append(path);
-
-    if (queryParams != null && !queryParams.isEmpty()) {
-      // support (constant) query string in `path`, e.g. "/posts?draft=1"
-      String prefix = path.contains("?") ? "&" : "?";
-      for (Pair param : queryParams) {
-        if (param.getValue() != null) {
-          if (prefix != null) {
-            url.append(prefix);
-            prefix = null;
-          } else {
-            url.append("&");
-          }
-          String value = parameterToString(param.getValue());
-          url.append(escapeString(param.getName())).append("=").append(escapeString(value));
+        if (respBody == null || "".equals(respBody)) {
+            return null;
         }
-      }
-    }
 
-    return url.toString();
-  }
-
-  /**
-   * Set header parameters to the request builder, including default headers.
-   */
-  public void processHeaderParams(Map<String, String> headerParams, Request.Builder reqBuilder) {
-    for (Entry<String, String> param : headerParams.entrySet()) {
-      reqBuilder.header(param.getKey(), parameterToString(param.getValue()));
-    }
-    for (Entry<String, String> header : defaultHeaderMap.entrySet()) {
-      if (!headerParams.containsKey(header.getKey())) {
-        reqBuilder.header(header.getKey(), parameterToString(header.getValue()));
-      }
-    }
-  }
-
-  /**
-   * Update query and header parameters based on authentication settings.
-   *
-   * @param authNames The authentications to apply
-   */
-  public void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
-    for (String authName : authNames) {
-      Authentication auth = authentications.get(authName);
-      if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
-      auth.applyToParams(queryParams, headerParams);
-    }
-  }
-
-  /**
-   * Build a form-encoding request body with the given form parameters.
-   */
-  public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
-    FormEncodingBuilder formBuilder  = new FormEncodingBuilder();
-    for (Entry<String, Object> param : formParams.entrySet()) {
-      formBuilder.add(param.getKey(), parameterToString(param.getValue()));
-    }
-    return formBuilder.build();
-  }
-
-  /**
-   * Build a multipart (file uploading) request body with the given form parameters,
-   * which could contain text fields and file fields.
-   */
-  public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
-    MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
-    for (Entry<String, Object> param : formParams.entrySet()) {
-      if (param.getValue() instanceof File) {
-        File file = (File) param.getValue();
-        Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"; filename=\"" + file.getName() + "\"");
-        MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
-        mpBuilder.addPart(partHeaders, RequestBody.create(mediaType, file));
-      } else {
-        Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
-        mpBuilder.addPart(partHeaders, RequestBody.create(null, parameterToString(param.getValue())));
-      }
-    }
-    return mpBuilder.build();
-  }
-
-  /**
-   * Guess Content-Type header from the given file (defaults to "application/octet-stream").
-   *
-   * @param file The given file
-   * @return The Content-Type guessed
-   */
-  public String guessContentTypeFromFile(File file) {
-    String contentType = URLConnection.guessContentTypeFromName(file.getName());
-    if (contentType == null) {
-      return "application/octet-stream";
-    } else {
-      return contentType;
-    }
-  }
-
-  /**
-   * Initialize datetime format according to the current environment, e.g. Java 1.7 and Android.
-   */
-  private void initDatetimeFormat() {
-    String formatWithTimeZone = null;
-    if (IS_ANDROID) {
-      if (ANDROID_SDK_VERSION >= 18) {
-        // The time zone format "ZZZZZ" is available since Android 4.3 (SDK version 18)
-        formatWithTimeZone = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ";
-      }
-    } else if (JAVA_VERSION >= 1.7) {
-      // The time zone format "XXX" is available since Java 1.7
-      formatWithTimeZone = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
-    }
-    if (formatWithTimeZone != null) {
-      this.datetimeFormat = new SimpleDateFormat(formatWithTimeZone);
-      // NOTE: Use the system's default time zone (mainly for datetime formatting).
-    } else {
-      // Use a common format that works across all systems.
-      this.datetimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-      // Always use the UTC time zone as we are using a constant trailing "Z" here.
-      this.datetimeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-    }
-  }
-
-  /**
-   * Apply SSL related settings to httpClient according to the current values of
-   * verifyingSsl and sslCaCert.
-   */
-  private void applySslSettings() {
-    try {
-      KeyManager[] keyManagers = null;
-      TrustManager[] trustManagers = null;
-      HostnameVerifier hostnameVerifier = null;
-      if (!verifyingSsl) {
-        TrustManager trustAll = new X509TrustManager() {
-          @Override
-          public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
-          @Override
-          public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
-          @Override
-          public X509Certificate[] getAcceptedIssuers() { return null; }
-        };
-        SSLContext sslContext = SSLContext.getInstance("TLS");
-        trustManagers = new TrustManager[]{ trustAll };
-        hostnameVerifier = new HostnameVerifier() {
-          @Override
-          public boolean verify(String hostname, SSLSession session) { return true; }
-        };
-      } else if (sslCaCert != null) {
-        char[] password = null; // Any password will work.
-        CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
-        Collection<? extends Certificate> certificates = certificateFactory.generateCertificates(sslCaCert);
-        if (certificates.isEmpty()) {
-          throw new IllegalArgumentException("expected non-empty set of trusted certificates");
+        String contentType = response.headers().get("Content-Type");
+        if (contentType == null) {
+            // ensuring a default content type
+            contentType = "application/json";
         }
-        KeyStore caKeyStore = newEmptyKeyStore(password);
-        int index = 0;
-        for (Certificate certificate : certificates) {
-          String certificateAlias = "ca" + Integer.toString(index++);
-          caKeyStore.setCertificateEntry(certificateAlias, certificate);
+        if (isJsonMime(contentType)) {
+            return json.deserialize(respBody, returnType);
+        } else if (returnType.equals(String.class)) {
+            // Expecting string, return the raw response body.
+            return (T) respBody;
+        } else {
+            throw new ApiException(
+                    "Content type \"" + contentType + "\" is not supported for type: " + returnType,
+                    response.code(),
+                    response.headers().toMultimap(),
+                    respBody);
         }
-        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        trustManagerFactory.init(caKeyStore);
-        trustManagers = trustManagerFactory.getTrustManagers();
-      }
-
-      if (keyManagers != null || trustManagers != null) {
-        SSLContext sslContext = SSLContext.getInstance("TLS");
-        sslContext.init(keyManagers, trustManagers, new SecureRandom());
-        httpClient.setSslSocketFactory(sslContext.getSocketFactory());
-      } else {
-        httpClient.setSslSocketFactory(null);
-      }
-      httpClient.setHostnameVerifier(hostnameVerifier);
-    } catch (GeneralSecurityException e) {
-      throw new RuntimeException(e);
     }
-  }
 
-  private KeyStore newEmptyKeyStore(char[] password) throws GeneralSecurityException {
-    try {
-      KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-      keyStore.load(null, password);
-      return keyStore;
-    } catch (IOException e) {
-      throw new AssertionError(e);
+    /**
+     * Serialize the given Java object into request body according to the object's
+     * class and the request Content-Type.
+     *
+     * @param obj The Java object
+     * @param contentType The request Content-Type
+     * @return The serialized request body
+     * @throws ApiException If fail to serialize the given object
+     */
+    public RequestBody serialize(Object obj, String contentType) throws ApiException {
+        if (obj instanceof byte[]) {
+            // Binary (byte array) body parameter support.
+            return RequestBody.create(MediaType.parse(contentType), (byte[]) obj);
+        } else if (obj instanceof File) {
+            // File body parameter support.
+            return RequestBody.create(MediaType.parse(contentType), (File) obj);
+        } else if (isJsonMime(contentType)) {
+            String content;
+            if (obj != null) {
+                content = json.serialize(obj);
+            } else {
+                content = null;
+            }
+            return RequestBody.create(MediaType.parse(contentType), content);
+        } else {
+            throw new ApiException("Content type \"" + contentType + "\" is not supported");
+        }
+    }
+
+    /**
+     * Download file from the given response.
+     *
+     * @param response An instance of the Response object
+     * @throws ApiException If fail to read file content from response and write to disk
+     * @return Downloaded file
+     */
+    public File downloadFileFromResponse(Response response) throws ApiException {
+        try {
+            File file = prepareDownloadFile(response);
+            BufferedSink sink = Okio.buffer(Okio.sink(file));
+            sink.writeAll(response.body().source());
+            sink.close();
+            return file;
+        } catch (IOException e) {
+            throw new ApiException(e);
+        }
+    }
+
+    /**
+     * Prepare file for download
+     *
+     * @param response An instance of the Response object
+     * @throws IOException If fail to prepare file for download
+     * @return Prepared file for the download
+     */
+    public File prepareDownloadFile(Response response) throws IOException {
+        String filename = null;
+        String contentDisposition = response.header("Content-Disposition");
+        if (contentDisposition != null && !"".equals(contentDisposition)) {
+            // Get filename from the Content-Disposition header.
+            Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
+            Matcher matcher = pattern.matcher(contentDisposition);
+            if (matcher.find()) {
+                filename = sanitizeFilename(matcher.group(1));
+            }
+        }
+
+        String prefix = null;
+        String suffix = null;
+        if (filename == null) {
+            prefix = "download-";
+            suffix = "";
+        } else {
+            int pos = filename.lastIndexOf(".");
+            if (pos == -1) {
+                prefix = filename + "-";
+            } else {
+                prefix = filename.substring(0, pos) + "-";
+                suffix = filename.substring(pos);
+            }
+            // File.createTempFile requires the prefix to be at least three characters long
+            if (prefix.length() < 3)
+                prefix = "download-";
+        }
+
+        if (tempFolderPath == null)
+            return File.createTempFile(prefix, suffix);
+        else
+            return File.createTempFile(prefix, suffix, new File(tempFolderPath));
+    }
+
+    /**
+     * {@link #execute(Call, Type)}
+     *
+     * @param <T> Type
+     * @param call An instance of the Call object
+     * @throws ApiException If fail to execute the call
+     * @return ApiResponse&lt;T&gt;
+     */
+    public <T> ApiResponse<T> execute(Call call) throws ApiException {
+        return execute(call, null);
+    }
+
+    /**
+     * Execute HTTP call and deserialize the HTTP response body into the given return type.
+     *
+     * @param returnType The return type used to deserialize HTTP response body
+     * @param <T> The return type corresponding to (same with) returnType
+     * @param call Call
+     * @return ApiResponse object containing response status, headers and
+     *   data, which is a Java object deserialized from response body and would be null
+     *   when returnType is null.
+     * @throws ApiException If fail to execute the call
+     */
+    public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiException {
+        try {
+            Response response = call.execute();
+            T data = handleResponse(response, returnType);
+            return new ApiResponse<T>(response.code(), response.headers().toMultimap(), data);
+        } catch (IOException e) {
+            throw new ApiException(e);
+        }
+    }
+
+    /**
+     * {@link #executeAsync(Call, Type, ApiCallback)}
+     *
+     * @param <T> Type
+     * @param call An instance of the Call object
+     * @param callback ApiCallback&lt;T&gt;
+     */
+    public <T> void executeAsync(Call call, ApiCallback<T> callback) {
+        executeAsync(call, null, callback);
+    }
+
+    /**
+     * Execute HTTP call asynchronously.
+     *
+     * @see #execute(Call, Type)
+     * @param <T> Type
+     * @param call The callback to be executed when the API call finishes
+     * @param returnType Return type
+     * @param callback ApiCallback
+     */
+    public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
+        call.enqueue(new Callback() {
+            @Override
+            public void onFailure(Request request, IOException e) {
+                callback.onFailure(new ApiException(e), 0, null);
+            }
+
+            @Override
+            public void onResponse(Response response) throws IOException {
+                T result;
+                try {
+                    result = (T) handleResponse(response, returnType);
+                } catch (ApiException e) {
+                    callback.onFailure(e, response.code(), response.headers().toMultimap());
+                    return;
+                }
+                callback.onSuccess(result, response.code(), response.headers().toMultimap());
+            }
+        });
+    }
+
+    /**
+     * Handle the given response, return the deserialized object when the response is successful.
+     *
+     * @param <T> Type
+     * @param response Response
+     * @param returnType Return type
+     * @throws ApiException If the response has a unsuccessful status code or
+     *   fail to deserialize the response body
+     * @return Type
+     */
+    public <T> T handleResponse(Response response, Type returnType) throws ApiException {
+        if (response.isSuccessful()) {
+            if (returnType == null || response.code() == 204) {
+                // returning null if the returnType is not defined,
+                // or the status code is 204 (No Content)
+                return null;
+            } else {
+                return deserialize(response, returnType);
+            }
+        } else {
+            String respBody = null;
+            if (response.body() != null) {
+                try {
+                    respBody = response.body().string();
+                } catch (IOException e) {
+                    throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+                }
+            }
+            throw new ApiException(response.message(), response.code(), response.headers().toMultimap(), respBody);
+        }
+    }
+
+    /**
+     * Build HTTP call with the given options.
+     *
+     * @param path The sub-path of the HTTP URL
+     * @param method The request method, one of "GET", "HEAD", "OPTIONS", "POST", "PUT", "PATCH" and "DELETE"
+     * @param queryParams The query parameters
+     * @param body The request body object
+     * @param headerParams The header parameters
+     * @param formParams The form parameters
+     * @param authNames The authentications to apply
+     * @param progressRequestListener Progress request listener
+     * @return The HTTP call
+     * @throws ApiException If fail to serialize the request body object
+     */
+    public Call buildCall(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames, ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        updateParamsForAuth(authNames, queryParams, headerParams);
+
+        final String url = buildUrl(path, queryParams);
+        final Request.Builder reqBuilder = new Request.Builder().url(url);
+        processHeaderParams(headerParams, reqBuilder);
+
+        String contentType = (String) headerParams.get("Content-Type");
+        // ensuring a default content type
+        if (contentType == null) {
+            contentType = "application/json";
+        }
+
+        RequestBody reqBody;
+        if (!HttpMethod.permitsRequestBody(method)) {
+            reqBody = null;
+        } else if ("application/x-www-form-urlencoded".equals(contentType)) {
+            reqBody = buildRequestBodyFormEncoding(formParams);
+        } else if ("multipart/form-data".equals(contentType)) {
+            reqBody = buildRequestBodyMultipart(formParams);
+        } else if (body == null) {
+            if ("DELETE".equals(method)) {
+                // allow calling DELETE without sending a request body
+                reqBody = null;
+            } else {
+                // use an empty request body (for POST, PUT and PATCH)
+                reqBody = RequestBody.create(MediaType.parse(contentType), "");
+            }
+        } else {
+            reqBody = serialize(body, contentType);
+        }
+
+        Request request = null;
+
+        if(progressRequestListener != null && reqBody != null) {
+            ProgressRequestBody progressRequestBody = new ProgressRequestBody(reqBody, progressRequestListener);
+            request = reqBuilder.method(method, progressRequestBody).build();
+        } else {
+            request = reqBuilder.method(method, reqBody).build();
+        }
+
+        return httpClient.newCall(request);
+    }
+
+    /**
+     * Build full URL by concatenating base path, the given sub path and query parameters.
+     *
+     * @param path The sub path
+     * @param queryParams The query parameters
+     * @return The full URL
+     */
+    public String buildUrl(String path, List<Pair> queryParams) {
+        final StringBuilder url = new StringBuilder();
+        url.append(basePath).append(path);
+
+        if (queryParams != null && !queryParams.isEmpty()) {
+            // support (constant) query string in `path`, e.g. "/posts?draft=1"
+            String prefix = path.contains("?") ? "&" : "?";
+            for (Pair param : queryParams) {
+                if (param.getValue() != null) {
+                    if (prefix != null) {
+                        url.append(prefix);
+                        prefix = null;
+                    } else {
+                        url.append("&");
+                    }
+                    String value = parameterToString(param.getValue());
+                    url.append(escapeString(param.getName())).append("=").append(escapeString(value));
+                }
+            }
+        }
+
+        return url.toString();
+    }
+
+    /**
+     * Set header parameters to the request builder, including default headers.
+     *
+     * @param headerParams Header parameters in the ofrm of Map
+     * @param reqBuilder Reqeust.Builder
+     */
+    public void processHeaderParams(Map<String, String> headerParams, Request.Builder reqBuilder) {
+        for (Entry<String, String> param : headerParams.entrySet()) {
+            reqBuilder.header(param.getKey(), parameterToString(param.getValue()));
+        }
+        for (Entry<String, String> header : defaultHeaderMap.entrySet()) {
+            if (!headerParams.containsKey(header.getKey())) {
+                reqBuilder.header(header.getKey(), parameterToString(header.getValue()));
+            }
+        }
+    }
+
+    /**
+     * Update query and header parameters based on authentication settings.
+     *
+     * @param authNames The authentications to apply
+     * @param queryParams  List of query parameters
+     * @param headerParams  Map of header parameters
+     */
+    public void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
+        for (String authName : authNames) {
+            Authentication auth = authentications.get(authName);
+            if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
+            auth.applyToParams(queryParams, headerParams);
+        }
+    }
+
+    /**
+     * Build a form-encoding request body with the given form parameters.
+     *
+     * @param formParams Form parameters in the form of Map
+     * @return RequestBody
+     */
+    public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
+        FormEncodingBuilder formBuilder  = new FormEncodingBuilder();
+        for (Entry<String, Object> param : formParams.entrySet()) {
+            formBuilder.add(param.getKey(), parameterToString(param.getValue()));
+        }
+        return formBuilder.build();
+    }
+
+    /**
+     * Build a multipart (file uploading) request body with the given form parameters,
+     * which could contain text fields and file fields.
+     *
+     * @param formParams Form parameters in the form of Map
+     * @return RequestBody
+     */
+    public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
+        MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
+        for (Entry<String, Object> param : formParams.entrySet()) {
+            if (param.getValue() instanceof File) {
+                File file = (File) param.getValue();
+                Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"; filename=\"" + file.getName() + "\"");
+                MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
+                mpBuilder.addPart(partHeaders, RequestBody.create(mediaType, file));
+            } else {
+                Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
+                mpBuilder.addPart(partHeaders, RequestBody.create(null, parameterToString(param.getValue())));
+            }
+        }
+        return mpBuilder.build();
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    public String guessContentTypeFromFile(File file) {
+        String contentType = URLConnection.guessContentTypeFromName(file.getName());
+        if (contentType == null) {
+            return "application/octet-stream";
+        } else {
+            return contentType;
+        }
+    }
+
+    /**
+     * Initialize datetime format according to the current environment, e.g. Java 1.7 and Android.
+     */
+    private void initDatetimeFormat() {
+        String formatWithTimeZone = null;
+        if (IS_ANDROID) {
+            if (ANDROID_SDK_VERSION >= 18) {
+                // The time zone format "ZZZZZ" is available since Android 4.3 (SDK version 18)
+                formatWithTimeZone = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ";
+            }
+        } else if (JAVA_VERSION >= 1.7) {
+            // The time zone format "XXX" is available since Java 1.7
+            formatWithTimeZone = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
+        }
+        if (formatWithTimeZone != null) {
+            this.datetimeFormat = new SimpleDateFormat(formatWithTimeZone);
+            // NOTE: Use the system's default time zone (mainly for datetime formatting).
+        } else {
+            // Use a common format that works across all systems.
+            this.datetimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+            // Always use the UTC time zone as we are using a constant trailing "Z" here.
+            this.datetimeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        }
+    }
+
+    /**
+     * Apply SSL related settings to httpClient according to the current values of
+     * verifyingSsl and sslCaCert.
+     */
+    private void applySslSettings() {
+        try {
+            KeyManager[] keyManagers = null;
+            TrustManager[] trustManagers = null;
+            HostnameVerifier hostnameVerifier = null;
+            if (!verifyingSsl) {
+                TrustManager trustAll = new X509TrustManager() {
+                    @Override
+                    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
+                    @Override
+                    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
+                    @Override
+                    public X509Certificate[] getAcceptedIssuers() { return null; }
+                };
+                SSLContext sslContext = SSLContext.getInstance("TLS");
+                trustManagers = new TrustManager[]{ trustAll };
+                hostnameVerifier = new HostnameVerifier() {
+                    @Override
+                    public boolean verify(String hostname, SSLSession session) { return true; }
+                };
+            } else if (sslCaCert != null) {
+                char[] password = null; // Any password will work.
+                CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
+                Collection<? extends Certificate> certificates = certificateFactory.generateCertificates(sslCaCert);
+                if (certificates.isEmpty()) {
+                    throw new IllegalArgumentException("expected non-empty set of trusted certificates");
+                }
+                KeyStore caKeyStore = newEmptyKeyStore(password);
+                int index = 0;
+                for (Certificate certificate : certificates) {
+                    String certificateAlias = "ca" + Integer.toString(index++);
+                    caKeyStore.setCertificateEntry(certificateAlias, certificate);
+                }
+                TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+                trustManagerFactory.init(caKeyStore);
+                trustManagers = trustManagerFactory.getTrustManagers();
+            }
+
+            if (keyManagers != null || trustManagers != null) {
+                SSLContext sslContext = SSLContext.getInstance("TLS");
+                sslContext.init(keyManagers, trustManagers, new SecureRandom());
+                httpClient.setSslSocketFactory(sslContext.getSocketFactory());
+            } else {
+                httpClient.setSslSocketFactory(null);
+            }
+            httpClient.setHostnameVerifier(hostnameVerifier);
+        } catch (GeneralSecurityException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private KeyStore newEmptyKeyStore(char[] password) throws GeneralSecurityException {
+        try {
+            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            keyStore.load(null, password);
+            return keyStore;
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
     }
-  }
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache
index 452f4e1e9825..88dcc43af4b0 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache
@@ -9,38 +9,38 @@ import java.util.Map;
  * @param T The type of data that is deserialized from response body
  */
 public class ApiResponse<T> {
-  final private int statusCode;
-  final private Map<String, List<String>> headers;
-  final private T data;
+    final private int statusCode;
+    final private Map<String, List<String>> headers;
+    final private T data;
 
-  /**
-   * @param statusCode The status code of HTTP response
-   * @param headers The headers of HTTP response
-   */
-  public ApiResponse(int statusCode, Map<String, List<String>> headers) {
-    this(statusCode, headers, null);
-  }
+    /**
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers) {
+        this(statusCode, headers, null);
+    }
 
-  /**
-   * @param statusCode The status code of HTTP response
-   * @param headers The headers of HTTP response
-   * @param data The object deserialized from response bod
-   */
-  public ApiResponse(int statusCode, Map<String, List<String>> headers, T data) {
-    this.statusCode = statusCode;
-    this.headers = headers;
-    this.data = data;
-  }
+    /**
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     * @param data The object deserialized from response bod
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers, T data) {
+        this.statusCode = statusCode;
+        this.headers = headers;
+        this.data = data;
+    }
 
-  public int getStatusCode() {
-    return statusCode;
-  }
+    public int getStatusCode() {
+        return statusCode;
+    }
 
-  public Map<String, List<String>> getHeaders() {
-    return headers;
-  }
+    public Map<String, List<String>> getHeaders() {
+        return headers;
+    }
 
-  public T getData() {
-    return data;
-  }
+    public T getData() {
+        return data;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
index 9cc1324acb62..c7dd1d8e62f8 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
@@ -17,69 +17,101 @@ import java.lang.reflect.Type;
 import java.util.Date;
 
 public class JSON {
-  private ApiClient apiClient;
-  private Gson gson;
+    private ApiClient apiClient;
+    private Gson gson;
 
-  public JSON(ApiClient apiClient) {
-    this.apiClient = apiClient;
-    gson = new GsonBuilder()
-      .registerTypeAdapter(Date.class, new DateAdapter(apiClient))
-      .create();
-  }
-
-  public Gson getGson() {
-    return gson;
-  }
-
-  public void setGson(Gson gson) {
-    this.gson = gson;
-  }
-
-  /**
-   * Serialize the given Java object into JSON string.
-   */
-  public String serialize(Object obj) {
-    return gson.toJson(obj);
-  }
-
-  /**
-   * Deserialize the given JSON string to Java object.
-   *
-   * @param body The JSON string
-   * @param returnType The type to deserialize inot
-   * @return The deserialized Java object
-   */
-  public <T> T deserialize(String body, Type returnType) {
-    try {
-      if (apiClient.isLenientOnJson()) {
-        JsonReader jsonReader = new JsonReader(new StringReader(body));
-        // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
-        jsonReader.setLenient(true);
-        return gson.fromJson(jsonReader, returnType);
-      } else {
-        return gson.fromJson(body, returnType);
-      }
-    } catch (JsonParseException e) {
-      // Fallback processing when failed to parse JSON form response body:
-      //   return the response body string directly for the String return type;
-      //   parse response body into date or datetime for the Date return type.
-      if (returnType.equals(String.class))
-        return (T) body;
-      else if (returnType.equals(Date.class))
-        return (T) apiClient.parseDateOrDatetime(body);
-      else throw(e);
+    /**
+     * JSON constructor.
+     *
+     * @param apiClient An instance of ApiClient
+     */
+    public JSON(ApiClient apiClient) {
+        this.apiClient = apiClient;
+        gson = new GsonBuilder()
+            .registerTypeAdapter(Date.class, new DateAdapter(apiClient))
+            .create();
+    }
+
+    /**
+     * Get Gson.
+     *
+     * @return Gson
+     */
+    public Gson getGson() {
+        return gson;
+    }
+
+    /**
+     * Set Gson.
+     *
+     * @param gson Gson
+     */
+    public void setGson(Gson gson) {
+        this.gson = gson;
+    }
+
+    /**
+     * Serialize the given Java object into JSON string.
+     *
+     * @param obj Object
+     * @return String representation of the JSON
+     */
+    public String serialize(Object obj) {
+        return gson.toJson(obj);
+    }
+
+    /**
+     * Deserialize the given JSON string to Java object.
+     *
+     * @param <T> Type
+     * @param body The JSON string
+     * @param returnType The type to deserialize inot
+     * @return The deserialized Java object
+     */
+    public <T> T deserialize(String body, Type returnType) {
+        try {
+            if (apiClient.isLenientOnJson()) {
+                JsonReader jsonReader = new JsonReader(new StringReader(body));
+                // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
+                jsonReader.setLenient(true);
+                return gson.fromJson(jsonReader, returnType);
+            } else {
+                return gson.fromJson(body, returnType);
+            }
+        } catch (JsonParseException e) {
+            // Fallback processing when failed to parse JSON form response body:
+            //   return the response body string directly for the String return type;
+            //   parse response body into date or datetime for the Date return type.
+            if (returnType.equals(String.class))
+                return (T) body;
+            else if (returnType.equals(Date.class))
+                return (T) apiClient.parseDateOrDatetime(body);
+            else throw(e);
+        }
     }
-  }
 }
 
 class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
     private final ApiClient apiClient;
 
+    /**
+     * Constructor for DateAdapter
+     *
+     * @param apiClient Api client
+     */
     public DateAdapter(ApiClient apiClient) {
         super();
         this.apiClient = apiClient;
     }
 
+    /**
+     * Serialize
+     *
+     * @param src Date
+     * @param typeOfSrc Type
+     * @param context Json Serialization Context
+     * @return Json Element
+     */
     @Override
     public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
         if (src == null) {
@@ -89,6 +121,16 @@ class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
         }
     }
 
+    /**
+     * Deserialize
+     *
+     * @param json Json element
+     * @param date Type
+     * @param typeOfSrc Type
+     * @param context Json Serialization Context
+     * @return Date
+     * @throw JsonParseException if fail to parse
+     */
     @Override
     public Date deserialize(JsonElement json, Type date, JsonDeserializationContext context) throws JsonParseException {
         String str = json.getAsJsonPrimitive().getAsString();
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache
index 57931ef4cfc4..a1c300b9f306 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache
@@ -18,9 +18,9 @@ public class ProgressRequestBody extends RequestBody {
     }
 
     private final RequestBody requestBody;
- 
+
     private final ProgressRequestListener progressListener;
-  
+
     private BufferedSink bufferedSink;
 
     public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) {
@@ -43,7 +43,7 @@ public class ProgressRequestBody extends RequestBody {
         if (bufferedSink == null) {
             bufferedSink = Okio.buffer(sink(sink));
         }
-  
+
         requestBody.writeTo(bufferedSink);
         bufferedSink.flush();
 
@@ -51,7 +51,7 @@ public class ProgressRequestBody extends RequestBody {
 
     private Sink sink(Sink sink) {
         return new ForwardingSink(sink) {
-       
+
             long bytesWritten = 0L;
             long contentLength = 0L;
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
index dd9141bd3dc9..13c813e58afe 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
@@ -30,138 +30,138 @@ import java.util.Map;
 
 {{#operations}}
 public class {{classname}} {
-  private ApiClient {{localVariablePrefix}}apiClient;
+    private ApiClient {{localVariablePrefix}}apiClient;
 
-  public {{classname}}() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public {{classname}}(ApiClient apiClient) {
-    this.{{localVariablePrefix}}apiClient = apiClient;
-  }
-
-  public ApiClient getApiClient() {
-    return {{localVariablePrefix}}apiClient;
-  }
-
-  public void setApiClient(ApiClient apiClient) {
-    this.{{localVariablePrefix}}apiClient = apiClient;
-  }
-
-  {{#operation}}
-  /* Build call for {{operationId}} */
-  private Call {{operationId}}Call({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
-    {{#allParams}}{{#required}}
-    // verify the required parameter '{{paramName}}' is set
-    if ({{paramName}} == null) {
-       throw new ApiException("Missing the required parameter '{{paramName}}' when calling {{operationId}}(Async)");
-    }
-    {{/required}}{{/allParams}}
-
-    // create path and map variables
-    String {{localVariablePrefix}}localVarPath = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}
-      .replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
-
-    {{javaUtilPrefix}}List<Pair> {{localVariablePrefix}}localVarQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>();{{#queryParams}}
-    if ({{paramName}} != null)
-      {{localVariablePrefix}}localVarQueryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));{{/queryParams}}
-
-    {{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>();{{#headerParams}}
-    if ({{paramName}} != null)
-      {{localVariablePrefix}}localVarHeaderParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));{{/headerParams}}
-
-    {{javaUtilPrefix}}Map<String, Object> {{localVariablePrefix}}localVarFormParams = new {{javaUtilPrefix}}HashMap<String, Object>();{{#formParams}}
-    if ({{paramName}} != null)
-      {{localVariablePrefix}}localVarFormParams.put("{{baseName}}", {{paramName}});{{/formParams}}
-
-    final String[] {{localVariablePrefix}}localVarAccepts = {
-      {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
-    };
-    final String {{localVariablePrefix}}localVarAccept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}localVarAccepts);
-    if ({{localVariablePrefix}}localVarAccept != null) {{localVariablePrefix}}localVarHeaderParams.put("Accept", {{localVariablePrefix}}localVarAccept);
-
-    final String[] {{localVariablePrefix}}localVarContentTypes = {
-      {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
-    };
-    final String {{localVariablePrefix}}localVarContentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}localVarContentTypes);
-    {{localVariablePrefix}}localVarHeaderParams.put("Content-Type", {{localVariablePrefix}}localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
+    public {{classname}}() {
+        this(Configuration.getDefaultApiClient());
     }
 
-    String[] {{localVariablePrefix}}localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
-    return {{localVariablePrefix}}apiClient.buildCall({{localVariablePrefix}}localVarPath, "{{httpMethod}}", {{localVariablePrefix}}localVarQueryParams, {{localVariablePrefix}}localVarPostBody, {{localVariablePrefix}}localVarHeaderParams, {{localVariablePrefix}}localVarFormParams, {{localVariablePrefix}}localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * {{summary}}
-   * {{notes}}{{#allParams}}
-   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}{{#returnType}}
-   * @return {{{returnType}}}{{/returnType}}
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
-    {{#returnType}}ApiResponse<{{{returnType}}}> {{localVariablePrefix}}resp = {{/returnType}}{{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
-    return {{localVariablePrefix}}resp.getData();{{/returnType}}
-  }
-
-  /**
-   * {{summary}}
-   * {{notes}}{{#allParams}}
-   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
-   * @return ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
-    Call {{localVariablePrefix}}call = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}null, null);
-    {{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
-    return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType);{{/returnType}}{{^returnType}}return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call);{{/returnType}}
-  }
-
-  /**
-   * {{summary}} (asynchronously)
-   * {{notes}}{{#allParams}}
-   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call {{operationId}}Async({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{localVariablePrefix}}callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    public {{classname}}(ApiClient apiClient) {
+        this.{{localVariablePrefix}}apiClient = apiClient;
     }
 
-    Call {{localVariablePrefix}}call = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}progressListener, progressRequestListener);
-    {{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
-    {{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType, {{localVariablePrefix}}callback);{{/returnType}}{{^returnType}}{{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}callback);{{/returnType}}
-    return {{localVariablePrefix}}call;
-  }
-  {{/operation}}
+    public ApiClient getApiClient() {
+        return {{localVariablePrefix}}apiClient;
+    }
+
+    public void setApiClient(ApiClient apiClient) {
+        this.{{localVariablePrefix}}apiClient = apiClient;
+    }
+
+    {{#operation}}
+    /* Build call for {{operationId}} */
+    private Call {{operationId}}Call({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
+        {{#allParams}}{{#required}}
+        // verify the required parameter '{{paramName}}' is set
+        if ({{paramName}} == null) {
+            throw new ApiException("Missing the required parameter '{{paramName}}' when calling {{operationId}}(Async)");
+        }
+        {{/required}}{{/allParams}}
+
+        // create path and map variables
+        String {{localVariablePrefix}}localVarPath = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}
+        .replaceAll("\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
+
+        {{javaUtilPrefix}}List<Pair> {{localVariablePrefix}}localVarQueryParams = new {{javaUtilPrefix}}ArrayList<Pair>();{{#queryParams}}
+        if ({{paramName}} != null)
+        {{localVariablePrefix}}localVarQueryParams.addAll({{localVariablePrefix}}apiClient.parameterToPairs("{{#collectionFormat}}{{{collectionFormat}}}{{/collectionFormat}}", "{{baseName}}", {{paramName}}));{{/queryParams}}
+
+        {{javaUtilPrefix}}Map<String, String> {{localVariablePrefix}}localVarHeaderParams = new {{javaUtilPrefix}}HashMap<String, String>();{{#headerParams}}
+        if ({{paramName}} != null)
+        {{localVariablePrefix}}localVarHeaderParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));{{/headerParams}}
+
+        {{javaUtilPrefix}}Map<String, Object> {{localVariablePrefix}}localVarFormParams = new {{javaUtilPrefix}}HashMap<String, Object>();{{#formParams}}
+        if ({{paramName}} != null)
+        {{localVariablePrefix}}localVarFormParams.put("{{baseName}}", {{paramName}});{{/formParams}}
+
+        final String[] {{localVariablePrefix}}localVarAccepts = {
+            {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
+        };
+        final String {{localVariablePrefix}}localVarAccept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}localVarAccepts);
+        if ({{localVariablePrefix}}localVarAccept != null) {{localVariablePrefix}}localVarHeaderParams.put("Accept", {{localVariablePrefix}}localVarAccept);
+
+        final String[] {{localVariablePrefix}}localVarContentTypes = {
+            {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
+        };
+        final String {{localVariablePrefix}}localVarContentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}localVarContentTypes);
+        {{localVariablePrefix}}localVarHeaderParams.put("Content-Type", {{localVariablePrefix}}localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] {{localVariablePrefix}}localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+        return {{localVariablePrefix}}apiClient.buildCall({{localVariablePrefix}}localVarPath, "{{httpMethod}}", {{localVariablePrefix}}localVarQueryParams, {{localVariablePrefix}}localVarPostBody, {{localVariablePrefix}}localVarHeaderParams, {{localVariablePrefix}}localVarFormParams, {{localVariablePrefix}}localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * {{summary}}
+     * {{notes}}{{#allParams}}
+     * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}{{#returnType}}
+     * @return {{returnType}}{{/returnType}}
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
+        {{#returnType}}ApiResponse<{{{returnType}}}> {{localVariablePrefix}}resp = {{/returnType}}{{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
+        return {{localVariablePrefix}}resp.getData();{{/returnType}}
+    }
+
+    /**
+     * {{summary}}
+     * {{notes}}{{#allParams}}
+     * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
+     * @return ApiResponse&lt;{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Void{{/returnType}}&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
+        Call {{localVariablePrefix}}call = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}null, null);
+        {{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
+        return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType);{{/returnType}}{{^returnType}}return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call);{{/returnType}}
+    }
+
+    /**
+     * {{summary}} (asynchronously)
+     * {{notes}}{{#allParams}}
+     * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{/allParams}}
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call {{operationId}}Async({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{localVariablePrefix}}callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        Call {{localVariablePrefix}}call = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}progressListener, progressRequestListener);
+        {{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
+        {{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType, {{localVariablePrefix}}callback);{{/returnType}}{{^returnType}}{{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}callback);{{/returnType}}
+        return {{localVariablePrefix}}call;
+    }
+    {{/operation}}
 }
 {{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
index f3ed85d980bd..636691a2f215 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
@@ -10,32 +10,32 @@ import java.util.List;
 import java.io.UnsupportedEncodingException;
 
 public class HttpBasicAuth implements Authentication {
-  private String username;
-  private String password;
+    private String username;
+    private String password;
 
-  public String getUsername() {
-    return username;
-  }
-
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-  public String getPassword() {
-    return password;
-  }
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
-    if (username == null && password == null) {
-      return;
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+        if (username == null && password == null) {
+            return;
+        }
+        headerParams.put("Authorization", Credentials.basic(
+            username == null ? "" : username,
+            password == null ? "" : password));
     }
-    headerParams.put("Authorization", Credentials.basic(
-        username == null ? "" : username,
-        password == null ? "" : password));
-  }
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache
index f7af4c89f2f8..213acb31568a 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache
@@ -2,19 +2,19 @@
  * {{^description}}Gets or Sets {{name}}{{/description}}{{#description}}{{description}}{{/description}}
  */
 public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
-  {{#allowableValues}}{{#enumVars}}@SerializedName({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
-  {{{name}}}({{{value}}}){{^-last}},
+    {{#allowableValues}}{{#enumVars}}@SerializedName({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
+    {{{name}}}({{{value}}}){{^-last}},
 
-  {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
+    {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
 
-  private {{dataType}} value;
+    private {{dataType}} value;
 
-  {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{dataType}} value) {
-    this.value = value;
-  }
+    {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{dataType}} value) {
+        this.value = value;
+    }
 
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache
index 30ebf3febb61..bb69f71d24bc 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache
@@ -1,20 +1,20 @@
-  /**
-   * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
-   */
-  public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
-    {{#allowableValues}}{{#enumVars}}@SerializedName({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
-    {{{name}}}({{{value}}}){{^-last}},
+    /**
+     * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+     */
+    public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
+        {{#allowableValues}}{{#enumVars}}@SerializedName({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
+        {{{name}}}({{{value}}}){{^-last}},
 
-    {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
+        {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
 
-    private {{datatype}} value;
+        private {{datatype}} value;
 
-    {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{datatype}} value) {
-      this.value = value;
+        {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{datatype}} value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
     }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-  }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
index b20499078a21..f2aad04d54b5 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
@@ -3,69 +3,93 @@
  */{{#description}}
 @ApiModel(description = "{{{description}}}"){{/description}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
-  {{#vars}}{{#isEnum}}
+    {{#vars}}
+    {{#isEnum}}
+{{>libraries/common/modelInnerEnum}}
+    {{/isEnum}}
+    {{#items.isEnum}}
+    {{#items}}
+{{>libraries/common/modelInnerEnum}}
+    {{/items}}
+    {{/items.isEnum}}
+    @SerializedName("{{baseName}}")
+    private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};
+    {{/vars}}
 
-{{>libraries/common/modelInnerEnum}}{{/isEnum}}{{#items.isEnum}}{{#items}}
-
-{{>libraries/common/modelInnerEnum}}{{/items}}{{/items.isEnum}}
-  @SerializedName("{{baseName}}")
-  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};
-  {{/vars}}
-
-  {{#vars}}
-  /**{{#description}}
-   * {{{description}}}{{/description}}{{#minimum}}
-   * minimum: {{minimum}}{{/minimum}}{{#maximum}}
-   * maximum: {{maximum}}{{/maximum}}
-   **/
-  @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
-  public {{{datatypeWithEnum}}} {{getter}}() {
-    return {{name}};
-  }{{^isReadOnly}}
-  public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
-    this.{{name}} = {{name}};
-  }{{/isReadOnly}}
-
-  {{/vars}}
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    {{#vars}}
+    /**
+    {{#description}}
+     * {{{description}}}
+    {{/description}}
+    {{^description}}
+     * Get {{name}}
+    {{/description}}
+    {{#minimum}}
+     * minimum: {{minimum}}
+    {{/minimum}}
+    {{#maximum}}
+     * maximum: {{maximum}}
+    {{/maximum}}
+     * @return {{name}}
+     **/
+    @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
+    public {{{datatypeWithEnum}}} {{getter}}() {
+        return {{name}};
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }{{#hasVars}}
-    {{classname}} {{classVarName}} = ({{classname}}) o;
-    return {{#vars}}Objects.equals(this.{{name}}, {{classVarName}}.{{name}}){{#hasMore}} &&
+
+    {{^isReadOnly}}
+    /**
+     * Set {{name}}
+     *
+     * @param {{name}} {{name}}
+     */
+    public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
+        this.{{name}} = {{name}};
+    }
+
+    {{/isReadOnly}}
+    {{/vars}}
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }{{#hasVars}}
+        {{classname}} {{classVarName}} = ({{classname}}) o;
+        return {{#vars}}Objects.equals(this.{{name}}, {{classVarName}}.{{name}}){{#hasMore}} &&
         {{/hasMore}}{{/vars}}{{#parent}} &&
         super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
-    return true;{{/hasVars}}
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash({{#vars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}});
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class {{classname}} {\n");
-    {{#parent}}sb.append("    ").append(toIndentedString(super.toString())).append("\n");{{/parent}}
-    {{#vars}}sb.append("    {{name}}: ").append(toIndentedString({{name}})).append("\n");
-    {{/vars}}sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
+        return true;{{/hasVars}}
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash({{#vars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}});
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class {{classname}} {\n");
+        {{#parent}}sb.append("    ").append(toIndentedString(super.toString())).append("\n");{{/parent}}
+        {{#vars}}sb.append("    {{name}}: ").append(toIndentedString({{name}})).append("\n");
+        {{/vars}}sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
     }
-    return o.toString().replace("\n", "\n    ");
-  }
 }
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 cfe169c5eca8..241f1b308e66 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
@@ -105,7 +105,7 @@
           <target>1.7</target>
         </configuration>
       </plugin>
-      <!-- For testing build.gradle, build.sbt -->
+      <!-- For testing build.gradle, build.sbt, mvn javadoc:javadoc -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -137,6 +137,19 @@
               </arguments>
             </configuration>
           </execution>
+          <execution>
+            <id>mvn-javadoc-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <arguments>
+                <argument>javadoc:javadoc</argument>
+              </arguments>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
@@ -172,7 +185,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-core-version>1.5.8</swagger-core-version>
+    <swagger-core-version>1.5.9</swagger-core-version>
     <okhttp-version>2.7.5</okhttp-version>
     <gson-version>2.6.2</gson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index 638e1b9345ea..0b84de7935ee 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -105,7 +105,7 @@
           <target>1.7</target>
         </configuration>
       </plugin>
-      <!-- For testing build.gradle, build.sbt -->
+      <!-- For testing build.gradle, build.sbt, mvn javadoc:javadoc -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -137,6 +137,19 @@
               </arguments>
             </configuration>
           </execution>
+          <execution>
+            <id>mvn-javadoc-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <arguments>
+                <argument>javadoc:javadoc</argument>
+              </arguments>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
@@ -172,7 +185,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-core-version>1.5.8</swagger-core-version>
+    <swagger-core-version>1.5.9</swagger-core-version>
     <okhttp-version>2.7.5</okhttp-version>
     <gson-version>2.6.2</gson-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java
index fcf2d289fbfd..9a1188c92e56 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java
@@ -11,39 +11,39 @@ import java.util.List;
  * @param <T> The return type
  */
 public interface ApiCallback<T> {
-  /**
-   * This is called when the API call fails.
-   *
-   * @param e The exception causing the failure
-   * @param statusCode Status code of the response if available, otherwise it would be 0
-   * @param responseHeaders Headers of the response if available, otherwise it would be null
-   */
-  void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders);
+    /**
+     * This is called when the API call fails.
+     *
+     * @param e The exception causing the failure
+     * @param statusCode Status code of the response if available, otherwise it would be 0
+     * @param responseHeaders Headers of the response if available, otherwise it would be null
+     */
+    void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders);
 
-  /**
-   * This is called when the API call succeeded.
-   *
-   * @param result The result deserialized from response
-   * @param statusCode Status code of the response
-   * @param responseHeaders Headers of the response
-   */
-  void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders);
+    /**
+     * This is called when the API call succeeded.
+     *
+     * @param result The result deserialized from response
+     * @param statusCode Status code of the response
+     * @param responseHeaders Headers of the response
+     */
+    void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders);
 
-  /**
-   * This is called when the API upload processing.
-   *
-   * @param bytesWritten bytes Written
-   * @param contentLength content length of request body
-   * @param done write end
-   */
-  void onUploadProgress(long bytesWritten, long contentLength, boolean done);
+    /**
+     * This is called when the API upload processing.
+     *
+     * @param bytesWritten bytes Written
+     * @param contentLength content length of request body
+     * @param done write end
+     */
+    void onUploadProgress(long bytesWritten, long contentLength, boolean done);
 
-  /**
-   * This is called when the API downlond processing.
-   *
-   * @param bytesRead bytes Read
-   * @param contentLength content lenngth of the response
-   * @param done Read end
-   */
-  void onDownloadProgress(long bytesRead, long contentLength, boolean done);
+    /**
+     * This is called when the API downlond processing.
+     *
+     * @param bytesRead bytes Read
+     * @param contentLength content lenngth of the response
+     * @param done Read end
+     */
+    void onDownloadProgress(long bytesRead, long contentLength, boolean done);
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
index 9328cb74d843..a035a3175df8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
@@ -67,1072 +67,1233 @@ import io.swagger.client.auth.ApiKeyAuth;
 import io.swagger.client.auth.OAuth;
 
 public class ApiClient {
-  public static final double JAVA_VERSION;
-  public static final boolean IS_ANDROID;
-  public static final int ANDROID_SDK_VERSION;
+    public static final double JAVA_VERSION;
+    public static final boolean IS_ANDROID;
+    public static final int ANDROID_SDK_VERSION;
 
-  static {
-    JAVA_VERSION = Double.parseDouble(System.getProperty("java.specification.version"));
-    boolean isAndroid;
-    try {
-      Class.forName("android.app.Activity");
-      isAndroid = true;
-    } catch (ClassNotFoundException e) {
-      isAndroid = false;
-    }
-    IS_ANDROID = isAndroid;
-    int sdkVersion = 0;
-    if (IS_ANDROID) {
-      try {
-        sdkVersion = Class.forName("android.os.Build$VERSION").getField("SDK_INT").getInt(null);
-      } catch (Exception e) {
+    static {
+        JAVA_VERSION = Double.parseDouble(System.getProperty("java.specification.version"));
+        boolean isAndroid;
         try {
-          sdkVersion = Integer.parseInt((String) Class.forName("android.os.Build$VERSION").getField("SDK").get(null));
-        } catch (Exception e2) { }
-      }
+            Class.forName("android.app.Activity");
+            isAndroid = true;
+        } catch (ClassNotFoundException e) {
+            isAndroid = false;
+        }
+        IS_ANDROID = isAndroid;
+        int sdkVersion = 0;
+        if (IS_ANDROID) {
+            try {
+                sdkVersion = Class.forName("android.os.Build$VERSION").getField("SDK_INT").getInt(null);
+            } catch (Exception e) {
+                try {
+                    sdkVersion = Integer.parseInt((String) Class.forName("android.os.Build$VERSION").getField("SDK").get(null));
+                } catch (Exception e2) { }
+            }
+        }
+        ANDROID_SDK_VERSION = sdkVersion;
     }
-    ANDROID_SDK_VERSION = sdkVersion;
-  }
 
-  /**
-   * The datetime format to be used when <code>lenientDatetimeFormat</code> is enabled.
-   */
-  public static final String LENIENT_DATETIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
+    /**
+     * The datetime format to be used when <code>lenientDatetimeFormat</code> is enabled.
+     */
+    public static final String LENIENT_DATETIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
 
-  private String basePath = "http://petstore.swagger.io/v2";
-  private boolean lenientOnJson = false;
-  private boolean debugging = false;
-  private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
-  private String tempFolderPath = null;
+    private String basePath = "http://petstore.swagger.io/v2";
+    private boolean lenientOnJson = false;
+    private boolean debugging = false;
+    private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
+    private String tempFolderPath = null;
 
-  private Map<String, Authentication> authentications;
+    private Map<String, Authentication> authentications;
 
-  private DateFormat dateFormat;
-  private DateFormat datetimeFormat;
-  private boolean lenientDatetimeFormat;
-  private int dateLength;
+    private DateFormat dateFormat;
+    private DateFormat datetimeFormat;
+    private boolean lenientDatetimeFormat;
+    private int dateLength;
 
-  private InputStream sslCaCert;
-  private boolean verifyingSsl;
+    private InputStream sslCaCert;
+    private boolean verifyingSsl;
 
-  private OkHttpClient httpClient;
-  private JSON json;
+    private OkHttpClient httpClient;
+    private JSON json;
 
-  private HttpLoggingInterceptor loggingInterceptor;
-
-  public ApiClient() {
-    httpClient = new OkHttpClient();
-
-    verifyingSsl = true;
-
-    json = new JSON(this);
+    private HttpLoggingInterceptor loggingInterceptor;
 
     /*
-     * Use RFC3339 format for date and datetime.
-     * See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
+     * Constructor for ApiClient
      */
-    this.dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-    // Always use UTC as the default time zone when dealing with date (without time).
-    this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-    initDatetimeFormat();
+    public ApiClient() {
+        httpClient = new OkHttpClient();
 
-    // Be lenient on datetime formats when parsing datetime from string.
-    // See <code>parseDatetime</code>.
-    this.lenientDatetimeFormat = true;
+        verifyingSsl = true;
 
-    // Set default User-Agent.
-    setUserAgent("Swagger-Codegen/1.0.0/java");
+        json = new JSON(this);
 
-    // Setup authentications (key: authentication name, value: authentication).
-    authentications = new HashMap<String, Authentication>();
-    authentications.put("petstore_auth", new OAuth());
-    authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
-    // Prevent the authentications from being modified.
-    authentications = Collections.unmodifiableMap(authentications);
-  }
+        /*
+         * Use RFC3339 format for date and datetime.
+         * See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
+         */
+        this.dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        // Always use UTC as the default time zone when dealing with date (without time).
+        this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        initDatetimeFormat();
 
-  public String getBasePath() {
-    return basePath;
-  }
+        // Be lenient on datetime formats when parsing datetime from string.
+        // See <code>parseDatetime</code>.
+        this.lenientDatetimeFormat = true;
 
-  public ApiClient setBasePath(String basePath) {
-    this.basePath = basePath;
-    return this;
-  }
+        // Set default User-Agent.
+        setUserAgent("Swagger-Codegen/1.0.0/java");
 
-  public OkHttpClient getHttpClient() {
-    return httpClient;
-  }
-
-  public ApiClient setHttpClient(OkHttpClient httpClient) {
-    this.httpClient = httpClient;
-    return this;
-  }
-
-  public JSON getJSON() {
-    return json;
-  }
-
-  public ApiClient setJSON(JSON json) {
-    this.json = json;
-    return this;
-  }
-
-  public boolean isVerifyingSsl() {
-    return verifyingSsl;
-  }
-
-  /**
-   * Configure whether to verify certificate and hostname when making https requests.
-   * Default to true.
-   * NOTE: Do NOT set to false in production code, otherwise you would face multiple types of cryptographic attacks.
-   */
-  public ApiClient setVerifyingSsl(boolean verifyingSsl) {
-    this.verifyingSsl = verifyingSsl;
-    applySslSettings();
-    return this;
-  }
-
-  public InputStream getSslCaCert() {
-    return sslCaCert;
-  }
-
-  /**
-   * Configure the CA certificate to be trusted when making https requests.
-   * Use null to reset to default.
-   */
-  public ApiClient setSslCaCert(InputStream sslCaCert) {
-    this.sslCaCert = sslCaCert;
-    applySslSettings();
-    return this;
-  }
-
-  public DateFormat getDateFormat() {
-    return dateFormat;
-  }
-
-  public ApiClient setDateFormat(DateFormat dateFormat) {
-    this.dateFormat = dateFormat;
-    this.dateLength = this.dateFormat.format(new Date()).length();
-    return this;
-  }
-
-  public DateFormat getDatetimeFormat() {
-    return datetimeFormat;
-  }
-
-  public ApiClient setDatetimeFormat(DateFormat datetimeFormat) {
-    this.datetimeFormat = datetimeFormat;
-    return this;
-  }
-
-  /**
-   * Whether to allow various ISO 8601 datetime formats when parsing a datetime string.
-   * @see #parseDatetime(String)
-   */
-  public boolean isLenientDatetimeFormat() {
-    return lenientDatetimeFormat;
-  }
-
-  public ApiClient setLenientDatetimeFormat(boolean lenientDatetimeFormat) {
-    this.lenientDatetimeFormat = lenientDatetimeFormat;
-    return this;
-  }
-
-  /**
-   * Parse the given date string into Date object.
-   * The default <code>dateFormat</code> supports these ISO 8601 date formats:
-   *   2015-08-16
-   *   2015-8-16
-   */
-  public Date parseDate(String str) {
-    if (str == null)
-      return null;
-    try {
-      return dateFormat.parse(str);
-    } catch (ParseException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  /**
-   * Parse the given datetime string into Date object.
-   * When <code>lenientDatetimeFormat</code> is enabled, the following ISO 8601 datetime formats are supported:
-   *   2015-08-16T08:20:05Z
-   *   2015-8-16T8:20:05Z
-   *   2015-08-16T08:20:05+00:00
-   *   2015-08-16T08:20:05+0000
-   *   2015-08-16T08:20:05.376Z
-   *   2015-08-16T08:20:05.376+00:00
-   *   2015-08-16T08:20:05.376+00
-   * Note: The 3-digit milli-seconds is optional. Time zone is required and can be in one of
-   *   these formats:
-   *   Z (same with +0000)
-   *   +08:00 (same with +0800)
-   *   -02 (same with -0200)
-   *   -0200
-   * @see https://en.wikipedia.org/wiki/ISO_8601
-   */
-  public Date parseDatetime(String str) {
-    if (str == null)
-      return null;
-
-    DateFormat format;
-    if (lenientDatetimeFormat) {
-      /*
-       * When lenientDatetimeFormat is enabled, normalize the date string
-       * into <code>LENIENT_DATETIME_FORMAT</code> to support various formats
-       * defined by ISO 8601.
-       */
-      // normalize time zone
-      //   trailing "Z": 2015-08-16T08:20:05Z => 2015-08-16T08:20:05+0000
-      str = str.replaceAll("[zZ]\\z", "+0000");
-      //   remove colon in time zone: 2015-08-16T08:20:05+00:00 => 2015-08-16T08:20:05+0000
-      str = str.replaceAll("([+-]\\d{2}):(\\d{2})\\z", "$1$2");
-      //   expand time zone: 2015-08-16T08:20:05+00 => 2015-08-16T08:20:05+0000
-      str = str.replaceAll("([+-]\\d{2})\\z", "$100");
-      // add milliseconds when missing
-      //   2015-08-16T08:20:05+0000 => 2015-08-16T08:20:05.000+0000
-      str = str.replaceAll("(:\\d{1,2})([+-]\\d{4})\\z", "$1.000$2");
-      format = new SimpleDateFormat(LENIENT_DATETIME_FORMAT);
-    } else {
-      format = this.datetimeFormat;
+        // Setup authentications (key: authentication name, value: authentication).
+        authentications = new HashMap<String, Authentication>();
+        authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+        authentications.put("petstore_auth", new OAuth());
+        // Prevent the authentications from being modified.
+        authentications = Collections.unmodifiableMap(authentications);
     }
 
-    try {
-      return format.parse(str);
-    } catch (ParseException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public Date parseDateOrDatetime(String str) {
-    if (str == null)
-      return null;
-    else if (str.length() <= dateLength)
-      return parseDate(str);
-    else
-      return parseDatetime(str);
-  }
-
-  /**
-   * Format the given Date object into string.
-   */
-  public String formatDate(Date date) {
-    return dateFormat.format(date);
-  }
-
-  /**
-   * Format the given Date object into string.
-   */
-  public String formatDatetime(Date date) {
-    return datetimeFormat.format(date);
-  }
-
-  /**
-   * Get authentications (key: authentication name, value: authentication).
-   */
-  public Map<String, Authentication> getAuthentications() {
-    return authentications;
-  }
-
-  /**
-   * Get authentication for the given name.
-   *
-   * @param authName The authentication name
-   * @return The authentication, null if not found
-   */
-  public Authentication getAuthentication(String authName) {
-    return authentications.get(authName);
-  }
-
-  /**
-   * Helper method to set username for the first HTTP basic authentication.
-   */
-  public void setUsername(String username) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof HttpBasicAuth) {
-        ((HttpBasicAuth) auth).setUsername(username);
-        return;
-      }
-    }
-    throw new RuntimeException("No HTTP basic authentication configured!");
-  }
-
-  /**
-   * Helper method to set password for the first HTTP basic authentication.
-   */
-  public void setPassword(String password) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof HttpBasicAuth) {
-        ((HttpBasicAuth) auth).setPassword(password);
-        return;
-      }
-    }
-    throw new RuntimeException("No HTTP basic authentication configured!");
-  }
-
-  /**
-   * Helper method to set API key value for the first API key authentication.
-   */
-  public void setApiKey(String apiKey) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof ApiKeyAuth) {
-        ((ApiKeyAuth) auth).setApiKey(apiKey);
-        return;
-      }
-    }
-    throw new RuntimeException("No API key authentication configured!");
-  }
-
-  /**
-   * Helper method to set API key prefix for the first API key authentication.
-   */
-  public void setApiKeyPrefix(String apiKeyPrefix) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof ApiKeyAuth) {
-        ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
-        return;
-      }
-    }
-    throw new RuntimeException("No API key authentication configured!");
-  }
-
-  /**
-   * Helper method to set access token for the first OAuth2 authentication.
-   */
-  public void setAccessToken(String accessToken) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof OAuth) {
-        ((OAuth) auth).setAccessToken(accessToken);
-        return;
-      }
-    }
-    throw new RuntimeException("No OAuth2 authentication configured!");
-  }
-
-  /**
-   * Set the User-Agent header's value (by adding to the default header map).
-   */
-  public ApiClient setUserAgent(String userAgent) {
-    addDefaultHeader("User-Agent", userAgent);
-    return this;
-  }
-
-  /**
-   * Add a default header.
-   *
-   * @param key The header's key
-   * @param value The header's value
-   */
-  public ApiClient addDefaultHeader(String key, String value) {
-    defaultHeaderMap.put(key, value);
-    return this;
-  }
-
-  /**
-   * @see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
-   */
-  public boolean isLenientOnJson() {
-    return lenientOnJson;
-  }
-
-  public ApiClient setLenientOnJson(boolean lenient) {
-    this.lenientOnJson = lenient;
-    return this;
-  }
-
-  /**
-   * Check that whether debugging is enabled for this API client.
-   */
-  public boolean isDebugging() {
-    return debugging;
-  }
-
-  /**
-   * Enable/disable debugging for this API client.
-   *
-   * @param debugging To enable (true) or disable (false) debugging
-   */
-  public ApiClient setDebugging(boolean debugging) {
-    if (debugging != this.debugging) {
-      if (debugging) {
-        loggingInterceptor = new HttpLoggingInterceptor();
-        loggingInterceptor.setLevel(Level.BODY);
-        httpClient.interceptors().add(loggingInterceptor);
-      } else {
-        httpClient.interceptors().remove(loggingInterceptor);
-        loggingInterceptor = null;
-      }
-    }
-    this.debugging = debugging;
-    return this;
-  }
-
-  /**
-   * The path of temporary folder used to store downloaded files from endpoints
-   * with file response. The default value is <code>null</code>, i.e. using
-   * the system's default tempopary folder.
-   *
-   * @see https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile(java.lang.String,%20java.lang.String,%20java.io.File)
-   */
-  public String getTempFolderPath() {
-    return tempFolderPath;
-  }
-
-  public ApiClient setTempFolderPath(String tempFolderPath) {
-    this.tempFolderPath = tempFolderPath;
-    return this;
-  }
-
-  /**
-   * Connect timeout (in milliseconds).
-   */
-  public int getConnectTimeout() {
-    return httpClient.getConnectTimeout();
-  }
-
-  /**
-   * Sets the connect timeout (in milliseconds).
-   * A value of 0 means no timeout, otherwise values must be between 1 and
-   * {@link Integer#MAX_VALUE}.
-   */
-  public ApiClient setConnectTimeout(int connectionTimeout) {
-    httpClient.setConnectTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
-    return this;
-  }
-
-  /**
-   * Format the given parameter object into string.
-   */
-  public String parameterToString(Object param) {
-    if (param == null) {
-      return "";
-    } else if (param instanceof Date) {
-      return formatDatetime((Date) param);
-    } else if (param instanceof Collection) {
-      StringBuilder b = new StringBuilder();
-      for (Object o : (Collection)param) {
-        if (b.length() > 0) {
-          b.append(",");
-        }
-        b.append(String.valueOf(o));
-      }
-      return b.toString();
-    } else {
-      return String.valueOf(param);
-    }
-  }
-
-  /*
-    Format to {@code Pair} objects.
-  */
-  public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
-    List<Pair> params = new ArrayList<Pair>();
-
-    // preconditions
-    if (name == null || name.isEmpty() || value == null) return params;
-
-    Collection valueCollection = null;
-    if (value instanceof Collection) {
-      valueCollection = (Collection) value;
-    } else {
-      params.add(new Pair(name, parameterToString(value)));
-      return params;
+    /**
+     * Get base path
+     *
+     * @return Baes path
+     */
+    public String getBasePath() {
+        return basePath;
     }
 
-    if (valueCollection.isEmpty()){
-      return params;
+    /**
+     * Set base path
+     *
+     * @param basePath Base path of the URL (e.g http://petstore.swagger.io/v2)
+     * @return An instance of OkHttpClient
+     */
+    public ApiClient setBasePath(String basePath) {
+        this.basePath = basePath;
+        return this;
     }
 
-    // get the collection format
-    collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
-
-    // create the params based on the collection format
-    if (collectionFormat.equals("multi")) {
-      for (Object item : valueCollection) {
-        params.add(new Pair(name, parameterToString(item)));
-      }
-
-      return params;
+    /**
+     * Get HTTP client
+     *
+     * @return An instance of OkHttpClient
+     */
+    public OkHttpClient getHttpClient() {
+        return httpClient;
     }
 
-    String delimiter = ",";
-
-    if (collectionFormat.equals("csv")) {
-      delimiter = ",";
-    } else if (collectionFormat.equals("ssv")) {
-      delimiter = " ";
-    } else if (collectionFormat.equals("tsv")) {
-      delimiter = "\t";
-    } else if (collectionFormat.equals("pipes")) {
-      delimiter = "|";
+    /**
+     * Set HTTP client
+     *
+     * @param httpClient An instance of OkHttpClient
+     * @return Api Client
+     */
+    public ApiClient setHttpClient(OkHttpClient httpClient) {
+        this.httpClient = httpClient;
+        return this;
     }
 
-    StringBuilder sb = new StringBuilder() ;
-    for (Object item : valueCollection) {
-      sb.append(delimiter);
-      sb.append(parameterToString(item));
+    /**
+     * Get JSON
+     *
+     * @return JSON object
+     */
+    public JSON getJSON() {
+        return json;
     }
 
-    params.add(new Pair(name, sb.substring(1)));
-
-    return params;
-  }
-
-  /**
-   * Sanitize filename by removing path.
-   * e.g. ../../sun.gif becomes sun.gif
-   *
-   * @param filename The filename to be sanitized
-   * @return The sanitized filename
-   */
-  public String sanitizeFilename(String filename) {
-    return filename.replaceAll(".*[/\\\\]", "");
-  }
-
-  /**
-   * Check if the given MIME is a JSON MIME.
-   * JSON MIME examples:
-   *   application/json
-   *   application/json; charset=UTF8
-   *   APPLICATION/JSON
-   */
-  public boolean isJsonMime(String mime) {
-    return mime != null && mime.matches("(?i)application\\/json(;.*)?");
-  }
-
-  /**
-   * Select the Accept header's value from the given accepts array:
-   *   if JSON exists in the given array, use it;
-   *   otherwise use all of them (joining into a string)
-   *
-   * @param accepts The accepts array to select from
-   * @return The Accept header to use. If the given array is empty,
-   *   null will be returned (not to set the Accept header explicitly).
-   */
-  public String selectHeaderAccept(String[] accepts) {
-    if (accepts.length == 0) {
-      return null;
-    }
-    for (String accept : accepts) {
-      if (isJsonMime(accept)) {
-        return accept;
-      }
-    }
-    return StringUtil.join(accepts, ",");
-  }
-
-  /**
-   * Select the Content-Type header's value from the given array:
-   *   if JSON exists in the given array, use it;
-   *   otherwise use the first one of the array.
-   *
-   * @param contentTypes The Content-Type array to select from
-   * @return The Content-Type header to use. If the given array is empty,
-   *   JSON will be used.
-   */
-  public String selectHeaderContentType(String[] contentTypes) {
-    if (contentTypes.length == 0) {
-      return "application/json";
-    }
-    for (String contentType : contentTypes) {
-      if (isJsonMime(contentType)) {
-        return contentType;
-      }
-    }
-    return contentTypes[0];
-  }
-
-  /**
-   * Escape the given string to be used as URL query value.
-   */
-  public String escapeString(String str) {
-    try {
-      return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
-    } catch (UnsupportedEncodingException e) {
-      return str;
-    }
-  }
-
-  /**
-   * Deserialize response body to Java object, according to the return type and
-   * the Content-Type response header.
-   *
-   * @param response HTTP response
-   * @param returnType The type of the Java object
-   * @return The deserialized Java object
-   * @throws ApiException If fail to deserialize response body, i.e. cannot read response body
-   *   or the Content-Type of the response is not supported.
-   */
-  public <T> T deserialize(Response response, Type returnType) throws ApiException {
-    if (response == null || returnType == null) {
-      return null;
+    /**
+     * Set JSON
+     *
+     * @param json JSON object
+     * @return Api client
+     */
+    public ApiClient setJSON(JSON json) {
+        this.json = json;
+        return this;
     }
 
-    if ("byte[]".equals(returnType.toString())) {
-      // Handle binary response (byte array).
-      try {
-        return (T) response.body().bytes();
-      } catch (IOException e) {
-        throw new ApiException(e);
-      }
-    } else if (returnType.equals(File.class)) {
-      // Handle file downloading.
-      return (T) downloadFileFromResponse(response);
+    /**
+     * True if isVerifyingSsl flag is on
+     *
+     * @return True if isVerifySsl flag is on
+     */
+    public boolean isVerifyingSsl() {
+        return verifyingSsl;
     }
 
-    String respBody;
-    try {
-      if (response.body() != null)
-        respBody = response.body().string();
-      else
-        respBody = null;
-    } catch (IOException e) {
-      throw new ApiException(e);
+    /**
+     * Configure whether to verify certificate and hostname when making https requests.
+     * Default to true.
+     * NOTE: Do NOT set to false in production code, otherwise you would face multiple types of cryptographic attacks.
+     *
+     * @param verifyingSsl True to verify TLS/SSL connection
+     * @return ApiClient
+     */
+    public ApiClient setVerifyingSsl(boolean verifyingSsl) {
+        this.verifyingSsl = verifyingSsl;
+        applySslSettings();
+        return this;
     }
 
-    if (respBody == null || "".equals(respBody)) {
-      return null;
+    /**
+     * Get SSL CA cert.
+     *
+     * @return Input stream to the SSL CA cert
+     */
+    public InputStream getSslCaCert() {
+        return sslCaCert;
     }
 
-    String contentType = response.headers().get("Content-Type");
-    if (contentType == null) {
-      // ensuring a default content type
-      contentType = "application/json";
-    }
-    if (isJsonMime(contentType)) {
-      return json.deserialize(respBody, returnType);
-    } else if (returnType.equals(String.class)) {
-      // Expecting string, return the raw response body.
-      return (T) respBody;
-    } else {
-      throw new ApiException(
-        "Content type \"" + contentType + "\" is not supported for type: " + returnType,
-        response.code(),
-        response.headers().toMultimap(),
-        respBody);
-    }
-  }
-
-  /**
-   * Serialize the given Java object into request body according to the object's
-   * class and the request Content-Type.
-   *
-   * @param obj The Java object
-   * @param contentType The request Content-Type
-   * @return The serialized request body
-   * @throws ApiException If fail to serialize the given object
-   */
-  public RequestBody serialize(Object obj, String contentType) throws ApiException {
-    if (obj instanceof byte[]) {
-      // Binary (byte array) body parameter support.
-      return RequestBody.create(MediaType.parse(contentType), (byte[]) obj);
-    } else if (obj instanceof File) {
-      // File body parameter support.
-      return RequestBody.create(MediaType.parse(contentType), (File) obj);
-    } else if (isJsonMime(contentType)) {
-      String content;
-      if (obj != null) {
-        content = json.serialize(obj);
-      } else {
-        content = null;
-      }
-      return RequestBody.create(MediaType.parse(contentType), content);
-    } else {
-      throw new ApiException("Content type \"" + contentType + "\" is not supported");
-    }
-  }
-
-  /**
-   * Download file from the given response.
-   * @throws ApiException If fail to read file content from response and write to disk
-   */
-  public File downloadFileFromResponse(Response response) throws ApiException {
-    try {
-        File file = prepareDownloadFile(response);
-        BufferedSink sink = Okio.buffer(Okio.sink(file));
-        sink.writeAll(response.body().source());
-        sink.close();
-        return file;
-    } catch (IOException e) {
-        throw new ApiException(e);
-    }
-  }
-
-  public File prepareDownloadFile(Response response) throws IOException {
-    String filename = null;
-    String contentDisposition = response.header("Content-Disposition");
-    if (contentDisposition != null && !"".equals(contentDisposition)) {
-      // Get filename from the Content-Disposition header.
-      Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
-      Matcher matcher = pattern.matcher(contentDisposition);
-      if (matcher.find()) {
-        filename = sanitizeFilename(matcher.group(1));
-      }
+    /**
+     * Configure the CA certificate to be trusted when making https requests.
+     * Use null to reset to default.
+     *
+     * @param sslCaCert input stream for SSL CA cert
+     * @return ApiClient
+     */
+    public ApiClient setSslCaCert(InputStream sslCaCert) {
+        this.sslCaCert = sslCaCert;
+        applySslSettings();
+        return this;
     }
 
-    String prefix = null;
-    String suffix = null;
-    if (filename == null) {
-      prefix = "download-";
-      suffix = "";
-    } else {
-      int pos = filename.lastIndexOf(".");
-      if (pos == -1) {
-        prefix = filename + "-";
-      } else {
-        prefix = filename.substring(0, pos) + "-";
-        suffix = filename.substring(pos);
-      }
-      // File.createTempFile requires the prefix to be at least three characters long
-      if (prefix.length() < 3)
-        prefix = "download-";
+    public DateFormat getDateFormat() {
+        return dateFormat;
     }
 
-    if (tempFolderPath == null)
-      return File.createTempFile(prefix, suffix);
-    else
-      return File.createTempFile(prefix, suffix, new File(tempFolderPath));
-  }
-
-  /**
-   * @see #execute(Call, Type)
-   */
-  public <T> ApiResponse<T> execute(Call call) throws ApiException {
-    return execute(call, null);
-  }
-
-  /**
-   * Execute HTTP call and deserialize the HTTP response body into the given return type.
-   *
-   * @param returnType The return type used to deserialize HTTP response body
-   * @param <T> The return type corresponding to (same with) returnType
-   * @return <code>ApiResponse</code> object containing response status, headers and
-   *   data, which is a Java object deserialized from response body and would be null
-   *   when returnType is null.
-   * @throws ApiException If fail to execute the call
-   */
-  public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiException {
-    try {
-      Response response = call.execute();
-      T data = handleResponse(response, returnType);
-      return new ApiResponse<T>(response.code(), response.headers().toMultimap(), data);
-    } catch (IOException e) {
-      throw new ApiException(e);
+    public ApiClient setDateFormat(DateFormat dateFormat) {
+        this.dateFormat = dateFormat;
+        this.dateLength = this.dateFormat.format(new Date()).length();
+        return this;
     }
-  }
 
-  /**
-   * #see executeAsync(Call, Type, ApiCallback)
-   */
-  public <T> void executeAsync(Call call, ApiCallback<T> callback) {
-    executeAsync(call, null, callback);
-  }
+    public DateFormat getDatetimeFormat() {
+        return datetimeFormat;
+    }
 
-  /**
-   * Execute HTTP call asynchronously.
-   *
-   * @see #execute(Call, Type)
-   * @param The callback to be executed when the API call finishes
-   */
-  public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
-    call.enqueue(new Callback() {
-      @Override
-      public void onFailure(Request request, IOException e) {
-        callback.onFailure(new ApiException(e), 0, null);
-      }
+    public ApiClient setDatetimeFormat(DateFormat datetimeFormat) {
+        this.datetimeFormat = datetimeFormat;
+        return this;
+    }
 
-      @Override
-      public void onResponse(Response response) throws IOException {
-        T result;
+    /**
+     * Whether to allow various ISO 8601 datetime formats when parsing a datetime string.
+     * @see #parseDatetime(String)
+     * @return True if lenientDatetimeFormat flag is set to true
+     */
+    public boolean isLenientDatetimeFormat() {
+        return lenientDatetimeFormat;
+    }
+
+    public ApiClient setLenientDatetimeFormat(boolean lenientDatetimeFormat) {
+        this.lenientDatetimeFormat = lenientDatetimeFormat;
+        return this;
+    }
+
+    /**
+     * Parse the given date string into Date object.
+     * The default <code>dateFormat</code> supports these ISO 8601 date formats:
+     *   2015-08-16
+     *   2015-8-16
+     * @param str String to be parsed
+     * @return Date
+     */
+    public Date parseDate(String str) {
+        if (str == null)
+            return null;
         try {
-          result = (T) handleResponse(response, returnType);
-        } catch (ApiException e) {
-          callback.onFailure(e, response.code(), response.headers().toMultimap());
-          return;
+            return dateFormat.parse(str);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Parse the given datetime string into Date object.
+     * When lenientDatetimeFormat is enabled, the following ISO 8601 datetime formats are supported:
+     *   2015-08-16T08:20:05Z
+     *   2015-8-16T8:20:05Z
+     *   2015-08-16T08:20:05+00:00
+     *   2015-08-16T08:20:05+0000
+     *   2015-08-16T08:20:05.376Z
+     *   2015-08-16T08:20:05.376+00:00
+     *   2015-08-16T08:20:05.376+00
+     * Note: The 3-digit milli-seconds is optional. Time zone is required and can be in one of
+     *   these formats:
+     *   Z (same with +0000)
+     *   +08:00 (same with +0800)
+     *   -02 (same with -0200)
+     *   -0200
+     * @see <a href="https://en.wikipedia.org/wiki/ISO_8601">ISO 8601</a>
+     * @param str Date time string to be parsed
+     * @return Date representation of the string
+     */
+    public Date parseDatetime(String str) {
+        if (str == null)
+            return null;
+
+        DateFormat format;
+        if (lenientDatetimeFormat) {
+            /*
+             * When lenientDatetimeFormat is enabled, normalize the date string
+             * into <code>LENIENT_DATETIME_FORMAT</code> to support various formats
+             * defined by ISO 8601.
+             */
+            // normalize time zone
+            //   trailing "Z": 2015-08-16T08:20:05Z => 2015-08-16T08:20:05+0000
+            str = str.replaceAll("[zZ]\\z", "+0000");
+            //   remove colon in time zone: 2015-08-16T08:20:05+00:00 => 2015-08-16T08:20:05+0000
+            str = str.replaceAll("([+-]\\d{2}):(\\d{2})\\z", "$1$2");
+            //   expand time zone: 2015-08-16T08:20:05+00 => 2015-08-16T08:20:05+0000
+            str = str.replaceAll("([+-]\\d{2})\\z", "$100");
+            // add milliseconds when missing
+            //   2015-08-16T08:20:05+0000 => 2015-08-16T08:20:05.000+0000
+            str = str.replaceAll("(:\\d{1,2})([+-]\\d{4})\\z", "$1.000$2");
+            format = new SimpleDateFormat(LENIENT_DATETIME_FORMAT);
+        } else {
+            format = this.datetimeFormat;
         }
-        callback.onSuccess(result, response.code(), response.headers().toMultimap());
-      }
-    });
-  }
 
-  /**
-   * Handle the given response, return the deserialized object when the response is successful.
-   *
-   * @throws ApiException If the response has a unsuccessful status code or
-   *   fail to deserialize the response body
-   */
-  public <T> T handleResponse(Response response, Type returnType) throws ApiException {
-    if (response.isSuccessful()) {
-      if (returnType == null || response.code() == 204) {
-        // returning null if the returnType is not defined,
-        // or the status code is 204 (No Content)
-        return null;
-      } else {
-        return deserialize(response, returnType);
-      }
-    } else {
-      String respBody = null;
-      if (response.body() != null) {
         try {
-          respBody = response.body().string();
+            return format.parse(str);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /*
+     * Parse date or date time in string format into Date object.
+     *
+     * @param str Date time string to be parsed
+     * @return Date representation of the string
+     */
+    public Date parseDateOrDatetime(String str) {
+        if (str == null)
+            return null;
+        else if (str.length() <= dateLength)
+            return parseDate(str);
+        else
+            return parseDatetime(str);
+    }
+
+    /**
+     * Format the given Date object into string (Date format).
+     *
+     * @param date Date object
+     * @return Formatted date in string representation
+     */
+    public String formatDate(Date date) {
+        return dateFormat.format(date);
+    }
+
+    /**
+     * Format the given Date object into string (Datetime format).
+     *
+     * @param date Date object
+     * @return Formatted datetime in string representation
+     */
+    public String formatDatetime(Date date) {
+        return datetimeFormat.format(date);
+    }
+
+    /**
+     * Get authentications (key: authentication name, value: authentication).
+     *
+     * @return Map of authentication objects
+     */
+    public Map<String, Authentication> getAuthentications() {
+        return authentications;
+    }
+
+    /**
+     * Get authentication for the given name.
+     *
+     * @param authName The authentication name
+     * @return The authentication, null if not found
+     */
+    public Authentication getAuthentication(String authName) {
+        return authentications.get(authName);
+    }
+
+    /**
+     * Helper method to set username for the first HTTP basic authentication.
+     *
+     * @param username Username
+     */
+    public void setUsername(String username) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof HttpBasicAuth) {
+                ((HttpBasicAuth) auth).setUsername(username);
+                return;
+            }
+        }
+        throw new RuntimeException("No HTTP basic authentication configured!");
+    }
+
+    /**
+     * Helper method to set password for the first HTTP basic authentication.
+     *
+     * @param password Password
+     */
+    public void setPassword(String password) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof HttpBasicAuth) {
+                ((HttpBasicAuth) auth).setPassword(password);
+                return;
+            }
+        }
+        throw new RuntimeException("No HTTP basic authentication configured!");
+    }
+
+    /**
+     * Helper method to set API key value for the first API key authentication.
+     *
+     * @param apiKey API key
+     */
+    public void setApiKey(String apiKey) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof ApiKeyAuth) {
+                ((ApiKeyAuth) auth).setApiKey(apiKey);
+                return;
+            }
+        }
+        throw new RuntimeException("No API key authentication configured!");
+    }
+
+    /**
+     * Helper method to set API key prefix for the first API key authentication.
+     *
+     * @param apiKeyPrefix API key prefix
+     */
+    public void setApiKeyPrefix(String apiKeyPrefix) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof ApiKeyAuth) {
+                ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
+                return;
+            }
+        }
+        throw new RuntimeException("No API key authentication configured!");
+    }
+
+    /**
+     * Helper method to set access token for the first OAuth2 authentication.
+     *
+     * @param accessToken Access token
+     */
+    public void setAccessToken(String accessToken) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof OAuth) {
+                ((OAuth) auth).setAccessToken(accessToken);
+                return;
+            }
+        }
+        throw new RuntimeException("No OAuth2 authentication configured!");
+    }
+
+    /**
+     * Set the User-Agent header's value (by adding to the default header map).
+     *
+     * @param userAgent HTTP request's user agent
+     * @return ApiClient
+     */
+    public ApiClient setUserAgent(String userAgent) {
+        addDefaultHeader("User-Agent", userAgent);
+        return this;
+    }
+
+    /**
+     * Add a default header.
+     *
+     * @param key The header's key
+     * @param value The header's value
+     * @return ApiClient
+     */
+    public ApiClient addDefaultHeader(String key, String value) {
+        defaultHeaderMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * @see <a href="https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)">setLenient</a>
+     *
+     * @return True if lenientOnJson is enabled, false otherwise.
+     */
+    public boolean isLenientOnJson() {
+        return lenientOnJson;
+    }
+
+    /**
+     * Set LenientOnJson
+     *
+     * @param lenient True to enable lenientOnJson
+     * @return ApiClient
+     */
+    public ApiClient setLenientOnJson(boolean lenient) {
+        this.lenientOnJson = lenient;
+        return this;
+    }
+
+    /**
+     * Check that whether debugging is enabled for this API client.
+     *
+     * @return True if debugging is enabled, false otherwise.
+     */
+    public boolean isDebugging() {
+        return debugging;
+    }
+
+    /**
+     * Enable/disable debugging for this API client.
+     *
+     * @param debugging To enable (true) or disable (false) debugging
+     * @return ApiClient
+     */
+    public ApiClient setDebugging(boolean debugging) {
+        if (debugging != this.debugging) {
+            if (debugging) {
+                loggingInterceptor = new HttpLoggingInterceptor();
+                loggingInterceptor.setLevel(Level.BODY);
+                httpClient.interceptors().add(loggingInterceptor);
+            } else {
+                httpClient.interceptors().remove(loggingInterceptor);
+                loggingInterceptor = null;
+            }
+        }
+        this.debugging = debugging;
+        return this;
+    }
+
+    /**
+     * The path of temporary folder used to store downloaded files from endpoints
+     * with file response. The default value is <code>null</code>, i.e. using
+     * the system's default tempopary folder.
+     *
+     * @see <a href="https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile">createTempFile</a>
+     * @return Temporary folder path
+     */
+    public String getTempFolderPath() {
+        return tempFolderPath;
+    }
+
+    /**
+     * Set the tempoaray folder path (for downloading files)
+     *
+     * @param tempFolderPath Temporary folder path
+     * @return ApiClient
+     */
+    public ApiClient setTempFolderPath(String tempFolderPath) {
+        this.tempFolderPath = tempFolderPath;
+        return this;
+    }
+
+    /**
+     * Get connection timeout (in milliseconds).
+     *
+     * @return Timeout in milliseconds
+     */
+    public int getConnectTimeout() {
+        return httpClient.getConnectTimeout();
+    }
+
+    /**
+     * Sets the connect timeout (in milliseconds).
+     * A value of 0 means no timeout, otherwise values must be between 1 and
+     *
+     * @param connectionTimeout connection timeout in milliseconds
+     * @return Api client
+     */
+    public ApiClient setConnectTimeout(int connectionTimeout) {
+        httpClient.setConnectTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
+        return this;
+    }
+
+    /**
+     * Format the given parameter object into string.
+     *
+     * @param param Parameter
+     * @return String representation of the parameter
+     */
+    public String parameterToString(Object param) {
+        if (param == null) {
+            return "";
+        } else if (param instanceof Date) {
+            return formatDatetime((Date) param);
+        } else if (param instanceof Collection) {
+            StringBuilder b = new StringBuilder();
+            for (Object o : (Collection)param) {
+                if (b.length() > 0) {
+                    b.append(",");
+                }
+                b.append(String.valueOf(o));
+            }
+            return b.toString();
+        } else {
+            return String.valueOf(param);
+        }
+    }
+
+    /**
+     * Format to {@code Pair} objects.
+     *
+     * @param collectionFormat collection format (e.g. csv, tsv)
+     * @param name Name
+     * @param value Value
+     * @return A list of Pair objects
+     */
+    public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
+        List<Pair> params = new ArrayList<Pair>();
+
+        // preconditions
+        if (name == null || name.isEmpty() || value == null) return params;
+
+        Collection valueCollection = null;
+        if (value instanceof Collection) {
+            valueCollection = (Collection) value;
+        } else {
+            params.add(new Pair(name, parameterToString(value)));
+            return params;
+        }
+
+        if (valueCollection.isEmpty()){
+            return params;
+        }
+
+        // get the collection format
+        collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
+
+        // create the params based on the collection format
+        if (collectionFormat.equals("multi")) {
+            for (Object item : valueCollection) {
+                params.add(new Pair(name, parameterToString(item)));
+            }
+
+            return params;
+        }
+
+        String delimiter = ",";
+
+        if (collectionFormat.equals("csv")) {
+            delimiter = ",";
+        } else if (collectionFormat.equals("ssv")) {
+            delimiter = " ";
+        } else if (collectionFormat.equals("tsv")) {
+            delimiter = "\t";
+        } else if (collectionFormat.equals("pipes")) {
+            delimiter = "|";
+        }
+
+        StringBuilder sb = new StringBuilder() ;
+        for (Object item : valueCollection) {
+            sb.append(delimiter);
+            sb.append(parameterToString(item));
+        }
+
+        params.add(new Pair(name, sb.substring(1)));
+
+        return params;
+    }
+
+    /**
+     * Sanitize filename by removing path.
+     * e.g. ../../sun.gif becomes sun.gif
+     *
+     * @param filename The filename to be sanitized
+     * @return The sanitized filename
+     */
+    public String sanitizeFilename(String filename) {
+        return filename.replaceAll(".*[/\\\\]", "");
+    }
+
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *
+     * @param mime MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    public boolean isJsonMime(String mime) {
+        return mime != null && mime.matches("(?i)application\\/json(;.*)?");
+    }
+
+    /**
+     * Select the Accept header's value from the given accepts array:
+     *   if JSON exists in the given array, use it;
+     *   otherwise use all of them (joining into a string)
+     *
+     * @param accepts The accepts array to select from
+     * @return The Accept header to use. If the given array is empty,
+     *   null will be returned (not to set the Accept header explicitly).
+     */
+    public String selectHeaderAccept(String[] accepts) {
+        if (accepts.length == 0) {
+            return null;
+        }
+        for (String accept : accepts) {
+            if (isJsonMime(accept)) {
+                return accept;
+            }
+        }
+        return StringUtil.join(accepts, ",");
+    }
+
+    /**
+     * Select the Content-Type header's value from the given array:
+     *   if JSON exists in the given array, use it;
+     *   otherwise use the first one of the array.
+     *
+     * @param contentTypes The Content-Type array to select from
+     * @return The Content-Type header to use. If the given array is empty,
+     *   JSON will be used.
+     */
+    public String selectHeaderContentType(String[] contentTypes) {
+        if (contentTypes.length == 0) {
+            return "application/json";
+        }
+        for (String contentType : contentTypes) {
+            if (isJsonMime(contentType)) {
+                return contentType;
+            }
+        }
+        return contentTypes[0];
+    }
+
+    /**
+     * Escape the given string to be used as URL query value.
+     *
+     * @param str String to be escaped
+     * @return Escaped string
+     */
+    public String escapeString(String str) {
+        try {
+            return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
+        } catch (UnsupportedEncodingException e) {
+            return str;
+        }
+    }
+
+    /**
+     * Deserialize response body to Java object, according to the return type and
+     * the Content-Type response header.
+     *
+     * @param <T> Type
+     * @param response HTTP response
+     * @param returnType The type of the Java object
+     * @return The deserialized Java object
+     * @throws ApiException If fail to deserialize response body, i.e. cannot read response body
+     *   or the Content-Type of the response is not supported.
+     */
+    public <T> T deserialize(Response response, Type returnType) throws ApiException {
+        if (response == null || returnType == null) {
+            return null;
+        }
+
+        if ("byte[]".equals(returnType.toString())) {
+            // Handle binary response (byte array).
+            try {
+                return (T) response.body().bytes();
+            } catch (IOException e) {
+                throw new ApiException(e);
+            }
+        } else if (returnType.equals(File.class)) {
+            // Handle file downloading.
+            return (T) downloadFileFromResponse(response);
+        }
+
+        String respBody;
+        try {
+            if (response.body() != null)
+                respBody = response.body().string();
+            else
+                respBody = null;
         } catch (IOException e) {
-          throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+            throw new ApiException(e);
         }
-      }
-      throw new ApiException(response.message(), response.code(), response.headers().toMultimap(), respBody);
-    }
-  }
 
-  /**
-   * Build HTTP call with the given options.
-   *
-   * @param path The sub-path of the HTTP URL
-   * @param method The request method, one of "GET", "HEAD", "OPTIONS", "POST", "PUT", "PATCH" and "DELETE"
-   * @param queryParams The query parameters
-   * @param body The request body object
-   * @param headerParams The header parameters
-   * @param formParams The form parameters
-   * @param authNames The authentications to apply
-   * @return The HTTP call
-   * @throws ApiException If fail to serialize the request body object
-   */
-  public Call buildCall(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames, ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    updateParamsForAuth(authNames, queryParams, headerParams);
-
-    final String url = buildUrl(path, queryParams);
-    final Request.Builder reqBuilder = new Request.Builder().url(url);
-    processHeaderParams(headerParams, reqBuilder);
-
-    String contentType = (String) headerParams.get("Content-Type");
-    // ensuring a default content type
-    if (contentType == null) {
-      contentType = "application/json";
-    }
-
-    RequestBody reqBody;
-    if (!HttpMethod.permitsRequestBody(method)) {
-      reqBody = null;
-    } else if ("application/x-www-form-urlencoded".equals(contentType)) {
-      reqBody = buildRequestBodyFormEncoding(formParams);
-    } else if ("multipart/form-data".equals(contentType)) {
-      reqBody = buildRequestBodyMultipart(formParams);
-    } else if (body == null) {
-      if ("DELETE".equals(method)) {
-        // allow calling DELETE without sending a request body
-        reqBody = null;
-      } else {
-        // use an empty request body (for POST, PUT and PATCH)
-        reqBody = RequestBody.create(MediaType.parse(contentType), "");
-      }
-    } else {
-      reqBody = serialize(body, contentType);
-    }
-
-    Request request = null;
-
-    if(progressRequestListener != null && reqBody != null) {
-      ProgressRequestBody progressRequestBody = new ProgressRequestBody(reqBody, progressRequestListener);
-      request = reqBuilder.method(method, progressRequestBody).build();
-    } else {
-      request = reqBuilder.method(method, reqBody).build();
-    }
-
-    return httpClient.newCall(request);
-  }
-
-  /**
-   * Build full URL by concatenating base path, the given sub path and query parameters.
-   *
-   * @param path The sub path
-   * @param queryParams The query parameters
-   * @return The full URL
-   */
-  public String buildUrl(String path, List<Pair> queryParams) {
-    final StringBuilder url = new StringBuilder();
-    url.append(basePath).append(path);
-
-    if (queryParams != null && !queryParams.isEmpty()) {
-      // support (constant) query string in `path`, e.g. "/posts?draft=1"
-      String prefix = path.contains("?") ? "&" : "?";
-      for (Pair param : queryParams) {
-        if (param.getValue() != null) {
-          if (prefix != null) {
-            url.append(prefix);
-            prefix = null;
-          } else {
-            url.append("&");
-          }
-          String value = parameterToString(param.getValue());
-          url.append(escapeString(param.getName())).append("=").append(escapeString(value));
+        if (respBody == null || "".equals(respBody)) {
+            return null;
         }
-      }
-    }
 
-    return url.toString();
-  }
-
-  /**
-   * Set header parameters to the request builder, including default headers.
-   */
-  public void processHeaderParams(Map<String, String> headerParams, Request.Builder reqBuilder) {
-    for (Entry<String, String> param : headerParams.entrySet()) {
-      reqBuilder.header(param.getKey(), parameterToString(param.getValue()));
-    }
-    for (Entry<String, String> header : defaultHeaderMap.entrySet()) {
-      if (!headerParams.containsKey(header.getKey())) {
-        reqBuilder.header(header.getKey(), parameterToString(header.getValue()));
-      }
-    }
-  }
-
-  /**
-   * Update query and header parameters based on authentication settings.
-   *
-   * @param authNames The authentications to apply
-   */
-  public void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
-    for (String authName : authNames) {
-      Authentication auth = authentications.get(authName);
-      if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
-      auth.applyToParams(queryParams, headerParams);
-    }
-  }
-
-  /**
-   * Build a form-encoding request body with the given form parameters.
-   */
-  public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
-    FormEncodingBuilder formBuilder  = new FormEncodingBuilder();
-    for (Entry<String, Object> param : formParams.entrySet()) {
-      formBuilder.add(param.getKey(), parameterToString(param.getValue()));
-    }
-    return formBuilder.build();
-  }
-
-  /**
-   * Build a multipart (file uploading) request body with the given form parameters,
-   * which could contain text fields and file fields.
-   */
-  public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
-    MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
-    for (Entry<String, Object> param : formParams.entrySet()) {
-      if (param.getValue() instanceof File) {
-        File file = (File) param.getValue();
-        Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"; filename=\"" + file.getName() + "\"");
-        MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
-        mpBuilder.addPart(partHeaders, RequestBody.create(mediaType, file));
-      } else {
-        Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
-        mpBuilder.addPart(partHeaders, RequestBody.create(null, parameterToString(param.getValue())));
-      }
-    }
-    return mpBuilder.build();
-  }
-
-  /**
-   * Guess Content-Type header from the given file (defaults to "application/octet-stream").
-   *
-   * @param file The given file
-   * @return The Content-Type guessed
-   */
-  public String guessContentTypeFromFile(File file) {
-    String contentType = URLConnection.guessContentTypeFromName(file.getName());
-    if (contentType == null) {
-      return "application/octet-stream";
-    } else {
-      return contentType;
-    }
-  }
-
-  /**
-   * Initialize datetime format according to the current environment, e.g. Java 1.7 and Android.
-   */
-  private void initDatetimeFormat() {
-    String formatWithTimeZone = null;
-    if (IS_ANDROID) {
-      if (ANDROID_SDK_VERSION >= 18) {
-        // The time zone format "ZZZZZ" is available since Android 4.3 (SDK version 18)
-        formatWithTimeZone = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ";
-      }
-    } else if (JAVA_VERSION >= 1.7) {
-      // The time zone format "XXX" is available since Java 1.7
-      formatWithTimeZone = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
-    }
-    if (formatWithTimeZone != null) {
-      this.datetimeFormat = new SimpleDateFormat(formatWithTimeZone);
-      // NOTE: Use the system's default time zone (mainly for datetime formatting).
-    } else {
-      // Use a common format that works across all systems.
-      this.datetimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-      // Always use the UTC time zone as we are using a constant trailing "Z" here.
-      this.datetimeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-    }
-  }
-
-  /**
-   * Apply SSL related settings to httpClient according to the current values of
-   * verifyingSsl and sslCaCert.
-   */
-  private void applySslSettings() {
-    try {
-      KeyManager[] keyManagers = null;
-      TrustManager[] trustManagers = null;
-      HostnameVerifier hostnameVerifier = null;
-      if (!verifyingSsl) {
-        TrustManager trustAll = new X509TrustManager() {
-          @Override
-          public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
-          @Override
-          public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
-          @Override
-          public X509Certificate[] getAcceptedIssuers() { return null; }
-        };
-        SSLContext sslContext = SSLContext.getInstance("TLS");
-        trustManagers = new TrustManager[]{ trustAll };
-        hostnameVerifier = new HostnameVerifier() {
-          @Override
-          public boolean verify(String hostname, SSLSession session) { return true; }
-        };
-      } else if (sslCaCert != null) {
-        char[] password = null; // Any password will work.
-        CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
-        Collection<? extends Certificate> certificates = certificateFactory.generateCertificates(sslCaCert);
-        if (certificates.isEmpty()) {
-          throw new IllegalArgumentException("expected non-empty set of trusted certificates");
+        String contentType = response.headers().get("Content-Type");
+        if (contentType == null) {
+            // ensuring a default content type
+            contentType = "application/json";
         }
-        KeyStore caKeyStore = newEmptyKeyStore(password);
-        int index = 0;
-        for (Certificate certificate : certificates) {
-          String certificateAlias = "ca" + Integer.toString(index++);
-          caKeyStore.setCertificateEntry(certificateAlias, certificate);
+        if (isJsonMime(contentType)) {
+            return json.deserialize(respBody, returnType);
+        } else if (returnType.equals(String.class)) {
+            // Expecting string, return the raw response body.
+            return (T) respBody;
+        } else {
+            throw new ApiException(
+                    "Content type \"" + contentType + "\" is not supported for type: " + returnType,
+                    response.code(),
+                    response.headers().toMultimap(),
+                    respBody);
         }
-        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        trustManagerFactory.init(caKeyStore);
-        trustManagers = trustManagerFactory.getTrustManagers();
-      }
-
-      if (keyManagers != null || trustManagers != null) {
-        SSLContext sslContext = SSLContext.getInstance("TLS");
-        sslContext.init(keyManagers, trustManagers, new SecureRandom());
-        httpClient.setSslSocketFactory(sslContext.getSocketFactory());
-      } else {
-        httpClient.setSslSocketFactory(null);
-      }
-      httpClient.setHostnameVerifier(hostnameVerifier);
-    } catch (GeneralSecurityException e) {
-      throw new RuntimeException(e);
     }
-  }
 
-  private KeyStore newEmptyKeyStore(char[] password) throws GeneralSecurityException {
-    try {
-      KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-      keyStore.load(null, password);
-      return keyStore;
-    } catch (IOException e) {
-      throw new AssertionError(e);
+    /**
+     * Serialize the given Java object into request body according to the object's
+     * class and the request Content-Type.
+     *
+     * @param obj The Java object
+     * @param contentType The request Content-Type
+     * @return The serialized request body
+     * @throws ApiException If fail to serialize the given object
+     */
+    public RequestBody serialize(Object obj, String contentType) throws ApiException {
+        if (obj instanceof byte[]) {
+            // Binary (byte array) body parameter support.
+            return RequestBody.create(MediaType.parse(contentType), (byte[]) obj);
+        } else if (obj instanceof File) {
+            // File body parameter support.
+            return RequestBody.create(MediaType.parse(contentType), (File) obj);
+        } else if (isJsonMime(contentType)) {
+            String content;
+            if (obj != null) {
+                content = json.serialize(obj);
+            } else {
+                content = null;
+            }
+            return RequestBody.create(MediaType.parse(contentType), content);
+        } else {
+            throw new ApiException("Content type \"" + contentType + "\" is not supported");
+        }
+    }
+
+    /**
+     * Download file from the given response.
+     *
+     * @param response An instance of the Response object
+     * @throws ApiException If fail to read file content from response and write to disk
+     * @return Downloaded file
+     */
+    public File downloadFileFromResponse(Response response) throws ApiException {
+        try {
+            File file = prepareDownloadFile(response);
+            BufferedSink sink = Okio.buffer(Okio.sink(file));
+            sink.writeAll(response.body().source());
+            sink.close();
+            return file;
+        } catch (IOException e) {
+            throw new ApiException(e);
+        }
+    }
+
+    /**
+     * Prepare file for download
+     *
+     * @param response An instance of the Response object
+     * @throws IOException If fail to prepare file for download
+     * @return Prepared file for the download
+     */
+    public File prepareDownloadFile(Response response) throws IOException {
+        String filename = null;
+        String contentDisposition = response.header("Content-Disposition");
+        if (contentDisposition != null && !"".equals(contentDisposition)) {
+            // Get filename from the Content-Disposition header.
+            Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
+            Matcher matcher = pattern.matcher(contentDisposition);
+            if (matcher.find()) {
+                filename = sanitizeFilename(matcher.group(1));
+            }
+        }
+
+        String prefix = null;
+        String suffix = null;
+        if (filename == null) {
+            prefix = "download-";
+            suffix = "";
+        } else {
+            int pos = filename.lastIndexOf(".");
+            if (pos == -1) {
+                prefix = filename + "-";
+            } else {
+                prefix = filename.substring(0, pos) + "-";
+                suffix = filename.substring(pos);
+            }
+            // File.createTempFile requires the prefix to be at least three characters long
+            if (prefix.length() < 3)
+                prefix = "download-";
+        }
+
+        if (tempFolderPath == null)
+            return File.createTempFile(prefix, suffix);
+        else
+            return File.createTempFile(prefix, suffix, new File(tempFolderPath));
+    }
+
+    /**
+     * {@link #execute(Call, Type)}
+     *
+     * @param <T> Type
+     * @param call An instance of the Call object
+     * @throws ApiException If fail to execute the call
+     * @return ApiResponse&lt;T&gt;
+     */
+    public <T> ApiResponse<T> execute(Call call) throws ApiException {
+        return execute(call, null);
+    }
+
+    /**
+     * Execute HTTP call and deserialize the HTTP response body into the given return type.
+     *
+     * @param returnType The return type used to deserialize HTTP response body
+     * @param <T> The return type corresponding to (same with) returnType
+     * @param call Call
+     * @return ApiResponse object containing response status, headers and
+     *   data, which is a Java object deserialized from response body and would be null
+     *   when returnType is null.
+     * @throws ApiException If fail to execute the call
+     */
+    public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiException {
+        try {
+            Response response = call.execute();
+            T data = handleResponse(response, returnType);
+            return new ApiResponse<T>(response.code(), response.headers().toMultimap(), data);
+        } catch (IOException e) {
+            throw new ApiException(e);
+        }
+    }
+
+    /**
+     * {@link #executeAsync(Call, Type, ApiCallback)}
+     *
+     * @param <T> Type
+     * @param call An instance of the Call object
+     * @param callback ApiCallback&lt;T&gt;
+     */
+    public <T> void executeAsync(Call call, ApiCallback<T> callback) {
+        executeAsync(call, null, callback);
+    }
+
+    /**
+     * Execute HTTP call asynchronously.
+     *
+     * @see #execute(Call, Type)
+     * @param <T> Type
+     * @param call The callback to be executed when the API call finishes
+     * @param returnType Return type
+     * @param callback ApiCallback
+     */
+    public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
+        call.enqueue(new Callback() {
+            @Override
+            public void onFailure(Request request, IOException e) {
+                callback.onFailure(new ApiException(e), 0, null);
+            }
+
+            @Override
+            public void onResponse(Response response) throws IOException {
+                T result;
+                try {
+                    result = (T) handleResponse(response, returnType);
+                } catch (ApiException e) {
+                    callback.onFailure(e, response.code(), response.headers().toMultimap());
+                    return;
+                }
+                callback.onSuccess(result, response.code(), response.headers().toMultimap());
+            }
+        });
+    }
+
+    /**
+     * Handle the given response, return the deserialized object when the response is successful.
+     *
+     * @param <T> Type
+     * @param response Response
+     * @param returnType Return type
+     * @throws ApiException If the response has a unsuccessful status code or
+     *   fail to deserialize the response body
+     * @return Type
+     */
+    public <T> T handleResponse(Response response, Type returnType) throws ApiException {
+        if (response.isSuccessful()) {
+            if (returnType == null || response.code() == 204) {
+                // returning null if the returnType is not defined,
+                // or the status code is 204 (No Content)
+                return null;
+            } else {
+                return deserialize(response, returnType);
+            }
+        } else {
+            String respBody = null;
+            if (response.body() != null) {
+                try {
+                    respBody = response.body().string();
+                } catch (IOException e) {
+                    throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
+                }
+            }
+            throw new ApiException(response.message(), response.code(), response.headers().toMultimap(), respBody);
+        }
+    }
+
+    /**
+     * Build HTTP call with the given options.
+     *
+     * @param path The sub-path of the HTTP URL
+     * @param method The request method, one of "GET", "HEAD", "OPTIONS", "POST", "PUT", "PATCH" and "DELETE"
+     * @param queryParams The query parameters
+     * @param body The request body object
+     * @param headerParams The header parameters
+     * @param formParams The form parameters
+     * @param authNames The authentications to apply
+     * @param progressRequestListener Progress request listener
+     * @return The HTTP call
+     * @throws ApiException If fail to serialize the request body object
+     */
+    public Call buildCall(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames, ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        updateParamsForAuth(authNames, queryParams, headerParams);
+
+        final String url = buildUrl(path, queryParams);
+        final Request.Builder reqBuilder = new Request.Builder().url(url);
+        processHeaderParams(headerParams, reqBuilder);
+
+        String contentType = (String) headerParams.get("Content-Type");
+        // ensuring a default content type
+        if (contentType == null) {
+            contentType = "application/json";
+        }
+
+        RequestBody reqBody;
+        if (!HttpMethod.permitsRequestBody(method)) {
+            reqBody = null;
+        } else if ("application/x-www-form-urlencoded".equals(contentType)) {
+            reqBody = buildRequestBodyFormEncoding(formParams);
+        } else if ("multipart/form-data".equals(contentType)) {
+            reqBody = buildRequestBodyMultipart(formParams);
+        } else if (body == null) {
+            if ("DELETE".equals(method)) {
+                // allow calling DELETE without sending a request body
+                reqBody = null;
+            } else {
+                // use an empty request body (for POST, PUT and PATCH)
+                reqBody = RequestBody.create(MediaType.parse(contentType), "");
+            }
+        } else {
+            reqBody = serialize(body, contentType);
+        }
+
+        Request request = null;
+
+        if(progressRequestListener != null && reqBody != null) {
+            ProgressRequestBody progressRequestBody = new ProgressRequestBody(reqBody, progressRequestListener);
+            request = reqBuilder.method(method, progressRequestBody).build();
+        } else {
+            request = reqBuilder.method(method, reqBody).build();
+        }
+
+        return httpClient.newCall(request);
+    }
+
+    /**
+     * Build full URL by concatenating base path, the given sub path and query parameters.
+     *
+     * @param path The sub path
+     * @param queryParams The query parameters
+     * @return The full URL
+     */
+    public String buildUrl(String path, List<Pair> queryParams) {
+        final StringBuilder url = new StringBuilder();
+        url.append(basePath).append(path);
+
+        if (queryParams != null && !queryParams.isEmpty()) {
+            // support (constant) query string in `path`, e.g. "/posts?draft=1"
+            String prefix = path.contains("?") ? "&" : "?";
+            for (Pair param : queryParams) {
+                if (param.getValue() != null) {
+                    if (prefix != null) {
+                        url.append(prefix);
+                        prefix = null;
+                    } else {
+                        url.append("&");
+                    }
+                    String value = parameterToString(param.getValue());
+                    url.append(escapeString(param.getName())).append("=").append(escapeString(value));
+                }
+            }
+        }
+
+        return url.toString();
+    }
+
+    /**
+     * Set header parameters to the request builder, including default headers.
+     *
+     * @param headerParams Header parameters in the ofrm of Map
+     * @param reqBuilder Reqeust.Builder
+     */
+    public void processHeaderParams(Map<String, String> headerParams, Request.Builder reqBuilder) {
+        for (Entry<String, String> param : headerParams.entrySet()) {
+            reqBuilder.header(param.getKey(), parameterToString(param.getValue()));
+        }
+        for (Entry<String, String> header : defaultHeaderMap.entrySet()) {
+            if (!headerParams.containsKey(header.getKey())) {
+                reqBuilder.header(header.getKey(), parameterToString(header.getValue()));
+            }
+        }
+    }
+
+    /**
+     * Update query and header parameters based on authentication settings.
+     *
+     * @param authNames The authentications to apply
+     * @param queryParams  List of query parameters
+     * @param headerParams  Map of header parameters
+     */
+    public void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams) {
+        for (String authName : authNames) {
+            Authentication auth = authentications.get(authName);
+            if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);
+            auth.applyToParams(queryParams, headerParams);
+        }
+    }
+
+    /**
+     * Build a form-encoding request body with the given form parameters.
+     *
+     * @param formParams Form parameters in the form of Map
+     * @return RequestBody
+     */
+    public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
+        FormEncodingBuilder formBuilder  = new FormEncodingBuilder();
+        for (Entry<String, Object> param : formParams.entrySet()) {
+            formBuilder.add(param.getKey(), parameterToString(param.getValue()));
+        }
+        return formBuilder.build();
+    }
+
+    /**
+     * Build a multipart (file uploading) request body with the given form parameters,
+     * which could contain text fields and file fields.
+     *
+     * @param formParams Form parameters in the form of Map
+     * @return RequestBody
+     */
+    public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
+        MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
+        for (Entry<String, Object> param : formParams.entrySet()) {
+            if (param.getValue() instanceof File) {
+                File file = (File) param.getValue();
+                Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"; filename=\"" + file.getName() + "\"");
+                MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
+                mpBuilder.addPart(partHeaders, RequestBody.create(mediaType, file));
+            } else {
+                Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
+                mpBuilder.addPart(partHeaders, RequestBody.create(null, parameterToString(param.getValue())));
+            }
+        }
+        return mpBuilder.build();
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    public String guessContentTypeFromFile(File file) {
+        String contentType = URLConnection.guessContentTypeFromName(file.getName());
+        if (contentType == null) {
+            return "application/octet-stream";
+        } else {
+            return contentType;
+        }
+    }
+
+    /**
+     * Initialize datetime format according to the current environment, e.g. Java 1.7 and Android.
+     */
+    private void initDatetimeFormat() {
+        String formatWithTimeZone = null;
+        if (IS_ANDROID) {
+            if (ANDROID_SDK_VERSION >= 18) {
+                // The time zone format "ZZZZZ" is available since Android 4.3 (SDK version 18)
+                formatWithTimeZone = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ";
+            }
+        } else if (JAVA_VERSION >= 1.7) {
+            // The time zone format "XXX" is available since Java 1.7
+            formatWithTimeZone = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
+        }
+        if (formatWithTimeZone != null) {
+            this.datetimeFormat = new SimpleDateFormat(formatWithTimeZone);
+            // NOTE: Use the system's default time zone (mainly for datetime formatting).
+        } else {
+            // Use a common format that works across all systems.
+            this.datetimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+            // Always use the UTC time zone as we are using a constant trailing "Z" here.
+            this.datetimeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        }
+    }
+
+    /**
+     * Apply SSL related settings to httpClient according to the current values of
+     * verifyingSsl and sslCaCert.
+     */
+    private void applySslSettings() {
+        try {
+            KeyManager[] keyManagers = null;
+            TrustManager[] trustManagers = null;
+            HostnameVerifier hostnameVerifier = null;
+            if (!verifyingSsl) {
+                TrustManager trustAll = new X509TrustManager() {
+                    @Override
+                    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
+                    @Override
+                    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
+                    @Override
+                    public X509Certificate[] getAcceptedIssuers() { return null; }
+                };
+                SSLContext sslContext = SSLContext.getInstance("TLS");
+                trustManagers = new TrustManager[]{ trustAll };
+                hostnameVerifier = new HostnameVerifier() {
+                    @Override
+                    public boolean verify(String hostname, SSLSession session) { return true; }
+                };
+            } else if (sslCaCert != null) {
+                char[] password = null; // Any password will work.
+                CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
+                Collection<? extends Certificate> certificates = certificateFactory.generateCertificates(sslCaCert);
+                if (certificates.isEmpty()) {
+                    throw new IllegalArgumentException("expected non-empty set of trusted certificates");
+                }
+                KeyStore caKeyStore = newEmptyKeyStore(password);
+                int index = 0;
+                for (Certificate certificate : certificates) {
+                    String certificateAlias = "ca" + Integer.toString(index++);
+                    caKeyStore.setCertificateEntry(certificateAlias, certificate);
+                }
+                TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+                trustManagerFactory.init(caKeyStore);
+                trustManagers = trustManagerFactory.getTrustManagers();
+            }
+
+            if (keyManagers != null || trustManagers != null) {
+                SSLContext sslContext = SSLContext.getInstance("TLS");
+                sslContext.init(keyManagers, trustManagers, new SecureRandom());
+                httpClient.setSslSocketFactory(sslContext.getSocketFactory());
+            } else {
+                httpClient.setSslSocketFactory(null);
+            }
+            httpClient.setHostnameVerifier(hostnameVerifier);
+        } catch (GeneralSecurityException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private KeyStore newEmptyKeyStore(char[] password) throws GeneralSecurityException {
+        try {
+            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            keyStore.load(null, password);
+            return keyStore;
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
     }
-  }
 }
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 73836815f565..325f124c2d57 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,67 +3,76 @@ package io.swagger.client;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:49.229+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T00:01:22.559+08:00")
 public class ApiException extends Exception {
-  private int code = 0;
-  private Map<String, List<String>> responseHeaders = null;
-  private String responseBody = null;
+    private int code = 0;
+    private Map<String, List<String>> responseHeaders = null;
+    private String responseBody = null;
 
-  public ApiException() {}
+    public ApiException() {}
 
-  public ApiException(Throwable throwable) {
-    super(throwable);
-  }
+    public ApiException(Throwable throwable) {
+        super(throwable);
+    }
 
-  public ApiException(String message) {
-    super(message);
-  }
+    public ApiException(String message) {
+        super(message);
+    }
 
-  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    super(message, throwable);
-    this.code = code;
-    this.responseHeaders = responseHeaders;
-    this.responseBody = responseBody;
-  }
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        super(message, throwable);
+        this.code = code;
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
 
-  public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    this(message, (Throwable) null, code, responseHeaders, responseBody);
-  }
+    public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(message, (Throwable) null, code, responseHeaders, responseBody);
+    }
 
-  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
-    this(message, throwable, code, responseHeaders, null);
-  }
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
+        this(message, throwable, code, responseHeaders, null);
+    }
 
-  public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    this((String) null, (Throwable) null, code, responseHeaders, responseBody);
-  }
+    public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+    }
 
-  public ApiException(int code, String message) {
-    super(message);
-    this.code = code;
-  }
+    public ApiException(int code, String message) {
+        super(message);
+        this.code = code;
+    }
 
-  public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
-    this(code, message);
-    this.responseHeaders = responseHeaders;
-    this.responseBody = responseBody;
-  }
+    public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(code, message);
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
 
-  public int getCode() {
-    return code;
-  }
+    /**
+     * Get the HTTP status code.
+     *
+     * @return HTTP status code
+     */
+    public int getCode() {
+        return code;
+    }
 
-  /**
-   * Get the HTTP response headers.
-   */
-  public Map<String, List<String>> getResponseHeaders() {
-    return responseHeaders;
-  }
+    /**
+     * Get the HTTP response headers.
+     *
+     * @return A map of list of string
+     */
+    public Map<String, List<String>> getResponseHeaders() {
+        return responseHeaders;
+    }
 
-  /**
-   * Get the HTTP response body.
-   */
-  public String getResponseBody() {
-    return responseBody;
-  }
+    /**
+     * Get the HTTP response body.
+     *
+     * @return Response body in the form of string
+     */
+    public String getResponseBody() {
+        return responseBody;
+    }
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java
index 0a33f09e64e4..b611649f4942 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java
@@ -9,38 +9,38 @@ import java.util.Map;
  * @param T The type of data that is deserialized from response body
  */
 public class ApiResponse<T> {
-  final private int statusCode;
-  final private Map<String, List<String>> headers;
-  final private T data;
+    final private int statusCode;
+    final private Map<String, List<String>> headers;
+    final private T data;
 
-  /**
-   * @param statusCode The status code of HTTP response
-   * @param headers The headers of HTTP response
-   */
-  public ApiResponse(int statusCode, Map<String, List<String>> headers) {
-    this(statusCode, headers, null);
-  }
+    /**
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers) {
+        this(statusCode, headers, null);
+    }
 
-  /**
-   * @param statusCode The status code of HTTP response
-   * @param headers The headers of HTTP response
-   * @param data The object deserialized from response bod
-   */
-  public ApiResponse(int statusCode, Map<String, List<String>> headers, T data) {
-    this.statusCode = statusCode;
-    this.headers = headers;
-    this.data = data;
-  }
+    /**
+     * @param statusCode The status code of HTTP response
+     * @param headers The headers of HTTP response
+     * @param data The object deserialized from response bod
+     */
+    public ApiResponse(int statusCode, Map<String, List<String>> headers, T data) {
+        this.statusCode = statusCode;
+        this.headers = headers;
+        this.data = data;
+    }
 
-  public int getStatusCode() {
-    return statusCode;
-  }
+    public int getStatusCode() {
+        return statusCode;
+    }
 
-  public Map<String, List<String>> getHeaders() {
-    return headers;
-  }
+    public Map<String, List<String>> getHeaders() {
+        return headers;
+    }
 
-  public T getData() {
-    return data;
-  }
+    public T getData() {
+        return data;
+    }
 }
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 db5ca8245e1a..0131c5123a52 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,22 +1,26 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:49.229+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T00:01:22.559+08:00")
 public class Configuration {
-  private static ApiClient defaultApiClient = new ApiClient();
+    private static ApiClient defaultApiClient = new ApiClient();
 
-  /**
-   * Get the default API client, which would be used when creating API
-   * instances without providing an API client.
-   */
-  public static ApiClient getDefaultApiClient() {
-    return defaultApiClient;
-   }
+    /**
+     * Get the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @return Default API client
+     */
+    public static ApiClient getDefaultApiClient() {
+        return defaultApiClient;
+    }
 
-  /**
-   * Set the default API client, which would be used when creating API
-   * instances without providing an API client.
-   */
-  public static void setDefaultApiClient(ApiClient apiClient) {
-    defaultApiClient = apiClient;
-  }
+    /**
+     * Set the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @param apiClient API client
+     */
+    public static void setDefaultApiClient(ApiClient apiClient) {
+        defaultApiClient = apiClient;
+    }
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
index d9d0881a153e..61120482629e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
@@ -17,69 +17,101 @@ import java.lang.reflect.Type;
 import java.util.Date;
 
 public class JSON {
-  private ApiClient apiClient;
-  private Gson gson;
+    private ApiClient apiClient;
+    private Gson gson;
 
-  public JSON(ApiClient apiClient) {
-    this.apiClient = apiClient;
-    gson = new GsonBuilder()
-      .registerTypeAdapter(Date.class, new DateAdapter(apiClient))
-      .create();
-  }
-
-  public Gson getGson() {
-    return gson;
-  }
-
-  public void setGson(Gson gson) {
-    this.gson = gson;
-  }
-
-  /**
-   * Serialize the given Java object into JSON string.
-   */
-  public String serialize(Object obj) {
-    return gson.toJson(obj);
-  }
-
-  /**
-   * Deserialize the given JSON string to Java object.
-   *
-   * @param body The JSON string
-   * @param returnType The type to deserialize inot
-   * @return The deserialized Java object
-   */
-  public <T> T deserialize(String body, Type returnType) {
-    try {
-      if (apiClient.isLenientOnJson()) {
-        JsonReader jsonReader = new JsonReader(new StringReader(body));
-        // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
-        jsonReader.setLenient(true);
-        return gson.fromJson(jsonReader, returnType);
-      } else {
-        return gson.fromJson(body, returnType);
-      }
-    } catch (JsonParseException e) {
-      // Fallback processing when failed to parse JSON form response body:
-      //   return the response body string directly for the String return type;
-      //   parse response body into date or datetime for the Date return type.
-      if (returnType.equals(String.class))
-        return (T) body;
-      else if (returnType.equals(Date.class))
-        return (T) apiClient.parseDateOrDatetime(body);
-      else throw(e);
+    /**
+     * JSON constructor.
+     *
+     * @param apiClient An instance of ApiClient
+     */
+    public JSON(ApiClient apiClient) {
+        this.apiClient = apiClient;
+        gson = new GsonBuilder()
+            .registerTypeAdapter(Date.class, new DateAdapter(apiClient))
+            .create();
+    }
+
+    /**
+     * Get Gson.
+     *
+     * @return Gson
+     */
+    public Gson getGson() {
+        return gson;
+    }
+
+    /**
+     * Set Gson.
+     *
+     * @param gson Gson
+     */
+    public void setGson(Gson gson) {
+        this.gson = gson;
+    }
+
+    /**
+     * Serialize the given Java object into JSON string.
+     *
+     * @param obj Object
+     * @return String representation of the JSON
+     */
+    public String serialize(Object obj) {
+        return gson.toJson(obj);
+    }
+
+    /**
+     * Deserialize the given JSON string to Java object.
+     *
+     * @param <T> Type
+     * @param body The JSON string
+     * @param returnType The type to deserialize inot
+     * @return The deserialized Java object
+     */
+    public <T> T deserialize(String body, Type returnType) {
+        try {
+            if (apiClient.isLenientOnJson()) {
+                JsonReader jsonReader = new JsonReader(new StringReader(body));
+                // see https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html#setLenient(boolean)
+                jsonReader.setLenient(true);
+                return gson.fromJson(jsonReader, returnType);
+            } else {
+                return gson.fromJson(body, returnType);
+            }
+        } catch (JsonParseException e) {
+            // Fallback processing when failed to parse JSON form response body:
+            //   return the response body string directly for the String return type;
+            //   parse response body into date or datetime for the Date return type.
+            if (returnType.equals(String.class))
+                return (T) body;
+            else if (returnType.equals(Date.class))
+                return (T) apiClient.parseDateOrDatetime(body);
+            else throw(e);
+        }
     }
-  }
 }
 
 class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
     private final ApiClient apiClient;
 
+    /**
+     * Constructor for DateAdapter
+     *
+     * @param apiClient Api client
+     */
     public DateAdapter(ApiClient apiClient) {
         super();
         this.apiClient = apiClient;
     }
 
+    /**
+     * Serialize
+     *
+     * @param src Date
+     * @param typeOfSrc Type
+     * @param context Json Serialization Context
+     * @return Json Element
+     */
     @Override
     public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
         if (src == null) {
@@ -89,6 +121,16 @@ class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
         }
     }
 
+    /**
+     * Deserialize
+     *
+     * @param json Json element
+     * @param date Type
+     * @param typeOfSrc Type
+     * @param context Json Serialization Context
+     * @return Date
+     * @throw JsonParseException if fail to parse
+     */
     @Override
     public Date deserialize(JsonElement json, Type date, JsonDeserializationContext context) throws JsonParseException {
         String str = json.getAsJsonPrimitive().getAsString();
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 e49c7eb91463..886d6130e965 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-06-03T00:41:49.229+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T00:01:22.559+08:00")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java
index 71f34ed11408..d20991c67800 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java
@@ -18,9 +18,9 @@ public class ProgressRequestBody extends RequestBody {
     }
 
     private final RequestBody requestBody;
- 
+
     private final ProgressRequestListener progressListener;
-  
+
     private BufferedSink bufferedSink;
 
     public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) {
@@ -43,7 +43,7 @@ public class ProgressRequestBody extends RequestBody {
         if (bufferedSink == null) {
             bufferedSink = Okio.buffer(sink(sink));
         }
-  
+
         requestBody.writeTo(bufferedSink);
         bufferedSink.flush();
 
@@ -51,7 +51,7 @@ public class ProgressRequestBody extends RequestBody {
 
     private Sink sink(Sink sink) {
         return new ForwardingSink(sink) {
-       
+
             long bytesWritten = 0L;
             long contentLength = 0L;
 
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 b4a8d21f7507..605a18984b27 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-06-03T00:41:49.229+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T00:01:22.559+08:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
index d4b464235bf1..313707926bf8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
@@ -17,8 +17,8 @@ import com.squareup.okhttp.Response;
 
 import java.io.IOException;
 
-import java.math.BigDecimal;
 import java.util.Date;
+import java.math.BigDecimal;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -27,196 +27,196 @@ import java.util.List;
 import java.util.Map;
 
 public class FakeApi {
-  private ApiClient apiClient;
+    private ApiClient apiClient;
 
-  public FakeApi() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public FakeApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /* Build call for testEndpointParameters */
-  private Call testEndpointParametersCall(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'number' is set
-    if (number == null) {
-       throw new ApiException("Missing the required parameter 'number' when calling testEndpointParameters(Async)");
+    public FakeApi() {
+        this(Configuration.getDefaultApiClient());
     }
-    
-    // verify the required parameter '_double' is set
-    if (_double == null) {
-       throw new ApiException("Missing the required parameter '_double' when calling testEndpointParameters(Async)");
+
+    public FakeApi(ApiClient apiClient) {
+        this.apiClient = apiClient;
     }
-    
-    // verify the required parameter 'string' is set
-    if (string == null) {
-       throw new ApiException("Missing the required parameter 'string' when calling testEndpointParameters(Async)");
+
+    public ApiClient getApiClient() {
+        return apiClient;
     }
-    
-    // verify the required parameter '_byte' is set
-    if (_byte == null) {
-       throw new ApiException("Missing the required parameter '_byte' when calling testEndpointParameters(Async)");
+
+    public void setApiClient(ApiClient apiClient) {
+        this.apiClient = apiClient;
     }
-    
 
-    // create path and map variables
-    String localVarPath = "/fake".replaceAll("\\{format\\}","json");
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-    if (integer != null)
-      localVarFormParams.put("integer", integer);
-    if (int32 != null)
-      localVarFormParams.put("int32", int32);
-    if (int64 != null)
-      localVarFormParams.put("int64", int64);
-    if (number != null)
-      localVarFormParams.put("number", number);
-    if (_float != null)
-      localVarFormParams.put("float", _float);
-    if (_double != null)
-      localVarFormParams.put("double", _double);
-    if (string != null)
-      localVarFormParams.put("string", string);
-    if (_byte != null)
-      localVarFormParams.put("byte", _byte);
-    if (binary != null)
-      localVarFormParams.put("binary", binary);
-    if (date != null)
-      localVarFormParams.put("date", date);
-    if (dateTime != null)
-      localVarFormParams.put("dateTime", dateTime);
-    if (password != null)
-      localVarFormParams.put("password", password);
-
-    final String[] localVarAccepts = {
-      "application/xml; charset=utf-8", "application/json; charset=utf-8"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      "application/xml; charset=utf-8", "application/json; charset=utf-8"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
+    /* Build call for testEndpointParameters */
+    private Call testEndpointParametersCall(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+        // verify the required parameter 'number' is set
+        if (number == null) {
+            throw new ApiException("Missing the required parameter 'number' when calling testEndpointParameters(Async)");
         }
-      });
+        
+        // verify the required parameter '_double' is set
+        if (_double == null) {
+            throw new ApiException("Missing the required parameter '_double' when calling testEndpointParameters(Async)");
+        }
+        
+        // verify the required parameter 'string' is set
+        if (string == null) {
+            throw new ApiException("Missing the required parameter 'string' when calling testEndpointParameters(Async)");
+        }
+        
+        // verify the required parameter '_byte' is set
+        if (_byte == null) {
+            throw new ApiException("Missing the required parameter '_byte' when calling testEndpointParameters(Async)");
+        }
+        
+
+        // create path and map variables
+        String localVarPath = "/fake".replaceAll("\\{format\\}","json");
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+        if (integer != null)
+        localVarFormParams.put("integer", integer);
+        if (int32 != null)
+        localVarFormParams.put("int32", int32);
+        if (int64 != null)
+        localVarFormParams.put("int64", int64);
+        if (number != null)
+        localVarFormParams.put("number", number);
+        if (_float != null)
+        localVarFormParams.put("float", _float);
+        if (_double != null)
+        localVarFormParams.put("double", _double);
+        if (string != null)
+        localVarFormParams.put("string", string);
+        if (_byte != null)
+        localVarFormParams.put("byte", _byte);
+        if (binary != null)
+        localVarFormParams.put("binary", binary);
+        if (date != null)
+        localVarFormParams.put("date", date);
+        if (dateTime != null)
+        localVarFormParams.put("dateTime", dateTime);
+        if (password != null)
+        localVarFormParams.put("password", password);
+
+        final String[] localVarAccepts = {
+            "application/xml; charset=utf-8", "application/json; charset=utf-8"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/xml; charset=utf-8", "application/json; charset=utf-8"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
-    String[] localVarAuthNames = new String[] {  };
-    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-   * @param number None (required)
-   * @param _double None (required)
-   * @param string None (required)
-   * @param _byte None (required)
-   * @param integer None (optional)
-   * @param int32 None (optional)
-   * @param int64 None (optional)
-   * @param _float None (optional)
-   * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
-   * @param password None (optional)
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void testEndpointParameters(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password) throws ApiException {
-    testEndpointParametersWithHttpInfo(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
-  }
-
-  /**
-   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-   * @param number None (required)
-   * @param _double None (required)
-   * @param string None (required)
-   * @param _byte None (required)
-   * @param integer None (optional)
-   * @param int32 None (optional)
-   * @param int64 None (optional)
-   * @param _float None (optional)
-   * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
-   * @param password None (optional)
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password) throws ApiException {
-    Call call = testEndpointParametersCall(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password, null, null);
-    return apiClient.execute(call);
-  }
-
-  /**
-   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  (asynchronously)
-   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-   * @param number None (required)
-   * @param _double None (required)
-   * @param string None (required)
-   * @param _byte None (required)
-   * @param integer None (optional)
-   * @param int32 None (optional)
-   * @param int64 None (optional)
-   * @param _float None (optional)
-   * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
-   * @param password None (optional)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call testEndpointParametersAsync(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password, final ApiCallback<Void> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    /**
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * @param number None (required)
+     * @param _double None (required)
+     * @param string None (required)
+     * @param _byte None (required)
+     * @param integer None (optional)
+     * @param int32 None (optional)
+     * @param int64 None (optional)
+     * @param _float None (optional)
+     * @param binary None (optional)
+     * @param date None (optional)
+     * @param dateTime None (optional)
+     * @param password None (optional)
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void testEndpointParameters(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password) throws ApiException {
+        testEndpointParametersWithHttpInfo(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
     }
 
-    Call call = testEndpointParametersCall(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password, progressListener, progressRequestListener);
-    apiClient.executeAsync(call, callback);
-    return call;
-  }
+    /**
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * @param number None (required)
+     * @param _double None (required)
+     * @param string None (required)
+     * @param _byte None (required)
+     * @param integer None (optional)
+     * @param int32 None (optional)
+     * @param int64 None (optional)
+     * @param _float None (optional)
+     * @param binary None (optional)
+     * @param date None (optional)
+     * @param dateTime None (optional)
+     * @param password None (optional)
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password) throws ApiException {
+        Call call = testEndpointParametersCall(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password, null, null);
+        return apiClient.execute(call);
+    }
+
+    /**
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트  (asynchronously)
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     * @param number None (required)
+     * @param _double None (required)
+     * @param string None (required)
+     * @param _byte None (required)
+     * @param integer None (optional)
+     * @param int32 None (optional)
+     * @param int64 None (optional)
+     * @param _float None (optional)
+     * @param binary None (optional)
+     * @param date None (optional)
+     * @param dateTime None (optional)
+     * @param password None (optional)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call testEndpointParametersAsync(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password, final ApiCallback<Void> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        Call call = testEndpointParametersCall(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, callback);
+        return call;
+    }
 }
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 ac7ad688c56a..c3090d83e1ed 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
@@ -18,8 +18,8 @@ import com.squareup.okhttp.Response;
 import java.io.IOException;
 
 import io.swagger.client.model.Pet;
-import io.swagger.client.model.ModelApiResponse;
 import java.io.File;
+import io.swagger.client.model.ModelApiResponse;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -28,887 +28,887 @@ import java.util.List;
 import java.util.Map;
 
 public class PetApi {
-  private ApiClient apiClient;
+    private ApiClient apiClient;
 
-  public PetApi() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public PetApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /* Build call for addPet */
-  private Call addPetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = body;
-    
-    // verify the required parameter 'body' is set
-    if (body == null) {
-       throw new ApiException("Missing the required parameter 'body' when calling addPet(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      "application/json", "application/xml"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
+    public PetApi() {
+        this(Configuration.getDefaultApiClient());
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * Add a new pet to the store
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void addPet(Pet body) throws ApiException {
-    addPetWithHttpInfo(body);
-  }
-
-  /**
-   * Add a new pet to the store
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> addPetWithHttpInfo(Pet body) throws ApiException {
-    Call call = addPetCall(body, null, null);
-    return apiClient.execute(call);
-  }
-
-  /**
-   * Add a new pet to the store (asynchronously)
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call addPetAsync(Pet body, final ApiCallback<Void> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    public PetApi(ApiClient apiClient) {
+        this.apiClient = apiClient;
     }
 
-    Call call = addPetCall(body, progressListener, progressRequestListener);
-    apiClient.executeAsync(call, callback);
-    return call;
-  }
-  /* Build call for deletePet */
-  private Call deletePetCall(Long petId, String apiKey, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-       throw new ApiException("Missing the required parameter 'petId' when calling deletePet(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    if (apiKey != null)
-      localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey));
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
+    public ApiClient getApiClient() {
+        return apiClient;
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete (required)
-   * @param apiKey  (optional)
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void deletePet(Long petId, String apiKey) throws ApiException {
-    deletePetWithHttpInfo(petId, apiKey);
-  }
-
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete (required)
-   * @param apiKey  (optional)
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException {
-    Call call = deletePetCall(petId, apiKey, null, null);
-    return apiClient.execute(call);
-  }
-
-  /**
-   * Deletes a pet (asynchronously)
-   * 
-   * @param petId Pet id to delete (required)
-   * @param apiKey  (optional)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call deletePetAsync(Long petId, String apiKey, final ApiCallback<Void> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    public void setApiClient(ApiClient apiClient) {
+        this.apiClient = apiClient;
     }
 
-    Call call = deletePetCall(petId, apiKey, progressListener, progressRequestListener);
-    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;
-    
-    // verify the required parameter 'status' is set
-    if (status == null) {
-       throw new ApiException("Missing the required parameter 'status' when calling findPetsByStatus(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/pet/findByStatus".replaceAll("\\{format\\}","json");
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    if (status != null)
-      localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "status", status));
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
+    /* Build call for addPet */
+    private Call addPetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = body;
+        
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling addPet(Async)");
         }
-      });
+        
+
+        // create path and map variables
+        String localVarPath = "/pet".replaceAll("\\{format\\}","json");
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/json", "application/xml"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] { "petstore_auth" };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma separated strings
-   * @param status Status values that need to be considered for filter (required)
-   * @return List<Pet>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
-    ApiResponse<List<Pet>> resp = findPetsByStatusWithHttpInfo(status);
-    return resp.getData();
-  }
-
-  /**
-   * Finds Pets by status
-   * Multiple status values can be provided with comma separated strings
-   * @param status Status values that need to be considered for filter (required)
-   * @return ApiResponse<List<Pet>>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException {
-    Call call = findPetsByStatusCall(status, null, null);
-    Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
-    return apiClient.execute(call, localVarReturnType);
-  }
-
-  /**
-   * Finds Pets by status (asynchronously)
-   * Multiple status values can be provided with comma separated strings
-   * @param status Status values that need to be considered for filter (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call findPetsByStatusAsync(List<String> status, final ApiCallback<List<Pet>> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    /**
+     * Add a new pet to the store
+     * 
+     * @param body Pet object that needs to be added to the store (required)
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void addPet(Pet body) throws ApiException {
+        addPetWithHttpInfo(body);
     }
 
-    Call call = findPetsByStatusCall(status, progressListener, progressRequestListener);
-    Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
-    apiClient.executeAsync(call, localVarReturnType, callback);
-    return call;
-  }
-  /* Build call for findPetsByTags */
-  private Call findPetsByTagsCall(List<String> tags, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'tags' is set
-    if (tags == null) {
-       throw new ApiException("Missing the required parameter 'tags' when calling findPetsByTags(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/pet/findByTags".replaceAll("\\{format\\}","json");
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    if (tags != null)
-      localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "tags", tags));
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
+    /**
+     * Add a new pet to the store
+     * 
+     * @param body Pet object that needs to be added to the store (required)
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> addPetWithHttpInfo(Pet body) throws ApiException {
+        Call call = addPetCall(body, null, null);
+        return apiClient.execute(call);
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
+    /**
+     * Add a new pet to the store (asynchronously)
+     * 
+     * @param body Pet object that needs to be added to the store (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call addPetAsync(Pet body, final ApiCallback<Void> callback) throws ApiException {
 
-  /**
-   * Finds Pets by tags
-   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by (required)
-   * @return List<Pet>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
-    ApiResponse<List<Pet>> resp = findPetsByTagsWithHttpInfo(tags);
-    return resp.getData();
-  }
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
 
-  /**
-   * Finds Pets by tags
-   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by (required)
-   * @return ApiResponse<List<Pet>>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) throws ApiException {
-    Call call = findPetsByTagsCall(tags, null, null);
-    Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
-    return apiClient.execute(call, localVarReturnType);
-  }
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
 
-  /**
-   * Finds Pets by tags (asynchronously)
-   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-   * @param tags Tags to filter by (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call findPetsByTagsAsync(List<String> tags, final ApiCallback<List<Pet>> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
         }
-      };
 
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
+        Call call = addPetCall(body, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, callback);
+        return call;
+    }
+    /* Build call for deletePet */
+    private Call deletePetCall(Long petId, String apiKey, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+        // verify the required parameter 'petId' is set
+        if (petId == null) {
+            throw new ApiException("Missing the required parameter 'petId' when calling deletePet(Async)");
         }
-      };
+        
+
+        // create path and map variables
+        String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+        .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        if (apiKey != null)
+        localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey));
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] { "petstore_auth" };
+        return apiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
-    Call call = findPetsByTagsCall(tags, progressListener, progressRequestListener);
-    Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
-    apiClient.executeAsync(call, localVarReturnType, callback);
-    return call;
-  }
-  /* Build call for getPetById */
-  private Call getPetByIdCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-       throw new ApiException("Missing the required parameter 'petId' when calling getPetById(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
+    /**
+     * Deletes a pet
+     * 
+     * @param petId Pet id to delete (required)
+     * @param apiKey  (optional)
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void deletePet(Long petId, String apiKey) throws ApiException {
+        deletePetWithHttpInfo(petId, apiKey);
     }
 
-    String[] localVarAuthNames = new String[] { "api_key" };
-    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * Find pet by ID
-   * Returns a single pet
-   * @param petId ID of pet to return (required)
-   * @return Pet
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public Pet getPetById(Long petId) throws ApiException {
-    ApiResponse<Pet> resp = getPetByIdWithHttpInfo(petId);
-    return resp.getData();
-  }
-
-  /**
-   * Find pet by ID
-   * Returns a single pet
-   * @param petId ID of pet to return (required)
-   * @return ApiResponse<Pet>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
-    Call call = getPetByIdCall(petId, null, null);
-    Type localVarReturnType = new TypeToken<Pet>(){}.getType();
-    return apiClient.execute(call, localVarReturnType);
-  }
-
-  /**
-   * Find pet by ID (asynchronously)
-   * Returns a single pet
-   * @param petId ID of pet to return (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call getPetByIdAsync(Long petId, final ApiCallback<Pet> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    /**
+     * Deletes a pet
+     * 
+     * @param petId Pet id to delete (required)
+     * @param apiKey  (optional)
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException {
+        Call call = deletePetCall(petId, apiKey, null, null);
+        return apiClient.execute(call);
     }
 
-    Call call = getPetByIdCall(petId, progressListener, progressRequestListener);
-    Type localVarReturnType = new TypeToken<Pet>(){}.getType();
-    apiClient.executeAsync(call, localVarReturnType, callback);
-    return call;
-  }
-  /* Build call for updatePet */
-  private Call updatePetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = body;
-    
-    // verify the required parameter 'body' is set
-    if (body == null) {
-       throw new ApiException("Missing the required parameter 'body' when calling updatePet(Async)");
-    }
-    
+    /**
+     * Deletes a pet (asynchronously)
+     * 
+     * @param petId Pet id to delete (required)
+     * @param apiKey  (optional)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call deletePetAsync(Long petId, String apiKey, final ApiCallback<Void> callback) throws ApiException {
 
-    // create path and map variables
-    String localVarPath = "/pet".replaceAll("\\{format\\}","json");
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
 
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
 
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      "application/json", "application/xml"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
         }
-      });
+
+        Call call = deletePetCall(petId, apiKey, progressListener, progressRequestListener);
+        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;
+        
+        // verify the required parameter 'status' is set
+        if (status == null) {
+            throw new ApiException("Missing the required parameter 'status' when calling findPetsByStatus(Async)");
+        }
+        
+
+        // create path and map variables
+        String localVarPath = "/pet/findByStatus".replaceAll("\\{format\\}","json");
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        if (status != null)
+        localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "status", status));
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] { "petstore_auth" };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void updatePet(Pet body) throws ApiException {
-    updatePetWithHttpInfo(body);
-  }
-
-  /**
-   * Update an existing pet
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> updatePetWithHttpInfo(Pet body) throws ApiException {
-    Call call = updatePetCall(body, null, null);
-    return apiClient.execute(call);
-  }
-
-  /**
-   * Update an existing pet (asynchronously)
-   * 
-   * @param body Pet object that needs to be added to the store (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call updatePetAsync(Pet body, final ApiCallback<Void> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    /**
+     * 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 (required)
+     * @return List&lt;Pet&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
+        ApiResponse<List<Pet>> resp = findPetsByStatusWithHttpInfo(status);
+        return resp.getData();
     }
 
-    Call call = updatePetCall(body, progressListener, progressRequestListener);
-    apiClient.executeAsync(call, callback);
-    return call;
-  }
-  /* Build call for updatePetWithForm */
-  private Call updatePetWithFormCall(Long petId, String name, String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-       throw new ApiException("Missing the required parameter 'petId' when calling updatePetWithForm(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-    if (name != null)
-      localVarFormParams.put("name", name);
-    if (status != null)
-      localVarFormParams.put("status", status);
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      "application/x-www-form-urlencoded"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
+    /**
+     * 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 (required)
+     * @return ApiResponse&lt;List&lt;Pet&gt;&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException {
+        Call call = findPetsByStatusCall(status, null, null);
+        Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
+    /**
+     * Finds Pets by status (asynchronously)
+     * Multiple status values can be provided with comma separated strings
+     * @param status Status values that need to be considered for filter (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call findPetsByStatusAsync(List<String> status, final ApiCallback<List<Pet>> callback) throws ApiException {
 
-  /**
-   * Updates a pet in the store with form data
-   * 
-   * @param petId ID of pet that needs to be updated (required)
-   * @param name Updated name of the pet (optional)
-   * @param status Updated status of the pet (optional)
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void updatePetWithForm(Long petId, String name, String status) throws ApiException {
-    updatePetWithFormWithHttpInfo(petId, name, status);
-  }
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
 
-  /**
-   * Updates a pet in the store with form data
-   * 
-   * @param petId ID of pet that needs to be updated (required)
-   * @param name Updated name of the pet (optional)
-   * @param status Updated status of the pet (optional)
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException {
-    Call call = updatePetWithFormCall(petId, name, status, null, null);
-    return apiClient.execute(call);
-  }
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
 
-  /**
-   * Updates a pet in the store with form data (asynchronously)
-   * 
-   * @param petId ID of pet that needs to be updated (required)
-   * @param name Updated name of the pet (optional)
-   * @param status Updated status of the pet (optional)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call updatePetWithFormAsync(Long petId, String name, String status, final ApiCallback<Void> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
         }
-      };
 
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
+        Call call = findPetsByStatusCall(status, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /* Build call for findPetsByTags */
+    private Call findPetsByTagsCall(List<String> tags, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+        // verify the required parameter 'tags' is set
+        if (tags == null) {
+            throw new ApiException("Missing the required parameter 'tags' when calling findPetsByTags(Async)");
         }
-      };
+        
+
+        // create path and map variables
+        String localVarPath = "/pet/findByTags".replaceAll("\\{format\\}","json");
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        if (tags != null)
+        localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "tags", tags));
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] { "petstore_auth" };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
-    Call call = updatePetWithFormCall(petId, name, status, progressListener, progressRequestListener);
-    apiClient.executeAsync(call, callback);
-    return call;
-  }
-  /* Build call for uploadFile */
-  private Call uploadFileCall(Long petId, String additionalMetadata, File file, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-       throw new ApiException("Missing the required parameter 'petId' when calling uploadFile(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-    if (additionalMetadata != null)
-      localVarFormParams.put("additionalMetadata", additionalMetadata);
-    if (file != null)
-      localVarFormParams.put("file", file);
-
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      "multipart/form-data"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
+    /**
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * @param tags Tags to filter by (required)
+     * @return List&lt;Pet&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
+        ApiResponse<List<Pet>> resp = findPetsByTagsWithHttpInfo(tags);
+        return resp.getData();
     }
 
-    String[] localVarAuthNames = new String[] { "petstore_auth" };
-    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * uploads an image
-   * 
-   * @param petId ID of pet to update (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @param file file to upload (optional)
-   * @return ModelApiResponse
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws ApiException {
-    ApiResponse<ModelApiResponse> resp = uploadFileWithHttpInfo(petId, additionalMetadata, file);
-    return resp.getData();
-  }
-
-  /**
-   * uploads an image
-   * 
-   * @param petId ID of pet to update (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @param file file to upload (optional)
-   * @return ApiResponse<ModelApiResponse>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File file) throws ApiException {
-    Call call = uploadFileCall(petId, additionalMetadata, file, null, null);
-    Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
-    return apiClient.execute(call, localVarReturnType);
-  }
-
-  /**
-   * uploads an image (asynchronously)
-   * 
-   * @param petId ID of pet to update (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @param file file to upload (optional)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call uploadFileAsync(Long petId, String additionalMetadata, File file, final ApiCallback<ModelApiResponse> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    /**
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * @param tags Tags to filter by (required)
+     * @return ApiResponse&lt;List&lt;Pet&gt;&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) throws ApiException {
+        Call call = findPetsByTagsCall(tags, null, null);
+        Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
     }
 
-    Call call = uploadFileCall(petId, additionalMetadata, file, progressListener, progressRequestListener);
-    Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
-    apiClient.executeAsync(call, localVarReturnType, callback);
-    return call;
-  }
+    /**
+     * Finds Pets by tags (asynchronously)
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * @param tags Tags to filter by (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call findPetsByTagsAsync(List<String> tags, final ApiCallback<List<Pet>> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        Call call = findPetsByTagsCall(tags, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /* Build call for getPetById */
+    private Call getPetByIdCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+        // verify the required parameter 'petId' is set
+        if (petId == null) {
+            throw new ApiException("Missing the required parameter 'petId' when calling getPetById(Async)");
+        }
+        
+
+        // create path and map variables
+        String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+        .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] { "api_key" };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * Find pet by ID
+     * Returns a single pet
+     * @param petId ID of pet to return (required)
+     * @return Pet
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public Pet getPetById(Long petId) throws ApiException {
+        ApiResponse<Pet> resp = getPetByIdWithHttpInfo(petId);
+        return resp.getData();
+    }
+
+    /**
+     * Find pet by ID
+     * Returns a single pet
+     * @param petId ID of pet to return (required)
+     * @return ApiResponse&lt;Pet&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
+        Call call = getPetByIdCall(petId, null, null);
+        Type localVarReturnType = new TypeToken<Pet>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Find pet by ID (asynchronously)
+     * Returns a single pet
+     * @param petId ID of pet to return (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call getPetByIdAsync(Long petId, final ApiCallback<Pet> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        Call call = getPetByIdCall(petId, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<Pet>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /* Build call for updatePet */
+    private Call updatePetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = body;
+        
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling updatePet(Async)");
+        }
+        
+
+        // create path and map variables
+        String localVarPath = "/pet".replaceAll("\\{format\\}","json");
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/json", "application/xml"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] { "petstore_auth" };
+        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * Update an existing pet
+     * 
+     * @param body Pet object that needs to be added to the store (required)
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void updatePet(Pet body) throws ApiException {
+        updatePetWithHttpInfo(body);
+    }
+
+    /**
+     * Update an existing pet
+     * 
+     * @param body Pet object that needs to be added to the store (required)
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> updatePetWithHttpInfo(Pet body) throws ApiException {
+        Call call = updatePetCall(body, null, null);
+        return apiClient.execute(call);
+    }
+
+    /**
+     * Update an existing pet (asynchronously)
+     * 
+     * @param body Pet object that needs to be added to the store (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call updatePetAsync(Pet body, final ApiCallback<Void> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        Call call = updatePetCall(body, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, callback);
+        return call;
+    }
+    /* Build call for updatePetWithForm */
+    private Call updatePetWithFormCall(Long petId, String name, String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+        // verify the required parameter 'petId' is set
+        if (petId == null) {
+            throw new ApiException("Missing the required parameter 'petId' when calling updatePetWithForm(Async)");
+        }
+        
+
+        // create path and map variables
+        String localVarPath = "/pet/{petId}".replaceAll("\\{format\\}","json")
+        .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+        if (name != null)
+        localVarFormParams.put("name", name);
+        if (status != null)
+        localVarFormParams.put("status", status);
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/x-www-form-urlencoded"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] { "petstore_auth" };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * @param petId ID of pet that needs to be updated (required)
+     * @param name Updated name of the pet (optional)
+     * @param status Updated status of the pet (optional)
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void updatePetWithForm(Long petId, String name, String status) throws ApiException {
+        updatePetWithFormWithHttpInfo(petId, name, status);
+    }
+
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * @param petId ID of pet that needs to be updated (required)
+     * @param name Updated name of the pet (optional)
+     * @param status Updated status of the pet (optional)
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException {
+        Call call = updatePetWithFormCall(petId, name, status, null, null);
+        return apiClient.execute(call);
+    }
+
+    /**
+     * Updates a pet in the store with form data (asynchronously)
+     * 
+     * @param petId ID of pet that needs to be updated (required)
+     * @param name Updated name of the pet (optional)
+     * @param status Updated status of the pet (optional)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call updatePetWithFormAsync(Long petId, String name, String status, final ApiCallback<Void> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        Call call = updatePetWithFormCall(petId, name, status, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, callback);
+        return call;
+    }
+    /* Build call for uploadFile */
+    private Call uploadFileCall(Long petId, String additionalMetadata, File file, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+        // verify the required parameter 'petId' is set
+        if (petId == null) {
+            throw new ApiException("Missing the required parameter 'petId' when calling uploadFile(Async)");
+        }
+        
+
+        // create path and map variables
+        String localVarPath = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json")
+        .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+        if (additionalMetadata != null)
+        localVarFormParams.put("additionalMetadata", additionalMetadata);
+        if (file != null)
+        localVarFormParams.put("file", file);
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "multipart/form-data"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] { "petstore_auth" };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * uploads an image
+     * 
+     * @param petId ID of pet to update (required)
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @param file file to upload (optional)
+     * @return ModelApiResponse
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws ApiException {
+        ApiResponse<ModelApiResponse> resp = uploadFileWithHttpInfo(petId, additionalMetadata, file);
+        return resp.getData();
+    }
+
+    /**
+     * uploads an image
+     * 
+     * @param petId ID of pet to update (required)
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @param file file to upload (optional)
+     * @return ApiResponse&lt;ModelApiResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File file) throws ApiException {
+        Call call = uploadFileCall(petId, additionalMetadata, file, null, null);
+        Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * uploads an image (asynchronously)
+     * 
+     * @param petId ID of pet to update (required)
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @param file file to upload (optional)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call uploadFileAsync(Long petId, String additionalMetadata, File file, final ApiCallback<ModelApiResponse> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        Call call = uploadFileCall(petId, additionalMetadata, file, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, 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 5d960d0b104a..a17475df5b2a 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
@@ -26,436 +26,436 @@ import java.util.List;
 import java.util.Map;
 
 public class StoreApi {
-  private ApiClient apiClient;
+    private ApiClient apiClient;
 
-  public StoreApi() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public StoreApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /* Build call for deleteOrder */
-  private Call deleteOrderCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'orderId' is set
-    if (orderId == null) {
-       throw new ApiException("Missing the required parameter 'orderId' when calling deleteOrder(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
+    public StoreApi() {
+        this(Configuration.getDefaultApiClient());
     }
 
-    String[] localVarAuthNames = new String[] {  };
-    return apiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted (required)
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void deleteOrder(String orderId) throws ApiException {
-    deleteOrderWithHttpInfo(orderId);
-  }
-
-  /**
-   * Delete purchase order by ID
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted (required)
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiException {
-    Call call = deleteOrderCall(orderId, null, null);
-    return apiClient.execute(call);
-  }
-
-  /**
-   * Delete purchase order by ID (asynchronously)
-   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-   * @param orderId ID of the order that needs to be deleted (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call deleteOrderAsync(String orderId, final ApiCallback<Void> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    public StoreApi(ApiClient apiClient) {
+        this.apiClient = apiClient;
     }
 
-    Call call = deleteOrderCall(orderId, progressListener, progressRequestListener);
-    apiClient.executeAsync(call, callback);
-    return call;
-  }
-  /* Build call for getInventory */
-  private Call getInventoryCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-
-    // create path and map variables
-    String localVarPath = "/store/inventory".replaceAll("\\{format\\}","json");
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
+    public ApiClient getApiClient() {
+        return apiClient;
     }
 
-    String[] localVarAuthNames = new String[] { "api_key" };
-    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Map<String, Integer>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public Map<String, Integer> getInventory() throws ApiException {
-    ApiResponse<Map<String, Integer>> resp = getInventoryWithHttpInfo();
-    return resp.getData();
-  }
-
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return ApiResponse<Map<String, Integer>>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException {
-    Call call = getInventoryCall(null, null);
-    Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
-    return apiClient.execute(call, localVarReturnType);
-  }
-
-  /**
-   * Returns pet inventories by status (asynchronously)
-   * Returns a map of status codes to quantities
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call getInventoryAsync(final ApiCallback<Map<String, Integer>> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    public void setApiClient(ApiClient apiClient) {
+        this.apiClient = apiClient;
     }
 
-    Call call = getInventoryCall(progressListener, progressRequestListener);
-    Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
-    apiClient.executeAsync(call, localVarReturnType, callback);
-    return call;
-  }
-  /* Build call for getOrderById */
-  private Call getOrderByIdCall(Long orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'orderId' is set
-    if (orderId == null) {
-       throw new ApiException("Missing the required parameter 'orderId' when calling getOrderById(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
+    /* Build call for deleteOrder */
+    private Call deleteOrderCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+        // verify the required parameter 'orderId' is set
+        if (orderId == null) {
+            throw new ApiException("Missing the required parameter 'orderId' when calling deleteOrder(Async)");
         }
-      });
+        
+
+        // create path and map variables
+        String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+        .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
-    String[] localVarAuthNames = new String[] {  };
-    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;&#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
-   */
-  public Order getOrderById(Long orderId) throws ApiException {
-    ApiResponse<Order> resp = getOrderByIdWithHttpInfo(orderId);
-    return resp.getData();
-  }
-
-  /**
-   * 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 orderId ID of pet that needs to be fetched (required)
-   * @return ApiResponse<Order>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException {
-    Call call = getOrderByIdCall(orderId, null, null);
-    Type localVarReturnType = new TypeToken<Order>(){}.getType();
-    return apiClient.execute(call, localVarReturnType);
-  }
-
-  /**
-   * Find purchase order by ID (asynchronously)
-   * For valid response try integer IDs with value &lt;&#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
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call getOrderByIdAsync(Long orderId, final ApiCallback<Order> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * @param orderId ID of the order that needs to be deleted (required)
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void deleteOrder(String orderId) throws ApiException {
+        deleteOrderWithHttpInfo(orderId);
     }
 
-    Call call = getOrderByIdCall(orderId, progressListener, progressRequestListener);
-    Type localVarReturnType = new TypeToken<Order>(){}.getType();
-    apiClient.executeAsync(call, localVarReturnType, callback);
-    return call;
-  }
-  /* Build call for placeOrder */
-  private Call placeOrderCall(Order body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = body;
-    
-    // verify the required parameter 'body' is set
-    if (body == null) {
-       throw new ApiException("Missing the required parameter 'body' when calling placeOrder(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/store/order".replaceAll("\\{format\\}","json");
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * @param orderId ID of the order that needs to be deleted (required)
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiException {
+        Call call = deleteOrderCall(orderId, null, null);
+        return apiClient.execute(call);
     }
 
-    String[] localVarAuthNames = new String[] {  };
-    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
+    /**
+     * Delete purchase order by ID (asynchronously)
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * @param orderId ID of the order that needs to be deleted (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call deleteOrderAsync(String orderId, final ApiCallback<Void> callback) throws ApiException {
 
-  /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet (required)
-   * @return Order
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public Order placeOrder(Order body) throws ApiException {
-    ApiResponse<Order> resp = placeOrderWithHttpInfo(body);
-    return resp.getData();
-  }
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
 
-  /**
-   * Place an order for a pet
-   * 
-   * @param body order placed for purchasing the pet (required)
-   * @return ApiResponse<Order>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException {
-    Call call = placeOrderCall(body, null, null);
-    Type localVarReturnType = new TypeToken<Order>(){}.getType();
-    return apiClient.execute(call, localVarReturnType);
-  }
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
 
-  /**
-   * Place an order for a pet (asynchronously)
-   * 
-   * @param body order placed for purchasing the pet (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call placeOrderAsync(Order body, final ApiCallback<Order> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
         }
-      };
 
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
+        Call call = deleteOrderCall(orderId, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, callback);
+        return call;
+    }
+    /* Build call for getInventory */
+    private Call getInventoryCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+
+        // create path and map variables
+        String localVarPath = "/store/inventory".replaceAll("\\{format\\}","json");
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
         }
-      };
+
+        String[] localVarAuthNames = new String[] { "api_key" };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
-    Call call = placeOrderCall(body, progressListener, progressRequestListener);
-    Type localVarReturnType = new TypeToken<Order>(){}.getType();
-    apiClient.executeAsync(call, localVarReturnType, callback);
-    return call;
-  }
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * @return Map&lt;String, Integer&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public Map<String, Integer> getInventory() throws ApiException {
+        ApiResponse<Map<String, Integer>> resp = getInventoryWithHttpInfo();
+        return resp.getData();
+    }
+
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * @return ApiResponse&lt;Map&lt;String, Integer&gt;&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException {
+        Call call = getInventoryCall(null, null);
+        Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Returns pet inventories by status (asynchronously)
+     * Returns a map of status codes to quantities
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call getInventoryAsync(final ApiCallback<Map<String, Integer>> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        Call call = getInventoryCall(progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /* Build call for getOrderById */
+    private Call getOrderByIdCall(Long orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+        // verify the required parameter 'orderId' is set
+        if (orderId == null) {
+            throw new ApiException("Missing the required parameter 'orderId' when calling getOrderById(Async)");
+        }
+        
+
+        // create path and map variables
+        String localVarPath = "/store/order/{orderId}".replaceAll("\\{format\\}","json")
+        .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * 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 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
+     */
+    public Order getOrderById(Long orderId) throws ApiException {
+        ApiResponse<Order> resp = getOrderByIdWithHttpInfo(orderId);
+        return resp.getData();
+    }
+
+    /**
+     * 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 orderId ID of pet that needs to be fetched (required)
+     * @return ApiResponse&lt;Order&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException {
+        Call call = getOrderByIdCall(orderId, null, null);
+        Type localVarReturnType = new TypeToken<Order>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Find purchase order by ID (asynchronously)
+     * For valid response try integer IDs with value &lt;&#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
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call getOrderByIdAsync(Long orderId, final ApiCallback<Order> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        Call call = getOrderByIdCall(orderId, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<Order>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /* Build call for placeOrder */
+    private Call placeOrderCall(Order body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = body;
+        
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling placeOrder(Async)");
+        }
+        
+
+        // create path and map variables
+        String localVarPath = "/store/order".replaceAll("\\{format\\}","json");
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * Place an order for a pet
+     * 
+     * @param body order placed for purchasing the pet (required)
+     * @return Order
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public Order placeOrder(Order body) throws ApiException {
+        ApiResponse<Order> resp = placeOrderWithHttpInfo(body);
+        return resp.getData();
+    }
+
+    /**
+     * Place an order for a pet
+     * 
+     * @param body order placed for purchasing the pet (required)
+     * @return ApiResponse&lt;Order&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException {
+        Call call = placeOrderCall(body, null, null);
+        Type localVarReturnType = new TypeToken<Order>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Place an order for a pet (asynchronously)
+     * 
+     * @param body order placed for purchasing the pet (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call placeOrderAsync(Order body, final ApiCallback<Order> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        Call call = placeOrderCall(body, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<Order>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java
index be0269ef28f2..da664e27c4b5 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
@@ -26,861 +26,861 @@ import java.util.List;
 import java.util.Map;
 
 public class UserApi {
-  private ApiClient apiClient;
+    private ApiClient apiClient;
 
-  public UserApi() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public UserApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /* Build call for createUser */
-  private Call createUserCall(User body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = body;
-    
-    // verify the required parameter 'body' is set
-    if (body == null) {
-       throw new ApiException("Missing the required parameter 'body' when calling createUser(Async)");
+    public UserApi() {
+        this(Configuration.getDefaultApiClient());
     }
-    
 
-    // create path and map variables
-    String localVarPath = "/user".replaceAll("\\{format\\}","json");
+    public UserApi(ApiClient apiClient) {
+        this.apiClient = apiClient;
+    }
 
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    public ApiClient getApiClient() {
+        return apiClient;
+    }
 
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+    public void setApiClient(ApiClient apiClient) {
+        this.apiClient = apiClient;
+    }
 
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
+    /* Build call for createUser */
+    private Call createUserCall(User body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = body;
+        
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling createUser(Async)");
         }
-      });
-    }
+        
 
-    String[] localVarAuthNames = new String[] {  };
-    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
+        // create path and map variables
+        String localVarPath = "/user".replaceAll("\\{format\\}","json");
 
-  /**
-   * Create user
-   * This can only be done by the logged in user.
-   * @param body Created user object (required)
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void createUser(User body) throws ApiException {
-    createUserWithHttpInfo(body);
-  }
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-  /**
-   * Create user
-   * This can only be done by the logged in user.
-   * @param body Created user object (required)
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> createUserWithHttpInfo(User body) throws ApiException {
-    Call call = createUserCall(body, null, null);
-    return apiClient.execute(call);
-  }
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-  /**
-   * Create user (asynchronously)
-   * This can only be done by the logged in user.
-   * @param body Created user object (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call createUserAsync(User body, final ApiCallback<Void> callback) throws ApiException {
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
         }
-      };
 
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * @param body Created user object (required)
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void createUser(User body) throws ApiException {
+        createUserWithHttpInfo(body);
+    }
+
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * @param body Created user object (required)
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> createUserWithHttpInfo(User body) throws ApiException {
+        Call call = createUserCall(body, null, null);
+        return apiClient.execute(call);
+    }
+
+    /**
+     * Create user (asynchronously)
+     * This can only be done by the logged in user.
+     * @param body Created user object (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call createUserAsync(User body, final ApiCallback<Void> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
         }
-      };
+
+        Call call = createUserCall(body, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, callback);
+        return call;
     }
-
-    Call call = createUserCall(body, progressListener, progressRequestListener);
-    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;
-    
-    // verify the required parameter 'body' is set
-    if (body == null) {
-       throw new ApiException("Missing the required parameter 'body' when calling createUsersWithArrayInput(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/user/createWithArray".replaceAll("\\{format\\}","json");
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
+    /* Build call for createUsersWithArrayInput */
+    private Call createUsersWithArrayInputCall(List<User> body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = body;
+        
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling createUsersWithArrayInput(Async)");
         }
-      });
-    }
+        
 
-    String[] localVarAuthNames = new String[] {  };
-    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
+        // create path and map variables
+        String localVarPath = "/user/createWithArray".replaceAll("\\{format\\}","json");
 
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void createUsersWithArrayInput(List<User> body) throws ApiException {
-    createUsersWithArrayInputWithHttpInfo(body);
-  }
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(List<User> body) throws ApiException {
-    Call call = createUsersWithArrayInputCall(body, null, null);
-    return apiClient.execute(call);
-  }
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-  /**
-   * Creates list of users with given input array (asynchronously)
-   * 
-   * @param body List of user object (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call createUsersWithArrayInputAsync(List<User> body, final ApiCallback<Void> callback) throws ApiException {
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
         }
-      };
 
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object (required)
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void createUsersWithArrayInput(List<User> body) throws ApiException {
+        createUsersWithArrayInputWithHttpInfo(body);
+    }
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object (required)
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(List<User> body) throws ApiException {
+        Call call = createUsersWithArrayInputCall(body, null, null);
+        return apiClient.execute(call);
+    }
+
+    /**
+     * Creates list of users with given input array (asynchronously)
+     * 
+     * @param body List of user object (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call createUsersWithArrayInputAsync(List<User> body, final ApiCallback<Void> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
         }
-      };
+
+        Call call = createUsersWithArrayInputCall(body, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, callback);
+        return call;
     }
-
-    Call call = createUsersWithArrayInputCall(body, progressListener, progressRequestListener);
-    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;
-    
-    // verify the required parameter 'body' is set
-    if (body == null) {
-       throw new ApiException("Missing the required parameter 'body' when calling createUsersWithListInput(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/user/createWithList".replaceAll("\\{format\\}","json");
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
+    /* Build call for createUsersWithListInput */
+    private Call createUsersWithListInputCall(List<User> body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = body;
+        
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling createUsersWithListInput(Async)");
         }
-      });
-    }
+        
 
-    String[] localVarAuthNames = new String[] {  };
-    return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
+        // create path and map variables
+        String localVarPath = "/user/createWithList".replaceAll("\\{format\\}","json");
 
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void createUsersWithListInput(List<User> body) throws ApiException {
-    createUsersWithListInputWithHttpInfo(body);
-  }
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param body List of user object (required)
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> createUsersWithListInputWithHttpInfo(List<User> body) throws ApiException {
-    Call call = createUsersWithListInputCall(body, null, null);
-    return apiClient.execute(call);
-  }
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-  /**
-   * Creates list of users with given input array (asynchronously)
-   * 
-   * @param body List of user object (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call createUsersWithListInputAsync(List<User> body, final ApiCallback<Void> callback) throws ApiException {
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
         }
-      };
 
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object (required)
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void createUsersWithListInput(List<User> body) throws ApiException {
+        createUsersWithListInputWithHttpInfo(body);
+    }
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * @param body List of user object (required)
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> createUsersWithListInputWithHttpInfo(List<User> body) throws ApiException {
+        Call call = createUsersWithListInputCall(body, null, null);
+        return apiClient.execute(call);
+    }
+
+    /**
+     * Creates list of users with given input array (asynchronously)
+     * 
+     * @param body List of user object (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call createUsersWithListInputAsync(List<User> body, final ApiCallback<Void> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
         }
-      };
+
+        Call call = createUsersWithListInputCall(body, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, callback);
+        return call;
     }
-
-    Call call = createUsersWithListInputCall(body, progressListener, progressRequestListener);
-    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;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-       throw new ApiException("Missing the required parameter 'username' when calling deleteUser(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
+    /* Build call for deleteUser */
+    private Call deleteUserCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+        // verify the required parameter 'username' is set
+        if (username == null) {
+            throw new ApiException("Missing the required parameter 'username' when calling deleteUser(Async)");
         }
-      });
-    }
+        
 
-    String[] localVarAuthNames = new String[] {  };
-    return apiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
+        // create path and map variables
+        String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+        .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted (required)
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void deleteUser(String username) throws ApiException {
-    deleteUserWithHttpInfo(username);
-  }
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted (required)
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> deleteUserWithHttpInfo(String username) throws ApiException {
-    Call call = deleteUserCall(username, null, null);
-    return apiClient.execute(call);
-  }
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-  /**
-   * Delete user (asynchronously)
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call deleteUserAsync(String username, final ApiCallback<Void> callback) throws ApiException {
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
         }
-      };
 
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * @param username The name that needs to be deleted (required)
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void deleteUser(String username) throws ApiException {
+        deleteUserWithHttpInfo(username);
+    }
+
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * @param username The name that needs to be deleted (required)
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> deleteUserWithHttpInfo(String username) throws ApiException {
+        Call call = deleteUserCall(username, null, null);
+        return apiClient.execute(call);
+    }
+
+    /**
+     * Delete user (asynchronously)
+     * This can only be done by the logged in user.
+     * @param username The name that needs to be deleted (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call deleteUserAsync(String username, final ApiCallback<Void> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
         }
-      };
+
+        Call call = deleteUserCall(username, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, callback);
+        return call;
     }
-
-    Call call = deleteUserCall(username, progressListener, progressRequestListener);
-    apiClient.executeAsync(call, callback);
-    return call;
-  }
-  /* Build call for getUserByName */
-  private Call getUserByNameCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-       throw new ApiException("Missing the required parameter 'username' when calling getUserByName(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
+    /* Build call for getUserByName */
+    private Call getUserByNameCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+        // verify the required parameter 'username' is set
+        if (username == null) {
+            throw new ApiException("Missing the required parameter 'username' when calling getUserByName(Async)");
         }
-      });
-    }
+        
 
-    String[] localVarAuthNames = new String[] {  };
-    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
+        // create path and map variables
+        String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+        .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
 
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
-   * @return User
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public User getUserByName(String username) throws ApiException {
-    ApiResponse<User> resp = getUserByNameWithHttpInfo(username);
-    return resp.getData();
-  }
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
 
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
-   * @return ApiResponse<User>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException {
-    Call call = getUserByNameCall(username, null, null);
-    Type localVarReturnType = new TypeToken<User>(){}.getType();
-    return apiClient.execute(call, localVarReturnType);
-  }
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-  /**
-   * Get user by user name (asynchronously)
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing.  (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call getUserByNameAsync(String username, final ApiCallback<User> callback) throws ApiException {
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
         }
-      };
 
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    /**
+     * Get user by user name
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing.  (required)
+     * @return User
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public User getUserByName(String username) throws ApiException {
+        ApiResponse<User> resp = getUserByNameWithHttpInfo(username);
+        return resp.getData();
+    }
+
+    /**
+     * Get user by user name
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing.  (required)
+     * @return ApiResponse&lt;User&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException {
+        Call call = getUserByNameCall(username, null, null);
+        Type localVarReturnType = new TypeToken<User>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Get user by user name (asynchronously)
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing.  (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call getUserByNameAsync(String username, final ApiCallback<User> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
         }
-      };
+
+        Call call = getUserByNameCall(username, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<User>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
     }
-
-    Call call = getUserByNameCall(username, progressListener, progressRequestListener);
-    Type localVarReturnType = new TypeToken<User>(){}.getType();
-    apiClient.executeAsync(call, localVarReturnType, callback);
-    return call;
-  }
-  /* Build call for loginUser */
-  private Call loginUserCall(String username, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-       throw new ApiException("Missing the required parameter 'username' when calling loginUser(Async)");
-    }
-    
-    // verify the required parameter 'password' is set
-    if (password == null) {
-       throw new ApiException("Missing the required parameter 'password' when calling loginUser(Async)");
-    }
-    
-
-    // create path and map variables
-    String localVarPath = "/user/login".replaceAll("\\{format\\}","json");
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    if (username != null)
-      localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username));
-    if (password != null)
-      localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password));
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
+    /* Build call for loginUser */
+    private Call loginUserCall(String username, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+        // verify the required parameter 'username' is set
+        if (username == null) {
+            throw new ApiException("Missing the required parameter 'username' when calling loginUser(Async)");
         }
-      });
+        
+        // verify the required parameter 'password' is set
+        if (password == null) {
+            throw new ApiException("Missing the required parameter 'password' when calling loginUser(Async)");
+        }
+        
+
+        // create path and map variables
+        String localVarPath = "/user/login".replaceAll("\\{format\\}","json");
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        if (username != null)
+        localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username));
+        if (password != null)
+        localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password));
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
-    String[] localVarAuthNames = new String[] {  };
-    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login (required)
-   * @param password The password for login in clear text (required)
-   * @return String
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public String loginUser(String username, String password) throws ApiException {
-    ApiResponse<String> resp = loginUserWithHttpInfo(username, password);
-    return resp.getData();
-  }
-
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login (required)
-   * @param password The password for login in clear text (required)
-   * @return ApiResponse<String>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException {
-    Call call = loginUserCall(username, password, null, null);
-    Type localVarReturnType = new TypeToken<String>(){}.getType();
-    return apiClient.execute(call, localVarReturnType);
-  }
-
-  /**
-   * Logs user into the system (asynchronously)
-   * 
-   * @param username The user name for login (required)
-   * @param password The password for login in clear text (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call loginUserAsync(String username, String password, final ApiCallback<String> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    /**
+     * Logs user into the system
+     * 
+     * @param username The user name for login (required)
+     * @param password The password for login in clear text (required)
+     * @return String
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public String loginUser(String username, String password) throws ApiException {
+        ApiResponse<String> resp = loginUserWithHttpInfo(username, password);
+        return resp.getData();
     }
 
-    Call call = loginUserCall(username, password, progressListener, progressRequestListener);
-    Type localVarReturnType = new TypeToken<String>(){}.getType();
-    apiClient.executeAsync(call, localVarReturnType, callback);
-    return call;
-  }
-  /* Build call for logoutUser */
-  private Call logoutUserCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
-    Object localVarPostBody = null;
-    
-
-    // create path and map variables
-    String localVarPath = "/user/logout".replaceAll("\\{format\\}","json");
-
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
-        }
-      });
+    /**
+     * Logs user into the system
+     * 
+     * @param username The user name for login (required)
+     * @param password The password for login in clear text (required)
+     * @return ApiResponse&lt;String&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException {
+        Call call = loginUserCall(username, password, null, null);
+        Type localVarReturnType = new TypeToken<String>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
     }
 
-    String[] localVarAuthNames = new String[] {  };
-    return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
+    /**
+     * Logs user into the system (asynchronously)
+     * 
+     * @param username The user name for login (required)
+     * @param password The password for login in clear text (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call loginUserAsync(String username, String password, final ApiCallback<String> callback) throws ApiException {
 
-  /**
-   * Logs out current logged in user session
-   * 
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void logoutUser() throws ApiException {
-    logoutUserWithHttpInfo();
-  }
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
 
-  /**
-   * Logs out current logged in user session
-   * 
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> logoutUserWithHttpInfo() throws ApiException {
-    Call call = logoutUserCall(null, null);
-    return apiClient.execute(call);
-  }
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
 
-  /**
-   * Logs out current logged in user session (asynchronously)
-   * 
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call logoutUserAsync(final ApiCallback<Void> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
         }
-      };
 
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
+        Call call = loginUserCall(username, password, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<String>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
+    /* Build call for logoutUser */
+    private Call logoutUserCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+        
+
+        // create path and map variables
+        String localVarPath = "/user/logout".replaceAll("\\{format\\}","json");
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
         }
-      };
+
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
-    Call call = logoutUserCall(progressListener, progressRequestListener);
-    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;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-       throw new ApiException("Missing the required parameter 'username' when calling updateUser(Async)");
+    /**
+     * Logs out current logged in user session
+     * 
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void logoutUser() throws ApiException {
+        logoutUserWithHttpInfo();
     }
-    
-    // verify the required parameter 'body' is set
-    if (body == null) {
-       throw new ApiException("Missing the required parameter 'body' when calling updateUser(Async)");
+
+    /**
+     * Logs out current logged in user session
+     * 
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> logoutUserWithHttpInfo() throws ApiException {
+        Call call = logoutUserCall(null, null);
+        return apiClient.execute(call);
     }
-    
 
-    // create path and map variables
-    String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
+    /**
+     * Logs out current logged in user session (asynchronously)
+     * 
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call logoutUserAsync(final ApiCallback<Void> callback) throws ApiException {
 
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
 
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
 
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-    if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-    localVarHeaderParams.put("Content-Type", localVarContentType);
-
-    if(progressListener != null) {
-      apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
-      @Override
-      public Response intercept(Interceptor.Chain chain) throws IOException {
-        Response originalResponse = chain.proceed(chain.request());
-        return originalResponse.newBuilder()
-                .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                .build();
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
         }
-      });
+
+        Call call = logoutUserCall(progressListener, progressRequestListener);
+        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;
+        
+        // verify the required parameter 'username' is set
+        if (username == null) {
+            throw new ApiException("Missing the required parameter 'username' when calling updateUser(Async)");
+        }
+        
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling updateUser(Async)");
+        }
+        
+
+        // create path and map variables
+        String localVarPath = "/user/{username}".replaceAll("\\{format\\}","json")
+        .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/xml", "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+                @Override
+                public Response intercept(Interceptor.Chain chain) throws IOException {
+                    Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] {  };
+        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
-    String[] localVarAuthNames = new String[] {  };
-    return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-  }
-
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted (required)
-   * @param body Updated user object (required)
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public void updateUser(String username, User body) throws ApiException {
-    updateUserWithHttpInfo(username, body);
-  }
-
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted (required)
-   * @param body Updated user object (required)
-   * @return ApiResponse<Void>
-   * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-   */
-  public ApiResponse<Void> updateUserWithHttpInfo(String username, User body) throws ApiException {
-    Call call = updateUserCall(username, body, null, null);
-    return apiClient.execute(call);
-  }
-
-  /**
-   * Updated user (asynchronously)
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted (required)
-   * @param body Updated user object (required)
-   * @param callback The callback to be executed when the API call finishes
-   * @return The request call
-   * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-   */
-  public Call updateUserAsync(String username, User body, final ApiCallback<Void> callback) throws ApiException {
-
-    ProgressResponseBody.ProgressListener progressListener = null;
-    ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-    if (callback != null) {
-      progressListener = new ProgressResponseBody.ProgressListener() {
-        @Override
-        public void update(long bytesRead, long contentLength, boolean done) {
-          callback.onDownloadProgress(bytesRead, contentLength, done);
-        }
-      };
-
-      progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-        @Override
-        public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-          callback.onUploadProgress(bytesWritten, contentLength, done);
-        }
-      };
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * @param username name that need to be deleted (required)
+     * @param body Updated user object (required)
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public void updateUser(String username, User body) throws ApiException {
+        updateUserWithHttpInfo(username, body);
     }
 
-    Call call = updateUserCall(username, body, progressListener, progressRequestListener);
-    apiClient.executeAsync(call, callback);
-    return call;
-  }
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * @param username name that need to be deleted (required)
+     * @param body Updated user object (required)
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<Void> updateUserWithHttpInfo(String username, User body) throws ApiException {
+        Call call = updateUserCall(username, body, null, null);
+        return apiClient.execute(call);
+    }
+
+    /**
+     * Updated user (asynchronously)
+     * This can only be done by the logged in user.
+     * @param username name that need to be deleted (required)
+     * @param body Updated user object (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public Call updateUserAsync(String username, User body, final ApiCallback<Void> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        Call call = updateUserCall(username, body, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, callback);
+        return call;
+    }
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index 468c1ad8410a..25c57b9e7d96 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-06-03T00:41:49.229+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T00:01:22.559+08:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java
index 98b1a6900b93..c5527df3b334 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java
@@ -6,6 +6,11 @@ import java.util.Map;
 import java.util.List;
 
 public interface Authentication {
-  /** Apply authentication settings to header and query params. */
-  void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
+    /**
+     * Apply authentication settings to header and query params.
+     *
+     * @param queryParams List of query parameters
+     * @param headerParams Map of header parameters
+     */
+    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index 6ed16d1db30a..454771365386 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -10,32 +10,32 @@ import java.util.List;
 import java.io.UnsupportedEncodingException;
 
 public class HttpBasicAuth implements Authentication {
-  private String username;
-  private String password;
+    private String username;
+    private String password;
 
-  public String getUsername() {
-    return username;
-  }
-
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-  public String getPassword() {
-    return password;
-  }
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
-    if (username == null && password == null) {
-      return;
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
+        if (username == null && password == null) {
+            return;
+        }
+        headerParams.put("Authorization", Credentials.basic(
+            username == null ? "" : username,
+            password == null ? "" : password));
     }
-    headerParams.put("Authorization", Credentials.basic(
-        username == null ? "" : username,
-        password == null ? "" : password));
-  }
 }
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 0b85d10068eb..354330e0013f 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-06-03T00:41:49.229+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T00:01:22.559+08:00")
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index ab464f65259a..eae1fc450de9 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -14,72 +14,88 @@ import com.google.gson.annotations.SerializedName;
  * AdditionalPropertiesClass
  */
 public class AdditionalPropertiesClass   {
-  
-  @SerializedName("map_property")
-  private Map<String, String> mapProperty = new HashMap<String, String>();
+    @SerializedName("map_property")
+    private Map<String, String> mapProperty = new HashMap<String, String>();
+    @SerializedName("map_of_map_property")
+    private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();
 
-  @SerializedName("map_of_map_property")
-  private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Map<String, String> getMapProperty() {
-    return mapProperty;
-  }
-  public void setMapProperty(Map<String, String> mapProperty) {
-    this.mapProperty = mapProperty;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Map<String, Map<String, String>> getMapOfMapProperty() {
-    return mapOfMapProperty;
-  }
-  public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
-    this.mapOfMapProperty = mapOfMapProperty;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get mapProperty
+     * @return mapProperty
+     **/
+    @ApiModelProperty(value = "")
+    public Map<String, String> getMapProperty() {
+        return mapProperty;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set mapProperty
+     *
+     * @param mapProperty mapProperty
+     */
+    public void setMapProperty(Map<String, String> mapProperty) {
+        this.mapProperty = mapProperty;
     }
-    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
-    return Objects.equals(this.mapProperty, additionalPropertiesClass.mapProperty) &&
+
+    /**
+     * Get mapOfMapProperty
+     * @return mapOfMapProperty
+     **/
+    @ApiModelProperty(value = "")
+    public Map<String, Map<String, String>> getMapOfMapProperty() {
+        return mapOfMapProperty;
+    }
+
+    /**
+     * Set mapOfMapProperty
+     *
+     * @param mapOfMapProperty mapOfMapProperty
+     */
+    public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
+        this.mapOfMapProperty = mapOfMapProperty;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+        return Objects.equals(this.mapProperty, additionalPropertiesClass.mapProperty) &&
         Objects.equals(this.mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mapProperty, mapOfMapProperty);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesClass {\n");
-    
-    sb.append("    mapProperty: ").append(toIndentedString(mapProperty)).append("\n");
-    sb.append("    mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).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    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(mapProperty, mapOfMapProperty);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class AdditionalPropertiesClass {\n");
+        
+        sb.append("    mapProperty: ").append(toIndentedString(mapProperty)).append("\n");
+        sb.append("    mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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/Animal.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Animal.java
index b83bc63db0e9..1dc78139c73d 100644
--- 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
@@ -11,72 +11,88 @@ import com.google.gson.annotations.SerializedName;
  * Animal
  */
 public class Animal   {
-  
-  @SerializedName("className")
-  private String className = null;
+    @SerializedName("className")
+    private String className = null;
+    @SerializedName("color")
+    private String color = "red";
 
-  @SerializedName("color")
-  private String color = "red";
-
-  /**
-   **/
-  @ApiModelProperty(required = true, value = "")
-  public String getClassName() {
-    return className;
-  }
-  public void setClassName(String className) {
-    this.className = className;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getColor() {
-    return color;
-  }
-  public void setColor(String color) {
-    this.color = color;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get className
+     * @return className
+     **/
+    @ApiModelProperty(required = true, value = "")
+    public String getClassName() {
+        return className;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set className
+     *
+     * @param className className
+     */
+    public void setClassName(String className) {
+        this.className = className;
     }
-    Animal animal = (Animal) o;
-    return Objects.equals(this.className, animal.className) &&
+
+    /**
+     * Get color
+     * @return color
+     **/
+    @ApiModelProperty(value = "")
+    public String getColor() {
+        return color;
+    }
+
+    /**
+     * Set color
+     *
+     * @param color color
+     */
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+
+    @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) &&
         Objects.equals(this.color, animal.color);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(className, color);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Animal {\n");
-    
-    sb.append("    className: ").append(toIndentedString(className)).append("\n");
-    sb.append("    color: ").append(toIndentedString(color)).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    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(className, color);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class Animal {\n");
+        
+        sb.append("    className: ").append(toIndentedString(className)).append("\n");
+        sb.append("    color: ").append(toIndentedString(color)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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/AnimalFarm.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
index 8be2f1ecd0d3..ccbebe839f1e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -12,42 +12,44 @@ import com.google.gson.annotations.SerializedName;
  * AnimalFarm
  */
 public class AnimalFarm extends ArrayList<Animal>  {
-  
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        return true;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode());
     }
-    return true;
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AnimalFarm {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).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";
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class AnimalFarm {\n");
+        sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
     }
-    return o.toString().replace("\n", "\n    ");
-  }
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
index 19ad5d374995..6a0f8f790faa 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -13,87 +13,110 @@ import com.google.gson.annotations.SerializedName;
  * ArrayTest
  */
 public class ArrayTest   {
-  
-  @SerializedName("array_of_string")
-  private List<String> arrayOfString = new ArrayList<String>();
+    @SerializedName("array_of_string")
+    private List<String> arrayOfString = new ArrayList<String>();
+    @SerializedName("array_array_of_integer")
+    private List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
+    @SerializedName("array_array_of_model")
+    private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
 
-  @SerializedName("array_array_of_integer")
-  private List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
-
-  @SerializedName("array_array_of_model")
-  private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<String> getArrayOfString() {
-    return arrayOfString;
-  }
-  public void setArrayOfString(List<String> arrayOfString) {
-    this.arrayOfString = arrayOfString;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<List<Long>> getArrayArrayOfInteger() {
-    return arrayArrayOfInteger;
-  }
-  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    this.arrayArrayOfInteger = arrayArrayOfInteger;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
-    return arrayArrayOfModel;
-  }
-  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    this.arrayArrayOfModel = arrayArrayOfModel;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get arrayOfString
+     * @return arrayOfString
+     **/
+    @ApiModelProperty(value = "")
+    public List<String> getArrayOfString() {
+        return arrayOfString;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set arrayOfString
+     *
+     * @param arrayOfString arrayOfString
+     */
+    public void setArrayOfString(List<String> arrayOfString) {
+        this.arrayOfString = arrayOfString;
     }
-    ArrayTest arrayTest = (ArrayTest) o;
-    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
+
+    /**
+     * Get arrayArrayOfInteger
+     * @return arrayArrayOfInteger
+     **/
+    @ApiModelProperty(value = "")
+    public List<List<Long>> getArrayArrayOfInteger() {
+        return arrayArrayOfInteger;
+    }
+
+    /**
+     * Set arrayArrayOfInteger
+     *
+     * @param arrayArrayOfInteger arrayArrayOfInteger
+     */
+    public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+        this.arrayArrayOfInteger = arrayArrayOfInteger;
+    }
+
+    /**
+     * Get arrayArrayOfModel
+     * @return arrayArrayOfModel
+     **/
+    @ApiModelProperty(value = "")
+    public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+        return arrayArrayOfModel;
+    }
+
+    /**
+     * Set arrayArrayOfModel
+     *
+     * @param arrayArrayOfModel arrayArrayOfModel
+     */
+    public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+        this.arrayArrayOfModel = arrayArrayOfModel;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ArrayTest arrayTest = (ArrayTest) o;
+        return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
         Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
         Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayTest {\n");
-    
-    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
-    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
-    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).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    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ArrayTest {\n");
+        
+        sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+        sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+        sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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
index 7d190d48425c..c76556658838 100644
--- 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
@@ -12,88 +12,111 @@ import com.google.gson.annotations.SerializedName;
  * Cat
  */
 public class Cat extends Animal  {
-  
-  @SerializedName("className")
-  private String className = null;
+    @SerializedName("className")
+    private String className = null;
+    @SerializedName("color")
+    private String color = "red";
+    @SerializedName("declawed")
+    private Boolean declawed = null;
 
-  @SerializedName("color")
-  private String color = "red";
-
-  @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 String getColor() {
-    return color;
-  }
-  public void setColor(String color) {
-    this.color = color;
-  }
-
-  /**
-   **/
-  @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;
+    /**
+     * Get className
+     * @return className
+     **/
+    @ApiModelProperty(required = true, value = "")
+    public String getClassName() {
+        return className;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set className
+     *
+     * @param className className
+     */
+    public void setClassName(String className) {
+        this.className = className;
     }
-    Cat cat = (Cat) o;
-    return Objects.equals(this.className, cat.className) &&
+
+    /**
+     * Get color
+     * @return color
+     **/
+    @ApiModelProperty(value = "")
+    public String getColor() {
+        return color;
+    }
+
+    /**
+     * Set color
+     *
+     * @param color color
+     */
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    /**
+     * Get declawed
+     * @return declawed
+     **/
+    @ApiModelProperty(value = "")
+    public Boolean getDeclawed() {
+        return declawed;
+    }
+
+    /**
+     * Set declawed
+     *
+     * @param declawed 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.color, cat.color) &&
         Objects.equals(this.declawed, cat.declawed) &&
         super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(className, color, 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("    color: ").append(toIndentedString(color)).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    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(className, color, 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("    color: ").append(toIndentedString(color)).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).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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 f72d42a57466..c156ce3a330b 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
@@ -11,72 +11,88 @@ import com.google.gson.annotations.SerializedName;
  * Category
  */
 public class Category   {
-  
-  @SerializedName("id")
-  private Long id = null;
+    @SerializedName("id")
+    private Long id = null;
+    @SerializedName("name")
+    private String name = null;
 
-  @SerializedName("name")
-  private String name = null;
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get id
+     * @return id
+     **/
+    @ApiModelProperty(value = "")
+    public Long getId() {
+        return id;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set id
+     *
+     * @param id id
+     */
+    public void setId(Long id) {
+        this.id = id;
     }
-    Category category = (Category) o;
-    return Objects.equals(this.id, category.id) &&
+
+    /**
+     * Get name
+     * @return name
+     **/
+    @ApiModelProperty(value = "")
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Set name
+     *
+     * @param name 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(this.id, category.id) &&
         Objects.equals(this.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    ");
-  }
+
+    @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).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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/Dog.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java
index ba9f5ac58583..e2823490c0d5 100644
--- 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
@@ -12,88 +12,111 @@ import com.google.gson.annotations.SerializedName;
  * Dog
  */
 public class Dog extends Animal  {
-  
-  @SerializedName("className")
-  private String className = null;
+    @SerializedName("className")
+    private String className = null;
+    @SerializedName("color")
+    private String color = "red";
+    @SerializedName("breed")
+    private String breed = null;
 
-  @SerializedName("color")
-  private String color = "red";
-
-  @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 getColor() {
-    return color;
-  }
-  public void setColor(String color) {
-    this.color = color;
-  }
-
-  /**
-   **/
-  @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;
+    /**
+     * Get className
+     * @return className
+     **/
+    @ApiModelProperty(required = true, value = "")
+    public String getClassName() {
+        return className;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set className
+     *
+     * @param className className
+     */
+    public void setClassName(String className) {
+        this.className = className;
     }
-    Dog dog = (Dog) o;
-    return Objects.equals(this.className, dog.className) &&
+
+    /**
+     * Get color
+     * @return color
+     **/
+    @ApiModelProperty(value = "")
+    public String getColor() {
+        return color;
+    }
+
+    /**
+     * Set color
+     *
+     * @param color color
+     */
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    /**
+     * Get breed
+     * @return breed
+     **/
+    @ApiModelProperty(value = "")
+    public String getBreed() {
+        return breed;
+    }
+
+    /**
+     * Set breed
+     *
+     * @param breed 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.color, dog.color) &&
         Objects.equals(this.breed, dog.breed) &&
         super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(className, color, 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("    color: ").append(toIndentedString(color)).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    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(className, color, 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("    color: ").append(toIndentedString(color)).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).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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/EnumClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
index 6426f26867c3..7008dd7ba4b4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
@@ -9,24 +9,24 @@ import com.google.gson.annotations.SerializedName;
  * Gets or Sets EnumClass
  */
 public enum EnumClass {
-  @SerializedName("_abc")
-  _ABC("_abc"),
+    @SerializedName("_abc")
+    _ABC("_abc"),
 
-  @SerializedName("-efg")
-  _EFG("-efg"),
+    @SerializedName("-efg")
+    _EFG("-efg"),
 
-  @SerializedName("(xyz)")
-  _XYZ_("(xyz)");
+    @SerializedName("(xyz)")
+    _XYZ_("(xyz)");
 
-  private String value;
+    private String value;
 
-  EnumClass(String value) {
-    this.value = value;
-  }
+    EnumClass(String value) {
+        this.value = value;
+    }
 
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
index 9b3103c16d7f..3da7e768f66f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
@@ -11,8 +11,6 @@ import com.google.gson.annotations.SerializedName;
  * EnumTest
  */
 public class EnumTest   {
-  
-
   /**
    * Gets or Sets enumString
    */
@@ -35,10 +33,8 @@ public class EnumTest   {
     }
   }
 
-  @SerializedName("enum_string")
-  private EnumStringEnum enumString = null;
-
-
+    @SerializedName("enum_string")
+    private EnumStringEnum enumString = null;
   /**
    * Gets or Sets enumInteger
    */
@@ -61,10 +57,8 @@ public class EnumTest   {
     }
   }
 
-  @SerializedName("enum_integer")
-  private EnumIntegerEnum enumInteger = null;
-
-
+    @SerializedName("enum_integer")
+    private EnumIntegerEnum enumInteger = null;
   /**
    * Gets or Sets enumNumber
    */
@@ -87,80 +81,106 @@ public class EnumTest   {
     }
   }
 
-  @SerializedName("enum_number")
-  private EnumNumberEnum enumNumber = null;
+    @SerializedName("enum_number")
+    private EnumNumberEnum enumNumber = null;
 
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public EnumStringEnum getEnumString() {
-    return enumString;
-  }
-  public void setEnumString(EnumStringEnum enumString) {
-    this.enumString = enumString;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public EnumIntegerEnum getEnumInteger() {
-    return enumInteger;
-  }
-  public void setEnumInteger(EnumIntegerEnum enumInteger) {
-    this.enumInteger = enumInteger;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public EnumNumberEnum getEnumNumber() {
-    return enumNumber;
-  }
-  public void setEnumNumber(EnumNumberEnum enumNumber) {
-    this.enumNumber = enumNumber;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get enumString
+     * @return enumString
+     **/
+    @ApiModelProperty(value = "")
+    public EnumStringEnum getEnumString() {
+        return enumString;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set enumString
+     *
+     * @param enumString enumString
+     */
+    public void setEnumString(EnumStringEnum enumString) {
+        this.enumString = enumString;
     }
-    EnumTest enumTest = (EnumTest) o;
-    return Objects.equals(this.enumString, enumTest.enumString) &&
+
+    /**
+     * Get enumInteger
+     * @return enumInteger
+     **/
+    @ApiModelProperty(value = "")
+    public EnumIntegerEnum getEnumInteger() {
+        return enumInteger;
+    }
+
+    /**
+     * Set enumInteger
+     *
+     * @param enumInteger enumInteger
+     */
+    public void setEnumInteger(EnumIntegerEnum enumInteger) {
+        this.enumInteger = enumInteger;
+    }
+
+    /**
+     * Get enumNumber
+     * @return enumNumber
+     **/
+    @ApiModelProperty(value = "")
+    public EnumNumberEnum getEnumNumber() {
+        return enumNumber;
+    }
+
+    /**
+     * Set enumNumber
+     *
+     * @param enumNumber enumNumber
+     */
+    public void setEnumNumber(EnumNumberEnum enumNumber) {
+        this.enumNumber = enumNumber;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        EnumTest enumTest = (EnumTest) o;
+        return Objects.equals(this.enumString, enumTest.enumString) &&
         Objects.equals(this.enumInteger, enumTest.enumInteger) &&
         Objects.equals(this.enumNumber, enumTest.enumNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(enumString, enumInteger, enumNumber);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumTest {\n");
-    
-    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
-    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
-    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).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    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(enumString, enumInteger, enumNumber);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class EnumTest {\n");
+        
+        sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
+        sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
+        sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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
index af3fec2a2eac..37c3412ee08c 100644
--- 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
@@ -13,197 +13,288 @@ import com.google.gson.annotations.SerializedName;
  * FormatTest
  */
 public class FormatTest   {
-  
-  @SerializedName("integer")
-  private Integer integer = null;
+    @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("uuid")
+    private String uuid = null;
+    @SerializedName("password")
+    private String password = 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("uuid")
-  private String uuid = null;
-
-  @SerializedName("password")
-  private String password = null;
-
-  /**
-   * minimum: 10.0
-   * maximum: 100.0
-   **/
-  @ApiModelProperty(value = "")
-  public Integer getInteger() {
-    return integer;
-  }
-  public void setInteger(Integer integer) {
-    this.integer = integer;
-  }
-
-  /**
-   * minimum: 20.0
-   * maximum: 200.0
-   **/
-  @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;
-  }
-
-  /**
-   * minimum: 32.1
-   * maximum: 543.2
-   **/
-  @ApiModelProperty(required = true, value = "")
-  public BigDecimal getNumber() {
-    return number;
-  }
-  public void setNumber(BigDecimal number) {
-    this.number = number;
-  }
-
-  /**
-   * minimum: 54.3
-   * maximum: 987.6
-   **/
-  @ApiModelProperty(value = "")
-  public Float getFloat() {
-    return _float;
-  }
-  public void setFloat(Float _float) {
-    this._float = _float;
-  }
-
-  /**
-   * minimum: 67.8
-   * maximum: 123.4
-   **/
-  @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(required = true, 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(required = true, 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 getUuid() {
-    return uuid;
-  }
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(required = true, 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;
+    /**
+     * Get integer
+     * minimum: 10.0
+     * maximum: 100.0
+     * @return integer
+     **/
+    @ApiModelProperty(value = "")
+    public Integer getInteger() {
+        return integer;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set integer
+     *
+     * @param integer integer
+     */
+    public void setInteger(Integer integer) {
+        this.integer = integer;
     }
-    FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+
+    /**
+     * Get int32
+     * minimum: 20.0
+     * maximum: 200.0
+     * @return int32
+     **/
+    @ApiModelProperty(value = "")
+    public Integer getInt32() {
+        return int32;
+    }
+
+    /**
+     * Set int32
+     *
+     * @param int32 int32
+     */
+    public void setInt32(Integer int32) {
+        this.int32 = int32;
+    }
+
+    /**
+     * Get int64
+     * @return int64
+     **/
+    @ApiModelProperty(value = "")
+    public Long getInt64() {
+        return int64;
+    }
+
+    /**
+     * Set int64
+     *
+     * @param int64 int64
+     */
+    public void setInt64(Long int64) {
+        this.int64 = int64;
+    }
+
+    /**
+     * Get number
+     * minimum: 32.1
+     * maximum: 543.2
+     * @return number
+     **/
+    @ApiModelProperty(required = true, value = "")
+    public BigDecimal getNumber() {
+        return number;
+    }
+
+    /**
+     * Set number
+     *
+     * @param number number
+     */
+    public void setNumber(BigDecimal number) {
+        this.number = number;
+    }
+
+    /**
+     * Get _float
+     * minimum: 54.3
+     * maximum: 987.6
+     * @return _float
+     **/
+    @ApiModelProperty(value = "")
+    public Float getFloat() {
+        return _float;
+    }
+
+    /**
+     * Set _float
+     *
+     * @param _float _float
+     */
+    public void setFloat(Float _float) {
+        this._float = _float;
+    }
+
+    /**
+     * Get _double
+     * minimum: 67.8
+     * maximum: 123.4
+     * @return _double
+     **/
+    @ApiModelProperty(value = "")
+    public Double getDouble() {
+        return _double;
+    }
+
+    /**
+     * Set _double
+     *
+     * @param _double _double
+     */
+    public void setDouble(Double _double) {
+        this._double = _double;
+    }
+
+    /**
+     * Get string
+     * @return string
+     **/
+    @ApiModelProperty(value = "")
+    public String getString() {
+        return string;
+    }
+
+    /**
+     * Set string
+     *
+     * @param string string
+     */
+    public void setString(String string) {
+        this.string = string;
+    }
+
+    /**
+     * Get _byte
+     * @return _byte
+     **/
+    @ApiModelProperty(required = true, value = "")
+    public byte[] getByte() {
+        return _byte;
+    }
+
+    /**
+     * Set _byte
+     *
+     * @param _byte _byte
+     */
+    public void setByte(byte[] _byte) {
+        this._byte = _byte;
+    }
+
+    /**
+     * Get binary
+     * @return binary
+     **/
+    @ApiModelProperty(value = "")
+    public byte[] getBinary() {
+        return binary;
+    }
+
+    /**
+     * Set binary
+     *
+     * @param binary binary
+     */
+    public void setBinary(byte[] binary) {
+        this.binary = binary;
+    }
+
+    /**
+     * Get date
+     * @return date
+     **/
+    @ApiModelProperty(required = true, value = "")
+    public Date getDate() {
+        return date;
+    }
+
+    /**
+     * Set date
+     *
+     * @param date date
+     */
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    /**
+     * Get dateTime
+     * @return dateTime
+     **/
+    @ApiModelProperty(value = "")
+    public Date getDateTime() {
+        return dateTime;
+    }
+
+    /**
+     * Set dateTime
+     *
+     * @param dateTime dateTime
+     */
+    public void setDateTime(Date dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    /**
+     * Get uuid
+     * @return uuid
+     **/
+    @ApiModelProperty(value = "")
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Set uuid
+     *
+     * @param uuid uuid
+     */
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    /**
+     * Get password
+     * @return password
+     **/
+    @ApiModelProperty(required = true, value = "")
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Set password
+     *
+     * @param password 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) &&
@@ -216,44 +307,46 @@ public class FormatTest   {
         Objects.equals(this.dateTime, formatTest.dateTime) &&
         Objects.equals(this.uuid, formatTest.uuid) &&
         Objects.equals(this.password, formatTest.password);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, 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("    uuid: ").append(toIndentedString(uuid)).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    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, 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("    uuid: ").append(toIndentedString(uuid)).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).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 5748d6731cfd..124515dad275 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -16,87 +16,110 @@ import com.google.gson.annotations.SerializedName;
  * MixedPropertiesAndAdditionalPropertiesClass
  */
 public class MixedPropertiesAndAdditionalPropertiesClass   {
-  
-  @SerializedName("uuid")
-  private String uuid = null;
+    @SerializedName("uuid")
+    private String uuid = null;
+    @SerializedName("dateTime")
+    private Date dateTime = null;
+    @SerializedName("map")
+    private Map<String, Animal> map = new HashMap<String, Animal>();
 
-  @SerializedName("dateTime")
-  private Date dateTime = null;
-
-  @SerializedName("map")
-  private Map<String, Animal> map = new HashMap<String, Animal>();
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getUuid() {
-    return uuid;
-  }
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Date getDateTime() {
-    return dateTime;
-  }
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Map<String, Animal> getMap() {
-    return map;
-  }
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get uuid
+     * @return uuid
+     **/
+    @ApiModelProperty(value = "")
+    public String getUuid() {
+        return uuid;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set uuid
+     *
+     * @param uuid uuid
+     */
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
     }
-    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+
+    /**
+     * Get dateTime
+     * @return dateTime
+     **/
+    @ApiModelProperty(value = "")
+    public Date getDateTime() {
+        return dateTime;
+    }
+
+    /**
+     * Set dateTime
+     *
+     * @param dateTime dateTime
+     */
+    public void setDateTime(Date dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    /**
+     * Get map
+     * @return map
+     **/
+    @ApiModelProperty(value = "")
+    public Map<String, Animal> getMap() {
+        return map;
+    }
+
+    /**
+     * Set map
+     *
+     * @param map map
+     */
+    public void setMap(Map<String, Animal> map) {
+        this.map = map;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+        return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
         Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
         Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).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    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(uuid, dateTime, map);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+        
+        sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+        sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+        sb.append("    map: ").append(toIndentedString(map)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Model200Response.java
index 0ca445cb5458..6a14bc15a22b 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
@@ -12,57 +12,66 @@ import com.google.gson.annotations.SerializedName;
  */
 @ApiModel(description = "Model for testing model name starting with number")
 public class Model200Response   {
-  
-  @SerializedName("name")
-  private Integer name = null;
+    @SerializedName("name")
+    private Integer name = null;
 
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Integer getName() {
-    return name;
-  }
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get name
+     * @return name
+     **/
+    @ApiModelProperty(value = "")
+    public Integer getName() {
+        return name;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set name
+     *
+     * @param name name
+     */
+    public void setName(Integer name) {
+        this.name = name;
     }
-    Model200Response _200Response = (Model200Response) o;
-    return Objects.equals(this.name, _200Response.name);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(name);
-  }
 
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Model200Response {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Model200Response _200Response = (Model200Response) o;
+        return Objects.equals(this.name, _200Response.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class Model200Response {\n");
+        
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
     }
-    return o.toString().replace("\n", "\n    ");
-  }
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
index da52eda160d9..1c13fce28b85 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -11,87 +11,110 @@ import com.google.gson.annotations.SerializedName;
  * ModelApiResponse
  */
 public class ModelApiResponse   {
-  
-  @SerializedName("code")
-  private Integer code = null;
+    @SerializedName("code")
+    private Integer code = null;
+    @SerializedName("type")
+    private String type = null;
+    @SerializedName("message")
+    private String message = null;
 
-  @SerializedName("type")
-  private String type = null;
-
-  @SerializedName("message")
-  private String message = null;
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Integer getCode() {
-    return code;
-  }
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getType() {
-    return type;
-  }
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getMessage() {
-    return message;
-  }
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get code
+     * @return code
+     **/
+    @ApiModelProperty(value = "")
+    public Integer getCode() {
+        return code;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set code
+     *
+     * @param code code
+     */
+    public void setCode(Integer code) {
+        this.code = code;
     }
-    ModelApiResponse _apiResponse = (ModelApiResponse) o;
-    return Objects.equals(this.code, _apiResponse.code) &&
+
+    /**
+     * Get type
+     * @return type
+     **/
+    @ApiModelProperty(value = "")
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Set type
+     *
+     * @param type type
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * Get message
+     * @return message
+     **/
+    @ApiModelProperty(value = "")
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * Set message
+     *
+     * @param message 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;
+        }
+        ModelApiResponse _apiResponse = (ModelApiResponse) o;
+        return Objects.equals(this.code, _apiResponse.code) &&
         Objects.equals(this.type, _apiResponse.type) &&
         Objects.equals(this.message, _apiResponse.message);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, type, message);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelApiResponse {\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    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(code, type, message);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ModelApiResponse {\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).
+     *
+     * @param o Object to be converted to indented string
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
index 51aa1f4e055a..dceff653982a 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
@@ -12,57 +12,66 @@ import com.google.gson.annotations.SerializedName;
  */
 @ApiModel(description = "Model for testing reserved words")
 public class ModelReturn   {
-  
-  @SerializedName("return")
-  private Integer _return = null;
+    @SerializedName("return")
+    private Integer _return = null;
 
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Integer getReturn() {
-    return _return;
-  }
-  public void setReturn(Integer _return) {
-    this._return = _return;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get _return
+     * @return _return
+     **/
+    @ApiModelProperty(value = "")
+    public Integer getReturn() {
+        return _return;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set _return
+     *
+     * @param _return _return
+     */
+    public void setReturn(Integer _return) {
+        this._return = _return;
     }
-    ModelReturn _return = (ModelReturn) o;
-    return Objects.equals(this._return, _return._return);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(_return);
-  }
 
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelReturn {\n");
-    
-    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ModelReturn _return = (ModelReturn) o;
+        return Objects.equals(this._return, _return._return);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(_return);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ModelReturn {\n");
+        
+        sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
     }
-    return o.toString().replace("\n", "\n    ");
-  }
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
index e471107b3dc9..9a15ccc032b3 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
@@ -12,96 +12,114 @@ import com.google.gson.annotations.SerializedName;
  */
 @ApiModel(description = "Model for testing model name same as property name")
 public class Name   {
-  
-  @SerializedName("name")
-  private Integer name = null;
+    @SerializedName("name")
+    private Integer name = null;
+    @SerializedName("snake_case")
+    private Integer snakeCase = null;
+    @SerializedName("property")
+    private String property = null;
+    @SerializedName("123Number")
+    private Integer _123Number = null;
 
-  @SerializedName("snake_case")
-  private Integer snakeCase = null;
-
-  @SerializedName("property")
-  private String property = null;
-
-  @SerializedName("123Number")
-  private Integer _123Number = null;
-
-  /**
-   **/
-  @ApiModelProperty(required = true, value = "")
-  public Integer getName() {
-    return name;
-  }
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Integer getSnakeCase() {
-    return snakeCase;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getProperty() {
-    return property;
-  }
-  public void setProperty(String property) {
-    this.property = property;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Integer get123Number() {
-    return _123Number;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get name
+     * @return name
+     **/
+    @ApiModelProperty(required = true, value = "")
+    public Integer getName() {
+        return name;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set name
+     *
+     * @param name name
+     */
+    public void setName(Integer name) {
+        this.name = name;
     }
-    Name name = (Name) o;
-    return Objects.equals(this.name, name.name) &&
+
+    /**
+     * Get snakeCase
+     * @return snakeCase
+     **/
+    @ApiModelProperty(value = "")
+    public Integer getSnakeCase() {
+        return snakeCase;
+    }
+
+    /**
+     * Get property
+     * @return property
+     **/
+    @ApiModelProperty(value = "")
+    public String getProperty() {
+        return property;
+    }
+
+    /**
+     * Set property
+     *
+     * @param property property
+     */
+    public void setProperty(String property) {
+        this.property = property;
+    }
+
+    /**
+     * Get _123Number
+     * @return _123Number
+     **/
+    @ApiModelProperty(value = "")
+    public Integer get123Number() {
+        return _123Number;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Name name = (Name) o;
+        return Objects.equals(this.name, name.name) &&
         Objects.equals(this.snakeCase, name.snakeCase) &&
         Objects.equals(this.property, name.property) &&
         Objects.equals(this._123Number, name._123Number);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, snakeCase, property, _123Number);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Name {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
-    sb.append("    property: ").append(toIndentedString(property)).append("\n");
-    sb.append("    _123Number: ").append(toIndentedString(_123Number)).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    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, snakeCase, property, _123Number);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class Name {\n");
+        
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
+        sb.append("    property: ").append(toIndentedString(property)).append("\n");
+        sb.append("    _123Number: ").append(toIndentedString(_123Number)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
index e5c87a21e5ba..6e52dd1712cd 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
@@ -12,20 +12,14 @@ import com.google.gson.annotations.SerializedName;
  * Order
  */
 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;
-
-
+    @SerializedName("id")
+    private Long id = null;
+    @SerializedName("petId")
+    private Long petId = null;
+    @SerializedName("quantity")
+    private Integer quantity = null;
+    @SerializedName("shipDate")
+    private Date shipDate = null;
   /**
    * Order Status
    */
@@ -51,120 +45,168 @@ public class Order   {
     }
   }
 
-  @SerializedName("status")
-  private StatusEnum status = null;
+    @SerializedName("status")
+    private StatusEnum status = null;
+    @SerializedName("complete")
+    private Boolean complete = false;
 
-  @SerializedName("complete")
-  private Boolean complete = false;
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Long getPetId() {
-    return petId;
-  }
-  public void setPetId(Long petId) {
-    this.petId = petId;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Integer getQuantity() {
-    return quantity;
-  }
-  public void setQuantity(Integer quantity) {
-    this.quantity = quantity;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Date getShipDate() {
-    return shipDate;
-  }
-  public void setShipDate(Date shipDate) {
-    this.shipDate = shipDate;
-  }
-
-  /**
-   * Order Status
-   **/
-  @ApiModelProperty(value = "Order Status")
-  public StatusEnum getStatus() {
-    return status;
-  }
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Boolean getComplete() {
-    return complete;
-  }
-  public void setComplete(Boolean complete) {
-    this.complete = complete;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get id
+     * @return id
+     **/
+    @ApiModelProperty(value = "")
+    public Long getId() {
+        return id;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set id
+     *
+     * @param id id
+     */
+    public void setId(Long id) {
+        this.id = id;
     }
-    Order order = (Order) o;
-    return Objects.equals(this.id, order.id) &&
+
+    /**
+     * Get petId
+     * @return petId
+     **/
+    @ApiModelProperty(value = "")
+    public Long getPetId() {
+        return petId;
+    }
+
+    /**
+     * Set petId
+     *
+     * @param petId petId
+     */
+    public void setPetId(Long petId) {
+        this.petId = petId;
+    }
+
+    /**
+     * Get quantity
+     * @return quantity
+     **/
+    @ApiModelProperty(value = "")
+    public Integer getQuantity() {
+        return quantity;
+    }
+
+    /**
+     * Set quantity
+     *
+     * @param quantity quantity
+     */
+    public void setQuantity(Integer quantity) {
+        this.quantity = quantity;
+    }
+
+    /**
+     * Get shipDate
+     * @return shipDate
+     **/
+    @ApiModelProperty(value = "")
+    public Date getShipDate() {
+        return shipDate;
+    }
+
+    /**
+     * Set shipDate
+     *
+     * @param shipDate shipDate
+     */
+    public void setShipDate(Date shipDate) {
+        this.shipDate = shipDate;
+    }
+
+    /**
+     * Order Status
+     * @return status
+     **/
+    @ApiModelProperty(value = "Order Status")
+    public StatusEnum getStatus() {
+        return status;
+    }
+
+    /**
+     * Set status
+     *
+     * @param status status
+     */
+    public void setStatus(StatusEnum status) {
+        this.status = status;
+    }
+
+    /**
+     * Get complete
+     * @return complete
+     **/
+    @ApiModelProperty(value = "")
+    public Boolean getComplete() {
+        return complete;
+    }
+
+    /**
+     * Set complete
+     *
+     * @param complete 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(this.id, order.id) &&
         Objects.equals(this.petId, order.petId) &&
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
         Objects.equals(this.complete, order.complete);
-  }
-
-  @Override
-  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    ");
-  }
+
+    @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).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
index bc18c39e75fc..abb2dcdef487 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
@@ -15,23 +15,16 @@ import com.google.gson.annotations.SerializedName;
  * Pet
  */
 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>();
-
-
+    @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>();
   /**
    * pet status in the store
    */
@@ -57,117 +50,166 @@ public class Pet   {
     }
   }
 
-  @SerializedName("status")
-  private StatusEnum status = null;
+    @SerializedName("status")
+    private StatusEnum status = null;
 
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Category getCategory() {
-    return category;
-  }
-  public void setCategory(Category category) {
-    this.category = category;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(required = true, value = "")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(required = true, value = "")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<Tag> getTags() {
-    return tags;
-  }
-  public void setTags(List<Tag> tags) {
-    this.tags = tags;
-  }
-
-  /**
-   * pet status in the store
-   **/
-  @ApiModelProperty(value = "pet status in the store")
-  public StatusEnum getStatus() {
-    return status;
-  }
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get id
+     * @return id
+     **/
+    @ApiModelProperty(value = "")
+    public Long getId() {
+        return id;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set id
+     *
+     * @param id id
+     */
+    public void setId(Long id) {
+        this.id = id;
     }
-    Pet pet = (Pet) o;
-    return Objects.equals(this.id, pet.id) &&
+
+    /**
+     * Get category
+     * @return category
+     **/
+    @ApiModelProperty(value = "")
+    public Category getCategory() {
+        return category;
+    }
+
+    /**
+     * Set category
+     *
+     * @param category category
+     */
+    public void setCategory(Category category) {
+        this.category = category;
+    }
+
+    /**
+     * Get name
+     * @return name
+     **/
+    @ApiModelProperty(required = true, value = "")
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Set name
+     *
+     * @param name name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Get photoUrls
+     * @return photoUrls
+     **/
+    @ApiModelProperty(required = true, value = "")
+    public List<String> getPhotoUrls() {
+        return photoUrls;
+    }
+
+    /**
+     * Set photoUrls
+     *
+     * @param photoUrls photoUrls
+     */
+    public void setPhotoUrls(List<String> photoUrls) {
+        this.photoUrls = photoUrls;
+    }
+
+    /**
+     * Get tags
+     * @return tags
+     **/
+    @ApiModelProperty(value = "")
+    public List<Tag> getTags() {
+        return tags;
+    }
+
+    /**
+     * Set tags
+     *
+     * @param tags tags
+     */
+    public void setTags(List<Tag> tags) {
+        this.tags = tags;
+    }
+
+    /**
+     * pet status in the store
+     * @return status
+     **/
+    @ApiModelProperty(value = "pet status in the store")
+    public StatusEnum getStatus() {
+        return status;
+    }
+
+    /**
+     * Set status
+     *
+     * @param status status
+     */
+    public void setStatus(StatusEnum status) {
+        this.status = status;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Pet pet = (Pet) o;
+        return Objects.equals(this.id, pet.id) &&
         Objects.equals(this.category, pet.category) &&
         Objects.equals(this.name, pet.name) &&
         Objects.equals(this.photoUrls, pet.photoUrls) &&
         Objects.equals(this.tags, pet.tags) &&
         Objects.equals(this.status, pet.status);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, category, name, photoUrls, tags, status);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Pet {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
     }
-    return o.toString().replace("\n", "\n    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, category, name, photoUrls, tags, status);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class Pet {\n");
+        
+        sb.append("    id: ").append(toIndentedString(id)).append("\n");
+        sb.append("    category: ").append(toIndentedString(category)).append("\n");
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+        sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+        sb.append("    status: ").append(toIndentedString(status)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 2e6c3c4f7ffb..bdaa83c3acf4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -11,69 +11,79 @@ import com.google.gson.annotations.SerializedName;
  * ReadOnlyFirst
  */
 public class ReadOnlyFirst   {
-  
-  @SerializedName("bar")
-  private String bar = null;
+    @SerializedName("bar")
+    private String bar = null;
+    @SerializedName("baz")
+    private String baz = null;
 
-  @SerializedName("baz")
-  private String baz = null;
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getBar() {
-    return bar;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getBaz() {
-    return baz;
-  }
-  public void setBaz(String baz) {
-    this.baz = baz;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get bar
+     * @return bar
+     **/
+    @ApiModelProperty(value = "")
+    public String getBar() {
+        return bar;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Get baz
+     * @return baz
+     **/
+    @ApiModelProperty(value = "")
+    public String getBaz() {
+        return baz;
     }
-    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
-    return Objects.equals(this.bar, readOnlyFirst.bar) &&
+
+    /**
+     * Set baz
+     *
+     * @param baz baz
+     */
+    public void setBaz(String baz) {
+        this.baz = baz;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+        return Objects.equals(this.bar, readOnlyFirst.bar) &&
         Objects.equals(this.baz, readOnlyFirst.baz);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar, baz);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ReadOnlyFirst {\n");
-    
-    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
-    sb.append("    baz: ").append(toIndentedString(baz)).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    ");
-  }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(bar, baz);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ReadOnlyFirst {\n");
+        
+        sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+        sb.append("    baz: ").append(toIndentedString(baz)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/SpecialModelName.java
index 46cee3c51f8e..2646fadf61cf 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
@@ -11,57 +11,66 @@ import com.google.gson.annotations.SerializedName;
  * SpecialModelName
  */
 public class SpecialModelName   {
-  
-  @SerializedName("$special[property.name]")
-  private Long specialPropertyName = null;
+    @SerializedName("$special[property.name]")
+    private Long specialPropertyName = null;
 
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Long getSpecialPropertyName() {
-    return specialPropertyName;
-  }
-  public void setSpecialPropertyName(Long specialPropertyName) {
-    this.specialPropertyName = specialPropertyName;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get specialPropertyName
+     * @return specialPropertyName
+     **/
+    @ApiModelProperty(value = "")
+    public Long getSpecialPropertyName() {
+        return specialPropertyName;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set specialPropertyName
+     *
+     * @param specialPropertyName specialPropertyName
+     */
+    public void setSpecialPropertyName(Long specialPropertyName) {
+        this.specialPropertyName = specialPropertyName;
     }
-    SpecialModelName specialModelName = (SpecialModelName) o;
-    return Objects.equals(this.specialPropertyName, specialModelName.specialPropertyName);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(specialPropertyName);
-  }
 
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SpecialModelName {\n");
-    
-    sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        SpecialModelName specialModelName = (SpecialModelName) o;
+        return Objects.equals(this.specialPropertyName, specialModelName.specialPropertyName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(specialPropertyName);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class SpecialModelName {\n");
+        
+        sb.append("    specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     *
+     * @param o Object to be converted to indented string
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
     }
-    return o.toString().replace("\n", "\n    ");
-  }
 }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Tag.java
index 600acee2ba7a..0f71d4e2a7fa 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
@@ -11,72 +11,88 @@ import com.google.gson.annotations.SerializedName;
  * Tag
  */
 public class Tag   {
-  
-  @SerializedName("id")
-  private Long id = null;
+    @SerializedName("id")
+    private Long id = null;
+    @SerializedName("name")
+    private String name = null;
 
-  @SerializedName("name")
-  private String name = null;
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get id
+     * @return id
+     **/
+    @ApiModelProperty(value = "")
+    public Long getId() {
+        return id;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set id
+     *
+     * @param id id
+     */
+    public void setId(Long id) {
+        this.id = id;
     }
-    Tag tag = (Tag) o;
-    return Objects.equals(this.id, tag.id) &&
+
+    /**
+     * Get name
+     * @return name
+     **/
+    @ApiModelProperty(value = "")
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Set name
+     *
+     * @param name 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(this.id, tag.id) &&
         Objects.equals(this.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    ");
-  }
+
+    @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).
+     *
+     * @param o Object to be converted to indented string
+     */
+    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/User.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/User.java
index c8b44ce65624..332d6b81ba02 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
@@ -11,123 +11,178 @@ import com.google.gson.annotations.SerializedName;
  * User
  */
 public class User   {
-  
-  @SerializedName("id")
-  private Long id = null;
+    @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;
 
-  @SerializedName("username")
-  private String username = null;
-
-  @SerializedName("firstName")
-  private String firstName = null;
-
-  @SerializedName("lastName")
-  private String lastName = null;
-
-  @SerializedName("email")
-  private String email = null;
-
-  @SerializedName("password")
-  private String password = null;
-
-  @SerializedName("phone")
-  private String phone = null;
-
-  @SerializedName("userStatus")
-  private Integer userStatus = null;
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getUsername() {
-    return username;
-  }
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getFirstName() {
-    return firstName;
-  }
-  public void setFirstName(String firstName) {
-    this.firstName = firstName;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getLastName() {
-    return lastName;
-  }
-  public void setLastName(String lastName) {
-    this.lastName = lastName;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getEmail() {
-    return email;
-  }
-  public void setEmail(String email) {
-    this.email = email;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getPassword() {
-    return password;
-  }
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public String getPhone() {
-    return phone;
-  }
-  public void setPhone(String phone) {
-    this.phone = phone;
-  }
-
-  /**
-   * User Status
-   **/
-  @ApiModelProperty(value = "User Status")
-  public Integer getUserStatus() {
-    return userStatus;
-  }
-  public void setUserStatus(Integer userStatus) {
-    this.userStatus = userStatus;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     * Get id
+     * @return id
+     **/
+    @ApiModelProperty(value = "")
+    public Long getId() {
+        return id;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Set id
+     *
+     * @param id id
+     */
+    public void setId(Long id) {
+        this.id = id;
     }
-    User user = (User) o;
-    return Objects.equals(this.id, user.id) &&
+
+    /**
+     * Get username
+     * @return username
+     **/
+    @ApiModelProperty(value = "")
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * Set username
+     *
+     * @param username username
+     */
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    /**
+     * Get firstName
+     * @return firstName
+     **/
+    @ApiModelProperty(value = "")
+    public String getFirstName() {
+        return firstName;
+    }
+
+    /**
+     * Set firstName
+     *
+     * @param firstName firstName
+     */
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    /**
+     * Get lastName
+     * @return lastName
+     **/
+    @ApiModelProperty(value = "")
+    public String getLastName() {
+        return lastName;
+    }
+
+    /**
+     * Set lastName
+     *
+     * @param lastName lastName
+     */
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    /**
+     * Get email
+     * @return email
+     **/
+    @ApiModelProperty(value = "")
+    public String getEmail() {
+        return email;
+    }
+
+    /**
+     * Set email
+     *
+     * @param email email
+     */
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    /**
+     * Get password
+     * @return password
+     **/
+    @ApiModelProperty(value = "")
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Set password
+     *
+     * @param password password
+     */
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    /**
+     * Get phone
+     * @return phone
+     **/
+    @ApiModelProperty(value = "")
+    public String getPhone() {
+        return phone;
+    }
+
+    /**
+     * Set phone
+     *
+     * @param phone phone
+     */
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    /**
+     * User Status
+     * @return userStatus
+     **/
+    @ApiModelProperty(value = "User Status")
+    public Integer getUserStatus() {
+        return userStatus;
+    }
+
+    /**
+     * Set userStatus
+     *
+     * @param userStatus 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(this.id, user.id) &&
         Objects.equals(this.username, user.username) &&
         Objects.equals(this.firstName, user.firstName) &&
         Objects.equals(this.lastName, user.lastName) &&
@@ -135,39 +190,41 @@ public class User   {
         Objects.equals(this.password, user.password) &&
         Objects.equals(this.phone, user.phone) &&
         Objects.equals(this.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    ");
-  }
+
+    @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).
+     *
+     * @param o Object to be converted to indented string
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
 }
 
diff --git a/samples/client/petstore/python/.gitignore b/samples/client/petstore/python/.gitignore
index a655050c2631..1dbc687de014 100644
--- a/samples/client/petstore/python/.gitignore
+++ b/samples/client/petstore/python/.gitignore
@@ -44,8 +44,6 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
-venv/
-.python-version
 
 # Translations
 *.mo
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index 7bf57caa2b81..15d55317325e 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-06-07T00:29:52.148+09:00
+- Build date: 2016-06-08T10:26:51.066+08:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -130,6 +130,12 @@ Class | Method | HTTP request | Description
 ## Documentation For Authorization
 
 
+## api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
 ## petstore_auth
 
 - **Type**: OAuth
@@ -139,12 +145,6 @@ Class | Method | HTTP request | Description
  - **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
 
diff --git a/samples/client/petstore/python/petstore_api/configuration.py b/samples/client/petstore/python/petstore_api/configuration.py
index 76f1f57c7842..ec940b714133 100644
--- a/samples/client/petstore/python/petstore_api/configuration.py
+++ b/samples/client/petstore/python/petstore_api/configuration.py
@@ -221,6 +221,13 @@ class Configuration(object):
         :return: The Auth Settings information dict.
         """
         return {
+            'api_key':
+                {
+                    'type': 'api_key',
+                    'in': 'header',
+                    'key': 'api_key',
+                    'value': self.get_api_key_with_prefix('api_key')
+                },
 
             'petstore_auth': 
                 {
@@ -229,13 +236,6 @@ class Configuration(object):
                     'key': 'Authorization',
                     'value': 'Bearer ' + self.access_token
                 },
-            'api_key':
-                {
-                    'type': 'api_key',
-                    'in': 'header',
-                    'key': 'api_key',
-                    'value': self.get_api_key_with_prefix('api_key')
-                },
 
         }
 

From acf17c85adc05b60938b830e263e19c1f1123d5c Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Wed, 8 Jun 2016 18:50:49 +0200
Subject: [PATCH 106/139] add joda support to retrofit clients and use it in
 samples

also adds back the petstore tests
---
 bin/java-petstore-retrofit2.sh                |   2 +-
 bin/java-petstore-retrofit2rx.sh              |   2 +-
 .../libraries/retrofit2/ApiClient.mustache    |  64 ++++
 .../libraries/retrofit2/build.gradle.mustache |  17 +-
 .../libraries/retrofit2/build.sbt.mustache    |   7 +-
 .../Java/libraries/retrofit2/pom.mustache     |  11 +-
 .../petstore/java/retrofit2/build.gradle      |   5 +-
 .../client/petstore/java/retrofit2/build.sbt  |   1 +
 .../petstore/java/retrofit2/docs/FakeApi.md   |   8 +-
 .../java/retrofit2/docs/FormatTest.md         |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   2 +-
 .../petstore/java/retrofit2/docs/Order.md     |   2 +-
 .../client/petstore/java/retrofit2/pom.xml    |   8 +-
 .../java/io/swagger/client/ApiClient.java     |  64 ++++
 .../java/io/swagger/client/StringUtil.java    |   2 +-
 .../java/io/swagger/client/api/FakeApi.java   |   5 +-
 .../io/swagger/client/model/FormatTest.java   |  15 +-
 ...ropertiesAndAdditionalPropertiesClass.java |   8 +-
 .../java/io/swagger/client/model/Order.java   |   8 +-
 .../src/test/java/io/swagger/TestUtils.java   |  17 +
 .../io/swagger/client/api/PetApiTest.java     | 249 ++++++++------
 .../io/swagger/client/api/StoreApiTest.java   | 110 +++---
 .../io/swagger/client/api/UserApiTest.java    | 157 ++++-----
 .../petstore/java/retrofit2rx/build.gradle    |   5 +-
 .../petstore/java/retrofit2rx/build.sbt       |   1 +
 .../petstore/java/retrofit2rx/docs/FakeApi.md |   8 +-
 .../java/retrofit2rx/docs/FormatTest.md       |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   2 +-
 .../petstore/java/retrofit2rx/docs/Order.md   |   2 +-
 .../client/petstore/java/retrofit2rx/pom.xml  |   7 +-
 .../java/io/swagger/client/ApiClient.java     |  64 ++++
 .../java/io/swagger/client/StringUtil.java    |   2 +-
 .../java/io/swagger/client/api/FakeApi.java   |   5 +-
 .../io/swagger/client/model/FormatTest.java   |  15 +-
 ...ropertiesAndAdditionalPropertiesClass.java |   8 +-
 .../java/io/swagger/client/model/Order.java   |   8 +-
 .../io/swagger/client/api/PetApiTest.java     | 313 ++++++++++++------
 .../client/api/SkeletonSubscriber.java        |  30 ++
 .../io/swagger/client/api/StoreApiTest.java   | 129 +++++---
 .../io/swagger/client/api/UserApiTest.java    | 176 +++++-----
 40 files changed, 960 insertions(+), 587 deletions(-)
 create mode 100644 samples/client/petstore/java/retrofit2/src/test/java/io/swagger/TestUtils.java
 create mode 100644 samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/SkeletonSubscriber.java

diff --git a/bin/java-petstore-retrofit2.sh b/bin/java-petstore-retrofit2.sh
index 3fda4df31663..14175ce72a2a 100755
--- a/bin/java-petstore-retrofit2.sh
+++ b/bin/java-petstore-retrofit2.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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2.json -o samples/client/petstore/java/retrofit2"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2.json -o samples/client/petstore/java/retrofit2 -DdateLibrary=joda"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore-retrofit2rx.sh b/bin/java-petstore-retrofit2rx.sh
index d714cc334559..c62da51daa89 100755
--- a/bin/java-petstore-retrofit2rx.sh
+++ b/bin/java-petstore-retrofit2rx.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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2rx.json -o samples/client/petstore/java/retrofit2rx -DuseRxJava=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2rx.json -o samples/client/petstore/java/retrofit2rx -DuseRxJava=true,dateLibrary=joda"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
index ad5f02c49e45..a4d62eece244 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
@@ -9,6 +9,10 @@ import java.util.Map;
 
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 
 import retrofit2.Converter;
 import retrofit2.Retrofit;
@@ -19,6 +23,9 @@ import retrofit2.converter.scalars.ScalarsConverterFactory;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
@@ -108,6 +115,8 @@ public class ApiClient {
    public void createDefaultAdapter() {
         Gson gson = new GsonBuilder()
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+                .registerTypeAdapter(DateTime.class, new DateTimeTypeAdapter())
+                .registerTypeAdapter(LocalDate.class, new LocalDateTypeAdapter())
                 .create();
 
         okClient = new OkHttpClient();
@@ -346,3 +355,58 @@ class GsonCustomConverterFactory extends Converter.Factory
     }
 }
 
+
+/**
+ * Gson TypeAdapter for Joda DateTime type
+ */
+class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
+
+    @Override
+    public void write(JsonWriter out, DateTime date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public DateTime read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseDateTime(date);
+        }
+    }
+}
+
+class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.date();
+
+    @Override
+    public void write(JsonWriter out, LocalDate date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public LocalDate read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseLocalDate(date);
+        }
+    }
+}
\ No newline at end of file
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 e56e682cfcd2..fd2e94b582eb 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
@@ -97,25 +97,20 @@ ext {
     oltu_version = "1.0.1"
     retrofit_version = "2.0.2"
     swagger_annotations_version = "1.5.8"
-    junit_version = "4.12"
-{{#useRxJava}}
-    rx_java_version = "1.1.3"
-{{/useRxJava}}
-{{^useRxJava}}{{/useRxJava}}
+    junit_version = "4.12"{{#useRxJava}}
+    rx_java_version = "1.1.3"{{/useRxJava}}
+    jodatime_version = "2.9.3"
 }
 
 dependencies {
     compile "com.squareup.retrofit2:retrofit:$retrofit_version"
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
-    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
-{{#useRxJava}}
+    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"{{#useRxJava}}
     compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
-    compile "io.reactivex:rxjava:$rx_java_version"
-{{/useRxJava}}
-{{^useRxJava}}{{/useRxJava}}
-
+    compile "io.reactivex:rxjava:$rx_java_version"{{/useRxJava}}
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile "joda-time:joda-time:$jodatime_version"
 
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
index 8e6986fa2d2f..ff564803b441 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
@@ -11,13 +11,12 @@ lazy val root = (project in file(".")).
     libraryDependencies ++= Seq(
       "com.squareup.retrofit2" % "retrofit" % "2.0.2" % "compile",
       "com.squareup.retrofit2" % "converter-scalars" % "2.0.2" % "compile",
-      "com.squareup.retrofit2" % "converter-gson" % "2.0.2" % "compile",
-      {{#useRxJava}}
+      "com.squareup.retrofit2" % "converter-gson" % "2.0.2" % "compile",{{#useRxJava}}
       "com.squareup.retrofit2" % "adapter-rxjava" % "2.0.2" % "compile",
-      "io.reactivex" % "rxjava" % "1.1.3" % "compile",
-      {{/useRxJava}}
+      "io.reactivex" % "rxjava" % "1.1.3" % "compile",{{/useRxJava}}
       "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "joda-time" % "joda-time" % "2.9.3" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
index 30f6a71d285c..2cc806ebbd3b 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -131,6 +131,11 @@
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime-version}</version>
     </dependency>{{#useRxJava}}
     <dependency>
       <groupId>io.reactivex</groupId>
@@ -153,9 +158,9 @@
   </dependencies>
   <properties>
     <swagger-core-version>1.5.8</swagger-core-version>
-    <retrofit-version>2.0.2</retrofit-version>
-    {{#useRxJava}}<rxjava-version>1.1.3</rxjava-version>{{/useRxJava}}
-    <okhttp-version>3.2.0</okhttp-version>
+    <retrofit-version>2.0.2</retrofit-version>{{#useRxJava}}
+    <rxjava-version>1.1.3</rxjava-version>{{/useRxJava}}
+    <jodatime-version>2.9.3</jodatime-version>
     <oltu-version>1.0.1</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle
index 6b96656a4a8b..4287ae6e53f8 100644
--- a/samples/client/petstore/java/retrofit2/build.gradle
+++ b/samples/client/petstore/java/retrofit2/build.gradle
@@ -98,17 +98,16 @@ ext {
     retrofit_version = "2.0.2"
     swagger_annotations_version = "1.5.8"
     junit_version = "4.12"
-
+    jodatime_version = "2.9.3"
 }
 
 dependencies {
     compile "com.squareup.retrofit2:retrofit:$retrofit_version"
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
-
-
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile "joda-time:joda-time:$jodatime_version"
 
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/retrofit2/build.sbt b/samples/client/petstore/java/retrofit2/build.sbt
index 8ebea3cad9df..c42d32f7b538 100644
--- a/samples/client/petstore/java/retrofit2/build.sbt
+++ b/samples/client/petstore/java/retrofit2/build.sbt
@@ -14,6 +14,7 @@ lazy val root = (project in file(".")).
       "com.squareup.retrofit2" % "converter-gson" % "2.0.2" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "joda-time" % "joda-time" % "2.9.3" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/client/petstore/java/retrofit2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2/docs/FakeApi.md
index 55f7cef2df48..e077fa5c8211 100644
--- a/samples/client/petstore/java/retrofit2/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2/docs/FakeApi.md
@@ -32,8 +32,8 @@ Integer int32 = 56; // Integer | None
 Long int64 = 789L; // Long | None
 Float _float = 3.4F; // Float | None
 byte[] binary = B; // byte[] | None
-Date date = new Date(); // Date | None
-Date dateTime = new Date(); // Date | None
+LocalDate date = new LocalDate(); // LocalDate | None
+DateTime dateTime = new DateTime(); // DateTime | None
 String password = "password_example"; // String | None
 try {
     Void result = apiInstance.testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
@@ -57,8 +57,8 @@ Name | Type | Description  | Notes
  **int64** | **Long**| None | [optional]
  **_float** | **Float**| None | [optional]
  **binary** | **byte[]**| None | [optional]
- **date** | **Date**| None | [optional]
- **dateTime** | **Date**| None | [optional]
+ **date** | **LocalDate**| None | [optional]
+ **dateTime** | **DateTime**| None | [optional]
  **password** | **String**| None | [optional]
 
 ### Return type
diff --git a/samples/client/petstore/java/retrofit2/docs/FormatTest.md b/samples/client/petstore/java/retrofit2/docs/FormatTest.md
index dc2b559dad28..44de7d9511a0 100644
--- a/samples/client/petstore/java/retrofit2/docs/FormatTest.md
+++ b/samples/client/petstore/java/retrofit2/docs/FormatTest.md
@@ -13,8 +13,8 @@ Name | Type | Description | Notes
 **string** | **String** |  |  [optional]
 **_byte** | **byte[]** |  | 
 **binary** | **byte[]** |  |  [optional]
-**date** | [**Date**](Date.md) |  | 
-**dateTime** | [**Date**](Date.md) |  |  [optional]
+**date** | [**LocalDate**](LocalDate.md) |  | 
+**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **uuid** | **String** |  |  [optional]
 **password** | **String** |  | 
 
diff --git a/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 00cc10ca9b3d..e3487bcc5019 100644
--- a/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **uuid** | **String** |  |  [optional]
-**dateTime** | [**Date**](Date.md) |  |  [optional]
+**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
 
 
diff --git a/samples/client/petstore/java/retrofit2/docs/Order.md b/samples/client/petstore/java/retrofit2/docs/Order.md
index 29ca3ddbc6b2..a1089f5384eb 100644
--- a/samples/client/petstore/java/retrofit2/docs/Order.md
+++ b/samples/client/petstore/java/retrofit2/docs/Order.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **id** | **Long** |  |  [optional]
 **petId** | **Long** |  |  [optional]
 **quantity** | **Integer** |  |  [optional]
-**shipDate** | [**Date**](Date.md) |  |  [optional]
+**shipDate** | [**DateTime**](DateTime.md) |  |  [optional]
 **status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
 **complete** | **Boolean** |  |  [optional]
 
diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml
index 05774ac38340..26c32613c1fd 100644
--- a/samples/client/petstore/java/retrofit2/pom.xml
+++ b/samples/client/petstore/java/retrofit2/pom.xml
@@ -132,6 +132,11 @@
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
     </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime-version}</version>
+    </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -144,8 +149,7 @@
   <properties>
     <swagger-core-version>1.5.8</swagger-core-version>
     <retrofit-version>2.0.2</retrofit-version>
-    
-    <okhttp-version>3.2.0</okhttp-version>
+    <jodatime-version>2.9.3</jodatime-version>
     <oltu-version>1.0.1</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
index e49bdf24d7bd..305b8b783e4b 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
@@ -9,6 +9,10 @@ import java.util.Map;
 
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 
 import retrofit2.Converter;
 import retrofit2.Retrofit;
@@ -19,6 +23,9 @@ import retrofit2.converter.scalars.ScalarsConverterFactory;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
@@ -107,6 +114,8 @@ public class ApiClient {
    public void createDefaultAdapter() {
         Gson gson = new GsonBuilder()
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+                .registerTypeAdapter(DateTime.class, new DateTimeTypeAdapter())
+                .registerTypeAdapter(LocalDate.class, new LocalDateTypeAdapter())
                 .create();
 
         okClient = new OkHttpClient();
@@ -345,3 +354,58 @@ class GsonCustomConverterFactory extends Converter.Factory
     }
 }
 
+
+/**
+ * Gson TypeAdapter for Joda DateTime type
+ */
+class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
+
+    @Override
+    public void write(JsonWriter out, DateTime date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public DateTime read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseDateTime(date);
+        }
+    }
+}
+
+class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.date();
+
+    @Override
+    public void write(JsonWriter out, LocalDate date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public LocalDate read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseLocalDate(date);
+        }
+    }
+}
\ No newline at end of file
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 16b65ffb7ef7..344f523df419 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-06-04T21:04:39.523+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-08T18:45:27.896+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/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
index 75fe792872a5..91bd85c1b33a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
@@ -8,8 +8,9 @@ import retrofit2.http.*;
 
 import okhttp3.RequestBody;
 
+import org.joda.time.LocalDate;
 import java.math.BigDecimal;
-import java.util.Date;
+import org.joda.time.DateTime;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,7 +39,7 @@ public interface FakeApi {
   @FormUrlEncoded
   @POST("fake")
   Call<Void> testEndpointParameters(
-    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("string") String string, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("binary") byte[] binary, @Field("date") Date date, @Field("dateTime") Date dateTime, @Field("password") String password
+    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("string") String string, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password
   );
 
 }
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
index 694335531fde..6063cf33f77b 100644
--- 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
@@ -4,7 +4,8 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -42,10 +43,10 @@ public class FormatTest   {
   private byte[] binary = null;
 
   @SerializedName("date")
-  private Date date = null;
+  private LocalDate date = null;
 
   @SerializedName("dateTime")
-  private Date dateTime = null;
+  private DateTime dateTime = null;
 
   @SerializedName("uuid")
   private String uuid = null;
@@ -156,20 +157,20 @@ public class FormatTest   {
   /**
    **/
   @ApiModelProperty(required = true, value = "")
-  public Date getDate() {
+  public LocalDate getDate() {
     return date;
   }
-  public void setDate(Date date) {
+  public void setDate(LocalDate date) {
     this.date = date;
   }
 
   /**
    **/
   @ApiModelProperty(value = "")
-  public Date getDateTime() {
+  public DateTime getDateTime() {
     return dateTime;
   }
-  public void setDateTime(Date dateTime) {
+  public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d4afc9964406..cf7f73c705ff 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -4,10 +4,10 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.joda.time.DateTime;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -21,7 +21,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   private String uuid = null;
 
   @SerializedName("dateTime")
-  private Date dateTime = null;
+  private DateTime dateTime = null;
 
   @SerializedName("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
@@ -39,10 +39,10 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   /**
    **/
   @ApiModelProperty(value = "")
-  public Date getDateTime() {
+  public DateTime getDateTime() {
     return dateTime;
   }
-  public void setDateTime(Date dateTime) {
+  public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
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 2f774c13834e..569d1c0fe461 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
@@ -3,7 +3,7 @@ package io.swagger.client.model;
 import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import org.joda.time.DateTime;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -23,7 +23,7 @@ public class Order   {
   private Integer quantity = null;
 
   @SerializedName("shipDate")
-  private Date shipDate = null;
+  private DateTime shipDate = null;
 
 
   /**
@@ -90,10 +90,10 @@ public class Order   {
   /**
    **/
   @ApiModelProperty(value = "")
-  public Date getShipDate() {
+  public DateTime getShipDate() {
     return shipDate;
   }
-  public void setShipDate(Date shipDate) {
+  public void setShipDate(DateTime shipDate) {
     this.shipDate = shipDate;
   }
 
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/TestUtils.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/TestUtils.java
new file mode 100644
index 000000000000..bf5a476ab29b
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/TestUtils.java
@@ -0,0 +1,17 @@
+package io.swagger;
+
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class TestUtils {
+    private static final AtomicLong atomicId = createAtomicId();
+
+    public static long nextId() {
+        return atomicId.getAndIncrement();
+    }
+
+    private static AtomicLong createAtomicId() {
+        int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
+        return new AtomicLong((long) baseId);
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/PetApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/PetApiTest.java
index 39b4dc05ee05..8b5546746238 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/PetApiTest.java
@@ -1,137 +1,190 @@
 package io.swagger.client.api;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
-import io.swagger.client.model.Pet;
-import io.swagger.client.model.ModelApiResponse;
+import io.swagger.client.CollectionFormats.*;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+import java.io.BufferedWriter;
 import java.io.File;
-import org.junit.Before;
-import org.junit.Test;
-
+import java.io.FileWriter;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
-/**
- * API tests for PetApi
- */
+import org.junit.*;
+
+import retrofit2.Response;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+import static org.junit.Assert.*;
+
 public class PetApiTest {
-
-    private PetApi api;
+    PetApi api = null;
 
     @Before
     public void setup() {
         api = new ApiClient().createService(PetApi.class);
     }
 
-    
-    /**
-     * Add a new pet to the store
-     *
-     * 
-     */
     @Test
-    public void addPetTest() {
-        Pet body = null;
-        // Void response = api.addPet(body);
+    public void testCreateAndGetPet() throws Exception {
+        Pet pet = createRandomPet();
+        Response<Void> rp2 = api.addPet(pet).execute();
 
-        // TODO: test validations
+        Response<Pet> rp = api.getPetById(pet.getId()).execute();
+        Pet fetched = rp.body();
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * Deletes a pet
-     *
-     * 
-     */
+
     @Test
-    public void deletePetTest() {
-        Long petId = null;
-        String apiKey = null;
-        // Void response = api.deletePet(petId, apiKey);
+    public void testUpdatePet() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
 
-        // TODO: test validations
+        api.updatePet(pet).execute();
+
+        Pet fetched = api.getPetById(pet.getId()).execute().body();
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * Finds Pets by status
-     *
-     * Multiple status values can be provided with comma separated strings
-     */
+
     @Test
-    public void findPetsByStatusTest() {
-        List<String> status = null;
-        // List<Pet> response = api.findPetsByStatus(status);
+    public void testFindPetsByStatus() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
 
-        // TODO: test validations
+        api.updatePet(pet).execute();
+
+        List<Pet> pets = api.findPetsByStatus(new CSVParams("available")).execute().body();
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+
+        assertTrue(found);
     }
-    
-    /**
-     * Finds Pets by tags
-     *
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     */
+
     @Test
-    public void findPetsByTagsTest() {
-        List<String> tags = null;
-        // List<Pet> response = api.findPetsByTags(tags);
+    public void testFindPetsByTags() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("monster");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
 
-        // TODO: test validations
+        List<Tag> tags = new ArrayList<Tag>();
+        Tag tag1 = new Tag();
+        tag1.setName("friendly");
+        tags.add(tag1);
+        pet.setTags(tags);
+
+        api.updatePet(pet).execute();
+
+        List<Pet> pets = api.findPetsByTags(new CSVParams("friendly")).execute().body();
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+        assertTrue(found);
     }
-    
-    /**
-     * Find pet by ID
-     *
-     * Returns a single pet
-     */
+
     @Test
-    public void getPetByIdTest() {
-        Long petId = null;
-        // Pet response = api.getPetById(petId);
+    public void testUpdatePetWithForm() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("frank");
+        api.addPet(pet).execute();
 
-        // TODO: test validations
+        Pet fetched = api.getPetById(pet.getId()).execute().body();
+
+        api.updatePetWithForm(fetched.getId(), "furt", null).execute();
+        Pet updated = api.getPetById(fetched.getId()).execute().body();
+
+        assertEquals(updated.getName(), "furt");
     }
-    
-    /**
-     * Update an existing pet
-     *
-     * 
-     */
+
     @Test
-    public void updatePetTest() {
-        Pet body = null;
-        // Void response = api.updatePet(body);
+    public void testDeletePet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet).execute();
 
-        // TODO: test validations
+        Pet fetched = api.getPetById(pet.getId()).execute().body();
+        api.deletePet(fetched.getId(), null).execute();
+
+        assertFalse(api.getPetById(fetched.getId()).execute().isSuccessful());
     }
-    
-    /**
-     * Updates a pet in the store with form data
-     *
-     * 
-     */
+
     @Test
-    public void updatePetWithFormTest() {
-        Long petId = null;
-        String name = null;
-        String status = null;
-        // Void response = api.updatePetWithForm(petId, name, status);
+    public void testUploadFile() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet).execute();
 
-        // TODO: test validations
+        File file = new File("hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+        writer.write("Hello world!");
+        writer.close();
+
+        api.uploadFile(pet.getId(), null, RequestBody.create(MediaType.parse("text/plain"), file)).execute();
     }
-    
-    /**
-     * uploads an image
-     *
-     * 
-     */
+
     @Test
-    public void uploadFileTest() {
-        Long petId = null;
-        String additionalMetadata = null;
-        File file = null;
-        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
+    public void testEqualsAndHashCode() {
+        Pet pet1 = new Pet();
+        Pet pet2 = new Pet();
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
 
-        // TODO: test validations
+        pet2.setName("really-happy");
+        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertFalse(pet1.equals(pet2));
+        assertFalse(pet2.equals(pet1));
+        assertFalse(pet1.hashCode() == (pet2.hashCode()));
+        assertTrue(pet2.equals(pet2));
+        assertTrue(pet2.hashCode() == pet2.hashCode());
+
+        pet1.setName("really-happy");
+        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+    }
+
+    private Pet createRandomPet() {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("gorilla");
+
+        Category category = new Category();
+        category.setName("really-happy");
+
+        pet.setCategory(category);
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+        pet.setPhotoUrls(photos);
+
+        return pet;
     }
-    
 }
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/StoreApiTest.java
index 1da787edf19c..4a8fd9a50bdb 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/StoreApiTest.java
@@ -1,77 +1,77 @@
 package io.swagger.client.api;
 
-import io.swagger.client.ApiClient;
-import io.swagger.client.model.Order;
-import org.junit.Before;
-import org.junit.Test;
+import io.swagger.TestUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import io.swagger.client.ApiClient;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+import java.lang.reflect.Field;
 import java.util.Map;
 
-/**
- * API tests for StoreApi
- */
-public class StoreApiTest {
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.junit.*;
 
-    private StoreApi api;
+import retrofit2.Response;
+import static org.junit.Assert.*;
+
+public class StoreApiTest {
+    StoreApi api = null;
 
     @Before
     public void setup() {
         api = new ApiClient().createService(StoreApi.class);
     }
 
-    
-    /**
-     * Delete purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     */
     @Test
-    public void deleteOrderTest() {
-        String orderId = null;
-        // Void response = api.deleteOrder(orderId);
-
-        // TODO: test validations
+    public void testGetInventory() throws Exception {
+        Map<String, Integer> inventory = api.getInventory().execute().body();
+        assertTrue(inventory.keySet().size() > 0);
     }
-    
-    /**
-     * Returns pet inventories by status
-     *
-     * Returns a map of status codes to quantities
-     */
+
     @Test
-    public void getInventoryTest() {
-        // Map<String, Integer> response = api.getInventory();
+    public void testPlaceOrder() throws Exception {
+        Order order = createOrder();
+        api.placeOrder(order).execute();
 
-        // TODO: test validations
+        Order fetched = api.getOrderById(order.getId()).execute().body();
+        assertEquals(order.getId(), fetched.getId());
+        assertEquals(order.getPetId(), fetched.getPetId());
+        assertEquals(order.getQuantity(), fetched.getQuantity());
+        assertEquals(order.getShipDate().withZone(DateTimeZone.UTC), fetched.getShipDate().withZone(DateTimeZone.UTC));
     }
-    
-    /**
-     * Find purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     */
+
     @Test
-    public void getOrderByIdTest() {
-        Long orderId = null;
-        // Order response = api.getOrderById(orderId);
+    public void testDeleteOrder() throws Exception {
+        Order order = createOrder();
+        Response<Order> aa = api.placeOrder(order).execute();
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Place an order for a pet
-     *
-     * 
-     */
-    @Test
-    public void placeOrderTest() {
-        Order body = null;
-        // Order response = api.placeOrder(body);
+        Order fetched = api.getOrderById(order.getId()).execute().body();
+        assertEquals(fetched.getId(), order.getId());
 
-        // TODO: test validations
+        api.deleteOrder(String.valueOf(order.getId())).execute();
+
+        api.getOrderById(order.getId()).execute();
+        //also in retrofit 1 should return an error but don't, check server api impl.
+    }
+
+    private Order createOrder() {
+        Order order = new Order();
+        order.setPetId(new Long(200));
+        order.setQuantity(new Integer(13));
+        order.setShipDate(DateTime.now());
+        order.setStatus(Order.StatusEnum.PLACED);
+        order.setComplete(true);
+
+        try {
+            Field idField = Order.class.getDeclaredField("id");
+            idField.setAccessible(true);
+            idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return order;
     }
-    
 }
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/UserApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/UserApiTest.java
index cd8553d84194..70fbb8fef98a 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/UserApiTest.java
@@ -1,131 +1,86 @@
 package io.swagger.client.api;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
-import io.swagger.client.model.User;
-import org.junit.Before;
-import org.junit.Test;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
-/**
- * API tests for UserApi
- */
+import java.util.Arrays;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
 public class UserApiTest {
-
-    private UserApi api;
+    UserApi api = null;
 
     @Before
     public void setup() {
         api = new ApiClient().createService(UserApi.class);
     }
 
-    
-    /**
-     * Create user
-     *
-     * This can only be done by the logged in user.
-     */
     @Test
-    public void createUserTest() {
-        User body = null;
-        // Void response = api.createUser(body);
+    public void testCreateUser() throws Exception {
+        User user = createUser();
 
-        // TODO: test validations
+        api.createUser(user).execute();
+
+        User fetched = api.getUserByName(user.getUsername()).execute().body();
+        assertEquals(user.getId(), fetched.getId());
     }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
+
     @Test
-    public void createUsersWithArrayInputTest() {
-        List<User> body = null;
-        // Void response = api.createUsersWithArrayInput(body);
+    public void testCreateUsersWithArray() throws Exception {
+        User user1 = createUser();
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2})).execute();
+
+        User fetched = api.getUserByName(user1.getUsername()).execute().body();
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
+
     @Test
-    public void createUsersWithListInputTest() {
-        List<User> body = null;
-        // Void response = api.createUsersWithListInput(body);
+    public void testCreateUsersWithList() throws Exception {
+        User user1 = createUser();
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2})).execute();
+
+        User fetched = api.getUserByName(user1.getUsername()).execute().body();
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
-    /**
-     * Delete user
-     *
-     * This can only be done by the logged in user.
-     */
+
     @Test
-    public void deleteUserTest() {
-        String username = null;
-        // Void response = api.deleteUser(username);
+    public void testLoginUser() throws Exception {
+        User user = createUser();
+        api.createUser(user).execute();
 
-        // TODO: test validations
+        String token = api.loginUser(user.getUsername(), user.getPassword()).execute().body();
+        assertTrue(token.startsWith("logged in user session:"));
     }
-    
-    /**
-     * Get user by user name
-     *
-     * 
-     */
+
     @Test
-    public void getUserByNameTest() {
-        String username = null;
-        // User response = api.getUserByName(username);
-
-        // TODO: test validations
+    public void logoutUser() throws Exception {
+        api.logoutUser().execute();
     }
-    
-    /**
-     * Logs user into the system
-     *
-     * 
-     */
-    @Test
-    public void loginUserTest() {
-        String username = null;
-        String password = null;
-        // String response = api.loginUser(username, password);
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Logs out current logged in user session
-     *
-     * 
-     */
-    @Test
-    public void logoutUserTest() {
-        // Void response = api.logoutUser();
+    private User createUser() {
+        User user = new User();
+        user.setId(TestUtils.nextId());
+        user.setUsername("fred");
+        user.setFirstName("Fred");
+        user.setLastName("Meyer");
+        user.setEmail("fred@fredmeyer.com");
+        user.setPassword("xxXXxx");
+        user.setPhone("408-867-5309");
+        user.setUserStatus(123);
 
-        // TODO: test validations
+        return user;
     }
-    
-    /**
-     * Updated user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void updateUserTest() {
-        String username = null;
-        User body = null;
-        // Void response = api.updateUser(username, body);
-
-        // TODO: test validations
-    }
-    
 }
diff --git a/samples/client/petstore/java/retrofit2rx/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle
index cbd0119e24b5..8d9fa82e69a5 100644
--- a/samples/client/petstore/java/retrofit2rx/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx/build.gradle
@@ -99,7 +99,7 @@ ext {
     swagger_annotations_version = "1.5.8"
     junit_version = "4.12"
     rx_java_version = "1.1.3"
-
+    jodatime_version = "2.9.3"
 }
 
 dependencies {
@@ -108,10 +108,9 @@ dependencies {
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
     compile "io.reactivex:rxjava:$rx_java_version"
-
-
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile "joda-time:joda-time:$jodatime_version"
 
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/retrofit2rx/build.sbt b/samples/client/petstore/java/retrofit2rx/build.sbt
index cfe2d8d341cb..3e999d082e03 100644
--- a/samples/client/petstore/java/retrofit2rx/build.sbt
+++ b/samples/client/petstore/java/retrofit2rx/build.sbt
@@ -16,6 +16,7 @@ lazy val root = (project in file(".")).
       "io.reactivex" % "rxjava" % "1.1.3" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "joda-time" % "joda-time" % "2.9.3" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md
index 55f7cef2df48..e077fa5c8211 100644
--- a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md
@@ -32,8 +32,8 @@ Integer int32 = 56; // Integer | None
 Long int64 = 789L; // Long | None
 Float _float = 3.4F; // Float | None
 byte[] binary = B; // byte[] | None
-Date date = new Date(); // Date | None
-Date dateTime = new Date(); // Date | None
+LocalDate date = new LocalDate(); // LocalDate | None
+DateTime dateTime = new DateTime(); // DateTime | None
 String password = "password_example"; // String | None
 try {
     Void result = apiInstance.testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
@@ -57,8 +57,8 @@ Name | Type | Description  | Notes
  **int64** | **Long**| None | [optional]
  **_float** | **Float**| None | [optional]
  **binary** | **byte[]**| None | [optional]
- **date** | **Date**| None | [optional]
- **dateTime** | **Date**| None | [optional]
+ **date** | **LocalDate**| None | [optional]
+ **dateTime** | **DateTime**| None | [optional]
  **password** | **String**| None | [optional]
 
 ### Return type
diff --git a/samples/client/petstore/java/retrofit2rx/docs/FormatTest.md b/samples/client/petstore/java/retrofit2rx/docs/FormatTest.md
index dc2b559dad28..44de7d9511a0 100644
--- a/samples/client/petstore/java/retrofit2rx/docs/FormatTest.md
+++ b/samples/client/petstore/java/retrofit2rx/docs/FormatTest.md
@@ -13,8 +13,8 @@ Name | Type | Description | Notes
 **string** | **String** |  |  [optional]
 **_byte** | **byte[]** |  | 
 **binary** | **byte[]** |  |  [optional]
-**date** | [**Date**](Date.md) |  | 
-**dateTime** | [**Date**](Date.md) |  |  [optional]
+**date** | [**LocalDate**](LocalDate.md) |  | 
+**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **uuid** | **String** |  |  [optional]
 **password** | **String** |  | 
 
diff --git a/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 00cc10ca9b3d..e3487bcc5019 100644
--- a/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **uuid** | **String** |  |  [optional]
-**dateTime** | [**Date**](Date.md) |  |  [optional]
+**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
 
 
diff --git a/samples/client/petstore/java/retrofit2rx/docs/Order.md b/samples/client/petstore/java/retrofit2rx/docs/Order.md
index 29ca3ddbc6b2..a1089f5384eb 100644
--- a/samples/client/petstore/java/retrofit2rx/docs/Order.md
+++ b/samples/client/petstore/java/retrofit2rx/docs/Order.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **id** | **Long** |  |  [optional]
 **petId** | **Long** |  |  [optional]
 **quantity** | **Integer** |  |  [optional]
-**shipDate** | [**Date**](Date.md) |  |  [optional]
+**shipDate** | [**DateTime**](DateTime.md) |  |  [optional]
 **status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
 **complete** | **Boolean** |  |  [optional]
 
diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml
index 79d826c3a41f..322fd2094150 100644
--- a/samples/client/petstore/java/retrofit2rx/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx/pom.xml
@@ -132,6 +132,11 @@
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
     </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime-version}</version>
+    </dependency>
     <dependency>
       <groupId>io.reactivex</groupId>
       <artifactId>rxjava</artifactId>
@@ -155,7 +160,7 @@
     <swagger-core-version>1.5.8</swagger-core-version>
     <retrofit-version>2.0.2</retrofit-version>
     <rxjava-version>1.1.3</rxjava-version>
-    <okhttp-version>3.2.0</okhttp-version>
+    <jodatime-version>2.9.3</jodatime-version>
     <oltu-version>1.0.1</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
index 32799fdf3d80..9e424881cbdd 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
@@ -9,6 +9,10 @@ import java.util.Map;
 
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 
 import retrofit2.Converter;
 import retrofit2.Retrofit;
@@ -19,6 +23,9 @@ import retrofit2.converter.scalars.ScalarsConverterFactory;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
@@ -107,6 +114,8 @@ public class ApiClient {
    public void createDefaultAdapter() {
         Gson gson = new GsonBuilder()
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+                .registerTypeAdapter(DateTime.class, new DateTimeTypeAdapter())
+                .registerTypeAdapter(LocalDate.class, new LocalDateTypeAdapter())
                 .create();
 
         okClient = new OkHttpClient();
@@ -345,3 +354,58 @@ class GsonCustomConverterFactory extends Converter.Factory
     }
 }
 
+
+/**
+ * Gson TypeAdapter for Joda DateTime type
+ */
+class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
+
+    @Override
+    public void write(JsonWriter out, DateTime date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public DateTime read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseDateTime(date);
+        }
+    }
+}
+
+class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.date();
+
+    @Override
+    public void write(JsonWriter out, LocalDate date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public LocalDate read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseLocalDate(date);
+        }
+    }
+}
\ No newline at end of file
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 4d786f284383..391c1c016c6f 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-06-04T21:05:33.279+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-08T18:44:17.529+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/FakeApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java
index cc0d5605548c..5e0511922fb3 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java
@@ -8,8 +8,9 @@ import retrofit2.http.*;
 
 import okhttp3.RequestBody;
 
+import org.joda.time.LocalDate;
 import java.math.BigDecimal;
-import java.util.Date;
+import org.joda.time.DateTime;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,7 +39,7 @@ public interface FakeApi {
   @FormUrlEncoded
   @POST("fake")
   Observable<Void> testEndpointParameters(
-    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("string") String string, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("binary") byte[] binary, @Field("date") Date date, @Field("dateTime") Date dateTime, @Field("password") String password
+    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("string") String string, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password
   );
 
 }
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
index 694335531fde..6063cf33f77b 100644
--- 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
@@ -4,7 +4,8 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -42,10 +43,10 @@ public class FormatTest   {
   private byte[] binary = null;
 
   @SerializedName("date")
-  private Date date = null;
+  private LocalDate date = null;
 
   @SerializedName("dateTime")
-  private Date dateTime = null;
+  private DateTime dateTime = null;
 
   @SerializedName("uuid")
   private String uuid = null;
@@ -156,20 +157,20 @@ public class FormatTest   {
   /**
    **/
   @ApiModelProperty(required = true, value = "")
-  public Date getDate() {
+  public LocalDate getDate() {
     return date;
   }
-  public void setDate(Date date) {
+  public void setDate(LocalDate date) {
     this.date = date;
   }
 
   /**
    **/
   @ApiModelProperty(value = "")
-  public Date getDateTime() {
+  public DateTime getDateTime() {
     return dateTime;
   }
-  public void setDateTime(Date dateTime) {
+  public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d4afc9964406..cf7f73c705ff 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -4,10 +4,10 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.joda.time.DateTime;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -21,7 +21,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   private String uuid = null;
 
   @SerializedName("dateTime")
-  private Date dateTime = null;
+  private DateTime dateTime = null;
 
   @SerializedName("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
@@ -39,10 +39,10 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   /**
    **/
   @ApiModelProperty(value = "")
-  public Date getDateTime() {
+  public DateTime getDateTime() {
     return dateTime;
   }
-  public void setDateTime(Date dateTime) {
+  public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
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 2f774c13834e..569d1c0fe461 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
@@ -3,7 +3,7 @@ package io.swagger.client.model;
 import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import org.joda.time.DateTime;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -23,7 +23,7 @@ public class Order   {
   private Integer quantity = null;
 
   @SerializedName("shipDate")
-  private Date shipDate = null;
+  private DateTime shipDate = null;
 
 
   /**
@@ -90,10 +90,10 @@ public class Order   {
   /**
    **/
   @ApiModelProperty(value = "")
-  public Date getShipDate() {
+  public DateTime getShipDate() {
     return shipDate;
   }
-  public void setShipDate(Date shipDate) {
+  public void setShipDate(DateTime shipDate) {
     this.shipDate = shipDate;
   }
 
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/PetApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/PetApiTest.java
index 39b4dc05ee05..8fa02bed6368 100644
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/PetApiTest.java
@@ -1,137 +1,254 @@
 package io.swagger.client.api;
 
 import io.swagger.client.ApiClient;
-import io.swagger.client.model.Pet;
-import io.swagger.client.model.ModelApiResponse;
+import io.swagger.client.CollectionFormats.*;
+import io.swagger.client.model.*;
+
+import java.io.BufferedWriter;
 import java.io.File;
-import org.junit.Before;
-import org.junit.Test;
-
+import java.io.FileWriter;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
-/**
- * API tests for PetApi
- */
+import org.junit.*;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+import static org.junit.Assert.*;
+
 public class PetApiTest {
-
-    private PetApi api;
+    PetApi api = null;
 
     @Before
     public void setup() {
         api = new ApiClient().createService(PetApi.class);
     }
 
-    
-    /**
-     * Add a new pet to the store
-     *
-     * 
-     */
     @Test
-    public void addPetTest() {
-        Pet body = null;
-        // Void response = api.addPet(body);
+    public void testCreateAndGetPet() throws Exception {
+        final Pet pet = createRandomPet();
+        api.addPet(pet).subscribe(new SkeletonSubscriber<Void>() {
+            @Override
+            public void onCompleted() {
+                api.getPetById(pet.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+                    @Override
+                    public void onNext(Pet fetched) {
+                        assertNotNull(fetched);
+                        assertEquals(pet.getId(), fetched.getId());
+                        assertNotNull(fetched.getCategory());
+                        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+                    }
+                });
+
+            }
+        });
 
-        // TODO: test validations
     }
-    
-    /**
-     * Deletes a pet
-     *
-     * 
-     */
+
     @Test
-    public void deletePetTest() {
-        Long petId = null;
-        String apiKey = null;
-        // Void response = api.deletePet(petId, apiKey);
+    public void testUpdatePet() throws Exception {
+        final Pet pet = createRandomPet();
+        pet.setName("programmer");
+
+        api.updatePet(pet).subscribe(new SkeletonSubscriber<Void>() {
+            @Override
+            public void onCompleted() {
+                api.getPetById(pet.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+                    @Override
+                    public void onNext(Pet fetched) {
+                        assertNotNull(fetched);
+                        assertEquals(pet.getId(), fetched.getId());
+                        assertNotNull(fetched.getCategory());
+                        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+                    }
+                });
+
+            }
+        });
 
-        // TODO: test validations
     }
-    
-    /**
-     * Finds Pets by status
-     *
-     * Multiple status values can be provided with comma separated strings
-     */
+
     @Test
-    public void findPetsByStatusTest() {
-        List<String> status = null;
-        // List<Pet> response = api.findPetsByStatus(status);
+    public void testFindPetsByStatus() throws Exception {
+        final Pet pet = createRandomPet();
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+
+        api.updatePet(pet).subscribe(new SkeletonSubscriber<Void>() {
+            @Override
+            public void onCompleted() {
+                api.findPetsByStatus(new CSVParams("available")).subscribe(new SkeletonSubscriber<List<Pet>>() {
+                    @Override
+                    public void onNext(List<Pet> pets) {
+                        assertNotNull(pets);
+
+                        boolean found = false;
+                        for (Pet fetched : pets) {
+                            if (fetched.getId().equals(pet.getId())) {
+                                found = true;
+                                break;
+                            }
+                        }
+
+                        assertTrue(found);
+                    }
+                });
+
+            }
+        });
 
-        // TODO: test validations
     }
-    
-    /**
-     * Finds Pets by tags
-     *
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     */
+
     @Test
-    public void findPetsByTagsTest() {
-        List<String> tags = null;
-        // List<Pet> response = api.findPetsByTags(tags);
+    public void testFindPetsByTags() throws Exception {
+        final Pet pet = createRandomPet();
+        pet.setName("monster");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+
+        List<Tag> tags = new ArrayList<Tag>();
+        Tag tag1 = new Tag();
+        tag1.setName("friendly");
+        tags.add(tag1);
+        pet.setTags(tags);
+
+        api.updatePet(pet).subscribe(new SkeletonSubscriber<Void>() {
+            @Override
+            public void onCompleted() {
+                api.findPetsByTags(new CSVParams("friendly")).subscribe(new SkeletonSubscriber<List<Pet>>() {
+                    @Override
+                    public void onNext(List<Pet> pets) {
+                        assertNotNull(pets);
+
+                        boolean found = false;
+                        for (Pet fetched : pets) {
+                            if (fetched.getId().equals(pet.getId())) {
+                                found = true;
+                                break;
+                            }
+                        }
+                        assertTrue(found);
+                    }
+                });
+
+            }
+        });
 
-        // TODO: test validations
     }
-    
-    /**
-     * Find pet by ID
-     *
-     * Returns a single pet
-     */
+
     @Test
-    public void getPetByIdTest() {
-        Long petId = null;
-        // Pet response = api.getPetById(petId);
+    public void testUpdatePetWithForm() throws Exception {
+        final Pet pet = createRandomPet();
+        pet.setName("frank");
+        api.addPet(pet).subscribe(SkeletonSubscriber.failTestOnError());
+        api.getPetById(pet.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+            @Override
+            public void onNext(final Pet fetched) {
+                api.updatePetWithForm(fetched.getId(), "furt", null)
+                        .subscribe(new SkeletonSubscriber<Void>() {
+                            @Override
+                            public void onCompleted() {
+                                api.getPetById(fetched.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+                                    @Override
+                                    public void onNext(Pet updated) {
+                                        assertEquals(updated.getName(), "furt");
+                                    }
+                                });
+
+                            }
+                        });
+            }
+        });
+
 
-        // TODO: test validations
     }
-    
-    /**
-     * Update an existing pet
-     *
-     * 
-     */
+
     @Test
-    public void updatePetTest() {
-        Pet body = null;
-        // Void response = api.updatePet(body);
+    public void testDeletePet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet).subscribe(SkeletonSubscriber.failTestOnError());
 
-        // TODO: test validations
+        api.getPetById(pet.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+            @Override
+            public void onNext(Pet fetched) {
+
+                api.deletePet(fetched.getId(), null).subscribe(SkeletonSubscriber.failTestOnError());
+                api.getPetById(fetched.getId()).subscribe(new SkeletonSubscriber<Pet>() {
+                    @Override
+                    public void onNext(Pet deletedPet) {
+                        fail("Should not have found deleted pet.");
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        // expected, because the pet has been deleted.
+                    }
+                });
+            }
+        });
     }
-    
-    /**
-     * Updates a pet in the store with form data
-     *
-     * 
-     */
+
     @Test
-    public void updatePetWithFormTest() {
-        Long petId = null;
-        String name = null;
-        String status = null;
-        // Void response = api.updatePetWithForm(petId, name, status);
+    public void testUploadFile() throws Exception {
+        File file = File.createTempFile("test", "hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
 
-        // TODO: test validations
+        writer.write("Hello world!");
+        writer.close();
+
+        Pet pet = createRandomPet();
+        api.addPet(pet).subscribe(SkeletonSubscriber.failTestOnError());
+
+        RequestBody body = RequestBody.create(MediaType.parse("text/plain"), file);
+        api.uploadFile(pet.getId(), "a test file", body).subscribe(new SkeletonSubscriber<ModelApiResponse>() {
+            @Override
+            public void onError(Throwable e) {
+                // this also yields a 400 for other tests, so I guess it's okay...
+            }
+        });
     }
-    
-    /**
-     * uploads an image
-     *
-     * 
-     */
+
     @Test
-    public void uploadFileTest() {
-        Long petId = null;
-        String additionalMetadata = null;
-        File file = null;
-        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
+    public void testEqualsAndHashCode() {
+        Pet pet1 = new Pet();
+        Pet pet2 = new Pet();
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
 
-        // TODO: test validations
+        pet2.setName("really-happy");
+        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertFalse(pet1.equals(pet2));
+        assertFalse(pet2.equals(pet1));
+        assertFalse(pet1.hashCode() == (pet2.hashCode()));
+        assertTrue(pet2.equals(pet2));
+        assertTrue(pet2.hashCode() == pet2.hashCode());
+
+        pet1.setName("really-happy");
+        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+    }
+
+    private Pet createRandomPet() {
+        Pet pet = new Pet();
+        pet.setId(System.currentTimeMillis());
+        pet.setName("gorilla");
+
+        Category category = new Category();
+        category.setName("really-happy");
+
+        pet.setCategory(category);
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+        pet.setPhotoUrls(photos);
+
+        return pet;
     }
-    
 }
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/SkeletonSubscriber.java b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/SkeletonSubscriber.java
new file mode 100644
index 000000000000..47d0df05e287
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/SkeletonSubscriber.java
@@ -0,0 +1,30 @@
+package io.swagger.client.api;
+
+import junit.framework.TestFailure;
+import rx.Subscriber;
+
+/**
+ * Skeleton subscriber for tests that will fail when onError() is called unexpectedly.
+ */
+public abstract class SkeletonSubscriber<T> extends Subscriber<T> {
+
+    public static <T> SkeletonSubscriber<T> failTestOnError() {
+        return new SkeletonSubscriber<T>() {
+        };
+    }
+
+    @Override
+    public void onCompleted() {
+        // space for rent
+    }
+
+    @Override
+    public void onNext(T t) {
+        // space for rent
+    }
+
+    @Override
+    public void onError(Throwable e) {
+        throw new RuntimeException("Subscriber onError() called with unhandled exception!", e);
+    }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/StoreApiTest.java
index 1da787edf19c..62f1b1947667 100644
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/StoreApiTest.java
@@ -1,77 +1,98 @@
 package io.swagger.client.api;
 
 import io.swagger.client.ApiClient;
-import io.swagger.client.model.Order;
-import org.junit.Before;
-import org.junit.Test;
+import io.swagger.client.model.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.lang.reflect.Field;
 import java.util.Map;
 
-/**
- * API tests for StoreApi
- */
-public class StoreApiTest {
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.junit.*;
 
-    private StoreApi api;
+import retrofit2.Response;
+
+import static org.junit.Assert.*;
+
+public class StoreApiTest {
+    StoreApi api = null;
 
     @Before
     public void setup() {
         api = new ApiClient().createService(StoreApi.class);
     }
 
-    
-    /**
-     * Delete purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     */
     @Test
-    public void deleteOrderTest() {
-        String orderId = null;
-        // Void response = api.deleteOrder(orderId);
+    public void testGetInventory() throws Exception {
+        api.getInventory().subscribe(new SkeletonSubscriber<Map<String, Integer>>() {
+            @Override
+            public void onNext(Map<String, Integer> inventory) {
+                assertTrue(inventory.keySet().size() > 0);
+            }
+        });
 
-        // TODO: test validations
     }
-    
-    /**
-     * Returns pet inventories by status
-     *
-     * Returns a map of status codes to quantities
-     */
+
     @Test
-    public void getInventoryTest() {
-        // Map<String, Integer> response = api.getInventory();
-
-        // TODO: test validations
+    public void testPlaceOrder() throws Exception {
+        final Order order = createOrder();
+        api.placeOrder(order).subscribe(SkeletonSubscriber.failTestOnError());
+        api.getOrderById(order.getId()).subscribe(new SkeletonSubscriber<Order>() {
+            @Override
+            public void onNext(Order fetched) {
+                assertEquals(order.getId(), fetched.getId());
+                assertEquals(order.getPetId(), fetched.getPetId());
+                assertEquals(order.getQuantity(), fetched.getQuantity());
+                assertEquals(order.getShipDate().withZone(DateTimeZone.UTC), fetched.getShipDate().withZone(DateTimeZone.UTC));
+            }
+        });
     }
-    
-    /**
-     * Find purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     */
+
     @Test
-    public void getOrderByIdTest() {
-        Long orderId = null;
-        // Order response = api.getOrderById(orderId);
+    public void testDeleteOrder() throws Exception {
+        final Order order = createOrder();
+        api.placeOrder(order).subscribe(SkeletonSubscriber.failTestOnError());
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Place an order for a pet
-     *
-     * 
-     */
-    @Test
-    public void placeOrderTest() {
-        Order body = null;
-        // Order response = api.placeOrder(body);
+        api.getOrderById(order.getId()).subscribe(new SkeletonSubscriber<Order>() {
+            @Override
+            public void onNext(Order fetched) {
+                assertEquals(fetched.getId(), order.getId());
+            }
+        });
 
-        // TODO: test validations
+
+        api.deleteOrder(String.valueOf(order.getId())).subscribe(SkeletonSubscriber.failTestOnError());
+        api.getOrderById(order.getId())
+                .subscribe(new SkeletonSubscriber<Order>() {
+                               @Override
+                               public void onNext(Order order) {
+                                   throw new RuntimeException("Should not have found deleted order.");
+                               }
+
+                               @Override
+                               public void onError(Throwable e) {
+                                   // should not find deleted order.
+                               }
+                           }
+                );
+    }
+
+    private Order createOrder() {
+        Order order = new Order();
+        order.setPetId(new Long(200));
+        order.setQuantity(new Integer(13));
+        order.setShipDate(DateTime.now());
+        order.setStatus(Order.StatusEnum.PLACED);
+        order.setComplete(true);
+
+        try {
+            Field idField = Order.class.getDeclaredField("id");
+            idField.setAccessible(true);
+            idField.set(order, System.currentTimeMillis());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return order;
     }
-    
 }
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/UserApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/UserApiTest.java
index cd8553d84194..02c3942b2101 100644
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/UserApiTest.java
@@ -1,131 +1,107 @@
 package io.swagger.client.api;
 
 import io.swagger.client.ApiClient;
-import io.swagger.client.model.User;
-import org.junit.Before;
-import org.junit.Test;
+import io.swagger.client.model.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.Arrays;
+
+import org.junit.*;
+
+import static org.junit.Assert.*;
 
 /**
- * API tests for UserApi
+ * NOTE: This serves as a sample and test case for the generator, which is why this is java-7 code.
+ * Much looks much nicer with no anonymous classes.
  */
 public class UserApiTest {
-
-    private UserApi api;
+    UserApi api = null;
 
     @Before
     public void setup() {
         api = new ApiClient().createService(UserApi.class);
     }
 
-    
-    /**
-     * Create user
-     *
-     * This can only be done by the logged in user.
-     */
     @Test
-    public void createUserTest() {
-        User body = null;
-        // Void response = api.createUser(body);
+    public void testCreateUser() throws Exception {
+        final User user = createUser();
 
-        // TODO: test validations
+        api.createUser(user).subscribe(new SkeletonSubscriber<Void>() {
+            @Override
+            public void onCompleted() {
+                api.getUserByName(user.getUsername()).subscribe(new SkeletonSubscriber<User>() {
+                    @Override
+                    public void onNext(User fetched) {
+                        assertEquals(user.getId(), fetched.getId());
+                    }
+                });
+            }
+        });
     }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
+
     @Test
-    public void createUsersWithArrayInputTest() {
-        List<User> body = null;
-        // Void response = api.createUsersWithArrayInput(body);
+    public void testCreateUsersWithArray() throws Exception {
+        final User user1 = createUser();
+        user1.setUsername("abc123");
+        User user2 = createUser();
+        user2.setUsername("123abc");
 
-        // TODO: test validations
+        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2})).subscribe(SkeletonSubscriber.failTestOnError());
+
+        api.getUserByName(user1.getUsername()).subscribe(new SkeletonSubscriber<User>() {
+            @Override
+            public void onNext(User fetched) {
+                assertEquals(user1.getId(), fetched.getId());
+            }
+        });
     }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
+
     @Test
-    public void createUsersWithListInputTest() {
-        List<User> body = null;
-        // Void response = api.createUsersWithListInput(body);
+    public void testCreateUsersWithList() throws Exception {
+        final User user1 = createUser();
+        user1.setUsername("abc123");
+        User user2 = createUser();
+        user2.setUsername("123abc");
 
-        // TODO: test validations
+        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2})).subscribe(SkeletonSubscriber.failTestOnError());
+
+        api.getUserByName(user1.getUsername()).subscribe(new SkeletonSubscriber<User>() {
+            @Override
+            public void onNext(User fetched) {
+                assertEquals(user1.getId(), fetched.getId());
+            }
+        });
     }
-    
-    /**
-     * Delete user
-     *
-     * This can only be done by the logged in user.
-     */
+
     @Test
-    public void deleteUserTest() {
-        String username = null;
-        // Void response = api.deleteUser(username);
+    public void testLoginUser() throws Exception {
+        User user = createUser();
+        api.createUser(user);
 
-        // TODO: test validations
+        api.loginUser(user.getUsername(), user.getPassword()).subscribe(new SkeletonSubscriber<String>() {
+            @Override
+            public void onNext(String token) {
+                assertTrue(token.startsWith("logged in user session:"));
+            }
+        });
     }
-    
-    /**
-     * Get user by user name
-     *
-     * 
-     */
+
     @Test
-    public void getUserByNameTest() {
-        String username = null;
-        // User response = api.getUserByName(username);
-
-        // TODO: test validations
+    public void logoutUser() throws Exception {
+        api.logoutUser();
     }
-    
-    /**
-     * Logs user into the system
-     *
-     * 
-     */
-    @Test
-    public void loginUserTest() {
-        String username = null;
-        String password = null;
-        // String response = api.loginUser(username, password);
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Logs out current logged in user session
-     *
-     * 
-     */
-    @Test
-    public void logoutUserTest() {
-        // Void response = api.logoutUser();
+    private User createUser() {
+        User user = new User();
+        user.setId(System.currentTimeMillis());
+        user.setUsername("fred");
+        user.setFirstName("Fred");
+        user.setLastName("Meyer");
+        user.setEmail("fred@fredmeyer.com");
+        user.setPassword("xxXXxx");
+        user.setPhone("408-867-5309");
+        user.setUserStatus(123);
 
-        // TODO: test validations
+        return user;
     }
-    
-    /**
-     * Updated user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void updateUserTest() {
-        String username = null;
-        User body = null;
-        // Void response = api.updateUser(username, body);
-
-        // TODO: test validations
-    }
-    
-}
+}
\ No newline at end of file

From ec3a200c8c3e7c300ca995dbf531c3dd2c594fbe Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Wed, 8 Jun 2016 19:53:00 +0200
Subject: [PATCH 107/139] remove generated annotation in feign sample

---
 bin/java-petstore-feign.sh                                      | 2 +-
 .../java/feign/src/main/java/io/swagger/client/ApiClient.java   | 2 +-
 .../feign/src/main/java/io/swagger/client/FormAwareEncoder.java | 2 +-
 .../java/feign/src/main/java/io/swagger/client/StringUtil.java  | 2 +-
 .../java/feign/src/main/java/io/swagger/client/api/FakeApi.java | 2 +-
 .../java/feign/src/main/java/io/swagger/client/api/PetApi.java  | 2 +-
 .../feign/src/main/java/io/swagger/client/api/StoreApi.java     | 2 +-
 .../java/feign/src/main/java/io/swagger/client/api/UserApi.java | 2 +-
 .../java/io/swagger/client/model/AdditionalPropertiesClass.java | 2 +-
 .../feign/src/main/java/io/swagger/client/model/Animal.java     | 2 +-
 .../feign/src/main/java/io/swagger/client/model/AnimalFarm.java | 2 +-
 .../feign/src/main/java/io/swagger/client/model/ArrayTest.java  | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Cat.java   | 2 +-
 .../feign/src/main/java/io/swagger/client/model/Category.java   | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Dog.java   | 2 +-
 .../feign/src/main/java/io/swagger/client/model/EnumTest.java   | 2 +-
 .../feign/src/main/java/io/swagger/client/model/FormatTest.java | 2 +-
 .../model/MixedPropertiesAndAdditionalPropertiesClass.java      | 2 +-
 .../src/main/java/io/swagger/client/model/Model200Response.java | 2 +-
 .../src/main/java/io/swagger/client/model/ModelApiResponse.java | 2 +-
 .../src/main/java/io/swagger/client/model/ModelReturn.java      | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Name.java  | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Order.java | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Pet.java   | 2 +-
 .../src/main/java/io/swagger/client/model/ReadOnlyFirst.java    | 2 +-
 .../src/main/java/io/swagger/client/model/SpecialModelName.java | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/Tag.java   | 2 +-
 .../java/feign/src/main/java/io/swagger/client/model/User.java  | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/bin/java-petstore-feign.sh b/bin/java-petstore-feign.sh
index e28439842d9b..40dbc592f7ec 100755
--- a/bin/java-petstore-feign.sh
+++ b/bin/java-petstore-feign.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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-feign.json -o samples/client/petstore/java/feign -DdateLibrary=joda"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-feign.json -o samples/client/petstore/java/feign -DdateLibrary=joda,hideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
index 790e401a3d7c..75b3a96f2c73 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
@@ -19,7 +19,7 @@ import feign.slf4j.Slf4jLogger;
 import io.swagger.client.auth.*;
 import io.swagger.client.auth.OAuth.AccessTokenListener;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class ApiClient {
   public interface Api {}
 
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 082c11e0032c..179a2834da92 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-06-07T22:38:14.473+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 bc13cd205d56..1383dd0decb0 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-06-07T22:38:14.473+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/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
index c40f87ebdaec..dbabdc649957 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public interface FakeApi extends ApiClient.Api {
 
 
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 2f8c942bd74a..e486495c5a9c 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
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public interface PetApi extends ApiClient.Api {
 
 
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 98085dca2308..ee80acba0b42 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public interface StoreApi extends ApiClient.Api {
 
 
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 f114d5f23c9f..6a2c8a6afb16 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
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import feign.*;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public interface UserApi extends ApiClient.Api {
 
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index c15373b66c8b..ccaba7709c45 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -13,7 +13,7 @@ import java.util.Map;
 /**
  * AdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class AdditionalPropertiesClass   {
   
   private Map<String, String> mapProperty = new HashMap<String, String>();
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
index c1c1a4116071..25c7d3e421cc 100644
--- 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Animal
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class Animal   {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
index 28a7b9c3be48..647e3a893e15 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * AnimalFarm
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class AnimalFarm extends ArrayList<Animal>  {
   
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
index 455f93dc4f6d..6c1eb23d8d0d 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * ArrayTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class ArrayTest   {
   
   private List<String> arrayOfString = new ArrayList<String>();
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
index f300be5fcad7..5ef9e23bd96e 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Cat
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class Cat extends Animal  {
   
   private String className = null;
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 c299f04c7dd4..c6cb703a89e3 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Category
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class Category   {
   
   private Long id = null;
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
index 372d5bcb4f61..4b3cc947cc52 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Dog
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class Dog extends Animal  {
   
   private String className = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
index f038af89dda8..1c8657fd3ec1 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * EnumTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class EnumTest   {
   
 
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
index 06545402ab90..793761500177 100644
--- 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
@@ -13,7 +13,7 @@ import org.joda.time.LocalDate;
 /**
  * FormatTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class FormatTest   {
   
   private Integer integer = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 10af02572556..2f0972bf41e7 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -15,7 +15,7 @@ import org.joda.time.DateTime;
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   
   private String uuid = null;
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 fc3989285146..b2809525c7f5 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 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.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class Model200Response   {
   
   private Integer name = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 408b2536a1bb..32fb86dd3238 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ModelApiResponse
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class ModelApiResponse   {
   
   private Integer code = null;
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 e7b24a568e65..a076d16f9643 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class ModelReturn   {
   
   private Integer _return = null;
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 fae7beeef93c..1ba2cc5e4a3c 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
@@ -11,7 +11,7 @@ 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")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class Name   {
   
   private Integer name = null;
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 893d121daa25..cec651e73a61 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
@@ -12,7 +12,7 @@ import org.joda.time.DateTime;
 /**
  * Order
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class Order   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
index d426d6c216e4..da8b76ad024b 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
@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * Pet
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class Pet   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index ddfa45b5dbdd..fdc3587df0e2 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ReadOnlyFirst
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class ReadOnlyFirst   {
   
   private String bar = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
index b7dd8dc42ca0..24e57756cb2f 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * SpecialModelName
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
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 2bcfcc68c927..9d3bdd8cb9e9 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Tag
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class Tag   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
index a6be090fd124..f23553660deb 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * User
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-07T22:38:14.473+02:00")
+
 public class User   {
   
   private Long id = null;

From 6df4ffab13e70cf94efd2b009bee736d2fc24cd2 Mon Sep 17 00:00:00 2001
From: Peter <graphhopper@gmx.de>
Date: Wed, 8 Jun 2016 22:37:41 +0200
Subject: [PATCH 108/139] use explicit Response class from okhttp fixing #3071

---
 .../main/resources/Java/libraries/okhttp-gson/api.mustache   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
index 13c813e58afe..cf5841b5ec81 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
@@ -13,7 +13,6 @@ import com.google.gson.reflect.TypeToken;
 
 import com.squareup.okhttp.Call;
 import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Response;
 
 import java.io.IOException;
 
@@ -90,8 +89,8 @@ public class {{classname}} {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();

From 6cab3a2a373964d9dda9e3f4485e11c3c4e93a4b Mon Sep 17 00:00:00 2001
From: Peter <graphhopper@gmx.de>
Date: Wed, 8 Jun 2016 22:53:58 +0200
Subject: [PATCH 109/139] added GraphHopper to projects/companies

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3a8e9d4c629b..ece108666e16 100644
--- a/README.md
+++ b/README.md
@@ -860,6 +860,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you
 - [everystory.us](http://everystory.us)
 - [Expected Behavior](http://www.expectedbehavior.com/)
 - [FH Münster - University of Applied Sciences](http://www.fh-muenster.de)
+- [GraphHopper](https://graphhopper.com/)
 - [IMS Health](http://www.imshealth.com/en/solution-areas/technology-and-applications)
 - [Interactive Intelligence](http://developer.mypurecloud.com/)
 - [LANDR Audio](https://www.landr.com/)

From 03f5619beb72846f42ab7c4bda8d99467e234f66 Mon Sep 17 00:00:00 2001
From: Takuro Wada <taxpon@gmail.com>
Date: Fri, 3 Jun 2016 07:08:28 +0900
Subject: [PATCH 110/139] Update python constructor to provide arguments for
 instance initialization ( #3029 )

---
 .../src/main/resources/python/model.mustache  |  4 +--
 .../models/additional_properties_class.py     |  6 ++--
 .../python/petstore_api/models/animal.py      |  6 ++--
 .../petstore_api/models/api_response.py       |  8 +++---
 .../python/petstore_api/models/array_test.py  |  8 +++---
 .../python/petstore_api/models/cat.py         |  8 +++---
 .../python/petstore_api/models/category.py    |  6 ++--
 .../python/petstore_api/models/dog.py         |  8 +++---
 .../python/petstore_api/models/enum_test.py   |  8 +++---
 .../python/petstore_api/models/format_test.py | 28 +++++++++----------
 ...perties_and_additional_properties_class.py |  8 +++---
 .../petstore_api/models/model_200_response.py |  4 +--
 .../petstore_api/models/model_return.py       |  4 +--
 .../python/petstore_api/models/name.py        | 10 +++----
 .../python/petstore_api/models/order.py       | 14 +++++-----
 .../python/petstore_api/models/pet.py         | 14 +++++-----
 .../petstore_api/models/read_only_first.py    |  6 ++--
 .../petstore_api/models/special_model_name.py |  4 +--
 .../python/petstore_api/models/tag.py         |  6 ++--
 .../python/petstore_api/models/user.py        | 18 ++++++------
 20 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index a592278bf128..1239ef8557d2 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -14,7 +14,7 @@ class {{classname}}(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self{{#vars}}, {{name}}={{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}{{/vars}}):
         """
         {{classname}} - a model defined in Swagger
 
@@ -34,7 +34,7 @@ class {{classname}}(object):
         }
 
 {{#vars}}
-        self._{{name}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}
+        self._{{name}} = {{name}}
 {{/vars}}
 {{#vars}}{{#-first}}
 {{/-first}}
diff --git a/samples/client/petstore/python/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
index 510287a16336..b5383efed388 100644
--- a/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
@@ -32,7 +32,7 @@ class AdditionalPropertiesClass(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, map_property=None, map_of_map_property=None):
         """
         AdditionalPropertiesClass - a model defined in Swagger
 
@@ -51,8 +51,8 @@ class AdditionalPropertiesClass(object):
             'map_of_map_property': 'map_of_map_property'
         }
 
-        self._map_property = None
-        self._map_of_map_property = None
+        self._map_property = map_property
+        self._map_of_map_property = map_of_map_property
 
     @property
     def map_property(self):
diff --git a/samples/client/petstore/python/petstore_api/models/animal.py b/samples/client/petstore/python/petstore_api/models/animal.py
index 6ed4786c88b9..8a5b64998726 100644
--- a/samples/client/petstore/python/petstore_api/models/animal.py
+++ b/samples/client/petstore/python/petstore_api/models/animal.py
@@ -32,7 +32,7 @@ class Animal(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, class_name=None, color='red'):
         """
         Animal - a model defined in Swagger
 
@@ -51,8 +51,8 @@ class Animal(object):
             'color': 'color'
         }
 
-        self._class_name = None
-        self._color = 'red'
+        self._class_name = class_name
+        self._color = color
 
     @property
     def class_name(self):
diff --git a/samples/client/petstore/python/petstore_api/models/api_response.py b/samples/client/petstore/python/petstore_api/models/api_response.py
index 8719ec107bea..7cb5eb5c8896 100644
--- a/samples/client/petstore/python/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python/petstore_api/models/api_response.py
@@ -32,7 +32,7 @@ class ApiResponse(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, code=None, type=None, message=None):
         """
         ApiResponse - a model defined in Swagger
 
@@ -53,9 +53,9 @@ class ApiResponse(object):
             'message': 'message'
         }
 
-        self._code = None
-        self._type = None
-        self._message = None
+        self._code = code
+        self._type = type
+        self._message = message
 
     @property
     def code(self):
diff --git a/samples/client/petstore/python/petstore_api/models/array_test.py b/samples/client/petstore/python/petstore_api/models/array_test.py
index c00062076494..adaeecc2ed7f 100644
--- a/samples/client/petstore/python/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python/petstore_api/models/array_test.py
@@ -32,7 +32,7 @@ class ArrayTest(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, array_of_string=None, array_array_of_integer=None, array_array_of_model=None):
         """
         ArrayTest - a model defined in Swagger
 
@@ -53,9 +53,9 @@ class ArrayTest(object):
             'array_array_of_model': 'array_array_of_model'
         }
 
-        self._array_of_string = None
-        self._array_array_of_integer = None
-        self._array_array_of_model = None
+        self._array_of_string = array_of_string
+        self._array_array_of_integer = array_array_of_integer
+        self._array_array_of_model = array_array_of_model
 
     @property
     def array_of_string(self):
diff --git a/samples/client/petstore/python/petstore_api/models/cat.py b/samples/client/petstore/python/petstore_api/models/cat.py
index 3b44fde4ee07..a37e0b0674b6 100644
--- a/samples/client/petstore/python/petstore_api/models/cat.py
+++ b/samples/client/petstore/python/petstore_api/models/cat.py
@@ -32,7 +32,7 @@ class Cat(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, class_name=None, color='red', declawed=None):
         """
         Cat - a model defined in Swagger
 
@@ -53,9 +53,9 @@ class Cat(object):
             'declawed': 'declawed'
         }
 
-        self._class_name = None
-        self._color = 'red'
-        self._declawed = None
+        self._class_name = class_name
+        self._color = color
+        self._declawed = declawed
 
     @property
     def class_name(self):
diff --git a/samples/client/petstore/python/petstore_api/models/category.py b/samples/client/petstore/python/petstore_api/models/category.py
index 4a88b5776f27..9adf7e1bab24 100644
--- a/samples/client/petstore/python/petstore_api/models/category.py
+++ b/samples/client/petstore/python/petstore_api/models/category.py
@@ -32,7 +32,7 @@ class Category(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, id=None, name=None):
         """
         Category - a model defined in Swagger
 
@@ -51,8 +51,8 @@ class Category(object):
             'name': 'name'
         }
 
-        self._id = None
-        self._name = None
+        self._id = id
+        self._name = name
 
     @property
     def id(self):
diff --git a/samples/client/petstore/python/petstore_api/models/dog.py b/samples/client/petstore/python/petstore_api/models/dog.py
index bf31dd373127..70225244a134 100644
--- a/samples/client/petstore/python/petstore_api/models/dog.py
+++ b/samples/client/petstore/python/petstore_api/models/dog.py
@@ -32,7 +32,7 @@ class Dog(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, class_name=None, color='red', breed=None):
         """
         Dog - a model defined in Swagger
 
@@ -53,9 +53,9 @@ class Dog(object):
             'breed': 'breed'
         }
 
-        self._class_name = None
-        self._color = 'red'
-        self._breed = None
+        self._class_name = class_name
+        self._color = color
+        self._breed = breed
 
     @property
     def class_name(self):
diff --git a/samples/client/petstore/python/petstore_api/models/enum_test.py b/samples/client/petstore/python/petstore_api/models/enum_test.py
index 9bcaafc0501a..faf89659ef26 100644
--- a/samples/client/petstore/python/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python/petstore_api/models/enum_test.py
@@ -32,7 +32,7 @@ class EnumTest(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, enum_string=None, enum_integer=None, enum_number=None):
         """
         EnumTest - a model defined in Swagger
 
@@ -53,9 +53,9 @@ class EnumTest(object):
             'enum_number': 'enum_number'
         }
 
-        self._enum_string = None
-        self._enum_integer = None
-        self._enum_number = None
+        self._enum_string = enum_string
+        self._enum_integer = enum_integer
+        self._enum_number = enum_number
 
     @property
     def enum_string(self):
diff --git a/samples/client/petstore/python/petstore_api/models/format_test.py b/samples/client/petstore/python/petstore_api/models/format_test.py
index d29155be1435..54522805164d 100644
--- a/samples/client/petstore/python/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python/petstore_api/models/format_test.py
@@ -32,7 +32,7 @@ class FormatTest(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, integer=None, int32=None, int64=None, number=None, float=None, double=None, string=None, byte=None, binary=None, date=None, date_time=None, uuid=None, password=None):
         """
         FormatTest - a model defined in Swagger
 
@@ -73,19 +73,19 @@ class FormatTest(object):
             '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._uuid = None
-        self._password = None
+        self._integer = integer
+        self._int32 = int32
+        self._int64 = int64
+        self._number = number
+        self._float = float
+        self._double = double
+        self._string = string
+        self._byte = byte
+        self._binary = binary
+        self._date = date
+        self._date_time = date_time
+        self._uuid = uuid
+        self._password = password
 
     @property
     def integer(self):
diff --git a/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 99c7c9d943c1..9c4bdd2a851c 100644
--- a/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -32,7 +32,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, uuid=None, date_time=None, map=None):
         """
         MixedPropertiesAndAdditionalPropertiesClass - a model defined in Swagger
 
@@ -53,9 +53,9 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
             'map': 'map'
         }
 
-        self._uuid = None
-        self._date_time = None
-        self._map = None
+        self._uuid = uuid
+        self._date_time = date_time
+        self._map = map
 
     @property
     def uuid(self):
diff --git a/samples/client/petstore/python/petstore_api/models/model_200_response.py b/samples/client/petstore/python/petstore_api/models/model_200_response.py
index cd86b10e9631..95326567ada2 100644
--- a/samples/client/petstore/python/petstore_api/models/model_200_response.py
+++ b/samples/client/petstore/python/petstore_api/models/model_200_response.py
@@ -32,7 +32,7 @@ class Model200Response(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, name=None):
         """
         Model200Response - a model defined in Swagger
 
@@ -49,7 +49,7 @@ class Model200Response(object):
             'name': 'name'
         }
 
-        self._name = None
+        self._name = name
 
     @property
     def name(self):
diff --git a/samples/client/petstore/python/petstore_api/models/model_return.py b/samples/client/petstore/python/petstore_api/models/model_return.py
index 711418c3d91d..5587c068b0f0 100644
--- a/samples/client/petstore/python/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python/petstore_api/models/model_return.py
@@ -32,7 +32,7 @@ class ModelReturn(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, _return=None):
         """
         ModelReturn - a model defined in Swagger
 
@@ -49,7 +49,7 @@ class ModelReturn(object):
             '_return': 'return'
         }
 
-        self.__return = None
+        self.__return = _return
 
     @property
     def _return(self):
diff --git a/samples/client/petstore/python/petstore_api/models/name.py b/samples/client/petstore/python/petstore_api/models/name.py
index 45d7b4bd8d07..2cff0bfc231d 100644
--- a/samples/client/petstore/python/petstore_api/models/name.py
+++ b/samples/client/petstore/python/petstore_api/models/name.py
@@ -32,7 +32,7 @@ class Name(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, name=None, snake_case=None, _property=None, _123_number=None):
         """
         Name - a model defined in Swagger
 
@@ -55,10 +55,10 @@ class Name(object):
             '_123_number': '123Number'
         }
 
-        self._name = None
-        self._snake_case = None
-        self.__property = None
-        self.__123_number = None
+        self._name = name
+        self._snake_case = snake_case
+        self.__property = _property
+        self.__123_number = _123_number
 
     @property
     def name(self):
diff --git a/samples/client/petstore/python/petstore_api/models/order.py b/samples/client/petstore/python/petstore_api/models/order.py
index a15e20f924e1..98d36719006e 100644
--- a/samples/client/petstore/python/petstore_api/models/order.py
+++ b/samples/client/petstore/python/petstore_api/models/order.py
@@ -32,7 +32,7 @@ class Order(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, id=None, pet_id=None, quantity=None, ship_date=None, status=None, complete=False):
         """
         Order - a model defined in Swagger
 
@@ -59,12 +59,12 @@ class Order(object):
             'complete': 'complete'
         }
 
-        self._id = None
-        self._pet_id = None
-        self._quantity = None
-        self._ship_date = None
-        self._status = None
-        self._complete = False
+        self._id = id
+        self._pet_id = pet_id
+        self._quantity = quantity
+        self._ship_date = ship_date
+        self._status = status
+        self._complete = complete
 
     @property
     def id(self):
diff --git a/samples/client/petstore/python/petstore_api/models/pet.py b/samples/client/petstore/python/petstore_api/models/pet.py
index deccb9630b74..7a93da19db93 100644
--- a/samples/client/petstore/python/petstore_api/models/pet.py
+++ b/samples/client/petstore/python/petstore_api/models/pet.py
@@ -32,7 +32,7 @@ class Pet(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, id=None, category=None, name=None, photo_urls=None, tags=None, status=None):
         """
         Pet - a model defined in Swagger
 
@@ -59,12 +59,12 @@ class Pet(object):
             'status': 'status'
         }
 
-        self._id = None
-        self._category = None
-        self._name = None
-        self._photo_urls = None
-        self._tags = None
-        self._status = None
+        self._id = id
+        self._category = category
+        self._name = name
+        self._photo_urls = photo_urls
+        self._tags = tags
+        self._status = status
 
     @property
     def id(self):
diff --git a/samples/client/petstore/python/petstore_api/models/read_only_first.py b/samples/client/petstore/python/petstore_api/models/read_only_first.py
index 4f479ae1d7f7..b1ca04f4a09a 100644
--- a/samples/client/petstore/python/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python/petstore_api/models/read_only_first.py
@@ -32,7 +32,7 @@ class ReadOnlyFirst(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, bar=None, baz=None):
         """
         ReadOnlyFirst - a model defined in Swagger
 
@@ -51,8 +51,8 @@ class ReadOnlyFirst(object):
             'baz': 'baz'
         }
 
-        self._bar = None
-        self._baz = None
+        self._bar = bar
+        self._baz = baz
 
     @property
     def bar(self):
diff --git a/samples/client/petstore/python/petstore_api/models/special_model_name.py b/samples/client/petstore/python/petstore_api/models/special_model_name.py
index af3fb00dda72..e48b7d79faf0 100644
--- a/samples/client/petstore/python/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python/petstore_api/models/special_model_name.py
@@ -32,7 +32,7 @@ class SpecialModelName(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, special_property_name=None):
         """
         SpecialModelName - a model defined in Swagger
 
@@ -49,7 +49,7 @@ class SpecialModelName(object):
             'special_property_name': '$special[property.name]'
         }
 
-        self._special_property_name = None
+        self._special_property_name = special_property_name
 
     @property
     def special_property_name(self):
diff --git a/samples/client/petstore/python/petstore_api/models/tag.py b/samples/client/petstore/python/petstore_api/models/tag.py
index a91b8127d51a..95013b4fa8a2 100644
--- a/samples/client/petstore/python/petstore_api/models/tag.py
+++ b/samples/client/petstore/python/petstore_api/models/tag.py
@@ -32,7 +32,7 @@ class Tag(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, id=None, name=None):
         """
         Tag - a model defined in Swagger
 
@@ -51,8 +51,8 @@ class Tag(object):
             'name': 'name'
         }
 
-        self._id = None
-        self._name = None
+        self._id = id
+        self._name = name
 
     @property
     def id(self):
diff --git a/samples/client/petstore/python/petstore_api/models/user.py b/samples/client/petstore/python/petstore_api/models/user.py
index f98a895b7168..1caf604d8255 100644
--- a/samples/client/petstore/python/petstore_api/models/user.py
+++ b/samples/client/petstore/python/petstore_api/models/user.py
@@ -32,7 +32,7 @@ class User(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self):
+    def __init__(self, id=None, username=None, first_name=None, last_name=None, email=None, password=None, phone=None, user_status=None):
         """
         User - a model defined in Swagger
 
@@ -63,14 +63,14 @@ class User(object):
             'user_status': 'userStatus'
         }
 
-        self._id = None
-        self._username = None
-        self._first_name = None
-        self._last_name = None
-        self._email = None
-        self._password = None
-        self._phone = None
-        self._user_status = None
+        self._id = id
+        self._username = username
+        self._first_name = first_name
+        self._last_name = last_name
+        self._email = email
+        self._password = password
+        self._phone = phone
+        self._user_status = user_status
 
     @property
     def id(self):

From 2c939b03b40e18ce0c100ccff33a20e3a46a6658 Mon Sep 17 00:00:00 2001
From: Takuro Wada <taxpon@gmail.com>
Date: Wed, 8 Jun 2016 23:48:34 +0900
Subject: [PATCH 111/139] Apply readWriteVars to constructor in
 python/model.mustach

---
 .../src/main/resources/python/gitignore.mustache     |  2 ++
 .../src/main/resources/python/model.mustache         |  9 ++++++---
 samples/client/petstore/python/README.md             | 12 ++++++------
 .../petstore/python/petstore_api/models/name.py      |  6 +++---
 .../python/petstore_api/models/read_only_first.py    |  4 ++--
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/python/gitignore.mustache b/modules/swagger-codegen/src/main/resources/python/gitignore.mustache
index 1dbc687de014..a655050c2631 100644
--- a/modules/swagger-codegen/src/main/resources/python/gitignore.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/gitignore.mustache
@@ -44,6 +44,8 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+venv/
+.python-version
 
 # Translations
 *.mo
diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index 1239ef8557d2..4a8cf2a4cc21 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -14,7 +14,7 @@ class {{classname}}(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self{{#vars}}, {{name}}={{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}{{/vars}}):
+    def __init__(self{{#readWriteVars}}, {{name}}={{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}{{/readWriteVars}}):
         """
         {{classname}} - a model defined in Swagger
 
@@ -33,9 +33,12 @@ class {{classname}}(object):
             {{/hasMore}}{{/vars}}
         }
 
-{{#vars}}
+{{#readOnlyVars}}
+        self._{{name}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}
+{{/readOnlyVars}}
+{{#readWriteVars}}
         self._{{name}} = {{name}}
-{{/vars}}
+{{/readWriteVars}}
 {{#vars}}{{#-first}}
 {{/-first}}
     @property
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index 15d55317325e..a25525100af7 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-06-08T10:26:51.066+08:00
+- Build date: 2016-06-08T23:40:51.798+09:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -24,7 +24,7 @@ pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
 
 Then import the package:
 ```python
-import swagger_client 
+import petstore_api
 ```
 
 ### Setuptools
@@ -38,7 +38,7 @@ python setup.py install --user
 
 Then import the package:
 ```python
-import swagger_client
+import petstore_api
 ```
 
 ## Getting Started
@@ -47,11 +47,11 @@ Please follow the [installation procedure](#installation--usage) and then run th
 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 # create an instance of the API class
-api_instance = swagger_client.FakeApi
+api_instance = petstore_api.FakeApi
 number = 3.4 # float | None
 double = 1.2 # float | None
 string = 'string_example' # str | None
diff --git a/samples/client/petstore/python/petstore_api/models/name.py b/samples/client/petstore/python/petstore_api/models/name.py
index 2cff0bfc231d..bddb37ed6ecb 100644
--- a/samples/client/petstore/python/petstore_api/models/name.py
+++ b/samples/client/petstore/python/petstore_api/models/name.py
@@ -32,7 +32,7 @@ class Name(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self, name=None, snake_case=None, _property=None, _123_number=None):
+    def __init__(self, name=None, _property=None):
         """
         Name - a model defined in Swagger
 
@@ -55,10 +55,10 @@ class Name(object):
             '_123_number': '123Number'
         }
 
+        self._snake_case = None
+        self.__123_number = None
         self._name = name
-        self._snake_case = snake_case
         self.__property = _property
-        self.__123_number = _123_number
 
     @property
     def name(self):
diff --git a/samples/client/petstore/python/petstore_api/models/read_only_first.py b/samples/client/petstore/python/petstore_api/models/read_only_first.py
index b1ca04f4a09a..d7a29c0fb89d 100644
--- a/samples/client/petstore/python/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python/petstore_api/models/read_only_first.py
@@ -32,7 +32,7 @@ class ReadOnlyFirst(object):
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
     """
-    def __init__(self, bar=None, baz=None):
+    def __init__(self, baz=None):
         """
         ReadOnlyFirst - a model defined in Swagger
 
@@ -51,7 +51,7 @@ class ReadOnlyFirst(object):
             'baz': 'baz'
         }
 
-        self._bar = bar
+        self._bar = None
         self._baz = baz
 
     @property

From 2ea37202a946e03e1c2f7cff295d1b3faaf17601 Mon Sep 17 00:00:00 2001
From: Takuro Wada <taxpon@gmail.com>
Date: Thu, 9 Jun 2016 07:53:03 +0900
Subject: [PATCH 112/139] Omit @property.setter for readonly property

---
 .../src/main/resources/python/model.mustache  |  2 ++
 samples/client/petstore/python/.gitignore     |  2 ++
 samples/client/petstore/python/README.md      | 18 +++++++-------
 .../python/petstore_api/configuration.py      | 14 +++++------
 .../python/petstore_api/models/name.py        | 24 -------------------
 .../petstore_api/models/read_only_first.py    | 12 ----------
 6 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index 4a8cf2a4cc21..a08595db88a8 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -52,6 +52,7 @@ class {{classname}}(object):
         """
         return self._{{name}}
 
+{{^isReadOnly}}
     @{{name}}.setter
     def {{name}}(self, {{name}}):
         """
@@ -99,6 +100,7 @@ class {{classname}}(object):
 
         self._{{name}} = {{name}}
 
+{{/isReadOnly}}
 {{/vars}}
     def to_dict(self):
         """
diff --git a/samples/client/petstore/python/.gitignore b/samples/client/petstore/python/.gitignore
index 1dbc687de014..a655050c2631 100644
--- a/samples/client/petstore/python/.gitignore
+++ b/samples/client/petstore/python/.gitignore
@@ -44,6 +44,8 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+venv/
+.python-version
 
 # Translations
 *.mo
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index a25525100af7..8fc15c13eecf 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -1,11 +1,11 @@
-# swagger_client
+# petstore_api
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 This Python 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-06-08T23:40:51.798+09:00
+- Build date: 2016-06-09T08:00:02.342+09:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
@@ -24,7 +24,7 @@ pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
 
 Then import the package:
 ```python
-import petstore_api
+import petstore_api 
 ```
 
 ### Setuptools
@@ -130,12 +130,6 @@ Class | Method | HTTP request | Description
 ## Documentation For Authorization
 
 
-## api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
 ## petstore_auth
 
 - **Type**: OAuth
@@ -145,6 +139,12 @@ Class | Method | HTTP request | Description
  - **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
 
diff --git a/samples/client/petstore/python/petstore_api/configuration.py b/samples/client/petstore/python/petstore_api/configuration.py
index ec940b714133..76f1f57c7842 100644
--- a/samples/client/petstore/python/petstore_api/configuration.py
+++ b/samples/client/petstore/python/petstore_api/configuration.py
@@ -221,13 +221,6 @@ class Configuration(object):
         :return: The Auth Settings information dict.
         """
         return {
-            'api_key':
-                {
-                    'type': 'api_key',
-                    'in': 'header',
-                    'key': 'api_key',
-                    'value': self.get_api_key_with_prefix('api_key')
-                },
 
             'petstore_auth': 
                 {
@@ -236,6 +229,13 @@ class Configuration(object):
                     'key': 'Authorization',
                     'value': 'Bearer ' + self.access_token
                 },
+            'api_key':
+                {
+                    'type': 'api_key',
+                    'in': 'header',
+                    'key': 'api_key',
+                    'value': self.get_api_key_with_prefix('api_key')
+                },
 
         }
 
diff --git a/samples/client/petstore/python/petstore_api/models/name.py b/samples/client/petstore/python/petstore_api/models/name.py
index bddb37ed6ecb..fa489658960c 100644
--- a/samples/client/petstore/python/petstore_api/models/name.py
+++ b/samples/client/petstore/python/petstore_api/models/name.py
@@ -94,18 +94,6 @@ class Name(object):
         """
         return self._snake_case
 
-    @snake_case.setter
-    def snake_case(self, snake_case):
-        """
-        Sets the snake_case of this Name.
-
-
-        :param snake_case: The snake_case of this Name.
-        :type: int
-        """
-
-        self._snake_case = snake_case
-
     @property
     def _property(self):
         """
@@ -140,18 +128,6 @@ class Name(object):
         """
         return self.__123_number
 
-    @_123_number.setter
-    def _123_number(self, _123_number):
-        """
-        Sets the _123_number of this Name.
-
-
-        :param _123_number: The _123_number of this Name.
-        :type: int
-        """
-
-        self.__123_number = _123_number
-
     def to_dict(self):
         """
         Returns the model properties as a dict
diff --git a/samples/client/petstore/python/petstore_api/models/read_only_first.py b/samples/client/petstore/python/petstore_api/models/read_only_first.py
index d7a29c0fb89d..c04d52501cf9 100644
--- a/samples/client/petstore/python/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python/petstore_api/models/read_only_first.py
@@ -65,18 +65,6 @@ class ReadOnlyFirst(object):
         """
         return self._bar
 
-    @bar.setter
-    def bar(self, bar):
-        """
-        Sets the bar of this ReadOnlyFirst.
-
-
-        :param bar: The bar of this ReadOnlyFirst.
-        :type: str
-        """
-
-        self._bar = bar
-
     @property
     def baz(self):
         """

From 28bece0ce0ef6036d8afe36bbfab31a64532b79e Mon Sep 17 00:00:00 2001
From: Peter <graphhopper@gmx.de>
Date: Thu, 9 Jun 2016 08:56:42 +0200
Subject: [PATCH 113/139] made response change to petstore

---
 .../java/io/swagger/client/ApiException.java  |  2 +-
 .../java/io/swagger/client/Configuration.java |  2 +-
 .../src/main/java/io/swagger/client/Pair.java |  2 +-
 .../java/io/swagger/client/StringUtil.java    |  2 +-
 .../java/io/swagger/client/api/FakeApi.java   |  5 ++-
 .../java/io/swagger/client/api/PetApi.java    | 33 +++++++++----------
 .../java/io/swagger/client/api/StoreApi.java  | 17 +++++-----
 .../java/io/swagger/client/api/UserApi.java   | 33 +++++++++----------
 .../io/swagger/client/auth/ApiKeyAuth.java    |  2 +-
 .../java/io/swagger/client/auth/OAuth.java    |  2 +-
 10 files changed, 48 insertions(+), 52 deletions(-)

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 325f124c2d57..0b6b9773ee72 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-06-09T00:01:22.559+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T08:56:08.812+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 0131c5123a52..6ae2ec402d52 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-06-09T00:01:22.559+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T08:56:08.812+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 886d6130e965..d76c4f87d8e3 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-06-09T00:01:22.559+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T08:56:08.812+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 605a18984b27..6a173209cd0c 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-06-09T00:01:22.559+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T08:56:08.812+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/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
index 313707926bf8..e94e2ea0ada4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
@@ -13,7 +13,6 @@ import com.google.gson.reflect.TypeToken;
 
 import com.squareup.okhttp.Call;
 import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Response;
 
 import java.io.IOException;
 
@@ -118,8 +117,8 @@ public class FakeApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
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 c3090d83e1ed..1d6d974d6a92 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
@@ -13,7 +13,6 @@ import com.google.gson.reflect.TypeToken;
 
 import com.squareup.okhttp.Call;
 import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Response;
 
 import java.io.IOException;
 
@@ -80,8 +79,8 @@ public class PetApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -185,8 +184,8 @@ public class PetApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -292,8 +291,8 @@ public class PetApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -400,8 +399,8 @@ public class PetApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -507,8 +506,8 @@ public class PetApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -613,8 +612,8 @@ public class PetApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -720,8 +719,8 @@ public class PetApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -833,8 +832,8 @@ public class PetApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
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 a17475df5b2a..964c496b8bbb 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
@@ -13,7 +13,6 @@ import com.google.gson.reflect.TypeToken;
 
 import com.squareup.okhttp.Call;
 import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Response;
 
 import java.io.IOException;
 
@@ -79,8 +78,8 @@ public class StoreApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -176,8 +175,8 @@ public class StoreApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -280,8 +279,8 @@ public class StoreApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -386,8 +385,8 @@ public class StoreApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
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 da664e27c4b5..a6cb3fcf3271 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
@@ -13,7 +13,6 @@ import com.google.gson.reflect.TypeToken;
 
 import com.squareup.okhttp.Call;
 import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Response;
 
 import java.io.IOException;
 
@@ -78,8 +77,8 @@ public class UserApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -180,8 +179,8 @@ public class UserApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -282,8 +281,8 @@ public class UserApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -385,8 +384,8 @@ public class UserApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -488,8 +487,8 @@ public class UserApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -603,8 +602,8 @@ public class UserApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -707,8 +706,8 @@ public class UserApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -812,8 +811,8 @@ public class UserApi {
         if(progressListener != null) {
             apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
                 @Override
-                public Response intercept(Interceptor.Chain chain) throws IOException {
-                    Response originalResponse = chain.proceed(chain.request());
+                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
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 25c57b9e7d96..c62830180fef 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-06-09T00:01:22.559+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T08:56:08.812+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 354330e0013f..575d556b9839 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-06-09T00:01:22.559+08:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T08:56:08.812+02:00")
 public class OAuth implements Authentication {
   private String accessToken;
 

From 2d170fd7a6afd36e9b55986e183e3251bc0d7ca8 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Thu, 9 Jun 2016 16:07:36 +0800
Subject: [PATCH 114/139] add license to

---
 bin/java-petstore-okhttp-gson.sh              |  2 +-
 bin/windows/java-petsore-okhttp-gson.bat      | 10 +++++++
 .../resources/Java/Configuration.mustache     |  2 ++
 .../src/main/resources/Java/Pair.mustache     |  2 ++
 .../main/resources/Java/StringUtil.mustache   |  2 ++
 .../src/main/resources/Java/api_test.mustache |  2 ++
 .../okhttp-gson/ApiCallback.mustache          |  2 ++
 .../libraries/okhttp-gson/ApiClient.mustache  |  2 ++
 .../okhttp-gson/ApiResponse.mustache          |  2 ++
 .../Java/libraries/okhttp-gson/JSON.mustache  |  2 ++
 .../okhttp-gson/ProgressRequestBody.mustache  |  2 ++
 .../okhttp-gson/ProgressResponseBody.mustache |  2 ++
 .../Java/libraries/okhttp-gson/api.mustache   |  2 ++
 .../okhttp-gson/auth/HttpBasicAuth.mustache   |  2 ++
 .../Java/libraries/okhttp-gson/model.mustache |  2 ++
 .../java/io/swagger/client/ApiCallback.java   | 24 +++++++++++++++++
 .../java/io/swagger/client/ApiClient.java     | 24 +++++++++++++++++
 .../java/io/swagger/client/ApiException.java  |  2 +-
 .../java/io/swagger/client/ApiResponse.java   | 24 +++++++++++++++++
 .../java/io/swagger/client/Configuration.java | 26 ++++++++++++++++++-
 .../src/main/java/io/swagger/client/JSON.java | 24 +++++++++++++++++
 .../src/main/java/io/swagger/client/Pair.java | 26 ++++++++++++++++++-
 .../swagger/client/ProgressRequestBody.java   | 24 +++++++++++++++++
 .../swagger/client/ProgressResponseBody.java  | 24 +++++++++++++++++
 .../java/io/swagger/client/StringUtil.java    | 26 ++++++++++++++++++-
 .../java/io/swagger/client/api/FakeApi.java   | 24 +++++++++++++++++
 .../java/io/swagger/client/api/PetApi.java    | 24 +++++++++++++++++
 .../java/io/swagger/client/api/StoreApi.java  | 24 +++++++++++++++++
 .../java/io/swagger/client/api/UserApi.java   | 24 +++++++++++++++++
 .../io/swagger/client/auth/ApiKeyAuth.java    |  2 +-
 .../io/swagger/client/auth/HttpBasicAuth.java | 24 +++++++++++++++++
 .../java/io/swagger/client/auth/OAuth.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 24 +++++++++++++++++
 .../java/io/swagger/client/model/Animal.java  | 24 +++++++++++++++++
 .../io/swagger/client/model/AnimalFarm.java   | 24 +++++++++++++++++
 .../io/swagger/client/model/ArrayTest.java    | 24 +++++++++++++++++
 .../java/io/swagger/client/model/Cat.java     | 24 +++++++++++++++++
 .../io/swagger/client/model/Category.java     | 24 +++++++++++++++++
 .../java/io/swagger/client/model/Dog.java     | 24 +++++++++++++++++
 .../io/swagger/client/model/EnumClass.java    | 24 +++++++++++++++++
 .../io/swagger/client/model/EnumTest.java     | 24 +++++++++++++++++
 .../io/swagger/client/model/FormatTest.java   | 24 +++++++++++++++++
 ...ropertiesAndAdditionalPropertiesClass.java | 24 +++++++++++++++++
 .../client/model/Model200Response.java        | 24 +++++++++++++++++
 .../client/model/ModelApiResponse.java        | 24 +++++++++++++++++
 .../io/swagger/client/model/ModelReturn.java  | 24 +++++++++++++++++
 .../java/io/swagger/client/model/Name.java    | 24 +++++++++++++++++
 .../java/io/swagger/client/model/Order.java   | 24 +++++++++++++++++
 .../java/io/swagger/client/model/Pet.java     | 24 +++++++++++++++++
 .../swagger/client/model/ReadOnlyFirst.java   | 24 +++++++++++++++++
 .../client/model/SpecialModelName.java        | 24 +++++++++++++++++
 .../java/io/swagger/client/model/Tag.java     | 24 +++++++++++++++++
 .../java/io/swagger/client/model/User.java    | 24 +++++++++++++++++
 53 files changed, 883 insertions(+), 7 deletions(-)
 create mode 100755 bin/windows/java-petsore-okhttp-gson.bat

diff --git a/bin/java-petstore-okhttp-gson.sh b/bin/java-petstore-okhttp-gson.sh
index f656624a6c62..b62610b1eff5 100755
--- a/bin/java-petstore-okhttp-gson.sh
+++ b/bin/java-petstore-okhttp-gson.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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-okhttp-gson.json -o samples/client/petstore/java/okhttp-gson"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-okhttp-gson.json -o samples/client/petstore/java/okhttp-gson -DhideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/java-petsore-okhttp-gson.bat b/bin/windows/java-petsore-okhttp-gson.bat
new file mode 100755
index 000000000000..cc2b52e4fa13
--- /dev/null
+++ b/bin/windows/java-petsore-okhttp-gson.bat
@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -t modules\swagger-codegen\src\main\resources\java -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java --library=okhttp-gson -DhideGenerationTimestamp=true
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache b/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache
index ea6cccb7d854..cb425df3563e 100644
--- a/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/Configuration.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/Pair.mustache b/modules/swagger-codegen/src/main/resources/Java/Pair.mustache
index e2a47317afe4..c08f145a4828 100644
--- a/modules/swagger-codegen/src/main/resources/Java/Pair.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/Pair.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache b/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache
index 073966b0c217..7b72a7bab451 100644
--- a/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/StringUtil.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/api_test.mustache b/modules/swagger-codegen/src/main/resources/Java/api_test.mustache
index f9e00ef29790..0a7639e0ec1f 100644
--- a/modules/swagger-codegen/src/main/resources/Java/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/api_test.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{package}};
 
 import {{invokerPackage}}.ApiException;
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache
index 3b554fefeff4..4cc99a76ec34 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}};
 
 import java.io.IOException;
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
index ac140471567f..3d6b3fe17f0b 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}};
 
 import com.squareup.okhttp.Call;
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache
index 88dcc43af4b0..82c86b3e215e 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}};
 
 import java.util.List;
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
index c7dd1d8e62f8..8e92e16c0adc 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}};
 
 import com.google.gson.Gson;
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache
index a1c300b9f306..d6570bd0d3ba 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}};
 
 import com.squareup.okhttp.MediaType;
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressResponseBody.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressResponseBody.mustache
index 061a95ac2998..3f53133697cd 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressResponseBody.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressResponseBody.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}};
 
 import com.squareup.okhttp.MediaType;
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
index 13c813e58afe..b2f8a72df6b9 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{package}};
 
 import {{invokerPackage}}.ApiCallback;
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
index 636691a2f215..320903b03193 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}}.auth;
 
 import {{invokerPackage}}.Pair;
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache
index 4bd6d5638b42..0c262eaa3a3a 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/model.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{package}};
 
 import java.util.Objects;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java
index 9a1188c92e56..2c9ca479f6cd 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client;
 
 import java.io.IOException;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
index a035a3175df8..9db036851207 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client;
 
 import com.squareup.okhttp.Call;
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 325f124c2d57..73f637e7be46 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-06-09T00:01:22.559+08:00")
+
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java
index b611649f4942..2ba402bc1b14 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client;
 
 import java.util.List;
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 0131c5123a52..4c252410dd9f 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,30 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T00:01:22.559+08:00")
+
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
index 61120482629e..14806b23ba5a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client;
 
 import com.google.gson.Gson;
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 886d6130e965..cd6e1443acd4 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,30 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T00:01:22.559+08:00")
+
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java
index d20991c67800..ddecd78de5d7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client;
 
 import com.squareup.okhttp.MediaType;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressResponseBody.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressResponseBody.java
index 138da3f2106e..98cc1ee5f7d0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressResponseBody.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressResponseBody.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client;
 
 import com.squareup.okhttp.MediaType;
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 605a18984b27..20aa7ab30e0b 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,30 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-09T00:01:22.559+08:00")
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
index 313707926bf8..ae1853eeccd3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.api;
 
 import io.swagger.client.ApiCallback;
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 c3090d83e1ed..3bc7e6df69cb 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.api;
 
 import io.swagger.client.ApiCallback;
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 a17475df5b2a..1f4717ee8501 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.api;
 
 import io.swagger.client.ApiCallback;
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 da664e27c4b5..ffc7aebb9b29 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.api;
 
 import io.swagger.client.ApiCallback;
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 25c57b9e7d96..6882dbc41c08 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-06-09T00:01:22.559+08:00")
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index 454771365386..3406f8f55fd5 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
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 354330e0013f..76d2917f24ea 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-06-09T00:01:22.559+08:00")
+
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index eae1fc450de9..d408dc424599 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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
index 1dc78139c73d..5270f3be9eff 100644
--- 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
index ccbebe839f1e..a30976c730c4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
index 6a0f8f790faa..e00a2d644ed0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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
index c76556658838..13c814801af5 100644
--- 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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 c156ce3a330b..06312c229eb9 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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
index e2823490c0d5..a9eeaf5bae8e 100644
--- 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
index 7008dd7ba4b4..970d8abf626e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
index 3da7e768f66f..ddd0f7acb132 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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
index 37c3412ee08c..494750d2e6a1 100644
--- 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 124515dad275..35762f1a0c7c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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 6a14bc15a22b..382f5014afb7 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 1c13fce28b85..e82ddccc7243 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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 dceff653982a..2be1c8524bdc 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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 9a15ccc032b3..ae8d4122ceaa 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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 6e52dd1712cd..def3eee8645b 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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 abb2dcdef487..a010b806792d 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index bdaa83c3acf4..23a8328a0c2f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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 2646fadf61cf..da372a36f9d9 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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 0f71d4e2a7fa..f8d857eea7ba 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;
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 332d6b81ba02..ad87af2477f2 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
@@ -1,3 +1,27 @@
+/**
+* Swagger Petstore
+* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+*
+* OpenAPI spec version: 1.0.0
+* Contact: apiteam@swagger.io
+*
+* NOTE: This class is auto generated by the swagger code generator program.
+* https://github.com/swagger-api/swagger-codegen.git
+* Do not edit the class manually.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package io.swagger.client.model;
 
 import java.util.Objects;

From 0a3a47dbd471eaa762cf87dd0bb7aed348246293 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Thu, 9 Jun 2016 16:20:57 +0800
Subject: [PATCH 115/139] add license to java okhttp client

---
 .../main/resources/Java/apiException.mustache |  2 +
 .../resources/Java/auth/ApiKeyAuth.mustache   |  2 +
 .../Java/auth/Authentication.mustache         |  2 +
 .../Java/auth/HttpBasicAuth.mustache          |  2 +
 .../main/resources/Java/auth/OAuth.mustache   |  2 +
 .../resources/Java/auth/OAuthFlow.mustache    |  4 +-
 .../main/resources/Java/licenseInfo.mustache  | 23 ++++++++++
 .../java/io/swagger/client/ApiCallback.java   | 45 ++++++++++---------
 .../java/io/swagger/client/ApiClient.java     | 45 ++++++++++---------
 .../java/io/swagger/client/ApiException.java  | 25 +++++++++++
 .../java/io/swagger/client/ApiResponse.java   | 45 ++++++++++---------
 .../java/io/swagger/client/Configuration.java | 45 ++++++++++---------
 .../src/main/java/io/swagger/client/JSON.java | 45 ++++++++++---------
 .../src/main/java/io/swagger/client/Pair.java | 45 ++++++++++---------
 .../swagger/client/ProgressRequestBody.java   | 45 ++++++++++---------
 .../swagger/client/ProgressResponseBody.java  | 45 ++++++++++---------
 .../java/io/swagger/client/StringUtil.java    | 45 ++++++++++---------
 .../java/io/swagger/client/api/FakeApi.java   | 45 ++++++++++---------
 .../java/io/swagger/client/api/PetApi.java    | 45 ++++++++++---------
 .../java/io/swagger/client/api/StoreApi.java  | 45 ++++++++++---------
 .../java/io/swagger/client/api/UserApi.java   | 45 ++++++++++---------
 .../io/swagger/client/auth/ApiKeyAuth.java    | 25 +++++++++++
 .../swagger/client/auth/Authentication.java   | 25 +++++++++++
 .../io/swagger/client/auth/HttpBasicAuth.java | 45 ++++++++++---------
 .../java/io/swagger/client/auth/OAuth.java    | 25 +++++++++++
 .../io/swagger/client/auth/OAuthFlow.java     | 27 ++++++++++-
 .../model/AdditionalPropertiesClass.java      | 45 ++++++++++---------
 .../java/io/swagger/client/model/Animal.java  | 45 ++++++++++---------
 .../io/swagger/client/model/AnimalFarm.java   | 45 ++++++++++---------
 .../io/swagger/client/model/ArrayTest.java    | 45 ++++++++++---------
 .../java/io/swagger/client/model/Cat.java     | 45 ++++++++++---------
 .../io/swagger/client/model/Category.java     | 45 ++++++++++---------
 .../java/io/swagger/client/model/Dog.java     | 45 ++++++++++---------
 .../io/swagger/client/model/EnumClass.java    | 45 ++++++++++---------
 .../io/swagger/client/model/EnumTest.java     | 45 ++++++++++---------
 .../io/swagger/client/model/FormatTest.java   | 45 ++++++++++---------
 ...ropertiesAndAdditionalPropertiesClass.java | 45 ++++++++++---------
 .../client/model/Model200Response.java        | 45 ++++++++++---------
 .../client/model/ModelApiResponse.java        | 45 ++++++++++---------
 .../io/swagger/client/model/ModelReturn.java  | 45 ++++++++++---------
 .../java/io/swagger/client/model/Name.java    | 45 ++++++++++---------
 .../java/io/swagger/client/model/Order.java   | 45 ++++++++++---------
 .../java/io/swagger/client/model/Pet.java     | 45 ++++++++++---------
 .../swagger/client/model/ReadOnlyFirst.java   | 45 ++++++++++---------
 .../client/model/SpecialModelName.java        | 45 ++++++++++---------
 .../java/io/swagger/client/model/Tag.java     | 45 ++++++++++---------
 .../java/io/swagger/client/model/User.java    | 45 ++++++++++---------
 47 files changed, 967 insertions(+), 772 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/Java/licenseInfo.mustache

diff --git a/modules/swagger-codegen/src/main/resources/Java/apiException.mustache b/modules/swagger-codegen/src/main/resources/Java/apiException.mustache
index 740ed4143abc..89ed524d37ed 100644
--- a/modules/swagger-codegen/src/main/resources/Java/apiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/apiException.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}};
 
 import java.util.Map;
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
index 931d17b0d046..f73a6f5b3f8f 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}}.auth;
 
 import {{invokerPackage}}.Pair;
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
index 592b55c2552c..26174fa3b591 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}}.auth;
 
 import {{invokerPackage}}.Pair;
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache
index febabe33d647..0438f6a40b71 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}}.auth;
 
 import {{invokerPackage}}.Pair;
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache
index 902f54a2e3a7..ffc9923d1fee 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}}.auth;
 
 import {{invokerPackage}}.Pair;
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/OAuthFlow.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/OAuthFlow.mustache
index 7ab35f6d890a..002e9572f33f 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/OAuthFlow.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/OAuthFlow.mustache
@@ -1,5 +1,7 @@
+{{>licenseInfo}}
+
 package {{invokerPackage}}.auth;
 
 public enum OAuthFlow {
     accessCode, implicit, password, application
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/main/resources/Java/licenseInfo.mustache b/modules/swagger-codegen/src/main/resources/Java/licenseInfo.mustache
new file mode 100644
index 000000000000..861d97234cfa
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/Java/licenseInfo.mustache
@@ -0,0 +1,23 @@
+/**
+ * {{{appName}}}
+ * {{{appDescription}}}
+ *
+ * {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
+ * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java
index 2c9ca479f6cd..efd0535e654e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiCallback.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
index 9db036851207..34af59510c2c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client;
 
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 73f637e7be46..600bb507f09e 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
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
 import java.util.Map;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java
index 2ba402bc1b14..b112f15f3e33 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiResponse.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client;
 
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 4c252410dd9f..cbdadd6262da 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,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
index 14806b23ba5a..0a3232fd91c5 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client;
 
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 cd6e1443acd4..4b44c415812b 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,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java
index ddecd78de5d7..a29fc9aec70f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressResponseBody.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressResponseBody.java
index 98cc1ee5f7d0..c20672cf0c4d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressResponseBody.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressResponseBody.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client;
 
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 20aa7ab30e0b..03c6c81e434f 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,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
index ae1853eeccd3..42f6e8bb356b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.api;
 
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 3bc7e6df69cb..eeec7a8e46ed 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.api;
 
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 1f4717ee8501..7037797d751c 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.api;
 
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 ffc7aebb9b29..b8fd7cbed5b3 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.api;
 
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 6882dbc41c08..6ba15566b609 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
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java
index c5527df3b334..a063a6998b54 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/Authentication.java
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index 3406f8f55fd5..9ac184eda83d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.auth;
 
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 76d2917f24ea..8802ebc92c81 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
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuthFlow.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuthFlow.java
index 597ec99b48b7..ec1f942b0f26 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuthFlow.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuthFlow.java
@@ -1,5 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 public enum OAuthFlow {
     accessCode, implicit, password, application
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index d408dc424599..da61d03f8d2d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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
index 5270f3be9eff..dca1f555e380 100644
--- 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
index a30976c730c4..516ff068c08b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
index e00a2d644ed0..9795e9b4d79b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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
index 13c814801af5..63bef8d8bbff 100644
--- 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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 06312c229eb9..31e61e56c251 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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
index a9eeaf5bae8e..cba351a12c98 100644
--- 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
index 970d8abf626e..af9ec9f32dca 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
index ddd0f7acb132..563a785d0b74 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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
index 494750d2e6a1..11516b0c5548 100644
--- 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 35762f1a0c7c..470e8b94665b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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 382f5014afb7..8c7227f3f4eb 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
index e82ddccc7243..e72fe0c7dbe3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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 2be1c8524bdc..52fd8ceaca1b 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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 ae8d4122ceaa..fb4ef89df702 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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 def3eee8645b..89f901ff678a 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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 a010b806792d..92c499ae7576 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 23a8328a0c2f..a43413d09037 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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 da372a36f9d9..1ed10e372ae8 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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 f8d857eea7ba..a80ef0125103 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 
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 ad87af2477f2..cac9626602da 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
@@ -1,26 +1,27 @@
 /**
-* Swagger Petstore
-* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*
-* 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.
-*/
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 
 package io.swagger.client.model;
 

From 1ff18c4ac61398733f7967400428bf98ba37b310 Mon Sep 17 00:00:00 2001
From: Peter <graphhopper@gmx.de>
Date: Thu, 9 Jun 2016 11:31:15 +0200
Subject: [PATCH 116/139] make all okhttp classes explicit to avoid conflict

---
 .../Java/libraries/okhttp-gson/api.mustache       | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
index ed447a8f5dd3..7abe897d42e8 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
@@ -13,9 +13,6 @@ import {{invokerPackage}}.ProgressResponseBody;
 
 import com.google.gson.reflect.TypeToken;
 
-import com.squareup.okhttp.Call;
-import com.squareup.okhttp.Interceptor;
-
 import java.io.IOException;
 
 {{#imports}}import {{import}};
@@ -51,7 +48,7 @@ public class {{classname}} {
 
     {{#operation}}
     /* Build call for {{operationId}} */
-    private Call {{operationId}}Call({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call {{operationId}}Call({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
         {{#allParams}}{{#required}}
         // verify the required parameter '{{paramName}}' is set
@@ -89,9 +86,9 @@ public class {{classname}} {
         {{localVariablePrefix}}localVarHeaderParams.put("Content-Type", {{localVariablePrefix}}localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -124,7 +121,7 @@ public class {{classname}} {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
-        Call {{localVariablePrefix}}call = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}null, null);
+        com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}null, null);
         {{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
         return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType);{{/returnType}}{{^returnType}}return {{localVariablePrefix}}apiClient.execute({{localVariablePrefix}}call);{{/returnType}}
     }
@@ -137,7 +134,7 @@ public class {{classname}} {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call {{operationId}}Async({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{localVariablePrefix}}callback) throws ApiException {
+    public com.squareup.okhttp.Call {{operationId}}Async({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{localVariablePrefix}}callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -158,7 +155,7 @@ public class {{classname}} {
             };
         }
 
-        Call {{localVariablePrefix}}call = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}progressListener, progressRequestListener);
+        com.squareup.okhttp.Call {{localVariablePrefix}}call = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}progressListener, progressRequestListener);
         {{#returnType}}Type {{localVariablePrefix}}localVarReturnType = new TypeToken<{{{returnType}}}>(){}.getType();
         {{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}localVarReturnType, {{localVariablePrefix}}callback);{{/returnType}}{{^returnType}}{{localVariablePrefix}}apiClient.executeAsync({{localVariablePrefix}}call, {{localVariablePrefix}}callback);{{/returnType}}
         return {{localVariablePrefix}}call;

From 32cabcfb230ab8749a1c27cf6c376ad9ba97d1e9 Mon Sep 17 00:00:00 2001
From: Peter <graphhopper@gmx.de>
Date: Thu, 9 Jun 2016 11:35:03 +0200
Subject: [PATCH 117/139] updated petstore with latest okhttp changes

---
 .../java/io/swagger/client/api/FakeApi.java   | 15 ++-
 .../java/io/swagger/client/api/PetApi.java    | 99 +++++++++----------
 .../java/io/swagger/client/api/StoreApi.java  | 51 +++++-----
 .../java/io/swagger/client/api/UserApi.java   | 99 +++++++++----------
 4 files changed, 126 insertions(+), 138 deletions(-)

diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
index 3e28653cab4f..2784add9c9c6 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
@@ -36,9 +36,6 @@ import io.swagger.client.ProgressResponseBody;
 
 import com.google.gson.reflect.TypeToken;
 
-import com.squareup.okhttp.Call;
-import com.squareup.okhttp.Interceptor;
-
 import java.io.IOException;
 
 import java.util.Date;
@@ -70,7 +67,7 @@ public class FakeApi {
     }
 
     /* Build call for testEndpointParameters */
-    private Call testEndpointParametersCall(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call testEndpointParametersCall(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'number' is set
@@ -140,9 +137,9 @@ public class FakeApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -195,7 +192,7 @@ public class FakeApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password) throws ApiException {
-        Call call = testEndpointParametersCall(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password, null, null);
+        com.squareup.okhttp.Call call = testEndpointParametersCall(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password, null, null);
         return apiClient.execute(call);
     }
 
@@ -218,7 +215,7 @@ public class FakeApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call testEndpointParametersAsync(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call testEndpointParametersAsync(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -239,7 +236,7 @@ public class FakeApi {
             };
         }
 
-        Call call = testEndpointParametersCall(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = testEndpointParametersCall(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password, progressListener, progressRequestListener);
         apiClient.executeAsync(call, callback);
         return call;
     }
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 d47afbe2d518..765754a3b09c 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
@@ -36,9 +36,6 @@ import io.swagger.client.ProgressResponseBody;
 
 import com.google.gson.reflect.TypeToken;
 
-import com.squareup.okhttp.Call;
-import com.squareup.okhttp.Interceptor;
-
 import java.io.IOException;
 
 import io.swagger.client.model.Pet;
@@ -71,7 +68,7 @@ public class PetApi {
     }
 
     /* Build call for addPet */
-    private Call addPetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call addPetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = body;
         
         // verify the required parameter 'body' is set
@@ -102,9 +99,9 @@ public class PetApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -135,7 +132,7 @@ public class PetApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> addPetWithHttpInfo(Pet body) throws ApiException {
-        Call call = addPetCall(body, null, null);
+        com.squareup.okhttp.Call call = addPetCall(body, null, null);
         return apiClient.execute(call);
     }
 
@@ -147,7 +144,7 @@ public class PetApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call addPetAsync(Pet body, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call addPetAsync(Pet body, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -168,12 +165,12 @@ public class PetApi {
             };
         }
 
-        Call call = addPetCall(body, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = addPetCall(body, progressListener, progressRequestListener);
         apiClient.executeAsync(call, callback);
         return call;
     }
     /* Build call for deletePet */
-    private Call deletePetCall(Long petId, String apiKey, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call deletePetCall(Long petId, String apiKey, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'petId' is set
@@ -207,9 +204,9 @@ public class PetApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -242,7 +239,7 @@ public class PetApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException {
-        Call call = deletePetCall(petId, apiKey, null, null);
+        com.squareup.okhttp.Call call = deletePetCall(petId, apiKey, null, null);
         return apiClient.execute(call);
     }
 
@@ -255,7 +252,7 @@ public class PetApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call deletePetAsync(Long petId, String apiKey, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call deletePetAsync(Long petId, String apiKey, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -276,12 +273,12 @@ public class PetApi {
             };
         }
 
-        Call call = deletePetCall(petId, apiKey, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = deletePetCall(petId, apiKey, progressListener, progressRequestListener);
         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 {
+    private com.squareup.okhttp.Call findPetsByStatusCall(List<String> status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'status' is set
@@ -314,9 +311,9 @@ public class PetApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -349,7 +346,7 @@ public class PetApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException {
-        Call call = findPetsByStatusCall(status, null, null);
+        com.squareup.okhttp.Call call = findPetsByStatusCall(status, null, null);
         Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -362,7 +359,7 @@ public class PetApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call findPetsByStatusAsync(List<String> status, final ApiCallback<List<Pet>> callback) throws ApiException {
+    public com.squareup.okhttp.Call findPetsByStatusAsync(List<String> status, final ApiCallback<List<Pet>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -383,13 +380,13 @@ public class PetApi {
             };
         }
 
-        Call call = findPetsByStatusCall(status, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = findPetsByStatusCall(status, progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
     /* Build call for findPetsByTags */
-    private Call findPetsByTagsCall(List<String> tags, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call findPetsByTagsCall(List<String> tags, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'tags' is set
@@ -422,9 +419,9 @@ public class PetApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -457,7 +454,7 @@ public class PetApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) throws ApiException {
-        Call call = findPetsByTagsCall(tags, null, null);
+        com.squareup.okhttp.Call call = findPetsByTagsCall(tags, null, null);
         Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -470,7 +467,7 @@ public class PetApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call findPetsByTagsAsync(List<String> tags, final ApiCallback<List<Pet>> callback) throws ApiException {
+    public com.squareup.okhttp.Call findPetsByTagsAsync(List<String> tags, final ApiCallback<List<Pet>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -491,13 +488,13 @@ public class PetApi {
             };
         }
 
-        Call call = findPetsByTagsCall(tags, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = findPetsByTagsCall(tags, progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<List<Pet>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
     /* Build call for getPetById */
-    private Call getPetByIdCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call getPetByIdCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'petId' is set
@@ -529,9 +526,9 @@ public class PetApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -564,7 +561,7 @@ public class PetApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
-        Call call = getPetByIdCall(petId, null, null);
+        com.squareup.okhttp.Call call = getPetByIdCall(petId, null, null);
         Type localVarReturnType = new TypeToken<Pet>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -577,7 +574,7 @@ public class PetApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call getPetByIdAsync(Long petId, final ApiCallback<Pet> callback) throws ApiException {
+    public com.squareup.okhttp.Call getPetByIdAsync(Long petId, final ApiCallback<Pet> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -598,13 +595,13 @@ public class PetApi {
             };
         }
 
-        Call call = getPetByIdCall(petId, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = getPetByIdCall(petId, progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<Pet>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
     /* Build call for updatePet */
-    private Call updatePetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call updatePetCall(Pet body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = body;
         
         // verify the required parameter 'body' is set
@@ -635,9 +632,9 @@ public class PetApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -668,7 +665,7 @@ public class PetApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> updatePetWithHttpInfo(Pet body) throws ApiException {
-        Call call = updatePetCall(body, null, null);
+        com.squareup.okhttp.Call call = updatePetCall(body, null, null);
         return apiClient.execute(call);
     }
 
@@ -680,7 +677,7 @@ public class PetApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call updatePetAsync(Pet body, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call updatePetAsync(Pet body, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -701,12 +698,12 @@ public class PetApi {
             };
         }
 
-        Call call = updatePetCall(body, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = updatePetCall(body, progressListener, progressRequestListener);
         apiClient.executeAsync(call, callback);
         return call;
     }
     /* Build call for updatePetWithForm */
-    private Call updatePetWithFormCall(Long petId, String name, String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call updatePetWithFormCall(Long petId, String name, String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'petId' is set
@@ -742,9 +739,9 @@ public class PetApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -779,7 +776,7 @@ public class PetApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException {
-        Call call = updatePetWithFormCall(petId, name, status, null, null);
+        com.squareup.okhttp.Call call = updatePetWithFormCall(petId, name, status, null, null);
         return apiClient.execute(call);
     }
 
@@ -793,7 +790,7 @@ public class PetApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call updatePetWithFormAsync(Long petId, String name, String status, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call updatePetWithFormAsync(Long petId, String name, String status, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -814,12 +811,12 @@ public class PetApi {
             };
         }
 
-        Call call = updatePetWithFormCall(petId, name, status, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = updatePetWithFormCall(petId, name, status, progressListener, progressRequestListener);
         apiClient.executeAsync(call, callback);
         return call;
     }
     /* Build call for uploadFile */
-    private Call uploadFileCall(Long petId, String additionalMetadata, File file, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call uploadFileCall(Long petId, String additionalMetadata, File file, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'petId' is set
@@ -855,9 +852,9 @@ public class PetApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -894,7 +891,7 @@ public class PetApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File file) throws ApiException {
-        Call call = uploadFileCall(petId, additionalMetadata, file, null, null);
+        com.squareup.okhttp.Call call = uploadFileCall(petId, additionalMetadata, file, null, null);
         Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -909,7 +906,7 @@ public class PetApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call uploadFileAsync(Long petId, String additionalMetadata, File file, final ApiCallback<ModelApiResponse> callback) throws ApiException {
+    public com.squareup.okhttp.Call uploadFileAsync(Long petId, String additionalMetadata, File file, final ApiCallback<ModelApiResponse> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -930,7 +927,7 @@ public class PetApi {
             };
         }
 
-        Call call = uploadFileCall(petId, additionalMetadata, file, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = uploadFileCall(petId, additionalMetadata, file, progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<ModelApiResponse>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, 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 2299101c41b0..43c530ee964e 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
@@ -36,9 +36,6 @@ import io.swagger.client.ProgressResponseBody;
 
 import com.google.gson.reflect.TypeToken;
 
-import com.squareup.okhttp.Call;
-import com.squareup.okhttp.Interceptor;
-
 import java.io.IOException;
 
 import io.swagger.client.model.Order;
@@ -69,7 +66,7 @@ public class StoreApi {
     }
 
     /* Build call for deleteOrder */
-    private Call deleteOrderCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call deleteOrderCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'orderId' is set
@@ -101,9 +98,9 @@ public class StoreApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -134,7 +131,7 @@ public class StoreApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiException {
-        Call call = deleteOrderCall(orderId, null, null);
+        com.squareup.okhttp.Call call = deleteOrderCall(orderId, null, null);
         return apiClient.execute(call);
     }
 
@@ -146,7 +143,7 @@ public class StoreApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call deleteOrderAsync(String orderId, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call deleteOrderAsync(String orderId, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -167,12 +164,12 @@ public class StoreApi {
             };
         }
 
-        Call call = deleteOrderCall(orderId, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = deleteOrderCall(orderId, progressListener, progressRequestListener);
         apiClient.executeAsync(call, callback);
         return call;
     }
     /* Build call for getInventory */
-    private Call getInventoryCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call getInventoryCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
 
@@ -198,9 +195,9 @@ public class StoreApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -231,7 +228,7 @@ public class StoreApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException {
-        Call call = getInventoryCall(null, null);
+        com.squareup.okhttp.Call call = getInventoryCall(null, null);
         Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -243,7 +240,7 @@ public class StoreApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call getInventoryAsync(final ApiCallback<Map<String, Integer>> callback) throws ApiException {
+    public com.squareup.okhttp.Call getInventoryAsync(final ApiCallback<Map<String, Integer>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -264,13 +261,13 @@ public class StoreApi {
             };
         }
 
-        Call call = getInventoryCall(progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = getInventoryCall(progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<Map<String, Integer>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
     /* Build call for getOrderById */
-    private Call getOrderByIdCall(Long orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call getOrderByIdCall(Long orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'orderId' is set
@@ -302,9 +299,9 @@ public class StoreApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -337,7 +334,7 @@ public class StoreApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException {
-        Call call = getOrderByIdCall(orderId, null, null);
+        com.squareup.okhttp.Call call = getOrderByIdCall(orderId, null, null);
         Type localVarReturnType = new TypeToken<Order>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -350,7 +347,7 @@ public class StoreApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call getOrderByIdAsync(Long orderId, final ApiCallback<Order> callback) throws ApiException {
+    public com.squareup.okhttp.Call getOrderByIdAsync(Long orderId, final ApiCallback<Order> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -371,13 +368,13 @@ public class StoreApi {
             };
         }
 
-        Call call = getOrderByIdCall(orderId, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = getOrderByIdCall(orderId, progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<Order>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
     /* Build call for placeOrder */
-    private Call placeOrderCall(Order body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call placeOrderCall(Order body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = body;
         
         // verify the required parameter 'body' is set
@@ -408,9 +405,9 @@ public class StoreApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -443,7 +440,7 @@ public class StoreApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException {
-        Call call = placeOrderCall(body, null, null);
+        com.squareup.okhttp.Call call = placeOrderCall(body, null, null);
         Type localVarReturnType = new TypeToken<Order>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -456,7 +453,7 @@ public class StoreApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call placeOrderAsync(Order body, final ApiCallback<Order> callback) throws ApiException {
+    public com.squareup.okhttp.Call placeOrderAsync(Order body, final ApiCallback<Order> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -477,7 +474,7 @@ public class StoreApi {
             };
         }
 
-        Call call = placeOrderCall(body, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = placeOrderCall(body, progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<Order>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/UserApi.java
index 37026b8fb176..9a7054091a39 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
@@ -36,9 +36,6 @@ import io.swagger.client.ProgressResponseBody;
 
 import com.google.gson.reflect.TypeToken;
 
-import com.squareup.okhttp.Call;
-import com.squareup.okhttp.Interceptor;
-
 import java.io.IOException;
 
 import io.swagger.client.model.User;
@@ -69,7 +66,7 @@ public class UserApi {
     }
 
     /* Build call for createUser */
-    private Call createUserCall(User body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call createUserCall(User body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = body;
         
         // verify the required parameter 'body' is set
@@ -100,9 +97,9 @@ public class UserApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -133,7 +130,7 @@ public class UserApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> createUserWithHttpInfo(User body) throws ApiException {
-        Call call = createUserCall(body, null, null);
+        com.squareup.okhttp.Call call = createUserCall(body, null, null);
         return apiClient.execute(call);
     }
 
@@ -145,7 +142,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call createUserAsync(User body, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call createUserAsync(User body, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -166,12 +163,12 @@ public class UserApi {
             };
         }
 
-        Call call = createUserCall(body, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = createUserCall(body, progressListener, progressRequestListener);
         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 {
+    private com.squareup.okhttp.Call createUsersWithArrayInputCall(List<User> body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = body;
         
         // verify the required parameter 'body' is set
@@ -202,9 +199,9 @@ public class UserApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -235,7 +232,7 @@ public class UserApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(List<User> body) throws ApiException {
-        Call call = createUsersWithArrayInputCall(body, null, null);
+        com.squareup.okhttp.Call call = createUsersWithArrayInputCall(body, null, null);
         return apiClient.execute(call);
     }
 
@@ -247,7 +244,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call createUsersWithArrayInputAsync(List<User> body, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call createUsersWithArrayInputAsync(List<User> body, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -268,12 +265,12 @@ public class UserApi {
             };
         }
 
-        Call call = createUsersWithArrayInputCall(body, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = createUsersWithArrayInputCall(body, progressListener, progressRequestListener);
         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 {
+    private com.squareup.okhttp.Call createUsersWithListInputCall(List<User> body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = body;
         
         // verify the required parameter 'body' is set
@@ -304,9 +301,9 @@ public class UserApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -337,7 +334,7 @@ public class UserApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> createUsersWithListInputWithHttpInfo(List<User> body) throws ApiException {
-        Call call = createUsersWithListInputCall(body, null, null);
+        com.squareup.okhttp.Call call = createUsersWithListInputCall(body, null, null);
         return apiClient.execute(call);
     }
 
@@ -349,7 +346,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call createUsersWithListInputAsync(List<User> body, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call createUsersWithListInputAsync(List<User> body, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -370,12 +367,12 @@ public class UserApi {
             };
         }
 
-        Call call = createUsersWithListInputCall(body, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = createUsersWithListInputCall(body, progressListener, progressRequestListener);
         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 {
+    private com.squareup.okhttp.Call deleteUserCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'username' is set
@@ -407,9 +404,9 @@ public class UserApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -440,7 +437,7 @@ public class UserApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> deleteUserWithHttpInfo(String username) throws ApiException {
-        Call call = deleteUserCall(username, null, null);
+        com.squareup.okhttp.Call call = deleteUserCall(username, null, null);
         return apiClient.execute(call);
     }
 
@@ -452,7 +449,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call deleteUserAsync(String username, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call deleteUserAsync(String username, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -473,12 +470,12 @@ public class UserApi {
             };
         }
 
-        Call call = deleteUserCall(username, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = deleteUserCall(username, progressListener, progressRequestListener);
         apiClient.executeAsync(call, callback);
         return call;
     }
     /* Build call for getUserByName */
-    private Call getUserByNameCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call getUserByNameCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'username' is set
@@ -510,9 +507,9 @@ public class UserApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -545,7 +542,7 @@ public class UserApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException {
-        Call call = getUserByNameCall(username, null, null);
+        com.squareup.okhttp.Call call = getUserByNameCall(username, null, null);
         Type localVarReturnType = new TypeToken<User>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -558,7 +555,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call getUserByNameAsync(String username, final ApiCallback<User> callback) throws ApiException {
+    public com.squareup.okhttp.Call getUserByNameAsync(String username, final ApiCallback<User> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -579,13 +576,13 @@ public class UserApi {
             };
         }
 
-        Call call = getUserByNameCall(username, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = getUserByNameCall(username, progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<User>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
     /* Build call for loginUser */
-    private Call loginUserCall(String username, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call loginUserCall(String username, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'username' is set
@@ -625,9 +622,9 @@ public class UserApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -662,7 +659,7 @@ public class UserApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException {
-        Call call = loginUserCall(username, password, null, null);
+        com.squareup.okhttp.Call call = loginUserCall(username, password, null, null);
         Type localVarReturnType = new TypeToken<String>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -676,7 +673,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call loginUserAsync(String username, String password, final ApiCallback<String> callback) throws ApiException {
+    public com.squareup.okhttp.Call loginUserAsync(String username, String password, final ApiCallback<String> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -697,13 +694,13 @@ public class UserApi {
             };
         }
 
-        Call call = loginUserCall(username, password, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = loginUserCall(username, password, progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<String>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
     /* Build call for logoutUser */
-    private Call logoutUserCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call logoutUserCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
 
@@ -729,9 +726,9 @@ public class UserApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -760,7 +757,7 @@ public class UserApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> logoutUserWithHttpInfo() throws ApiException {
-        Call call = logoutUserCall(null, null);
+        com.squareup.okhttp.Call call = logoutUserCall(null, null);
         return apiClient.execute(call);
     }
 
@@ -771,7 +768,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call logoutUserAsync(final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call logoutUserAsync(final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -792,12 +789,12 @@ public class UserApi {
             };
         }
 
-        Call call = logoutUserCall(progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = logoutUserCall(progressListener, progressRequestListener);
         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 {
+    private com.squareup.okhttp.Call updateUserCall(String username, User body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = body;
         
         // verify the required parameter 'username' is set
@@ -834,9 +831,9 @@ public class UserApi {
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(Interceptor.Chain chain) throws IOException {
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
                     com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
@@ -869,7 +866,7 @@ public class UserApi {
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<Void> updateUserWithHttpInfo(String username, User body) throws ApiException {
-        Call call = updateUserCall(username, body, null, null);
+        com.squareup.okhttp.Call call = updateUserCall(username, body, null, null);
         return apiClient.execute(call);
     }
 
@@ -882,7 +879,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public Call updateUserAsync(String username, User body, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call updateUserAsync(String username, User body, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -903,7 +900,7 @@ public class UserApi {
             };
         }
 
-        Call call = updateUserCall(username, body, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = updateUserCall(username, body, progressListener, progressRequestListener);
         apiClient.executeAsync(call, callback);
         return call;
     }

From 4ee483dcc028388119dd6650e7613fb0b78c9351 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Thu, 9 Jun 2016 18:23:19 +0800
Subject: [PATCH 118/139] fix okhttp pom to remove dependency on gradle, sbt
 test

---
 .../Java/libraries/okhttp-gson/pom.mustache   | 47 -------------------
 1 file changed, 47 deletions(-)

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 241f1b308e66..d3080ee51ae1 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
@@ -105,53 +105,6 @@
           <target>1.7</target>
         </configuration>
       </plugin>
-      <!-- For testing build.gradle, build.sbt, mvn javadoc:javadoc -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <id>gradle-test</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>gradle</executable>
-              <arguments>
-                <argument>check</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>sbt-test</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>sbt</executable>
-              <arguments>
-                <argument>publishLocal</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>mvn-javadoc-test</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>mvn</executable>
-              <arguments>
-                <argument>javadoc:javadoc</argument>
-              </arguments>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>

From f3e368c7238fd6e262ce2d4c7be1713fed6110ce Mon Sep 17 00:00:00 2001
From: Newell Zhu <zlx.star@gmail.com>
Date: Thu, 9 Jun 2016 18:40:01 +0800
Subject: [PATCH 119/139] Add model & migrate support

---
 .../languages/Rails5ServerCodegen.java        | 69 ++++++++-------
 .../main/resources/rails5/migrate.mustache    | 15 ++++
 .../src/main/resources/rails5/model.mustache  | 12 +++
 samples/server/petstore/rails5/README.md      |  2 +-
 .../rails5/app/models/api_response.rb         | 27 ++++++
 .../petstore/rails5/app/models/category.rb    | 27 ++++++
 .../petstore/rails5/app/models/order.rb       | 27 ++++++
 .../server/petstore/rails5/app/models/pet.rb  | 31 +++++++
 .../server/petstore/rails5/app/models/tag.rb  | 27 ++++++
 .../server/petstore/rails5/app/models/user.rb | 27 ++++++
 .../rails5/db/migrate/0_init_tables.rb        | 84 +++++++++++++++++++
 11 files changed, 311 insertions(+), 37 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/rails5/migrate.mustache
 create mode 100644 modules/swagger-codegen/src/main/resources/rails5/model.mustache
 create mode 100644 samples/server/petstore/rails5/app/models/api_response.rb
 create mode 100644 samples/server/petstore/rails5/app/models/category.rb
 create mode 100644 samples/server/petstore/rails5/app/models/order.rb
 create mode 100644 samples/server/petstore/rails5/app/models/pet.rb
 create mode 100644 samples/server/petstore/rails5/app/models/tag.rb
 create mode 100644 samples/server/petstore/rails5/app/models/user.rb
 create mode 100644 samples/server/petstore/rails5/db/migrate/0_init_tables.rb

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java
index cbf77338ab3c..4bb4c8e883ca 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java
@@ -1,5 +1,7 @@
 package io.swagger.codegen.languages;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 import io.swagger.codegen.CodegenConfig;
@@ -24,6 +26,7 @@ import org.slf4j.LoggerFactory;
 public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Rails5ServerCodegen.class);
+    private static final SimpleDateFormat MIGRATE_FILE_NAME_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
 
     protected String gemName;
     protected String moduleName;
@@ -57,12 +60,13 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
 
     public Rails5ServerCodegen() {
         super();
-        apiPackage = "app/controllers";
         outputFolder = "generated-code" + File.separator + "rails5";
-
-        // no model
-        modelTemplateFiles.clear();
+        apiPackage = "app/controllers";
         apiTemplateFiles.put("controller.mustache", ".rb");
+
+        modelPackage = "app/models";
+        modelTemplateFiles.put("model.mustache", ".rb");
+
         embeddedTemplateDir = templateDir = "rails5";
 
         typeMapping.clear();
@@ -77,21 +81,21 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
                         "if", "not", "return", "undef", "yield")
         );
 
-        languageSpecificPrimitives.add("int");
-        languageSpecificPrimitives.add("array");
-        languageSpecificPrimitives.add("map");
-        languageSpecificPrimitives.add("string");
-        languageSpecificPrimitives.add("DateTime");
-
-        typeMapping.put("long", "int");
-        typeMapping.put("integer", "int");
-        typeMapping.put("Array", "array");
-        typeMapping.put("String", "string");
-        typeMapping.put("List", "array");
-        typeMapping.put("map", "map");
-        //TODO binary should be mapped to byte array
-        // mapped to String as a workaround
+        typeMapping.put("string", "string");
+        typeMapping.put("char", "string");
+        typeMapping.put("int", "integer");
+        typeMapping.put("integer", "integer");
+        typeMapping.put("long", "integer");
+        typeMapping.put("short", "integer");
+        typeMapping.put("float", "float");
+        typeMapping.put("double", "decimal");
+        typeMapping.put("number", "float");
+        typeMapping.put("date", "date");
+        typeMapping.put("DateTime", "datetime");
+        typeMapping.put("boolean", "boolean");
         typeMapping.put("binary", "string");
+        typeMapping.put("ByteArray", "string");
+        typeMapping.put("UUID", "string");
 
         // remove modelPackage and apiPackage added by default
         cliOptions.clear();
@@ -145,6 +149,7 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
         supportingFiles.add(new SupportingFile("secrets.yml", configFolder, "secrets.yml"));
         supportingFiles.add(new SupportingFile("spring.rb", configFolder, "spring.rb"));
         supportingFiles.add(new SupportingFile(".keep", migrateFolder, ".keep"));
+        supportingFiles.add(new SupportingFile("migrate.mustache", migrateFolder, "0_init_tables.rb"));
         supportingFiles.add(new SupportingFile("schema.rb", dbFolder, "schema.rb"));
         supportingFiles.add(new SupportingFile("seeds.rb", dbFolder, "seeds.rb"));
         supportingFiles.add(new SupportingFile(".keep", tasksFolder, ".keep"));
@@ -204,24 +209,6 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
         return super.getTypeDeclaration(p);
     }
 
-    @Override
-    public String getSwaggerType(Property p) {
-        String swaggerType = super.getSwaggerType(p);
-        String type = null;
-        if (typeMapping.containsKey(swaggerType)) {
-            type = typeMapping.get(swaggerType);
-            if (languageSpecificPrimitives.contains(type)) {
-                return type;
-            }
-        } else {
-            type = swaggerType;
-        }
-        if (type == null) {
-            return null;
-        }
-        return type;
-    }
-
     @Override
     public String toDefaultValue(Property p) {
         return "null";
@@ -249,6 +236,16 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
         return name;
     }
 
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            return typeMapping.get(swaggerType);
+        }
+        return "string";
+    }
+
     @Override
     public String toParamName(String name) {
         // should be the same as variable name
diff --git a/modules/swagger-codegen/src/main/resources/rails5/migrate.mustache b/modules/swagger-codegen/src/main/resources/rails5/migrate.mustache
new file mode 100644
index 000000000000..508b0ce7edef
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/rails5/migrate.mustache
@@ -0,0 +1,15 @@
+=begin
+{{> info}}
+=end
+
+class InitTables < ActiveRecord::Migration
+  def change{{#models}}{{#model}}
+    create_table :{{classFilename}}, id: false do |t|{{#vars}}{{#isContainer}}
+      t.string :{{name}}{{/isContainer}}{{^isContainer}}
+      t.{{datatype}} :{{{name}}}{{/isContainer}}{{/vars}}
+
+      t.timestamps
+    end
+{{/model}}{{/models}}
+  end
+end
diff --git a/modules/swagger-codegen/src/main/resources/rails5/model.mustache b/modules/swagger-codegen/src/main/resources/rails5/model.mustache
new file mode 100644
index 000000000000..edfe9fac56c8
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/rails5/model.mustache
@@ -0,0 +1,12 @@
+=begin
+{{> info}}
+=end
+
+{{#models}}{{#model}}
+class {{classname}} < ApplicationRecord
+{{#requiredVars}}
+  validate_presence_of :{{name}}
+{{/requiredVars}}{{#vars}}{{#isListContainer}}
+  serialize :{{name}}, Array{{/isListContainer}}{{#isMapContainer}}
+  serialize :{{name}}, Hash{{/isMapContainer}}{{/vars}}
+end{{/model}}{{/models}}
diff --git a/samples/server/petstore/rails5/README.md b/samples/server/petstore/rails5/README.md
index c5cb90075a67..841b82ad6569 100644
--- a/samples/server/petstore/rails5/README.md
+++ b/samples/server/petstore/rails5/README.md
@@ -14,7 +14,7 @@ bundle install
 This sample was generated with the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.
 
 ```
-bin/rake db:create
+bin/rake db:create db:migrate
 bin/rails s
 ```
 
diff --git a/samples/server/petstore/rails5/app/models/api_response.rb b/samples/server/petstore/rails5/app/models/api_response.rb
new file mode 100644
index 000000000000..1ad59e6c7920
--- /dev/null
+++ b/samples/server/petstore/rails5/app/models/api_response.rb
@@ -0,0 +1,27 @@
+=begin
+Swagger Petstore
+
+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.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end
+
+
+class ApiResponse < ApplicationRecord
+
+end
diff --git a/samples/server/petstore/rails5/app/models/category.rb b/samples/server/petstore/rails5/app/models/category.rb
new file mode 100644
index 000000000000..3adaa4883095
--- /dev/null
+++ b/samples/server/petstore/rails5/app/models/category.rb
@@ -0,0 +1,27 @@
+=begin
+Swagger Petstore
+
+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.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end
+
+
+class Category < ApplicationRecord
+
+end
diff --git a/samples/server/petstore/rails5/app/models/order.rb b/samples/server/petstore/rails5/app/models/order.rb
new file mode 100644
index 000000000000..963eb8e18eda
--- /dev/null
+++ b/samples/server/petstore/rails5/app/models/order.rb
@@ -0,0 +1,27 @@
+=begin
+Swagger Petstore
+
+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.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end
+
+
+class Order < ApplicationRecord
+
+end
diff --git a/samples/server/petstore/rails5/app/models/pet.rb b/samples/server/petstore/rails5/app/models/pet.rb
new file mode 100644
index 000000000000..da927b6260e5
--- /dev/null
+++ b/samples/server/petstore/rails5/app/models/pet.rb
@@ -0,0 +1,31 @@
+=begin
+Swagger Petstore
+
+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.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end
+
+
+class Pet < ApplicationRecord
+  validate_presence_of :name
+  validate_presence_of :photo_urls
+
+  serialize :photo_urls, Array
+  serialize :tags, Array
+end
diff --git a/samples/server/petstore/rails5/app/models/tag.rb b/samples/server/petstore/rails5/app/models/tag.rb
new file mode 100644
index 000000000000..096f132e2c2a
--- /dev/null
+++ b/samples/server/petstore/rails5/app/models/tag.rb
@@ -0,0 +1,27 @@
+=begin
+Swagger Petstore
+
+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.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end
+
+
+class Tag < ApplicationRecord
+
+end
diff --git a/samples/server/petstore/rails5/app/models/user.rb b/samples/server/petstore/rails5/app/models/user.rb
new file mode 100644
index 000000000000..47f81df10899
--- /dev/null
+++ b/samples/server/petstore/rails5/app/models/user.rb
@@ -0,0 +1,27 @@
+=begin
+Swagger Petstore
+
+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.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end
+
+
+class User < ApplicationRecord
+
+end
diff --git a/samples/server/petstore/rails5/db/migrate/0_init_tables.rb b/samples/server/petstore/rails5/db/migrate/0_init_tables.rb
new file mode 100644
index 000000000000..5fa060fb4dc6
--- /dev/null
+++ b/samples/server/petstore/rails5/db/migrate/0_init_tables.rb
@@ -0,0 +1,84 @@
+=begin
+Swagger Petstore
+
+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.
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end
+
+class InitTables < ActiveRecord::Migration
+  def change
+    create_table :api_response, id: false do |t|
+      t.integer :code
+      t.string :type
+      t.string :message
+
+      t.timestamps
+    end
+
+    create_table :category, id: false do |t|
+      t.integer :id
+      t.string :name
+
+      t.timestamps
+    end
+
+    create_table :order, id: false do |t|
+      t.integer :id
+      t.integer :pet_id
+      t.integer :quantity
+      t.datetime :ship_date
+      t.string :status
+      t.boolean :complete
+
+      t.timestamps
+    end
+
+    create_table :pet, id: false do |t|
+      t.integer :id
+      t.string :category
+      t.string :name
+      t.string :photo_urls
+      t.string :tags
+      t.string :status
+
+      t.timestamps
+    end
+
+    create_table :tag, id: false do |t|
+      t.integer :id
+      t.string :name
+
+      t.timestamps
+    end
+
+    create_table :user, id: false do |t|
+      t.integer :id
+      t.string :username
+      t.string :first_name
+      t.string :last_name
+      t.string :email
+      t.string :password
+      t.string :phone
+      t.integer :user_status
+
+      t.timestamps
+    end
+
+  end
+end

From b27022749f85521c2ba012fae1682ed4bd350e26 Mon Sep 17 00:00:00 2001
From: Newell Zhu <zlx.star@gmail.com>
Date: Thu, 9 Jun 2016 18:40:25 +0800
Subject: [PATCH 120/139] Add debug support for rails5

---
 bin/rails5-petstore-server.sh                               | 2 +-
 modules/swagger-codegen/src/main/resources/rails5/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/rails5-petstore-server.sh b/bin/rails5-petstore-server.sh
index 28b3ca3069bb..9997a83f6a7b 100755
--- a/bin/rails5-petstore-server.sh
+++ b/bin/rails5-petstore-server.sh
@@ -25,7 +25,7 @@ then
 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"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DdebugSupportingFiles"
 ags="$@ generate -t modules/swagger-codegen/src/main/resources/rails5 -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l rails5 -o samples/server/petstore/rails5"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/resources/rails5/README.md b/modules/swagger-codegen/src/main/resources/rails5/README.md
index c5cb90075a67..841b82ad6569 100644
--- a/modules/swagger-codegen/src/main/resources/rails5/README.md
+++ b/modules/swagger-codegen/src/main/resources/rails5/README.md
@@ -14,7 +14,7 @@ bundle install
 This sample was generated with the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.
 
 ```
-bin/rake db:create
+bin/rake db:create db:migrate
 bin/rails s
 ```
 

From 3c252f264ce6ebec7b5fd7e7310b1494f85933fc Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Thu, 9 Jun 2016 10:21:14 +0200
Subject: [PATCH 121/139] use joda in jersey1/jersey2 client sample

---
 bin/java-petstore-jersey2.sh                  |   4 +-
 bin/java-petstore.sh                          |   4 +-
 bin/windows/java-petstore.bat                 |   2 +-
 .../java/default/.swagger-codegen-ignore      |  23 +
 samples/client/petstore/java/default/LICENSE  | 201 +++++++++
 .../default/docs/AdditionalPropertiesClass.md |  11 +
 .../petstore/java/default/docs/Animal.md      |   1 +
 .../petstore/java/default/docs/ArrayTest.md   |  12 +
 .../client/petstore/java/default/docs/Cat.md  |   1 +
 .../client/petstore/java/default/docs/Dog.md  |   1 +
 .../petstore/java/default/docs/FakeApi.md     |  12 +-
 .../petstore/java/default/docs/FormatTest.md  |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |  12 +
 .../client/petstore/java/default/docs/Name.md |   1 +
 .../petstore/java/default/docs/Order.md       |   2 +-
 .../java/default/docs/ReadOnlyFirst.md        |  11 +
 samples/client/petstore/java/default/gradlew  |   0
 .../java/default/petstore_profiling.output    |  23 -
 samples/client/petstore/java/default/pom.xml  |   4 +-
 .../java/io/swagger/client/ApiClient.java     |   7 +-
 .../java/io/swagger/client/api/FakeApi.java   |   9 +-
 .../java/io/swagger/client/api/PetApi.java    |   2 +-
 .../model/AdditionalPropertiesClass.java      |  97 +++++
 .../java/io/swagger/client/model/Animal.java  |  24 +-
 .../io/swagger/client/model/ArrayTest.java    | 116 +++++
 .../java/io/swagger/client/model/Cat.java     |  22 +-
 .../java/io/swagger/client/model/Dog.java     |  22 +-
 .../io/swagger/client/model/FormatTest.java   |  19 +-
 ...ropertiesAndAdditionalPropertiesClass.java | 119 ++++++
 .../java/io/swagger/client/model/Name.java    |  14 +-
 .../java/io/swagger/client/model/Order.java   |  10 +-
 .../swagger/client/model/ReadOnlyFirst.java   |  84 ++++
 .../java/io/swagger/client/ApiClientTest.java |   1 +
 .../io/swagger/client/api/PetApiTest.java     | 401 ++++++++++++------
 .../io/swagger/client/api/StoreApiTest.java   | 154 ++++---
 .../io/swagger/client/api/UserApiTest.java    | 187 +++-----
 .../io/swagger/petstore/test/PetApiTest.java  | 306 -------------
 .../swagger/petstore/test/StoreApiTest.java   | 100 -----
 .../io/swagger/petstore/test/UserApiTest.java |  88 ----
 .../client/petstore/java/jersey2/build.gradle |   2 +-
 .../petstore/java/jersey2/docs/FakeApi.md     |   8 +-
 .../petstore/java/jersey2/docs/FormatTest.md  |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   2 +-
 .../petstore/java/jersey2/docs/Order.md       |   2 +-
 samples/client/petstore/java/jersey2/gradlew  |   0
 .../client/petstore/java/jersey2/hello.txt    |   1 -
 .../java/io/swagger/client/ApiClient.java     |   7 +-
 .../java/io/swagger/client/ApiException.java  |   2 +-
 .../java/io/swagger/client/Configuration.java |   2 +-
 .../src/main/java/io/swagger/client/JSON.java |   2 +-
 .../src/main/java/io/swagger/client/Pair.java |   2 +-
 .../java/io/swagger/client/StringUtil.java    |   2 +-
 .../java/io/swagger/client/api/FakeApi.java   |   7 +-
 .../java/io/swagger/client/api/PetApi.java    |   2 +-
 .../java/io/swagger/client/api/StoreApi.java  |   2 +-
 .../java/io/swagger/client/api/UserApi.java   |   2 +-
 .../io/swagger/client/auth/ApiKeyAuth.java    |   2 +-
 .../io/swagger/client/auth/HttpBasicAuth.java |   2 +-
 .../java/io/swagger/client/auth/OAuth.java    |   2 +-
 .../model/AdditionalPropertiesClass.java      |   2 +-
 .../java/io/swagger/client/model/Animal.java  |   2 +-
 .../io/swagger/client/model/AnimalFarm.java   |   2 +-
 .../io/swagger/client/model/ArrayTest.java    |   2 +-
 .../java/io/swagger/client/model/Cat.java     |   2 +-
 .../io/swagger/client/model/Category.java     |   2 +-
 .../java/io/swagger/client/model/Dog.java     |   2 +-
 .../io/swagger/client/model/EnumTest.java     |   2 +-
 .../io/swagger/client/model/FormatTest.java   |  21 +-
 ...ropertiesAndAdditionalPropertiesClass.java |  12 +-
 .../client/model/Model200Response.java        |   2 +-
 .../client/model/ModelApiResponse.java        |   2 +-
 .../io/swagger/client/model/ModelReturn.java  |   2 +-
 .../java/io/swagger/client/model/Name.java    |   2 +-
 .../java/io/swagger/client/model/Order.java   |  12 +-
 .../java/io/swagger/client/model/Pet.java     |   2 +-
 .../swagger/client/model/ReadOnlyFirst.java   |   2 +-
 .../client/model/SpecialModelName.java        |   2 +-
 .../java/io/swagger/client/model/Tag.java     |   2 +-
 .../java/io/swagger/client/model/User.java    |   2 +-
 .../java/io/swagger/client/ApiClientTest.java |   1 +
 .../test/java/io/swagger/client/JSONTest.java |  21 +-
 .../io/swagger/client/api/PetApiTest.java     | 383 +++++++++++------
 .../io/swagger/client/api/StoreApiTest.java   | 153 ++++---
 .../io/swagger/client/api/UserApiTest.java    | 187 +++-----
 .../io/swagger/petstore/test/PetApiTest.java  | 288 -------------
 .../swagger/petstore/test/StoreApiTest.java   |  98 -----
 .../io/swagger/petstore/test/UserApiTest.java |  88 ----
 87 files changed, 1714 insertions(+), 1750 deletions(-)
 create mode 100644 samples/client/petstore/java/default/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/java/default/LICENSE
 create mode 100644 samples/client/petstore/java/default/docs/AdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/default/docs/ArrayTest.md
 create mode 100644 samples/client/petstore/java/default/docs/MixedPropertiesAndAdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/default/docs/ReadOnlyFirst.md
 mode change 100755 => 100644 samples/client/petstore/java/default/gradlew
 delete mode 100644 samples/client/petstore/java/default/petstore_profiling.output
 create mode 100644 samples/client/petstore/java/default/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ArrayTest.java
 create mode 100644 samples/client/petstore/java/default/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
 delete mode 100644 samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
 delete mode 100644 samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
 delete mode 100644 samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java
 mode change 100755 => 100644 samples/client/petstore/java/jersey2/gradlew
 delete mode 100644 samples/client/petstore/java/jersey2/hello.txt
 delete mode 100644 samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java
 delete mode 100644 samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
 delete mode 100644 samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java

diff --git a/bin/java-petstore-jersey2.sh b/bin/java-petstore-jersey2.sh
index a715e7ff5450..014af660cd82 100755
--- a/bin/java-petstore-jersey2.sh
+++ b/bin/java-petstore-jersey2.sh
@@ -26,6 +26,8 @@ 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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-jersey2.json -o samples/client/petstore/java/jersey2"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-jersey2.json -o samples/client/petstore/java/jersey2 -DdateLibrary=joda,hideGenerationTimestamp=true"
 
+rm -rf samples/client/petstore/java/jersey2/src/main
+find samples/client/petstore/java/jersey2 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore.sh b/bin/java-petstore.sh
index ed80c841df67..576798ee24b7 100755
--- a/bin/java-petstore.sh
+++ b/bin/java-petstore.sh
@@ -26,6 +26,8 @@ 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-with-fake-endpoints-models-for-testing.yaml -l java -o samples/client/petstore/java/default -DhideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -o samples/client/petstore/java/default -DdateLibrary=joda,hideGenerationTimestamp=true"
 
+rm -rf samples/client/petstore/java/default/src/main
+find samples/client/petstore/java/default -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/java-petstore.bat b/bin/windows/java-petstore.bat
index 18544cbad36d..02a81e1adbf7 100755
--- a/bin/windows/java-petstore.bat
+++ b/bin/windows/java-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\java -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java
+set ags=generate -t modules\swagger-codegen\src\main\resources\java -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java -DdateLibrary=joda,hideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/samples/client/petstore/java/default/.swagger-codegen-ignore b/samples/client/petstore/java/default/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/java/default/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/java/default/LICENSE b/samples/client/petstore/java/default/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/java/default/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/java/default/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/default/docs/AdditionalPropertiesClass.md
new file mode 100644
index 000000000000..0437c4dd8cc7
--- /dev/null
+++ b/samples/client/petstore/java/default/docs/AdditionalPropertiesClass.md
@@ -0,0 +1,11 @@
+
+# AdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**mapProperty** | **Map&lt;String, String&gt;** |  |  [optional]
+**mapOfMapProperty** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/default/docs/Animal.md b/samples/client/petstore/java/default/docs/Animal.md
index 3ecb7f991f38..b3f325c3524d 100644
--- a/samples/client/petstore/java/default/docs/Animal.md
+++ b/samples/client/petstore/java/default/docs/Animal.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **String** |  | 
+**color** | **String** |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/default/docs/ArrayTest.md b/samples/client/petstore/java/default/docs/ArrayTest.md
new file mode 100644
index 000000000000..9feee16427fb
--- /dev/null
+++ b/samples/client/petstore/java/default/docs/ArrayTest.md
@@ -0,0 +1,12 @@
+
+# ArrayTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**arrayOfString** | **List&lt;String&gt;** |  |  [optional]
+**arrayArrayOfInteger** | [**List&lt;List&lt;Long&gt;&gt;**](List.md) |  |  [optional]
+**arrayArrayOfModel** | [**List&lt;List&lt;ReadOnlyFirst&gt;&gt;**](List.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/default/docs/Cat.md b/samples/client/petstore/java/default/docs/Cat.md
index 373af540c416..be6e56fa8ce3 100644
--- a/samples/client/petstore/java/default/docs/Cat.md
+++ b/samples/client/petstore/java/default/docs/Cat.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **String** |  | 
+**color** | **String** |  |  [optional]
 **declawed** | **Boolean** |  |  [optional]
 
 
diff --git a/samples/client/petstore/java/default/docs/Dog.md b/samples/client/petstore/java/default/docs/Dog.md
index a1d638d3badd..71a7dbe809e2 100644
--- a/samples/client/petstore/java/default/docs/Dog.md
+++ b/samples/client/petstore/java/default/docs/Dog.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **String** |  | 
+**color** | **String** |  |  [optional]
 **breed** | **String** |  |  [optional]
 
 
diff --git a/samples/client/petstore/java/default/docs/FakeApi.md b/samples/client/petstore/java/default/docs/FakeApi.md
index b4e5f34974a5..0c1f55a0902e 100644
--- a/samples/client/petstore/java/default/docs/FakeApi.md
+++ b/samples/client/petstore/java/default/docs/FakeApi.md
@@ -32,8 +32,8 @@ Integer int32 = 56; // Integer | None
 Long int64 = 789L; // Long | None
 Float _float = 3.4F; // Float | None
 byte[] binary = B; // byte[] | None
-Date date = new Date(); // Date | None
-Date dateTime = new Date(); // Date | None
+LocalDate date = new LocalDate(); // LocalDate | None
+DateTime dateTime = new DateTime(); // DateTime | None
 String password = "password_example"; // String | None
 try {
     apiInstance.testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
@@ -56,8 +56,8 @@ Name | Type | Description  | Notes
  **int64** | **Long**| None | [optional]
  **_float** | **Float**| None | [optional]
  **binary** | **byte[]**| None | [optional]
- **date** | **Date**| None | [optional]
- **dateTime** | **Date**| None | [optional]
+ **date** | **LocalDate**| None | [optional]
+ **dateTime** | **DateTime**| None | [optional]
  **password** | **String**| None | [optional]
 
 ### Return type
@@ -70,6 +70,6 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
+ - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
 
diff --git a/samples/client/petstore/java/default/docs/FormatTest.md b/samples/client/petstore/java/default/docs/FormatTest.md
index dc2b559dad28..44de7d9511a0 100644
--- a/samples/client/petstore/java/default/docs/FormatTest.md
+++ b/samples/client/petstore/java/default/docs/FormatTest.md
@@ -13,8 +13,8 @@ Name | Type | Description | Notes
 **string** | **String** |  |  [optional]
 **_byte** | **byte[]** |  | 
 **binary** | **byte[]** |  |  [optional]
-**date** | [**Date**](Date.md) |  | 
-**dateTime** | [**Date**](Date.md) |  |  [optional]
+**date** | [**LocalDate**](LocalDate.md) |  | 
+**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **uuid** | **String** |  |  [optional]
 **password** | **String** |  | 
 
diff --git a/samples/client/petstore/java/default/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/default/docs/MixedPropertiesAndAdditionalPropertiesClass.md
new file mode 100644
index 000000000000..e3487bcc5019
--- /dev/null
+++ b/samples/client/petstore/java/default/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -0,0 +1,12 @@
+
+# MixedPropertiesAndAdditionalPropertiesClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**uuid** | **String** |  |  [optional]
+**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
+**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/default/docs/Name.md b/samples/client/petstore/java/default/docs/Name.md
index 5390a15e9cd7..ce2fb4dee50c 100644
--- a/samples/client/petstore/java/default/docs/Name.md
+++ b/samples/client/petstore/java/default/docs/Name.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **name** | **Integer** |  | 
 **snakeCase** | **Integer** |  |  [optional]
 **property** | **String** |  |  [optional]
+**_123Number** | **Integer** |  |  [optional]
 
 
 
diff --git a/samples/client/petstore/java/default/docs/Order.md b/samples/client/petstore/java/default/docs/Order.md
index 29ca3ddbc6b2..a1089f5384eb 100644
--- a/samples/client/petstore/java/default/docs/Order.md
+++ b/samples/client/petstore/java/default/docs/Order.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **id** | **Long** |  |  [optional]
 **petId** | **Long** |  |  [optional]
 **quantity** | **Integer** |  |  [optional]
-**shipDate** | [**Date**](Date.md) |  |  [optional]
+**shipDate** | [**DateTime**](DateTime.md) |  |  [optional]
 **status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
 **complete** | **Boolean** |  |  [optional]
 
diff --git a/samples/client/petstore/java/default/docs/ReadOnlyFirst.md b/samples/client/petstore/java/default/docs/ReadOnlyFirst.md
new file mode 100644
index 000000000000..426b7cde95ab
--- /dev/null
+++ b/samples/client/petstore/java/default/docs/ReadOnlyFirst.md
@@ -0,0 +1,11 @@
+
+# ReadOnlyFirst
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**bar** | **String** |  |  [optional]
+**baz** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/default/gradlew b/samples/client/petstore/java/default/gradlew
old mode 100755
new mode 100644
diff --git a/samples/client/petstore/java/default/petstore_profiling.output b/samples/client/petstore/java/default/petstore_profiling.output
deleted file mode 100644
index 215625487656..000000000000
--- a/samples/client/petstore/java/default/petstore_profiling.output
+++ /dev/null
@@ -1,23 +0,0 @@
-# To run the profiling:
-#   mvn compile test-compile exec:java -Dexec.classpathScope=test -Dexec.mainClass="io.swagger.PetstoreProfiling"
-
-0: ADD PET => 0.987609128
-0: GET PET => 0.450873167
-0: UPDATE PET => 0.447611998
-0: DELETE PET => 0.397707664
-1: ADD PET => 0.395333121
-1: GET PET => 0.381760136
-1: UPDATE PET => 0.395245221
-1: DELETE PET => 0.384854324
-2: ADD PET => 0.400336227
-2: GET PET => 0.378959921
-2: UPDATE PET => 0.397619284
-2: DELETE PET => 0.383307393
-3: ADD PET => 0.385764805
-3: GET PET => 0.40218304
-3: UPDATE PET => 0.387887511
-3: DELETE PET => 0.398063489
-4: ADD PET => 0.384757488
-4: GET PET => 0.398719713
-4: UPDATE PET => 0.383319052
-4: DELETE PET => 0.408516644
diff --git a/samples/client/petstore/java/default/pom.xml b/samples/client/petstore/java/default/pom.xml
index 2ea4060bc3a3..0b24e1201005 100644
--- a/samples/client/petstore/java/default/pom.xml
+++ b/samples/client/petstore/java/default/pom.xml
@@ -97,8 +97,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
     </plugins>
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
index 50c0e8db6413..ba846404249a 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
@@ -41,7 +41,7 @@ import io.swagger.client.auth.HttpBasicAuth;
 import io.swagger.client.auth.ApiKeyAuth;
 import io.swagger.client.auth.OAuth;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T15:55:38.841+08:00")
+
 public class ApiClient {
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   private String basePath = "http://petstore.swagger.io/v2";
@@ -76,12 +76,7 @@ public class ApiClient {
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();
     authentications.put("petstore_auth", new OAuth());
-    authentications.put("test_api_client_id", new ApiKeyAuth("header", "x-test_api_client_id"));
-    authentications.put("test_api_client_secret", new ApiKeyAuth("header", "x-test_api_client_secret"));
     authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
-    authentications.put("test_http_basic", new HttpBasicAuth());
-    authentications.put("test_api_key_query", new ApiKeyAuth("query", "test_api_key_query"));
-    authentications.put("test_api_key_header", new ApiKeyAuth("header", "test_api_key_header"));
     // Prevent the authentications from being modified.
     authentications = Collections.unmodifiableMap(authentications);
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/FakeApi.java
index 40ee5e2774fc..dc9faf57ea60 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/FakeApi.java
@@ -8,8 +8,9 @@ import io.swagger.client.Configuration;
 import io.swagger.client.model.*;
 import io.swagger.client.Pair;
 
-import java.util.Date;
+import org.joda.time.LocalDate;
 import java.math.BigDecimal;
+import org.joda.time.DateTime;
 
 
 import java.util.ArrayList;
@@ -54,7 +55,7 @@ public class FakeApi {
    * @param password None (optional)
    * @throws ApiException if fails to make API call
    */
-  public void testEndpointParameters(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password) throws ApiException {
+  public void testEndpointParameters(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, LocalDate date, DateTime dateTime, String password) throws ApiException {
     Object localVarPostBody = null;
     
     // verify the required parameter 'number' is set
@@ -113,12 +114,12 @@ if (password != null)
       localVarFormParams.put("password", password);
 
     final String[] localVarAccepts = {
-      "application/xml", "application/json"
+      "application/xml; charset=utf-8", "application/json; charset=utf-8"
     };
     final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
     final String[] localVarContentTypes = {
-      
+      "application/xml; charset=utf-8", "application/json; charset=utf-8"
     };
     final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 
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 0816f9a2961b..50a6ecff737d 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
@@ -9,8 +9,8 @@ import io.swagger.client.model.*;
 import io.swagger.client.Pair;
 
 import io.swagger.client.model.Pet;
-import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
+import java.io.File;
 
 
 import java.util.ArrayList;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
new file mode 100644
index 000000000000..ccaba7709c45
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -0,0 +1,97 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * AdditionalPropertiesClass
+ */
+
+public class AdditionalPropertiesClass   {
+  
+  private Map<String, String> mapProperty = new HashMap<String, String>();
+  private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();
+
+  
+  /**
+   **/
+  public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
+    this.mapProperty = mapProperty;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("map_property")
+  public Map<String, String> getMapProperty() {
+    return mapProperty;
+  }
+  public void setMapProperty(Map<String, String> mapProperty) {
+    this.mapProperty = mapProperty;
+  }
+
+
+  /**
+   **/
+  public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
+    this.mapOfMapProperty = mapOfMapProperty;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("map_of_map_property")
+  public Map<String, Map<String, String>> getMapOfMapProperty() {
+    return mapOfMapProperty;
+  }
+  public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
+    this.mapOfMapProperty = mapOfMapProperty;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+    return Objects.equals(this.mapProperty, additionalPropertiesClass.mapProperty) &&
+        Objects.equals(this.mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapProperty, mapOfMapProperty);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesClass {\n");
+    
+    sb.append("    mapProperty: ").append(toIndentedString(mapProperty)).append("\n");
+    sb.append("    mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).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/Animal.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Animal.java
index 365f0110b78b..25c7d3e421cc 100644
--- 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
@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
 public class Animal   {
   
   private String className = null;
+  private String color = "red";
 
   
   /**
@@ -33,6 +34,23 @@ public class Animal   {
   }
 
 
+  /**
+   **/
+  public Animal color(String color) {
+    this.color = color;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("color")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -42,12 +60,13 @@ public class Animal   {
       return false;
     }
     Animal animal = (Animal) o;
-    return Objects.equals(this.className, animal.className);
+    return Objects.equals(this.className, animal.className) &&
+        Objects.equals(this.color, animal.color);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className);
+    return Objects.hash(className, color);
   }
 
   @Override
@@ -56,6 +75,7 @@ public class Animal   {
     sb.append("class Animal {\n");
     
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ArrayTest.java
new file mode 100644
index 000000000000..6c1eb23d8d0d
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -0,0 +1,116 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * ArrayTest
+ */
+
+public class ArrayTest   {
+  
+  private List<String> arrayOfString = new ArrayList<String>();
+  private List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+
+  
+  /**
+   **/
+  public ArrayTest arrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("array_of_string")
+  public List<String> getArrayOfString() {
+    return arrayOfString;
+  }
+  public void setArrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+  }
+
+
+  /**
+   **/
+  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("array_array_of_integer")
+  public List<List<Long>> getArrayArrayOfInteger() {
+    return arrayArrayOfInteger;
+  }
+  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+  }
+
+
+  /**
+   **/
+  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("array_array_of_model")
+  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+    return arrayArrayOfModel;
+  }
+  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayTest arrayTest = (ArrayTest) o;
+    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
+        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
+        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayTest {\n");
+    
+    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).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
index 21c54aff2046..5ef9e23bd96e 100644
--- 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
@@ -15,6 +15,7 @@ import io.swagger.client.model.Animal;
 public class Cat extends Animal  {
   
   private String className = null;
+  private String color = "red";
   private Boolean declawed = null;
 
   
@@ -35,6 +36,23 @@ public class Cat extends Animal  {
   }
 
 
+  /**
+   **/
+  public Cat color(String color) {
+    this.color = color;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("color")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
+
   /**
    **/
   public Cat declawed(Boolean declawed) {
@@ -62,13 +80,14 @@ public class Cat extends Animal  {
     }
     Cat cat = (Cat) o;
     return Objects.equals(this.className, cat.className) &&
+        Objects.equals(this.color, cat.color) &&
         Objects.equals(this.declawed, cat.declawed) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className, declawed, super.hashCode());
+    return Objects.hash(className, color, declawed, super.hashCode());
   }
 
   @Override
@@ -77,6 +96,7 @@ public class Cat extends Animal  {
     sb.append("class Cat {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
     sb.append("}");
     return sb.toString();
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
index ed5581058c69..4b3cc947cc52 100644
--- 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
@@ -15,6 +15,7 @@ import io.swagger.client.model.Animal;
 public class Dog extends Animal  {
   
   private String className = null;
+  private String color = "red";
   private String breed = null;
 
   
@@ -35,6 +36,23 @@ public class Dog extends Animal  {
   }
 
 
+  /**
+   **/
+  public Dog color(String color) {
+    this.color = color;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("color")
+  public String getColor() {
+    return color;
+  }
+  public void setColor(String color) {
+    this.color = color;
+  }
+
+
   /**
    **/
   public Dog breed(String breed) {
@@ -62,13 +80,14 @@ public class Dog extends Animal  {
     }
     Dog dog = (Dog) o;
     return Objects.equals(this.className, dog.className) &&
+        Objects.equals(this.color, dog.color) &&
         Objects.equals(this.breed, dog.breed) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(className, breed, super.hashCode());
+    return Objects.hash(className, color, breed, super.hashCode());
   }
 
   @Override
@@ -77,6 +96,7 @@ public class Dog extends Animal  {
     sb.append("class Dog {\n");
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
     sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
     sb.append("}");
     return sb.toString();
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
index c01974880aed..793761500177 100644
--- 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
@@ -6,7 +6,8 @@ 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 org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 
 
 /**
@@ -24,8 +25,8 @@ public class FormatTest   {
   private String string = null;
   private byte[] _byte = null;
   private byte[] binary = null;
-  private Date date = null;
-  private Date dateTime = null;
+  private LocalDate date = null;
+  private DateTime dateTime = null;
   private String uuid = null;
   private String password = null;
 
@@ -195,34 +196,34 @@ public class FormatTest   {
 
   /**
    **/
-  public FormatTest date(Date date) {
+  public FormatTest date(LocalDate date) {
     this.date = date;
     return this;
   }
   
   @ApiModelProperty(example = "null", required = true, value = "")
   @JsonProperty("date")
-  public Date getDate() {
+  public LocalDate getDate() {
     return date;
   }
-  public void setDate(Date date) {
+  public void setDate(LocalDate date) {
     this.date = date;
   }
 
 
   /**
    **/
-  public FormatTest dateTime(Date dateTime) {
+  public FormatTest dateTime(DateTime dateTime) {
     this.dateTime = dateTime;
     return this;
   }
   
   @ApiModelProperty(example = "null", value = "")
   @JsonProperty("dateTime")
-  public Date getDateTime() {
+  public DateTime getDateTime() {
     return dateTime;
   }
-  public void setDateTime(Date dateTime) {
+  public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
new file mode 100644
index 000000000000..2f0972bf41e7
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -0,0 +1,119 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+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;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.joda.time.DateTime;
+
+
+/**
+ * MixedPropertiesAndAdditionalPropertiesClass
+ */
+
+public class MixedPropertiesAndAdditionalPropertiesClass   {
+  
+  private String uuid = null;
+  private DateTime dateTime = null;
+  private Map<String, Animal> map = new HashMap<String, Animal>();
+
+  
+  /**
+   **/
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
+    this.uuid = uuid;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("uuid")
+  public String getUuid() {
+    return uuid;
+  }
+  public void setUuid(String uuid) {
+    this.uuid = uuid;
+  }
+
+
+  /**
+   **/
+  public MixedPropertiesAndAdditionalPropertiesClass dateTime(DateTime dateTime) {
+    this.dateTime = dateTime;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("dateTime")
+  public DateTime getDateTime() {
+    return dateTime;
+  }
+  public void setDateTime(DateTime dateTime) {
+    this.dateTime = dateTime;
+  }
+
+
+  /**
+   **/
+  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+    this.map = map;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("map")
+  public Map<String, Animal> getMap() {
+    return map;
+  }
+  public void setMap(Map<String, Animal> map) {
+    this.map = map;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
+        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid, dateTime, map);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+    
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
index 60b26b556586..1ba2cc5e4a3c 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
@@ -17,6 +17,7 @@ public class Name   {
   private Integer name = null;
   private Integer snakeCase = null;
   private String property = null;
+  private Integer _123Number = null;
 
   
   /**
@@ -60,6 +61,13 @@ public class Name   {
   }
 
 
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("123Number")
+  public Integer get123Number() {
+    return _123Number;
+  }
+
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -71,12 +79,13 @@ public class Name   {
     Name name = (Name) o;
     return Objects.equals(this.name, name.name) &&
         Objects.equals(this.snakeCase, name.snakeCase) &&
-        Objects.equals(this.property, name.property);
+        Objects.equals(this.property, name.property) &&
+        Objects.equals(this._123Number, name._123Number);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name, snakeCase, property);
+    return Objects.hash(name, snakeCase, property, _123Number);
   }
 
   @Override
@@ -87,6 +96,7 @@ public class Name   {
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
     sb.append("    property: ").append(toIndentedString(property)).append("\n");
+    sb.append("    _123Number: ").append(toIndentedString(_123Number)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
index ed5739592a34..cec651e73a61 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
@@ -6,7 +6,7 @@ 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;
+import org.joda.time.DateTime;
 
 
 /**
@@ -18,7 +18,7 @@ public class Order   {
   private Long id = null;
   private Long petId = null;
   private Integer quantity = null;
-  private Date shipDate = null;
+  private DateTime shipDate = null;
 
   /**
    * Order Status
@@ -98,17 +98,17 @@ public class Order   {
 
   /**
    **/
-  public Order shipDate(Date shipDate) {
+  public Order shipDate(DateTime shipDate) {
     this.shipDate = shipDate;
     return this;
   }
   
   @ApiModelProperty(example = "null", value = "")
   @JsonProperty("shipDate")
-  public Date getShipDate() {
+  public DateTime getShipDate() {
     return shipDate;
   }
-  public void setShipDate(Date shipDate) {
+  public void setShipDate(DateTime shipDate) {
     this.shipDate = shipDate;
   }
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
new file mode 100644
index 000000000000..fdc3587df0e2
--- /dev/null
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -0,0 +1,84 @@
+package io.swagger.client.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**
+ * ReadOnlyFirst
+ */
+
+public class ReadOnlyFirst   {
+  
+  private String bar = null;
+  private String baz = null;
+
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("bar")
+  public String getBar() {
+    return bar;
+  }
+
+
+  /**
+   **/
+  public ReadOnlyFirst baz(String baz) {
+    this.baz = baz;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("baz")
+  public String getBaz() {
+    return baz;
+  }
+  public void setBaz(String baz) {
+    this.baz = baz;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+    return Objects.equals(this.bar, readOnlyFirst.bar) &&
+        Objects.equals(this.baz, readOnlyFirst.baz);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, baz);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ReadOnlyFirst {\n");
+    
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    baz: ").append(toIndentedString(baz)).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/test/java/io/swagger/client/ApiClientTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java
index 47f004c283bf..19b55257d0c0 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/client/ApiClientTest.java
@@ -111,6 +111,7 @@ public class ApiClientTest {
         }
     }
 
+    @Ignore("There is no more basic auth in petstore security definitions")
     @Test
     public void testSetUsernameAndPassword() {
         HttpBasicAuth auth = null;
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/PetApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/PetApiTest.java
index c25e0d8bfa2f..e75a9c7e7da7 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/PetApiTest.java
@@ -1,155 +1,306 @@
 package io.swagger.client.api;
 
-import io.swagger.client.ApiException;
-import io.swagger.client.model.Pet;
-import io.swagger.client.model.ModelApiResponse;
-import java.io.File;
-import org.junit.Test;
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.datatype.joda.*;
 
+import io.swagger.TestUtils;
+
+import io.swagger.client.*;
+import io.swagger.client.api.*;
+import io.swagger.client.auth.*;
+import io.swagger.client.model.*;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-/**
- * API tests for PetApi
- */
+import org.junit.*;
+import static org.junit.Assert.*;
+
 public class PetApiTest {
+    private PetApi api;
+    private ObjectMapper mapper;
 
-    private final PetApi api = new PetApi();
-
-    
-    /**
-     * Add a new pet to the store
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void addPetTest() throws ApiException {
-        Pet body = null;
-        // api.addPet(body);
-
-        // TODO: test validations
+    @Before
+    public void setup() {
+        api = new PetApi();
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
     }
-    
-    /**
-     * Deletes a pet
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void deletePetTest() throws ApiException {
-        Long petId = null;
-        String apiKey = null;
-        // api.deletePet(petId, apiKey);
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Finds Pets by status
-     *
-     * Multiple status values can be provided with comma separated strings
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
     @Test
-    public void findPetsByStatusTest() throws ApiException {
-        List<String> status = null;
-        // List<Pet> response = api.findPetsByStatus(status);
+    public void testApiClient() {
+        // the default api client is used
+        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
+        assertNotNull(api.getApiClient());
+        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
 
-        // TODO: test validations
+        ApiClient oldClient = api.getApiClient();
+
+        ApiClient newClient = new ApiClient();
+        newClient.setBasePath("http://example.com");
+        newClient.setDebugging(true);
+
+        // set api client via constructor
+        api = new PetApi(newClient);
+        assertNotNull(api.getApiClient());
+        assertEquals("http://example.com", api.getApiClient().getBasePath());
+        assertTrue(api.getApiClient().isDebugging());
+
+        // set api client via setter method
+        api.setApiClient(oldClient);
+        assertNotNull(api.getApiClient());
+        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
     }
-    
-    /**
-     * Finds Pets by tags
-     *
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void findPetsByTagsTest() throws ApiException {
-        List<String> tags = null;
-        // List<Pet> response = api.findPetsByTags(tags);
+    public void testCreateAndGetPet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
 
-        // TODO: test validations
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * Find pet by ID
-     *
-     * Returns a single pet
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
+    /*
     @Test
-    public void getPetByIdTest() throws ApiException {
-        Long petId = null;
-        // Pet response = api.getPetById(petId);
+    public void testCreateAndGetPetWithByteArray() throws Exception {
+        Pet pet = createRandomPet();
+        byte[] bytes = serializeJson(pet).getBytes();
+        api.addPetUsingByteArray(bytes);
 
-        // TODO: test validations
+        byte[] fetchedBytes = api.petPetIdtestingByteArraytrueGet(pet.getId());
+        Pet fetched = deserializeJson(new String(fetchedBytes), Pet.class);
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * Update an existing pet
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void updatePetTest() throws ApiException {
-        Pet body = null;
-        // api.updatePet(body);
+    public void testGetPetByIdInObject() throws Exception {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("pet " + pet.getId());
 
-        // TODO: test validations
+        Category category = new Category();
+        category.setId(TestUtils.nextId());
+        category.setName("category " + category.getId());
+        pet.setCategory(category);
+
+        pet.setStatus(Pet.StatusEnum.PENDING);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1"});
+        pet.setPhotoUrls(photos);
+
+        api.addPet(pet);
+
+        InlineResponse200 fetched = api.getPetByIdInObject(pet.getId());
+        assertEquals(pet.getId(), fetched.getId());
+        assertEquals(pet.getName(), fetched.getName());
+
+        Object categoryObj = fetched.getCategory();
+        assertNotNull(categoryObj);
+        assertTrue(categoryObj instanceof Map);
+
+        Map categoryMap = (Map) categoryObj;
+        Object categoryIdObj = categoryMap.get("id");
+        assertTrue(categoryIdObj instanceof Integer);
+        Integer categoryIdInt = (Integer) categoryIdObj;
+        assertEquals(category.getId(), Long.valueOf(categoryIdInt));
+        assertEquals(category.getName(), categoryMap.get("name"));
     }
-    
-    /**
-     * Updates a pet in the store with form data
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+    */
+
     @Test
-    public void updatePetWithFormTest() throws ApiException {
-        Long petId = null;
-        String name = null;
-        String status = null;
-        // api.updatePetWithForm(petId, name, status);
+    public void testUpdatePet() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
 
-        // TODO: test validations
+        api.updatePet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * uploads an image
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void uploadFileTest() throws ApiException {
-        Long petId = null;
-        String additionalMetadata = null;
-        File file = null;
-        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
+    public void testFindPetsByStatus() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
 
-        // TODO: test validations
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+
+        assertTrue(found);
+    }
+
+    @Test
+    public void testFindPetsByTags() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("monster");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+
+        List<Tag> tags = new ArrayList<Tag>();
+        Tag tag1 = new Tag();
+        tag1.setName("friendly");
+        tags.add(tag1);
+        pet.setTags(tags);
+
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+        assertTrue(found);
+    }
+
+    @Test
+    public void testUpdatePetWithForm() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("frank");
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+
+        api.updatePetWithForm(fetched.getId(), "furt", null);
+        Pet updated = api.getPetById(fetched.getId());
+
+        assertEquals(updated.getName(), "furt");
+    }
+
+    @Test
+    public void testDeletePet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        api.deletePet(fetched.getId(), null);
+
+        try {
+            fetched = api.getPetById(fetched.getId());
+            fail("expected an error");
+        } catch (ApiException e) {
+            assertEquals(404, e.getCode());
+        }
+    }
+
+    @Test
+    public void testUploadFile() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+
+        File file = new File("hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+        writer.write("Hello world!");
+        writer.close();
+
+        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        Pet pet1 = new Pet();
+        Pet pet2 = new Pet();
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+
+        pet2.setName("really-happy");
+        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertFalse(pet1.equals(pet2));
+        assertFalse(pet2.equals(pet1));
+        assertFalse(pet1.hashCode() == (pet2.hashCode()));
+        assertTrue(pet2.equals(pet2));
+        assertTrue(pet2.hashCode() == pet2.hashCode());
+
+        pet1.setName("really-happy");
+        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+    }
+
+    private Pet createRandomPet() {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("gorilla");
+
+        Category category = new Category();
+        category.setName("really-happy");
+
+        pet.setCategory(category);
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+        pet.setPhotoUrls(photos);
+
+        return pet;
+    }
+
+    private String serializeJson(Object o) {
+        if (mapper == null) {
+            mapper = createObjectMapper();
+        }
+        try {
+            return mapper.writeValueAsString(o);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private <T> T deserializeJson(String json, Class<T> klass) {
+        if (mapper == null) {
+            mapper = createObjectMapper();
+        }
+        try {
+            return mapper.readValue(json, klass);
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+    }
+
+    private ObjectMapper createObjectMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+        mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+        mapper.registerModule(new JodaModule());
+        return mapper;
     }
-    
 }
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/StoreApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/StoreApiTest.java
index 31abbbeae4ea..51779f265f02 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/StoreApiTest.java
@@ -1,83 +1,103 @@
 package io.swagger.client.api;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiException;
-import io.swagger.client.model.Order;
-import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import io.swagger.client.*;
+import io.swagger.client.api.*;
+import io.swagger.client.auth.*;
+import io.swagger.client.model.*;
+
+import java.lang.reflect.Field;
 import java.util.Map;
+import java.text.SimpleDateFormat;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.junit.*;
+import static org.junit.Assert.*;
 
-/**
- * API tests for StoreApi
- */
 public class StoreApiTest {
+    StoreApi api = null;
 
-    private final StoreApi api = new 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
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void deleteOrderTest() throws ApiException {
-        String orderId = null;
-        // api.deleteOrder(orderId);
-
-        // TODO: test validations
+    @Before
+    public void setup() {
+        api = new StoreApi();
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
+        // set custom date format that is used by the petstore server
+        api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
     }
-    
-    /**
-     * Returns pet inventories by status
-     *
-     * Returns a map of status codes to quantities
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void getInventoryTest() throws ApiException {
-        // Map<String, Integer> response = api.getInventory();
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Find purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
     @Test
-    public void getOrderByIdTest() throws ApiException {
-        Long orderId = null;
-        // Order response = api.getOrderById(orderId);
-
-        // TODO: test validations
+    public void testGetInventory() throws Exception {
+        Map<String, Integer> inventory = api.getInventory();
+        assertTrue(inventory.keySet().size() > 0);
     }
-    
-    /**
-     * Place an order for a pet
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
+    /*
     @Test
-    public void placeOrderTest() throws ApiException {
-        Order body = null;
-        // Order response = api.placeOrder(body);
+    public void testGetInventoryInObject() throws Exception {
+        Object inventoryObj = api.getInventoryInObject();
+        assertTrue(inventoryObj instanceof Map);
 
-        // TODO: test validations
+        Map inventoryMap = (Map) inventoryObj;
+        assertTrue(inventoryMap.keySet().size() > 0);
+
+        Map.Entry firstEntry = (Map.Entry) inventoryMap.entrySet().iterator().next();
+        assertTrue(firstEntry.getKey() instanceof String);
+        assertTrue(firstEntry.getValue() instanceof Integer);
+    }
+    */
+
+    @Test
+    public void testPlaceOrder() throws Exception {
+        Order order = createOrder();
+        api.placeOrder(order);
+
+        Order fetched = api.getOrderById(order.getId());
+        assertEquals(order.getId(), fetched.getId());
+        assertEquals(order.getPetId(), fetched.getPetId());
+        assertEquals(order.getQuantity(), fetched.getQuantity());
+        assertEquals(order.getShipDate().withZone(DateTimeZone.UTC), fetched.getShipDate().withZone(DateTimeZone.UTC));
+    }
+
+    @Test
+    public void testDeleteOrder() throws Exception {
+        Order order = createOrder();
+        api.placeOrder(order);
+
+        Order fetched = api.getOrderById(order.getId());
+        assertEquals(fetched.getId(), order.getId());
+
+        api.deleteOrder(String.valueOf(order.getId()));
+
+        try {
+            api.getOrderById(order.getId());
+            // fail("expected an error");
+        } catch (ApiException e) {
+            // ok
+        }
+    }
+
+    private Order createOrder() {
+        Order order = new Order();
+        order.setPetId(new Long(200));
+        order.setQuantity(new Integer(13));
+        order.setShipDate(DateTime.now());
+        order.setStatus(Order.StatusEnum.PLACED);
+        order.setComplete(true);
+
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
+        return order;
     }
-    
 }
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/UserApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/UserApiTest.java
index 7e96762ff4eb..c7fb92d25529 100644
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/default/src/test/java/io/swagger/client/api/UserApiTest.java
@@ -1,149 +1,88 @@
 package io.swagger.client.api;
 
-import io.swagger.client.ApiException;
-import io.swagger.client.model.User;
-import org.junit.Test;
+import io.swagger.TestUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import io.swagger.client.api.*;
+import io.swagger.client.auth.*;
+import io.swagger.client.model.*;
+
+import java.util.Arrays;
+
+import org.junit.*;
+import static org.junit.Assert.*;
 
-/**
- * API tests for UserApi
- */
 public class UserApiTest {
+    UserApi api = null;
 
-    private final UserApi api = new UserApi();
-
-    
-    /**
-     * Create user
-     *
-     * This can only be done by the logged in user.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void createUserTest() throws ApiException {
-        User body = null;
-        // api.createUser(body);
-
-        // TODO: test validations
+    @Before
+    public void setup() {
+        api = new UserApi();
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
     }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void createUsersWithArrayInputTest() throws ApiException {
-        List<User> body = null;
-        // api.createUsersWithArrayInput(body);
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
     @Test
-    public void createUsersWithListInputTest() throws ApiException {
-        List<User> body = null;
-        // api.createUsersWithListInput(body);
+    public void testCreateUser() throws Exception {
+        User user = createUser();
 
-        // TODO: test validations
+        api.createUser(user);
+
+        User fetched = api.getUserByName(user.getUsername());
+        assertEquals(user.getId(), fetched.getId());
     }
-    
-    /**
-     * Delete user
-     *
-     * This can only be done by the logged in user.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void deleteUserTest() throws ApiException {
-        String username = null;
-        // api.deleteUser(username);
+    public void testCreateUsersWithArray() throws Exception {
+        User user1 = createUser();
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
+
+        User fetched = api.getUserByName(user1.getUsername());
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
-    /**
-     * Get user by user name
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void getUserByNameTest() throws ApiException {
-        String username = null;
-        // User response = api.getUserByName(username);
+    public void testCreateUsersWithList() throws Exception {
+        User user1 = createUser();
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
+
+        User fetched = api.getUserByName(user1.getUsername());
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
-    /**
-     * Logs user into the system
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void loginUserTest() throws ApiException {
-        String username = null;
-        String password = null;
-        // String response = api.loginUser(username, password);
+    public void testLoginUser() throws Exception {
+        User user = createUser();
+        api.createUser(user);
 
-        // TODO: test validations
+        String token = api.loginUser(user.getUsername(), user.getPassword());
+        assertTrue(token.startsWith("logged in user session:"));
     }
-    
-    /**
-     * Logs out current logged in user session
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void logoutUserTest() throws ApiException {
-        // api.logoutUser();
-
-        // TODO: test validations
+    public void logoutUser() throws Exception {
+        api.logoutUser();
     }
-    
-    /**
-     * Updated user
-     *
-     * This can only be done by the logged in user.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void updateUserTest() throws ApiException {
-        String username = null;
-        User body = null;
-        // api.updateUser(username, body);
 
-        // TODO: test validations
+    private User createUser() {
+        User user = new User();
+        user.setId(TestUtils.nextId());
+        user.setUsername("fred" + user.getId());
+        user.setFirstName("Fred");
+        user.setLastName("Meyer");
+        user.setEmail("fred@fredmeyer.com");
+        user.setPassword("xxXXxx");
+        user.setPhone("408-867-5309");
+        user.setUserStatus(123);
+
+        return user;
     }
-    
 }
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
deleted file mode 100644
index 9e927a69ba2e..000000000000
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ /dev/null
@@ -1,306 +0,0 @@
-package io.swagger.petstore.test;
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.datatype.joda.*;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.*;
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class PetApiTest {
-    private PetApi api;
-    private ObjectMapper mapper;
-
-    @Before
-    public void setup() {
-        api = new PetApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-    }
-
-    @Test
-    public void testApiClient() {
-        // the default api client is used
-        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
-        assertNotNull(api.getApiClient());
-        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-
-        ApiClient oldClient = api.getApiClient();
-
-        ApiClient newClient = new ApiClient();
-        newClient.setBasePath("http://example.com");
-        newClient.setDebugging(true);
-
-        // set api client via constructor
-        api = new PetApi(newClient);
-        assertNotNull(api.getApiClient());
-        assertEquals("http://example.com", api.getApiClient().getBasePath());
-        assertTrue(api.getApiClient().isDebugging());
-
-        // set api client via setter method
-        api.setApiClient(oldClient);
-        assertNotNull(api.getApiClient());
-        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-    }
-
-    @Test
-    public void testCreateAndGetPet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    /*
-    @Test
-    public void testCreateAndGetPetWithByteArray() throws Exception {
-        Pet pet = createRandomPet();
-        byte[] bytes = serializeJson(pet).getBytes();
-        api.addPetUsingByteArray(bytes);
-
-        byte[] fetchedBytes = api.petPetIdtestingByteArraytrueGet(pet.getId());
-        Pet fetched = deserializeJson(new String(fetchedBytes), Pet.class);
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testGetPetByIdInObject() throws Exception {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("pet " + pet.getId());
-
-        Category category = new Category();
-        category.setId(TestUtils.nextId());
-        category.setName("category " + category.getId());
-        pet.setCategory(category);
-
-        pet.setStatus(Pet.StatusEnum.PENDING);
-        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1"});
-        pet.setPhotoUrls(photos);
-
-        api.addPet(pet);
-
-        InlineResponse200 fetched = api.getPetByIdInObject(pet.getId());
-        assertEquals(pet.getId(), fetched.getId());
-        assertEquals(pet.getName(), fetched.getName());
-
-        Object categoryObj = fetched.getCategory();
-        assertNotNull(categoryObj);
-        assertTrue(categoryObj instanceof Map);
-
-        Map categoryMap = (Map) categoryObj;
-        Object categoryIdObj = categoryMap.get("id");
-        assertTrue(categoryIdObj instanceof Integer);
-        Integer categoryIdInt = (Integer) categoryIdObj;
-        assertEquals(category.getId(), Long.valueOf(categoryIdInt));
-        assertEquals(category.getName(), categoryMap.get("name"));
-    }
-    */
-
-    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-
-        api.updatePet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testFindPetsByStatus() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-    }
-
-    @Test
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<Tag> tags = new ArrayList<Tag>();
-        Tag tag1 = new Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-    }
-
-    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("frank");
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-
-        api.updatePetWithForm(fetched.getId(), "furt", null);
-        Pet updated = api.getPetById(fetched.getId());
-
-        assertEquals(updated.getName(), "furt");
-    }
-
-    @Test
-    public void testDeletePet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(fetched.getId(), null);
-
-        try {
-            fetched = api.getPetById(fetched.getId());
-            fail("expected an error");
-        } catch (ApiException e) {
-            assertEquals(404, e.getCode());
-        }
-    }
-
-    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        File file = new File("hello.txt");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-        writer.write("Hello world!");
-        writer.close();
-
-        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-
-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-    }
-
-    private Pet createRandomPet() {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("gorilla");
-
-        Category category = new Category();
-        category.setName("really-happy");
-
-        pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
-        pet.setPhotoUrls(photos);
-
-        return pet;
-    }
-
-    private String serializeJson(Object o) {
-        if (mapper == null) {
-            mapper = createObjectMapper();
-        }
-        try {
-            return mapper.writeValueAsString(o);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private <T> T deserializeJson(String json, Class<T> klass) {
-        if (mapper == null) {
-            mapper = createObjectMapper();
-        }
-        try {
-            return mapper.readValue(json, klass);
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
-    }
-
-    private ObjectMapper createObjectMapper() {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-        mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
-        mapper.registerModule(new JodaModule());
-        return mapper;
-    }
-}
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
deleted file mode 100644
index 4b33d380f147..000000000000
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.ApiException;
-
-import io.swagger.client.*;
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-import java.text.SimpleDateFormat;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class StoreApiTest {
-    StoreApi api = null;
-
-    @Before
-    public void setup() {
-        api = new StoreApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-        // set custom date format that is used by the petstore server
-        api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
-    }
-
-    @Test
-    public void testGetInventory() throws Exception {
-        Map<String, Integer> inventory = api.getInventory();
-        assertTrue(inventory.keySet().size() > 0);
-    }
-
-    /*
-    @Test
-    public void testGetInventoryInObject() throws Exception {
-        Object inventoryObj = api.getInventoryInObject();
-        assertTrue(inventoryObj instanceof Map);
-
-        Map inventoryMap = (Map) inventoryObj;
-        assertTrue(inventoryMap.keySet().size() > 0);
-
-        Map.Entry firstEntry = (Map.Entry) inventoryMap.entrySet().iterator().next();
-        assertTrue(firstEntry.getKey() instanceof String);
-        assertTrue(firstEntry.getValue() instanceof Integer);
-    }
-    */
-
-    @Test
-    public void testPlaceOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(order.getId(), fetched.getId());
-        assertEquals(order.getPetId(), fetched.getPetId());
-        assertEquals(order.getQuantity(), fetched.getQuantity());
-    }
-
-    @Test
-    public void testDeleteOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(fetched.getId(), order.getId());
-
-        api.deleteOrder(String.valueOf(order.getId()));
-
-        try {
-            api.getOrderById(order.getId());
-            // fail("expected an error");
-        } catch (ApiException e) {
-            // ok
-        }
-    }
-
-    private Order createOrder() {
-        Order order = new Order();
-        order.setPetId(new Long(200));
-        order.setQuantity(new Integer(13));
-        order.setShipDate(new java.util.Date());
-        order.setStatus(Order.StatusEnum.PLACED);
-        order.setComplete(true);
-
-        try {
-          Field idField = Order.class.getDeclaredField("id");
-          idField.setAccessible(true);
-          idField.set(order, TestUtils.nextId());
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
-
-        return order;
-    }
-}
diff --git a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java
deleted file mode 100644
index 195e5c1e8613..000000000000
--- a/samples/client/petstore/java/default/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.util.Arrays;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class UserApiTest {
-    UserApi api = null;
-
-    @Before
-    public void setup() {
-        api = new UserApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-    }
-
-    @Test
-    public void testCreateUser() throws Exception {
-        User user = createUser();
-
-        api.createUser(user);
-
-        User fetched = api.getUserByName(user.getUsername());
-        assertEquals(user.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithArray() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithList() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testLoginUser() throws Exception {
-        User user = createUser();
-        api.createUser(user);
-
-        String token = api.loginUser(user.getUsername(), user.getPassword());
-        assertTrue(token.startsWith("logged in user session:"));
-    }
-
-    @Test
-    public void logoutUser() throws Exception {
-        api.logoutUser();
-    }
-
-    private User createUser() {
-        User user = new User();
-        user.setId(TestUtils.nextId());
-        user.setUsername("fred" + user.getId());
-        user.setFirstName("Fred");
-        user.setLastName("Meyer");
-        user.setEmail("fred@fredmeyer.com");
-        user.setPassword("xxXXxx");
-        user.setPhone("408-867-5309");
-        user.setUserStatus(123);
-
-        return user;
-    }
-}
diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle
index 9c98d11c4cdf..6574f746d05b 100644
--- a/samples/client/petstore/java/jersey2/build.gradle
+++ b/samples/client/petstore/java/jersey2/build.gradle
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    swagger_annotations_version = "1.5.0"
+    swagger_annotations_version = "1.5.8"
     jackson_version = "2.7.0"
     jersey_version = "2.22.2"
     jodatime_version = "2.9.3"
diff --git a/samples/client/petstore/java/jersey2/docs/FakeApi.md b/samples/client/petstore/java/jersey2/docs/FakeApi.md
index 8e15d4d1f690..0c1f55a0902e 100644
--- a/samples/client/petstore/java/jersey2/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey2/docs/FakeApi.md
@@ -32,8 +32,8 @@ Integer int32 = 56; // Integer | None
 Long int64 = 789L; // Long | None
 Float _float = 3.4F; // Float | None
 byte[] binary = B; // byte[] | None
-Date date = new Date(); // Date | None
-Date dateTime = new Date(); // Date | None
+LocalDate date = new LocalDate(); // LocalDate | None
+DateTime dateTime = new DateTime(); // DateTime | None
 String password = "password_example"; // String | None
 try {
     apiInstance.testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
@@ -56,8 +56,8 @@ Name | Type | Description  | Notes
  **int64** | **Long**| None | [optional]
  **_float** | **Float**| None | [optional]
  **binary** | **byte[]**| None | [optional]
- **date** | **Date**| None | [optional]
- **dateTime** | **Date**| None | [optional]
+ **date** | **LocalDate**| None | [optional]
+ **dateTime** | **DateTime**| None | [optional]
  **password** | **String**| None | [optional]
 
 ### Return type
diff --git a/samples/client/petstore/java/jersey2/docs/FormatTest.md b/samples/client/petstore/java/jersey2/docs/FormatTest.md
index dc2b559dad28..44de7d9511a0 100644
--- a/samples/client/petstore/java/jersey2/docs/FormatTest.md
+++ b/samples/client/petstore/java/jersey2/docs/FormatTest.md
@@ -13,8 +13,8 @@ Name | Type | Description | Notes
 **string** | **String** |  |  [optional]
 **_byte** | **byte[]** |  | 
 **binary** | **byte[]** |  |  [optional]
-**date** | [**Date**](Date.md) |  | 
-**dateTime** | [**Date**](Date.md) |  |  [optional]
+**date** | [**LocalDate**](LocalDate.md) |  | 
+**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **uuid** | **String** |  |  [optional]
 **password** | **String** |  | 
 
diff --git a/samples/client/petstore/java/jersey2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/jersey2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 00cc10ca9b3d..e3487bcc5019 100644
--- a/samples/client/petstore/java/jersey2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **uuid** | **String** |  |  [optional]
-**dateTime** | [**Date**](Date.md) |  |  [optional]
+**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
 
 
diff --git a/samples/client/petstore/java/jersey2/docs/Order.md b/samples/client/petstore/java/jersey2/docs/Order.md
index 29ca3ddbc6b2..a1089f5384eb 100644
--- a/samples/client/petstore/java/jersey2/docs/Order.md
+++ b/samples/client/petstore/java/jersey2/docs/Order.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **id** | **Long** |  |  [optional]
 **petId** | **Long** |  |  [optional]
 **quantity** | **Integer** |  |  [optional]
-**shipDate** | [**Date**](Date.md) |  |  [optional]
+**shipDate** | [**DateTime**](DateTime.md) |  |  [optional]
 **status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
 **complete** | **Boolean** |  |  [optional]
 
diff --git a/samples/client/petstore/java/jersey2/gradlew b/samples/client/petstore/java/jersey2/gradlew
old mode 100755
new mode 100644
diff --git a/samples/client/petstore/java/jersey2/hello.txt b/samples/client/petstore/java/jersey2/hello.txt
deleted file mode 100644
index 6769dd60bdf5..000000000000
--- a/samples/client/petstore/java/jersey2/hello.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
index bc43cfe670e6..d82f0db0239b 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
@@ -48,7 +48,7 @@ import io.swagger.client.auth.HttpBasicAuth;
 import io.swagger.client.auth.ApiKeyAuth;
 import io.swagger.client.auth.OAuth;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-17T17:22:31.147+08:00")
+
 public class ApiClient {
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   private String basePath = "http://petstore.swagger.io/v2";
@@ -85,12 +85,7 @@ public class ApiClient {
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();
     authentications.put("petstore_auth", new OAuth());
-    authentications.put("test_api_client_id", new ApiKeyAuth("header", "x-test_api_client_id"));
-    authentications.put("test_api_client_secret", new ApiKeyAuth("header", "x-test_api_client_secret"));
     authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
-    authentications.put("test_http_basic", new HttpBasicAuth());
-    authentications.put("test_api_key_query", new ApiKeyAuth("query", "test_api_key_query"));
-    authentications.put("test_api_key_header", new ApiKeyAuth("header", "test_api_key_header"));
     // Prevent the authentications from being modified.
     authentications = Collections.unmodifiableMap(authentications);
   }
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 00a3321d4744..27395e86ba98 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-06-03T00:41:43.242+08:00")
+
 public class ApiException extends Exception {
   private int code = 0;
   private Map<String, List<String>> responseHeaders = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java
index bbfa1a1c4eee..19b0ebeae4e7 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-06-03T00:41:43.242+08:00")
+
 public class Configuration {
   private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java
index f38b16d55ad8..d6f725b2caad 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-06-03T00:41:43.242+08:00")
+
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java
index 863136c9ef60..d8d32210b105 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-06-03T00:41:43.242+08:00")
+
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java
index 9bd7767e8a27..1383dd0decb0 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-06-03T00:41:43.242+08:00")
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
index e120b12d42c9..ce4830a1f77f 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
@@ -7,15 +7,16 @@ import io.swagger.client.Pair;
 
 import javax.ws.rs.core.GenericType;
 
+import org.joda.time.LocalDate;
 import java.math.BigDecimal;
-import java.util.Date;
+import org.joda.time.DateTime;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class FakeApi {
   private ApiClient apiClient;
 
@@ -52,7 +53,7 @@ public class FakeApi {
    * @param password None (optional)
    * @throws ApiException if fails to make API call
    */
-  public void testEndpointParameters(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password) throws ApiException {
+  public void testEndpointParameters(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, LocalDate date, DateTime dateTime, String password) throws ApiException {
     Object localVarPostBody = null;
     
     // verify the required parameter 'number' is set
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 f09defffe3c2..ad66598406da 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-06-03T00:41:43.242+08:00")
+
 public class PetApi {
   private ApiClient apiClient;
 
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 36336fe8c0bd..c0c9a166ad72 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-06-03T00:41:43.242+08:00")
+
 public class StoreApi {
   private ApiClient apiClient;
 
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 42e08132830e..7602f4e2ba94 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-06-03T00:41:43.242+08:00")
+
 public class UserApi {
   private ApiClient apiClient;
 
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 6d5c20361ef2..6882dbc41c08 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-06-03T00:41:43.242+08:00")
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index 8bc5686d3c13..64f2c887377b 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-06-03T00:41:43.242+08:00")
+
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java
index 140ee3d63c92..76d2917f24ea 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-06-03T00:41:43.242+08:00")
+
 public class OAuth implements Authentication {
   private String accessToken;
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 4c9d7b51a028..ccaba7709c45 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -13,7 +13,7 @@ import java.util.Map;
 /**
  * AdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class AdditionalPropertiesClass   {
   
   private Map<String, String> mapProperty = new HashMap<String, String>();
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
index 3506eb252987..25c7d3e421cc 100644
--- 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Animal
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class Animal   {
   
   private String className = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
index e035fb41d855..647e3a893e15 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * AnimalFarm
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class AnimalFarm extends ArrayList<Animal>  {
   
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
index 7b4d2bb3cc35..6c1eb23d8d0d 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * ArrayTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class ArrayTest   {
   
   private List<String> arrayOfString = new ArrayList<String>();
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
index 19d57357959b..5ef9e23bd96e 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Cat
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class Cat extends Animal  {
   
   private String className = null;
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 5f8edb7f80f4..c6cb703a89e3 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Category
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class Category   {
   
   private Long id = null;
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
index 2c01fa4f1a14..4b3cc947cc52 100644
--- 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
@@ -11,7 +11,7 @@ import io.swagger.client.model.Animal;
 /**
  * Dog
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class Dog extends Animal  {
   
   private String className = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
index 08d5c3d617ac..1c8657fd3ec1 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * EnumTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class EnumTest   {
   
 
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
index 2f80a5dc9723..793761500177 100644
--- 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
@@ -6,13 +6,14 @@ 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 org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 
 
 /**
  * FormatTest
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class FormatTest   {
   
   private Integer integer = null;
@@ -24,8 +25,8 @@ public class FormatTest   {
   private String string = null;
   private byte[] _byte = null;
   private byte[] binary = null;
-  private Date date = null;
-  private Date dateTime = null;
+  private LocalDate date = null;
+  private DateTime dateTime = null;
   private String uuid = null;
   private String password = null;
 
@@ -195,34 +196,34 @@ public class FormatTest   {
 
   /**
    **/
-  public FormatTest date(Date date) {
+  public FormatTest date(LocalDate date) {
     this.date = date;
     return this;
   }
   
   @ApiModelProperty(example = "null", required = true, value = "")
   @JsonProperty("date")
-  public Date getDate() {
+  public LocalDate getDate() {
     return date;
   }
-  public void setDate(Date date) {
+  public void setDate(LocalDate date) {
     this.date = date;
   }
 
 
   /**
    **/
-  public FormatTest dateTime(Date dateTime) {
+  public FormatTest dateTime(DateTime dateTime) {
     this.dateTime = dateTime;
     return this;
   }
   
   @ApiModelProperty(example = "null", value = "")
   @JsonProperty("dateTime")
-  public Date getDateTime() {
+  public DateTime getDateTime() {
     return dateTime;
   }
-  public void setDateTime(Date dateTime) {
+  public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index c55c44aa4c72..2f0972bf41e7 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -6,20 +6,20 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.joda.time.DateTime;
 
 
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   
   private String uuid = null;
-  private Date dateTime = null;
+  private DateTime dateTime = null;
   private Map<String, Animal> map = new HashMap<String, Animal>();
 
   
@@ -42,17 +42,17 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass dateTime(DateTime dateTime) {
     this.dateTime = dateTime;
     return this;
   }
   
   @ApiModelProperty(example = "null", value = "")
   @JsonProperty("dateTime")
-  public Date getDateTime() {
+  public DateTime getDateTime() {
     return dateTime;
   }
-  public void setDateTime(Date dateTime) {
+  public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
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 3a3014b87c08..b2809525c7f5 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 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.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class Model200Response   {
   
   private Integer name = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
index b8e916043e58..32fb86dd3238 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ModelApiResponse
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class ModelApiResponse   {
   
   private Integer code = null;
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 28df30b73f0c..a076d16f9643 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
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class ModelReturn   {
   
   private Integer _return = null;
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 091e716d948b..1ba2cc5e4a3c 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
@@ -11,7 +11,7 @@ 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")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class Name   {
   
   private Integer name = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
index 40c54de3071f..cec651e73a61 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
@@ -6,19 +6,19 @@ 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;
+import org.joda.time.DateTime;
 
 
 /**
  * Order
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class Order   {
   
   private Long id = null;
   private Long petId = null;
   private Integer quantity = null;
-  private Date shipDate = null;
+  private DateTime shipDate = null;
 
   /**
    * Order Status
@@ -98,17 +98,17 @@ public class Order   {
 
   /**
    **/
-  public Order shipDate(Date shipDate) {
+  public Order shipDate(DateTime shipDate) {
     this.shipDate = shipDate;
     return this;
   }
   
   @ApiModelProperty(example = "null", value = "")
   @JsonProperty("shipDate")
-  public Date getShipDate() {
+  public DateTime getShipDate() {
     return shipDate;
   }
-  public void setShipDate(Date shipDate) {
+  public void setShipDate(DateTime shipDate) {
     this.shipDate = shipDate;
   }
 
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 2ec54dd8d8f4..da8b76ad024b 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
@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * Pet
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class Pet   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 268c6adc65e6..fdc3587df0e2 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * ReadOnlyFirst
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class ReadOnlyFirst   {
   
   private String bar = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
index 3b2003b6e47a..24e57756cb2f 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * SpecialModelName
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class SpecialModelName   {
   
   private Long specialPropertyName = null;
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 277e48fa0b29..9d3bdd8cb9e9 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Tag
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class Tag   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
index d1f924eb2a88..f23553660deb 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
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * User
  */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-03T00:41:43.242+08:00")
+
 public class User   {
   
   private Long id = null;
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java
index 47f004c283bf..19b55257d0c0 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/ApiClientTest.java
@@ -111,6 +111,7 @@ public class ApiClientTest {
         }
     }
 
+    @Ignore("There is no more basic auth in petstore security definitions")
     @Test
     public void testSetUsernameAndPassword() {
         HttpBasicAuth auth = null;
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/JSONTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/JSONTest.java
index f10909ab9e73..9386b3d52367 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/JSONTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/JSONTest.java
@@ -3,10 +3,10 @@ package io.swagger.client;
 import io.swagger.client.model.Order;
 
 import java.lang.Exception;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
 
+import org.joda.time.DateTimeZone;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 import org.junit.*;
 import static org.junit.Assert.*;
 
@@ -23,26 +23,23 @@ public class JSONTest {
 
     @Test
     public void testDefaultDate() throws Exception {
-        final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
-        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        final DateTimeFormatter dateFormat = ISODateTimeFormat.dateTime();
         final String dateStr = "2015-11-07T14:11:05.267Z";
-        order.setShipDate(dateFormat.parse(dateStr));
+        order.setShipDate(dateFormat.parseDateTime(dateStr));
 
         String str = json.getContext(null).writeValueAsString(order);
         Order o = json.getContext(null).readValue(str, Order.class);
-        assertEquals(dateStr, dateFormat.format(o.getShipDate()));
+        assertEquals(dateStr, dateFormat.print(o.getShipDate()));
     }
 
     @Test
     public void testCustomDate() throws Exception {
-        final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
-        dateFormat.setTimeZone(TimeZone.getTimeZone("GMT-2"));
+        final DateTimeFormatter dateFormat = ISODateTimeFormat.dateTimeNoMillis().withZone(DateTimeZone.forID("Etc/GMT+2"));
         final String dateStr = "2015-11-07T14:11:05-02:00";
-        order.setShipDate(dateFormat.parse(dateStr));
+        order.setShipDate(dateFormat.parseDateTime(dateStr));
 
-        json.setDateFormat(dateFormat);
         String str = json.getContext(null).writeValueAsString(order);
         Order o = json.getContext(null).readValue(str, Order.class);
-        assertEquals(dateStr, dateFormat.format(o.getShipDate()));
+        assertEquals(dateStr, dateFormat.print(o.getShipDate()));
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/PetApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/PetApiTest.java
index c25e0d8bfa2f..7f4d27c8b777 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/PetApiTest.java
@@ -1,155 +1,288 @@
 package io.swagger.client.api;
 
-import io.swagger.client.ApiException;
-import io.swagger.client.model.Pet;
-import io.swagger.client.model.ModelApiResponse;
-import java.io.File;
-import org.junit.Test;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.swagger.TestUtils;
+
+import io.swagger.client.*;
+import io.swagger.client.api.*;
+import io.swagger.client.auth.*;
+import io.swagger.client.model.*;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-/**
- * API tests for PetApi
- */
+import org.junit.*;
+import static org.junit.Assert.*;
+
 public class PetApiTest {
+    PetApi api = null;
 
-    private final PetApi api = new PetApi();
-
-    
-    /**
-     * Add a new pet to the store
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void addPetTest() throws ApiException {
-        Pet body = null;
-        // api.addPet(body);
-
-        // TODO: test validations
+    @Before
+    public void setup() {
+        api = new PetApi();
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
     }
-    
-    /**
-     * Deletes a pet
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void deletePetTest() throws ApiException {
-        Long petId = null;
-        String apiKey = null;
-        // api.deletePet(petId, apiKey);
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Finds Pets by status
-     *
-     * Multiple status values can be provided with comma separated strings
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
     @Test
-    public void findPetsByStatusTest() throws ApiException {
-        List<String> status = null;
-        // List<Pet> response = api.findPetsByStatus(status);
+    public void testApiClient() {
+        // the default api client is used
+        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
+        assertNotNull(api.getApiClient());
+        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
 
-        // TODO: test validations
+        ApiClient oldClient = api.getApiClient();
+
+        ApiClient newClient = new ApiClient();
+        newClient.setBasePath("http://example.com");
+        newClient.setDebugging(true);
+
+        // set api client via constructor
+        api = new PetApi(newClient);
+        assertNotNull(api.getApiClient());
+        assertEquals("http://example.com", api.getApiClient().getBasePath());
+        assertTrue(api.getApiClient().isDebugging());
+
+        // set api client via setter method
+        api.setApiClient(oldClient);
+        assertNotNull(api.getApiClient());
+        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
     }
-    
-    /**
-     * Finds Pets by tags
-     *
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void findPetsByTagsTest() throws ApiException {
-        List<String> tags = null;
-        // List<Pet> response = api.findPetsByTags(tags);
+    public void testCreateAndGetPet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
 
-        // TODO: test validations
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * Find pet by ID
-     *
-     * Returns a single pet
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
+    /*
     @Test
-    public void getPetByIdTest() throws ApiException {
-        Long petId = null;
-        // Pet response = api.getPetById(petId);
+    public void testCreateAndGetPetWithByteArray() throws Exception {
+        Pet pet = createRandomPet();
+        byte[] bytes = serializeJson(pet, api.getApiClient()).getBytes();
+        api.addPetUsingByteArray(bytes);
 
-        // TODO: test validations
+        byte[] fetchedBytes = api.petPetIdtestingByteArraytrueGet(pet.getId());
+        Pet fetched = deserializeJson(new String(fetchedBytes), Pet.class, api.getApiClient());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * Update an existing pet
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void updatePetTest() throws ApiException {
-        Pet body = null;
-        // api.updatePet(body);
+    public void testGetPetByIdInObject() throws Exception {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("pet " + pet.getId());
 
-        // TODO: test validations
+        Category category = new Category();
+        category.setId(TestUtils.nextId());
+        category.setName("category " + category.getId());
+        pet.setCategory(category);
+
+        pet.setStatus(Pet.StatusEnum.PENDING);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1"});
+        pet.setPhotoUrls(photos);
+
+        api.addPet(pet);
+
+        InlineResponse200 fetched = api.getPetByIdInObject(pet.getId());
+        assertEquals(pet.getId(), fetched.getId());
+        assertEquals(pet.getName(), fetched.getName());
+
+        Object categoryObj = fetched.getCategory();
+        assertNotNull(categoryObj);
+        assertTrue(categoryObj instanceof Map);
+
+        Map categoryMap = (Map) categoryObj;
+        Object categoryIdObj = categoryMap.get("id");
+        assertTrue(categoryIdObj instanceof Integer);
+        Integer categoryIdInt = (Integer) categoryIdObj;
+        assertEquals(category.getId(), Long.valueOf(categoryIdInt));
+        assertEquals(category.getName(), categoryMap.get("name"));
     }
-    
-    /**
-     * Updates a pet in the store with form data
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+    */
+
     @Test
-    public void updatePetWithFormTest() throws ApiException {
-        Long petId = null;
-        String name = null;
-        String status = null;
-        // api.updatePetWithForm(petId, name, status);
+    public void testUpdatePet() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
 
-        // TODO: test validations
+        api.updatePet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * uploads an image
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void uploadFileTest() throws ApiException {
-        Long petId = null;
-        String additionalMetadata = null;
-        File file = null;
-        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
+    public void testFindPetsByStatus() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
 
-        // TODO: test validations
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+
+        assertTrue(found);
+    }
+
+    @Test
+    public void testFindPetsByTags() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("monster");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+
+        List<Tag> tags = new ArrayList<Tag>();
+        Tag tag1 = new Tag();
+        tag1.setName("friendly");
+        tags.add(tag1);
+        pet.setTags(tags);
+
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+        assertTrue(found);
+    }
+
+    @Test
+    public void testUpdatePetWithForm() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("frank");
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+
+        api.updatePetWithForm(fetched.getId(), "furt", null);
+        Pet updated = api.getPetById(fetched.getId());
+
+        assertEquals(updated.getName(), "furt");
+    }
+
+    @Test
+    public void testDeletePet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        api.deletePet(fetched.getId(), null);
+
+        try {
+            fetched = api.getPetById(fetched.getId());
+            fail("expected an error");
+        } catch (ApiException e) {
+            assertEquals(404, e.getCode());
+        }
+    }
+
+    @Test
+    public void testUploadFile() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+
+        File file = new File("hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+        writer.write("Hello world!");
+        writer.close();
+
+        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        Pet pet1 = new Pet();
+        Pet pet2 = new Pet();
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+
+        pet2.setName("really-happy");
+        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertFalse(pet1.equals(pet2));
+        assertFalse(pet2.equals(pet1));
+        assertFalse(pet1.hashCode() == (pet2.hashCode()));
+        assertTrue(pet2.equals(pet2));
+        assertTrue(pet2.hashCode() == pet2.hashCode());
+
+        pet1.setName("really-happy");
+        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+    }
+
+    private Pet createRandomPet() {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("gorilla");
+
+        Category category = new Category();
+        category.setName("really-happy");
+
+        pet.setCategory(category);
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+        pet.setPhotoUrls(photos);
+
+        return pet;
+    }
+
+    private String serializeJson(Object o, ApiClient apiClient) {
+        ObjectMapper mapper = apiClient.getJSON().getContext(null);
+        try {
+            return mapper.writeValueAsString(o);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private <T> T deserializeJson(String json, Class<T> klass, ApiClient apiClient) {
+        ObjectMapper mapper = apiClient.getJSON().getContext(null);
+        try {
+            return mapper.readValue(json, klass);
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
     }
-    
 }
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/StoreApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/StoreApiTest.java
index 31abbbeae4ea..3cc2442c64d7 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/StoreApiTest.java
@@ -1,83 +1,100 @@
 package io.swagger.client.api;
 
-import io.swagger.client.ApiException;
-import io.swagger.client.model.Order;
-import org.junit.Test;
+import io.swagger.TestUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import io.swagger.client.*;
+import io.swagger.client.auth.*;
+import io.swagger.client.model.*;
+
+import java.lang.reflect.Field;
 import java.util.Map;
+import java.text.SimpleDateFormat;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.junit.*;
+import static org.junit.Assert.*;
 
-/**
- * API tests for StoreApi
- */
 public class StoreApiTest {
+    StoreApi api = null;
 
-    private final StoreApi api = new 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
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void deleteOrderTest() throws ApiException {
-        String orderId = null;
-        // api.deleteOrder(orderId);
-
-        // TODO: test validations
+    @Before
+    public void setup() {
+        api = new StoreApi();
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
+        // set custom date format that is used by the petstore server
+        api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
     }
-    
-    /**
-     * Returns pet inventories by status
-     *
-     * Returns a map of status codes to quantities
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void getInventoryTest() throws ApiException {
-        // Map<String, Integer> response = api.getInventory();
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Find purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
     @Test
-    public void getOrderByIdTest() throws ApiException {
-        Long orderId = null;
-        // Order response = api.getOrderById(orderId);
-
-        // TODO: test validations
+    public void testGetInventory() throws Exception {
+        Map<String, Integer> inventory = api.getInventory();
+        assertTrue(inventory.keySet().size() > 0);
     }
-    
-    /**
-     * Place an order for a pet
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
+    /*
     @Test
-    public void placeOrderTest() throws ApiException {
-        Order body = null;
-        // Order response = api.placeOrder(body);
+    public void testGetInventoryInObject() throws Exception {
+        Object inventoryObj = api.getInventoryInObject();
+        assertTrue(inventoryObj instanceof Map);
 
-        // TODO: test validations
+        Map inventoryMap = (Map) inventoryObj;
+        assertTrue(inventoryMap.keySet().size() > 0);
+
+        Map.Entry firstEntry = (Map.Entry) inventoryMap.entrySet().iterator().next();
+        assertTrue(firstEntry.getKey() instanceof String);
+        assertTrue(firstEntry.getValue() instanceof Integer);
+    }
+    */
+
+    @Test
+    public void testPlaceOrder() throws Exception {
+        Order order = createOrder();
+        api.placeOrder(order);
+
+        Order fetched = api.getOrderById(order.getId());
+        assertEquals(order.getId(), fetched.getId());
+        assertEquals(order.getPetId(), fetched.getPetId());
+        assertEquals(order.getQuantity(), fetched.getQuantity());
+        assertEquals(order.getShipDate().withZone(DateTimeZone.UTC), fetched.getShipDate().withZone(DateTimeZone.UTC));
+    }
+
+    @Test
+    public void testDeleteOrder() throws Exception {
+        Order order = createOrder();
+        api.placeOrder(order);
+
+        Order fetched = api.getOrderById(order.getId());
+        assertEquals(fetched.getId(), order.getId());
+
+        api.deleteOrder(String.valueOf(order.getId()));
+
+        try {
+            api.getOrderById(order.getId());
+            // fail("expected an error");
+        } catch (ApiException e) {
+            // ok
+        }
+    }
+
+    private Order createOrder() {
+        Order order = new Order();
+        order.setPetId(new Long(200));
+        order.setQuantity(new Integer(13));
+        order.setShipDate(DateTime.now());
+        order.setStatus(Order.StatusEnum.PLACED);
+        order.setComplete(true);
+
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
+        return order;
     }
-    
 }
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/UserApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/UserApiTest.java
index 7e96762ff4eb..c7fb92d25529 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/client/api/UserApiTest.java
@@ -1,149 +1,88 @@
 package io.swagger.client.api;
 
-import io.swagger.client.ApiException;
-import io.swagger.client.model.User;
-import org.junit.Test;
+import io.swagger.TestUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import io.swagger.client.api.*;
+import io.swagger.client.auth.*;
+import io.swagger.client.model.*;
+
+import java.util.Arrays;
+
+import org.junit.*;
+import static org.junit.Assert.*;
 
-/**
- * API tests for UserApi
- */
 public class UserApiTest {
+    UserApi api = null;
 
-    private final UserApi api = new UserApi();
-
-    
-    /**
-     * Create user
-     *
-     * This can only be done by the logged in user.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void createUserTest() throws ApiException {
-        User body = null;
-        // api.createUser(body);
-
-        // TODO: test validations
+    @Before
+    public void setup() {
+        api = new UserApi();
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
     }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void createUsersWithArrayInputTest() throws ApiException {
-        List<User> body = null;
-        // api.createUsersWithArrayInput(body);
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
     @Test
-    public void createUsersWithListInputTest() throws ApiException {
-        List<User> body = null;
-        // api.createUsersWithListInput(body);
+    public void testCreateUser() throws Exception {
+        User user = createUser();
 
-        // TODO: test validations
+        api.createUser(user);
+
+        User fetched = api.getUserByName(user.getUsername());
+        assertEquals(user.getId(), fetched.getId());
     }
-    
-    /**
-     * Delete user
-     *
-     * This can only be done by the logged in user.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void deleteUserTest() throws ApiException {
-        String username = null;
-        // api.deleteUser(username);
+    public void testCreateUsersWithArray() throws Exception {
+        User user1 = createUser();
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
+
+        User fetched = api.getUserByName(user1.getUsername());
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
-    /**
-     * Get user by user name
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void getUserByNameTest() throws ApiException {
-        String username = null;
-        // User response = api.getUserByName(username);
+    public void testCreateUsersWithList() throws Exception {
+        User user1 = createUser();
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
+
+        User fetched = api.getUserByName(user1.getUsername());
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
-    /**
-     * Logs user into the system
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void loginUserTest() throws ApiException {
-        String username = null;
-        String password = null;
-        // String response = api.loginUser(username, password);
+    public void testLoginUser() throws Exception {
+        User user = createUser();
+        api.createUser(user);
 
-        // TODO: test validations
+        String token = api.loginUser(user.getUsername(), user.getPassword());
+        assertTrue(token.startsWith("logged in user session:"));
     }
-    
-    /**
-     * Logs out current logged in user session
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void logoutUserTest() throws ApiException {
-        // api.logoutUser();
-
-        // TODO: test validations
+    public void logoutUser() throws Exception {
+        api.logoutUser();
     }
-    
-    /**
-     * Updated user
-     *
-     * This can only be done by the logged in user.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void updateUserTest() throws ApiException {
-        String username = null;
-        User body = null;
-        // api.updateUser(username, body);
 
-        // TODO: test validations
+    private User createUser() {
+        User user = new User();
+        user.setId(TestUtils.nextId());
+        user.setUsername("fred" + user.getId());
+        user.setFirstName("Fred");
+        user.setLastName("Meyer");
+        user.setEmail("fred@fredmeyer.com");
+        user.setPassword("xxXXxx");
+        user.setPhone("408-867-5309");
+        user.setUserStatus(123);
+
+        return user;
     }
-    
 }
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java
deleted file mode 100644
index 515838532575..000000000000
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package io.swagger.petstore.test;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.*;
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class PetApiTest {
-    PetApi api = null;
-
-    @Before
-    public void setup() {
-        api = new PetApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-    }
-
-    @Test
-    public void testApiClient() {
-        // the default api client is used
-        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
-        assertNotNull(api.getApiClient());
-        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-
-        ApiClient oldClient = api.getApiClient();
-
-        ApiClient newClient = new ApiClient();
-        newClient.setBasePath("http://example.com");
-        newClient.setDebugging(true);
-
-        // set api client via constructor
-        api = new PetApi(newClient);
-        assertNotNull(api.getApiClient());
-        assertEquals("http://example.com", api.getApiClient().getBasePath());
-        assertTrue(api.getApiClient().isDebugging());
-
-        // set api client via setter method
-        api.setApiClient(oldClient);
-        assertNotNull(api.getApiClient());
-        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-    }
-
-    @Test
-    public void testCreateAndGetPet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    /*
-    @Test
-    public void testCreateAndGetPetWithByteArray() throws Exception {
-        Pet pet = createRandomPet();
-        byte[] bytes = serializeJson(pet, api.getApiClient()).getBytes();
-        api.addPetUsingByteArray(bytes);
-
-        byte[] fetchedBytes = api.petPetIdtestingByteArraytrueGet(pet.getId());
-        Pet fetched = deserializeJson(new String(fetchedBytes), Pet.class, api.getApiClient());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testGetPetByIdInObject() throws Exception {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("pet " + pet.getId());
-
-        Category category = new Category();
-        category.setId(TestUtils.nextId());
-        category.setName("category " + category.getId());
-        pet.setCategory(category);
-
-        pet.setStatus(Pet.StatusEnum.PENDING);
-        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1"});
-        pet.setPhotoUrls(photos);
-
-        api.addPet(pet);
-
-        InlineResponse200 fetched = api.getPetByIdInObject(pet.getId());
-        assertEquals(pet.getId(), fetched.getId());
-        assertEquals(pet.getName(), fetched.getName());
-
-        Object categoryObj = fetched.getCategory();
-        assertNotNull(categoryObj);
-        assertTrue(categoryObj instanceof Map);
-
-        Map categoryMap = (Map) categoryObj;
-        Object categoryIdObj = categoryMap.get("id");
-        assertTrue(categoryIdObj instanceof Integer);
-        Integer categoryIdInt = (Integer) categoryIdObj;
-        assertEquals(category.getId(), Long.valueOf(categoryIdInt));
-        assertEquals(category.getName(), categoryMap.get("name"));
-    }
-    */
-
-    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-
-        api.updatePet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testFindPetsByStatus() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-    }
-
-    @Test
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<Tag> tags = new ArrayList<Tag>();
-        Tag tag1 = new Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-    }
-
-    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("frank");
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-
-        api.updatePetWithForm(fetched.getId(), "furt", null);
-        Pet updated = api.getPetById(fetched.getId());
-
-        assertEquals(updated.getName(), "furt");
-    }
-
-    @Test
-    public void testDeletePet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(fetched.getId(), null);
-
-        try {
-            fetched = api.getPetById(fetched.getId());
-            fail("expected an error");
-        } catch (ApiException e) {
-            assertEquals(404, e.getCode());
-        }
-    }
-
-    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        File file = new File("hello.txt");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-        writer.write("Hello world!");
-        writer.close();
-
-        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-
-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-    }
-
-    private Pet createRandomPet() {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("gorilla");
-
-        Category category = new Category();
-        category.setName("really-happy");
-
-        pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
-        pet.setPhotoUrls(photos);
-
-        return pet;
-    }
-
-    private String serializeJson(Object o, ApiClient apiClient) {
-        ObjectMapper mapper = apiClient.getJSON().getContext(null);
-        try {
-            return mapper.writeValueAsString(o);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private <T> T deserializeJson(String json, Class<T> klass, ApiClient apiClient) {
-        ObjectMapper mapper = apiClient.getJSON().getContext(null);
-        try {
-            return mapper.readValue(json, klass);
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
deleted file mode 100644
index 7ccbdf3f32bf..000000000000
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.*;
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-import java.text.SimpleDateFormat;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class StoreApiTest {
-    StoreApi api = null;
-
-    @Before
-    public void setup() {
-        api = new StoreApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-        // set custom date format that is used by the petstore server
-        api.getApiClient().setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
-    }
-
-    @Test
-    public void testGetInventory() throws Exception {
-        Map<String, Integer> inventory = api.getInventory();
-        assertTrue(inventory.keySet().size() > 0);
-    }
-
-    /*
-    @Test
-    public void testGetInventoryInObject() throws Exception {
-        Object inventoryObj = api.getInventoryInObject();
-        assertTrue(inventoryObj instanceof Map);
-
-        Map inventoryMap = (Map) inventoryObj;
-        assertTrue(inventoryMap.keySet().size() > 0);
-
-        Map.Entry firstEntry = (Map.Entry) inventoryMap.entrySet().iterator().next();
-        assertTrue(firstEntry.getKey() instanceof String);
-        assertTrue(firstEntry.getValue() instanceof Integer);
-    }
-    */
-
-    @Test
-    public void testPlaceOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(order.getId(), fetched.getId());
-        assertEquals(order.getPetId(), fetched.getPetId());
-        assertEquals(order.getQuantity(), fetched.getQuantity());
-    }
-
-    @Test
-    public void testDeleteOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(fetched.getId(), order.getId());
-
-        api.deleteOrder(String.valueOf(order.getId()));
-
-        try {
-            api.getOrderById(order.getId());
-            // fail("expected an error");
-        } catch (ApiException e) {
-            // ok
-        }
-    }
-
-    private Order createOrder() {
-        Order order = new Order();
-        order.setPetId(new Long(200));
-        order.setQuantity(new Integer(13));
-        order.setShipDate(new java.util.Date());
-        order.setStatus(Order.StatusEnum.PLACED);
-        order.setComplete(true);
-
-        try {
-          Field idField = Order.class.getDeclaredField("id");
-          idField.setAccessible(true);
-          idField.set(order, TestUtils.nextId());
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
-
-        return order;
-    }
-}
diff --git a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java
deleted file mode 100644
index 195e5c1e8613..000000000000
--- a/samples/client/petstore/java/jersey2/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.util.Arrays;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class UserApiTest {
-    UserApi api = null;
-
-    @Before
-    public void setup() {
-        api = new UserApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-    }
-
-    @Test
-    public void testCreateUser() throws Exception {
-        User user = createUser();
-
-        api.createUser(user);
-
-        User fetched = api.getUserByName(user.getUsername());
-        assertEquals(user.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithArray() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithList() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testLoginUser() throws Exception {
-        User user = createUser();
-        api.createUser(user);
-
-        String token = api.loginUser(user.getUsername(), user.getPassword());
-        assertTrue(token.startsWith("logged in user session:"));
-    }
-
-    @Test
-    public void logoutUser() throws Exception {
-        api.logoutUser();
-    }
-
-    private User createUser() {
-        User user = new User();
-        user.setId(TestUtils.nextId());
-        user.setUsername("fred" + user.getId());
-        user.setFirstName("Fred");
-        user.setLastName("Meyer");
-        user.setEmail("fred@fredmeyer.com");
-        user.setPassword("xxXXxx");
-        user.setPhone("408-867-5309");
-        user.setUserStatus(123);
-
-        return user;
-    }
-}

From 61884211bbc5246dce9ccc50769f573c653a16a0 Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Thu, 9 Jun 2016 18:09:02 +0200
Subject: [PATCH 122/139] add joda support to okhttp-gson and use it in the
 samples

---
 bin/java-petstore-okhttp-gson.sh              |   4 +-
 ...gson.bat => java-petstore-okhttp-gson.bat} |   2 +-
 .../Java/libraries/okhttp-gson/JSON.mustache  |  69 +++
 .../okhttp-gson/build.gradle.mustache         |   1 +
 .../libraries/okhttp-gson/build.sbt.mustache  |   1 +
 .../Java/libraries/okhttp-gson/pom.mustache   |   6 +
 .../petstore/java/okhttp-gson/build.gradle    |   1 +
 .../petstore/java/okhttp-gson/build.sbt       |   1 +
 .../petstore/java/okhttp-gson/docs/FakeApi.md |   8 +-
 .../java/okhttp-gson/docs/FormatTest.md       |   4 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   2 +-
 .../petstore/java/okhttp-gson/docs/Order.md   |   2 +-
 .../client/petstore/java/okhttp-gson/gradlew  |   0
 .../client/petstore/java/okhttp-gson/pom.xml  |  53 +-
 .../java/io/swagger/client/ApiClient.java     |   2 +-
 .../src/main/java/io/swagger/client/JSON.java |  69 +++
 .../java/io/swagger/client/api/FakeApi.java   |  11 +-
 .../java/io/swagger/client/api/PetApi.java    |   2 +-
 .../io/swagger/client/model/FormatTest.java   |  15 +-
 ...ropertiesAndAdditionalPropertiesClass.java |   8 +-
 .../java/io/swagger/client/model/Order.java   |   8 +-
 .../test/java/io/swagger/client/JSONTest.java |  22 +-
 .../io/swagger/client/api/PetApiTest.java     | 488 +++++++++++++-----
 .../io/swagger/client/api/StoreApiTest.java   | 156 +++---
 .../io/swagger/client/api/UserApiTest.java    | 186 +++----
 .../io/swagger/petstore/test/PetApiTest.java  | 398 --------------
 .../swagger/petstore/test/StoreApiTest.java   | 104 ----
 .../io/swagger/petstore/test/UserApiTest.java |  88 ----
 28 files changed, 714 insertions(+), 997 deletions(-)
 rename bin/windows/{java-petsore-okhttp-gson.bat => java-petstore-okhttp-gson.bat} (90%)
 mode change 100755 => 100644 samples/client/petstore/java/okhttp-gson/gradlew
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java

diff --git a/bin/java-petstore-okhttp-gson.sh b/bin/java-petstore-okhttp-gson.sh
index b62610b1eff5..521c8ca4826c 100755
--- a/bin/java-petstore-okhttp-gson.sh
+++ b/bin/java-petstore-okhttp-gson.sh
@@ -26,6 +26,8 @@ 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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-okhttp-gson.json -o samples/client/petstore/java/okhttp-gson -DhideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-okhttp-gson.json -o samples/client/petstore/java/okhttp-gson -DdateLibrary=joda,hideGenerationTimestamp=true"
 
+rm -rf samples/client/petstore/java/okhttp-gson/src/main
+find samples/client/petstore/java/okhttp-gson -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/java-petsore-okhttp-gson.bat b/bin/windows/java-petstore-okhttp-gson.bat
similarity index 90%
rename from bin/windows/java-petsore-okhttp-gson.bat
rename to bin/windows/java-petstore-okhttp-gson.bat
index cc2b52e4fa13..e7c1dde982a3 100755
--- a/bin/windows/java-petsore-okhttp-gson.bat
+++ b/bin/windows/java-petstore-okhttp-gson.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -t modules\swagger-codegen\src\main\resources\java -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java --library=okhttp-gson -DhideGenerationTimestamp=true
+set ags=generate -t modules\swagger-codegen\src\main\resources\java -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java --library=okhttp-gson -DdateLibrary=joda,hideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
index 8e92e16c0adc..b1be00ea985f 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache
@@ -12,12 +12,20 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 
+import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.Type;
 import java.util.Date;
 
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+
 public class JSON {
     private ApiClient apiClient;
     private Gson gson;
@@ -31,6 +39,8 @@ public class JSON {
         this.apiClient = apiClient;
         gson = new GsonBuilder()
             .registerTypeAdapter(Date.class, new DateAdapter(apiClient))
+            .registerTypeAdapter(DateTime.class, new DateTimeTypeAdapter())
+            .registerTypeAdapter(LocalDate.class, new LocalDateTypeAdapter())
             .create();
     }
 
@@ -143,3 +153,62 @@ class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
         }
     }
 }
+
+/**
+ * Gson TypeAdapter for Joda DateTime type
+ */
+class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
+
+    @Override
+    public void write(JsonWriter out, DateTime date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public DateTime read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseDateTime(date);
+        }
+    }
+}
+
+/**
+ * Gson TypeAdapter for Joda LocalDate type
+ */
+class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.date();
+
+    @Override
+    public void write(JsonWriter out, LocalDate date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public LocalDate read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseLocalDate(date);
+        }
+    }
+}
+            
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 4e7b0d1c395f..d05d7746e89b 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
@@ -98,5 +98,6 @@ dependencies {
     compile 'com.squareup.okhttp:okhttp:2.7.5'
     compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
     compile 'com.google.code.gson:gson:2.6.2'
+    compile 'joda-time:joda-time:2.9.3'
     testCompile 'junit:junit:4.12'
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
index 4673864fdd64..1352db979883 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
@@ -13,6 +13,7 @@ lazy val root = (project in file(".")).
       "com.squareup.okhttp" % "okhttp" % "2.7.5",
       "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
       "com.google.code.gson" % "gson" % "2.6.2",
+      "joda-time" % "joda-time" % "2.9.3" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
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 d3080ee51ae1..b1ec0b624614 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
@@ -128,6 +128,11 @@
       <artifactId>gson</artifactId>
       <version>${gson-version}</version>
     </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime-version}</version>
+  </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -141,6 +146,7 @@
     <swagger-core-version>1.5.9</swagger-core-version>
     <okhttp-version>2.7.5</okhttp-version>
     <gson-version>2.6.2</gson-version>
+    <jodatime-version>2.9.3</jodatime-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
index 57812871f64a..d7c6b63ea756 100644
--- a/samples/client/petstore/java/okhttp-gson/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -98,5 +98,6 @@ dependencies {
     compile 'com.squareup.okhttp:okhttp:2.7.5'
     compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
     compile 'com.google.code.gson:gson:2.6.2'
+    compile 'joda-time:joda-time:2.9.3'
     testCompile 'junit:junit:4.12'
 }
diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt
index bbfd5c01bab8..01a1095f8a40 100644
--- a/samples/client/petstore/java/okhttp-gson/build.sbt
+++ b/samples/client/petstore/java/okhttp-gson/build.sbt
@@ -13,6 +13,7 @@ lazy val root = (project in file(".")).
       "com.squareup.okhttp" % "okhttp" % "2.7.5",
       "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
       "com.google.code.gson" % "gson" % "2.6.2",
+      "joda-time" % "joda-time" % "2.9.3" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
index 8e15d4d1f690..0c1f55a0902e 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
@@ -32,8 +32,8 @@ Integer int32 = 56; // Integer | None
 Long int64 = 789L; // Long | None
 Float _float = 3.4F; // Float | None
 byte[] binary = B; // byte[] | None
-Date date = new Date(); // Date | None
-Date dateTime = new Date(); // Date | None
+LocalDate date = new LocalDate(); // LocalDate | None
+DateTime dateTime = new DateTime(); // DateTime | None
 String password = "password_example"; // String | None
 try {
     apiInstance.testEndpointParameters(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
@@ -56,8 +56,8 @@ Name | Type | Description  | Notes
  **int64** | **Long**| None | [optional]
  **_float** | **Float**| None | [optional]
  **binary** | **byte[]**| None | [optional]
- **date** | **Date**| None | [optional]
- **dateTime** | **Date**| None | [optional]
+ **date** | **LocalDate**| None | [optional]
+ **dateTime** | **DateTime**| None | [optional]
  **password** | **String**| None | [optional]
 
 ### Return type
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md b/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md
index dc2b559dad28..44de7d9511a0 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md
@@ -13,8 +13,8 @@ Name | Type | Description | Notes
 **string** | **String** |  |  [optional]
 **_byte** | **byte[]** |  | 
 **binary** | **byte[]** |  |  [optional]
-**date** | [**Date**](Date.md) |  | 
-**dateTime** | [**Date**](Date.md) |  |  [optional]
+**date** | [**LocalDate**](LocalDate.md) |  | 
+**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **uuid** | **String** |  |  [optional]
 **password** | **String** |  | 
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 00cc10ca9b3d..e3487bcc5019 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **uuid** | **String** |  |  [optional]
-**dateTime** | [**Date**](Date.md) |  |  [optional]
+**dateTime** | [**DateTime**](DateTime.md) |  |  [optional]
 **map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
 
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Order.md b/samples/client/petstore/java/okhttp-gson/docs/Order.md
index 29ca3ddbc6b2..a1089f5384eb 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Order.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Order.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **id** | **Long** |  |  [optional]
 **petId** | **Long** |  |  [optional]
 **quantity** | **Integer** |  |  [optional]
-**shipDate** | [**Date**](Date.md) |  |  [optional]
+**shipDate** | [**DateTime**](DateTime.md) |  |  [optional]
 **status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
 **complete** | **Boolean** |  |  [optional]
 
diff --git a/samples/client/petstore/java/okhttp-gson/gradlew b/samples/client/petstore/java/okhttp-gson/gradlew
old mode 100755
new mode 100644
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index 0b84de7935ee..a534184d8240 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -105,53 +105,6 @@
           <target>1.7</target>
         </configuration>
       </plugin>
-      <!-- For testing build.gradle, build.sbt, mvn javadoc:javadoc -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <id>gradle-test</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>gradle</executable>
-              <arguments>
-                <argument>check</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>sbt-test</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>sbt</executable>
-              <arguments>
-                <argument>publishLocal</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>mvn-javadoc-test</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>mvn</executable>
-              <arguments>
-                <argument>javadoc:javadoc</argument>
-              </arguments>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -175,6 +128,11 @@
       <artifactId>gson</artifactId>
       <version>${gson-version}</version>
     </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime-version}</version>
+  </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -188,6 +146,7 @@
     <swagger-core-version>1.5.9</swagger-core-version>
     <okhttp-version>2.7.5</okhttp-version>
     <gson-version>2.6.2</gson-version>
+    <jodatime-version>2.9.3</jodatime-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
index 34af59510c2c..374a185a5995 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java
@@ -173,8 +173,8 @@ public class ApiClient {
 
         // Setup authentications (key: authentication name, value: authentication).
         authentications = new HashMap<String, Authentication>();
-        authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
         authentications.put("petstore_auth", new OAuth());
+        authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
         // Prevent the authentications from being modified.
         authentications = Collections.unmodifiableMap(authentications);
     }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
index 0a3232fd91c5..7e404e47a266 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
@@ -35,12 +35,20 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 
+import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.Type;
 import java.util.Date;
 
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+
 public class JSON {
     private ApiClient apiClient;
     private Gson gson;
@@ -54,6 +62,8 @@ public class JSON {
         this.apiClient = apiClient;
         gson = new GsonBuilder()
             .registerTypeAdapter(Date.class, new DateAdapter(apiClient))
+            .registerTypeAdapter(DateTime.class, new DateTimeTypeAdapter())
+            .registerTypeAdapter(LocalDate.class, new LocalDateTypeAdapter())
             .create();
     }
 
@@ -166,3 +176,62 @@ class DateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
         }
     }
 }
+
+/**
+ * Gson TypeAdapter for Joda DateTime type
+ */
+class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
+
+    @Override
+    public void write(JsonWriter out, DateTime date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public DateTime read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseDateTime(date);
+        }
+    }
+}
+
+/**
+ * Gson TypeAdapter for Joda LocalDate type
+ */
+class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.date();
+
+    @Override
+    public void write(JsonWriter out, LocalDate date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public LocalDate read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseLocalDate(date);
+        }
+    }
+}
+            
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
index 2784add9c9c6..e502060d682e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
@@ -38,8 +38,9 @@ import com.google.gson.reflect.TypeToken;
 
 import java.io.IOException;
 
-import java.util.Date;
+import org.joda.time.LocalDate;
 import java.math.BigDecimal;
+import org.joda.time.DateTime;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -67,7 +68,7 @@ public class FakeApi {
     }
 
     /* Build call for testEndpointParameters */
-    private com.squareup.okhttp.Call testEndpointParametersCall(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call testEndpointParametersCall(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, LocalDate date, DateTime dateTime, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'number' is set
@@ -169,7 +170,7 @@ public class FakeApi {
      * @param password None (optional)
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public void testEndpointParameters(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password) throws ApiException {
+    public void testEndpointParameters(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, LocalDate date, DateTime dateTime, String password) throws ApiException {
         testEndpointParametersWithHttpInfo(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
     }
 
@@ -191,7 +192,7 @@ public class FakeApi {
      * @return ApiResponse&lt;Void&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password) throws ApiException {
+    public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, LocalDate date, DateTime dateTime, String password) throws ApiException {
         com.squareup.okhttp.Call call = testEndpointParametersCall(number, _double, string, _byte, integer, int32, int64, _float, binary, date, dateTime, password, null, null);
         return apiClient.execute(call);
     }
@@ -215,7 +216,7 @@ public class FakeApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call testEndpointParametersAsync(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, Date date, Date dateTime, String password, final ApiCallback<Void> callback) throws ApiException {
+    public com.squareup.okhttp.Call testEndpointParametersAsync(BigDecimal number, Double _double, String string, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, byte[] binary, LocalDate date, DateTime dateTime, String password, final ApiCallback<Void> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
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 765754a3b09c..d453504215c1 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
@@ -39,8 +39,8 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 import io.swagger.client.model.Pet;
-import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
+import java.io.File;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
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
index 11516b0c5548..66c4203c94eb 100644
--- 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
@@ -29,7 +29,8 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -57,9 +58,9 @@ public class FormatTest   {
     @SerializedName("binary")
     private byte[] binary = null;
     @SerializedName("date")
-    private Date date = null;
+    private LocalDate date = null;
     @SerializedName("dateTime")
-    private Date dateTime = null;
+    private DateTime dateTime = null;
     @SerializedName("uuid")
     private String uuid = null;
     @SerializedName("password")
@@ -242,7 +243,7 @@ public class FormatTest   {
      * @return date
      **/
     @ApiModelProperty(required = true, value = "")
-    public Date getDate() {
+    public LocalDate getDate() {
         return date;
     }
 
@@ -251,7 +252,7 @@ public class FormatTest   {
      *
      * @param date date
      */
-    public void setDate(Date date) {
+    public void setDate(LocalDate date) {
         this.date = date;
     }
 
@@ -260,7 +261,7 @@ public class FormatTest   {
      * @return dateTime
      **/
     @ApiModelProperty(value = "")
-    public Date getDateTime() {
+    public DateTime getDateTime() {
         return dateTime;
     }
 
@@ -269,7 +270,7 @@ public class FormatTest   {
      *
      * @param dateTime dateTime
      */
-    public void setDateTime(Date dateTime) {
+    public void setDateTime(DateTime dateTime) {
         this.dateTime = dateTime;
     }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 470e8b94665b..3c88142fc0a8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -29,10 +29,10 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.joda.time.DateTime;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -44,7 +44,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
     @SerializedName("uuid")
     private String uuid = null;
     @SerializedName("dateTime")
-    private Date dateTime = null;
+    private DateTime dateTime = null;
     @SerializedName("map")
     private Map<String, Animal> map = new HashMap<String, Animal>();
 
@@ -71,7 +71,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
      * @return dateTime
      **/
     @ApiModelProperty(value = "")
-    public Date getDateTime() {
+    public DateTime getDateTime() {
         return dateTime;
     }
 
@@ -80,7 +80,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
      *
      * @param dateTime dateTime
      */
-    public void setDateTime(Date dateTime) {
+    public void setDateTime(DateTime dateTime) {
         this.dateTime = dateTime;
     }
 
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 89f901ff678a..681715f12ed6 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
@@ -28,7 +28,7 @@ package io.swagger.client.model;
 import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import org.joda.time.DateTime;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -44,7 +44,7 @@ public class Order   {
     @SerializedName("quantity")
     private Integer quantity = null;
     @SerializedName("shipDate")
-    private Date shipDate = null;
+    private DateTime shipDate = null;
   /**
    * Order Status
    */
@@ -134,7 +134,7 @@ public class Order   {
      * @return shipDate
      **/
     @ApiModelProperty(value = "")
-    public Date getShipDate() {
+    public DateTime getShipDate() {
         return shipDate;
     }
 
@@ -143,7 +143,7 @@ public class Order   {
      *
      * @param shipDate shipDate
      */
-    public void setShipDate(Date shipDate) {
+    public void setShipDate(DateTime shipDate) {
         this.shipDate = shipDate;
     }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/JSONTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/JSONTest.java
index fdc2e4c7d4a1..8dab64b289e2 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/JSONTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/JSONTest.java
@@ -6,10 +6,10 @@ import io.swagger.client.model.Order;
 
 import java.lang.Exception;
 import java.lang.reflect.Type;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
+import org.joda.time.DateTimeZone;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 import org.junit.*;
 import static org.junit.Assert.*;
 
@@ -27,29 +27,25 @@ public class JSONTest {
 
     @Test
     public void testDefaultDate() throws Exception {
-        final DateFormat datetimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
-        datetimeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        final DateTimeFormatter datetimeFormat = ISODateTimeFormat.dateTime().withZone(DateTimeZone.UTC);
         final String dateStr = "2015-11-07T14:11:05.267Z";
-        order.setShipDate(datetimeFormat.parse(dateStr));
+        order.setShipDate(datetimeFormat.parseDateTime(dateStr));
 
         String str = json.serialize(order);
         Type type = new TypeToken<Order>() { }.getType();
         Order o = json.deserialize(str, type);
-        assertEquals(dateStr, datetimeFormat.format(o.getShipDate()));
+        assertEquals(dateStr, datetimeFormat.print(o.getShipDate()));
     }
 
     @Test
     public void testCustomDate() throws Exception {
-        final DateFormat datetimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
-        datetimeFormat.setTimeZone(TimeZone.getTimeZone("GMT-2"));
+        final DateTimeFormatter datetimeFormat = ISODateTimeFormat.dateTimeNoMillis().withZone(DateTimeZone.forID("Etc/GMT+2"));
         final String dateStr = "2015-11-07T14:11:05-02:00";
-        order.setShipDate(datetimeFormat.parse(dateStr));
+        order.setShipDate(datetimeFormat.parseDateTime(dateStr));
 
-        apiClient.setDatetimeFormat(datetimeFormat);
-        apiClient.setLenientDatetimeFormat(false);
         String str = json.serialize(order);
         Type type = new TypeToken<Order>() { }.getType();
         Order o = json.deserialize(str, type);
-        assertEquals(dateStr, datetimeFormat.format(o.getShipDate()));
+        assertEquals(dateStr, datetimeFormat.print(o.getShipDate()));
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/PetApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/PetApiTest.java
index c25e0d8bfa2f..8bfb76050930 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/PetApiTest.java
@@ -1,155 +1,395 @@
 package io.swagger.client.api;
 
-import io.swagger.client.ApiException;
-import io.swagger.client.model.Pet;
-import io.swagger.client.model.ModelApiResponse;
-import java.io.File;
-import org.junit.Test;
+import io.swagger.TestUtils;
 
+import io.swagger.client.*;
+import io.swagger.client.auth.*;
+import io.swagger.client.model.*;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-/**
- * API tests for PetApi
- */
+import org.junit.*;
+import static org.junit.Assert.*;
+
 public class PetApiTest {
+    PetApi api = null;
 
-    private final PetApi api = new PetApi();
-
-    
-    /**
-     * Add a new pet to the store
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void addPetTest() throws ApiException {
-        Pet body = null;
-        // api.addPet(body);
-
-        // TODO: test validations
+    @Before
+    public void setup() {
+        api = new PetApi();
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
     }
-    
-    /**
-     * Deletes a pet
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void deletePetTest() throws ApiException {
-        Long petId = null;
-        String apiKey = null;
-        // api.deletePet(petId, apiKey);
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Finds Pets by status
-     *
-     * Multiple status values can be provided with comma separated strings
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
     @Test
-    public void findPetsByStatusTest() throws ApiException {
-        List<String> status = null;
-        // List<Pet> response = api.findPetsByStatus(status);
+    public void testApiClient() {
+        // the default api client is used
+        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
+        assertNotNull(api.getApiClient());
+        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
 
-        // TODO: test validations
+        ApiClient oldClient = api.getApiClient();
+
+        ApiClient newClient = new ApiClient();
+        newClient.setBasePath("http://example.com");
+        newClient.setDebugging(true);
+
+        // set api client via constructor
+        api = new PetApi(newClient);
+        assertNotNull(api.getApiClient());
+        assertEquals("http://example.com", api.getApiClient().getBasePath());
+        assertTrue(api.getApiClient().isDebugging());
+
+        // set api client via setter method
+        api.setApiClient(oldClient);
+        assertNotNull(api.getApiClient());
+        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
     }
-    
-    /**
-     * Finds Pets by tags
-     *
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void findPetsByTagsTest() throws ApiException {
-        List<String> tags = null;
-        // List<Pet> response = api.findPetsByTags(tags);
+    public void testCreateAndGetPet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
 
-        // TODO: test validations
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * Find pet by ID
-     *
-     * Returns a single pet
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
+    /*
     @Test
-    public void getPetByIdTest() throws ApiException {
-        Long petId = null;
-        // Pet response = api.getPetById(petId);
+    public void testCreateAndGetPetWithByteArray() throws Exception {
+        Pet pet = createRandomPet();
+        byte[] bytes = serializeJson(pet, api.getApiClient()).getBytes();
+        api.addPetUsingByteArray(bytes);
 
-        // TODO: test validations
+        byte[] fetchedBytes = api.petPetIdtestingByteArraytrueGet(pet.getId());
+        Type type = new TypeToken<Pet>(){}.getType();
+        Pet fetched = deserializeJson(new String(fetchedBytes), type, api.getApiClient());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * Update an existing pet
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+    */
+
     @Test
-    public void updatePetTest() throws ApiException {
-        Pet body = null;
-        // api.updatePet(body);
+    public void testCreateAndGetPetWithHttpInfo() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPetWithHttpInfo(pet);
 
-        // TODO: test validations
+        ApiResponse<Pet> resp = api.getPetByIdWithHttpInfo(pet.getId());
+        assertEquals(200, resp.getStatusCode());
+        assertEquals("application/json", resp.getHeaders().get("Content-Type").get(0));
+        Pet fetched = resp.getData();
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * Updates a pet in the store with form data
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void updatePetWithFormTest() throws ApiException {
-        Long petId = null;
-        String name = null;
-        String status = null;
-        // api.updatePetWithForm(petId, name, status);
+    public void testCreateAndGetPetAsync() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+        // to store returned Pet or error message/exception
+        final Map<String, Object> result = new HashMap<String, Object>();
 
-        // TODO: test validations
+        api.getPetByIdAsync(pet.getId(), new ApiCallback<Pet>() {
+            @Override
+            public void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
+                result.put("error", e.getMessage());
+            }
+
+            @Override
+            public void onSuccess(Pet pet, int statusCode, Map<String, List<String>> responseHeaders) {
+                result.put("pet", pet);
+            }
+
+            @Override
+            public void onUploadProgress(long bytesWritten, long contentLength, boolean done) {
+                //empty
+            }
+
+            @Override
+            public void onDownloadProgress(long bytesRead, long contentLength, boolean done) {
+                //empty
+            }
+        });
+        // the API call should be executed asynchronously, so result should be empty at the moment
+        assertTrue(result.isEmpty());
+
+        // wait for the asynchronous call to finish (at most 10 seconds)
+        final int maxTry = 10;
+        int tryCount = 1;
+        Pet fetched = null;
+        do {
+            if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
+            Thread.sleep(1000);
+            tryCount += 1;
+            if (result.get("error") != null) fail((String) result.get("error"));
+            if (result.get("pet") != null) {
+                fetched = (Pet) result.get("pet");
+                break;
+            }
+        } while (result.isEmpty());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+
+        // test getting a nonexistent pet
+        result.clear();
+        api.getPetByIdAsync(new Long(-10000), new ApiCallback<Pet>() {
+            @Override
+            public void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
+                result.put("exception", e);
+            }
+
+            @Override
+            public void onSuccess(Pet pet, int statusCode, Map<String, List<String>> responseHeaders) {
+                result.put("pet", pet);
+            }
+
+            @Override
+            public void onUploadProgress(long bytesWritten, long contentLength, boolean done) {
+                //empty
+            }
+
+            @Override
+            public void onDownloadProgress(long bytesRead, long contentLength, boolean done) {
+                //empty
+            }
+        });
+        // the API call should be executed asynchronously, so result should be empty at the moment
+        assertTrue(result.isEmpty());
+
+        // wait for the asynchronous call to finish (at most 10 seconds)
+        tryCount = 1;
+        ApiException exception = null;
+        do {
+            if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
+            Thread.sleep(1000);
+            tryCount += 1;
+            if (result.get("pet") != null) fail("expected an error");
+            if (result.get("exception") != null) {
+                exception = (ApiException) result.get("exception");
+                break;
+            }
+        } while (result.isEmpty());
+        assertNotNull(exception);
+        assertEquals(404, exception.getCode());
+        assertEquals("Not Found", exception.getMessage());
+        assertEquals("application/json", exception.getResponseHeaders().get("Content-Type").get(0));
     }
-    
-    /**
-     * uploads an image
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
+    /*
     @Test
-    public void uploadFileTest() throws ApiException {
-        Long petId = null;
-        String additionalMetadata = null;
-        File file = null;
-        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
+    public void testGetPetByIdInObject() throws Exception {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("pet " + pet.getId());
 
-        // TODO: test validations
+        Category category = new Category();
+        category.setId(TestUtils.nextId());
+        category.setName("category " + category.getId());
+        pet.setCategory(category);
+
+        pet.setStatus(Pet.StatusEnum.PENDING);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1"});
+        pet.setPhotoUrls(photos);
+
+        api.addPet(pet);
+
+        InlineResponse200 fetched = api.getPetByIdInObject(pet.getId());
+        assertEquals(pet.getId(), fetched.getId());
+        assertEquals(pet.getName(), fetched.getName());
+
+        Object categoryObj = fetched.getCategory();
+        assertNotNull(categoryObj);
+        assertTrue(categoryObj instanceof Map);
+
+        Map categoryMap = (Map) categoryObj;
+        Object categoryIdObj = categoryMap.get("id");
+        // NOTE: Gson parses integer value to double.
+        assertTrue(categoryIdObj instanceof Double);
+        Long categoryIdLong = ((Double) categoryIdObj).longValue();
+        assertEquals(category.getId(), categoryIdLong);
+        assertEquals(category.getName(), categoryMap.get("name"));
+    }
+    */
+
+    @Test
+    public void testUpdatePet() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
+
+        api.updatePet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+    }
+
+    @Test
+    public void testFindPetsByStatus() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.PENDING);
+
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"pending"}));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+
+        assertTrue(found);
+
+        api.deletePet(pet.getId(), null);
+    }
+
+    @Test
+    public void testFindPetsByTags() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("monster");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+
+        List<Tag> tags = new ArrayList<Tag>();
+        Tag tag1 = new Tag();
+        tag1.setName("friendly");
+        tags.add(tag1);
+        pet.setTags(tags);
+
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+        assertTrue(found);
+
+        api.deletePet(pet.getId(), null);
+    }
+
+    @Test
+    public void testUpdatePetWithForm() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("frank");
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+
+        api.updatePetWithForm(fetched.getId(), "furt", null);
+        Pet updated = api.getPetById(fetched.getId());
+
+        assertEquals(updated.getName(), "furt");
+    }
+
+    @Test
+    public void testDeletePet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        api.deletePet(fetched.getId(), null);
+
+        try {
+            fetched = api.getPetById(fetched.getId());
+            fail("expected an error");
+        } catch (ApiException e) {
+            assertEquals(404, e.getCode());
+        }
+    }
+
+    @Test
+    public void testUploadFile() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
+
+        File file = new File("hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+        writer.write("Hello world!");
+        writer.close();
+
+        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        Pet pet1 = new Pet();
+        Pet pet2 = new Pet();
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+
+        pet2.setName("really-happy");
+        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertFalse(pet1.equals(pet2));
+        assertFalse(pet2.equals(pet1));
+        assertFalse(pet1.hashCode() == (pet2.hashCode()));
+        assertTrue(pet2.equals(pet2));
+        assertTrue(pet2.hashCode() == pet2.hashCode());
+
+        pet1.setName("really-happy");
+        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+    }
+
+    private Pet createRandomPet() {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("gorilla");
+
+        Category category = new Category();
+        category.setName("really-happy");
+
+        pet.setCategory(category);
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+        pet.setPhotoUrls(photos);
+
+        return pet;
+    }
+
+    private String serializeJson(Object o, ApiClient apiClient) {
+        return apiClient.getJSON().serialize(o);
+    }
+
+    private <T> T deserializeJson(String json, Type type, ApiClient apiClient) {
+        return (T) apiClient.getJSON().deserialize(json, type);
     }
-    
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/StoreApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/StoreApiTest.java
index 31abbbeae4ea..491001cfce32 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/StoreApiTest.java
@@ -1,83 +1,105 @@
 package io.swagger.client.api;
 
+import io.swagger.TestUtils;
 import io.swagger.client.ApiException;
-import io.swagger.client.model.Order;
-import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import io.swagger.client.auth.*;
+import io.swagger.client.model.*;
+
+import java.lang.reflect.Field;
 import java.util.Map;
+import java.text.SimpleDateFormat;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.junit.*;
+import static org.junit.Assert.*;
 
-/**
- * API tests for StoreApi
- */
 public class StoreApiTest {
+    StoreApi api = null;
 
-    private final StoreApi api = new 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
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void deleteOrderTest() throws ApiException {
-        String orderId = null;
-        // api.deleteOrder(orderId);
-
-        // TODO: test validations
+    @Before
+    public void setup() {
+        api = new StoreApi();
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
+        // set custom date format that is used by the petstore server
+        // Note: it would still work without this setting as okhttp-gson Java client supports
+        // various date formats by default (with lenientDatetimeFormat enabled), including
+        // the one used by petstore server
+        api.getApiClient().setDatetimeFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
+        api.getApiClient().setLenientDatetimeFormat(false);
     }
-    
-    /**
-     * Returns pet inventories by status
-     *
-     * Returns a map of status codes to quantities
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void getInventoryTest() throws ApiException {
-        // Map<String, Integer> response = api.getInventory();
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Find purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
     @Test
-    public void getOrderByIdTest() throws ApiException {
-        Long orderId = null;
-        // Order response = api.getOrderById(orderId);
-
-        // TODO: test validations
+    public void testGetInventory() throws Exception {
+        Map<String, Integer> inventory = api.getInventory();
+        assertTrue(inventory.keySet().size() > 0);
     }
-    
-    /**
-     * Place an order for a pet
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
+    /*
     @Test
-    public void placeOrderTest() throws ApiException {
-        Order body = null;
-        // Order response = api.placeOrder(body);
+    public void testGetInventoryInObject() throws Exception {
+        Object inventoryObj = api.getInventoryInObject();
+        assertTrue(inventoryObj instanceof Map);
 
-        // TODO: test validations
+        Map inventoryMap = (Map) inventoryObj;
+        assertTrue(inventoryMap.keySet().size() > 0);
+
+        Map.Entry firstEntry = (Map.Entry) inventoryMap.entrySet().iterator().next();
+        assertTrue(firstEntry.getKey() instanceof String);
+        // NOTE: Gson parses integer value to double.
+        assertTrue(firstEntry.getValue() instanceof Double);
+    }
+    */
+
+    @Test
+    public void testPlaceOrder() throws Exception {
+        Order order = createOrder();
+        api.placeOrder(order);
+
+        Order fetched = api.getOrderById(order.getId());
+        assertEquals(order.getId(), fetched.getId());
+        assertEquals(order.getPetId(), fetched.getPetId());
+        assertEquals(order.getQuantity(), fetched.getQuantity());
+        assertEquals(order.getShipDate().withZone(DateTimeZone.UTC), fetched.getShipDate().withZone(DateTimeZone.UTC));
+    }
+
+    @Test
+    public void testDeleteOrder() throws Exception {
+        Order order = createOrder();
+        api.placeOrder(order);
+
+        Order fetched = api.getOrderById(order.getId());
+        assertEquals(fetched.getId(), order.getId());
+
+        api.deleteOrder(String.valueOf(order.getId()));
+
+        try {
+            api.getOrderById(order.getId());
+            // fail("expected an error");
+        } catch (ApiException e) {
+            // ok
+        }
+    }
+
+    private Order createOrder() {
+        Order order = new Order();
+        order.setPetId(new Long(200));
+        order.setQuantity(new Integer(13));
+        order.setShipDate(DateTime.now());
+        order.setStatus(Order.StatusEnum.PLACED);
+        order.setComplete(true);
+
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
+        return order;
     }
-    
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/UserApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/UserApiTest.java
index 7e96762ff4eb..b47a146d737e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/UserApiTest.java
@@ -1,149 +1,87 @@
 package io.swagger.client.api;
 
-import io.swagger.client.ApiException;
-import io.swagger.client.model.User;
-import org.junit.Test;
+import io.swagger.TestUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import io.swagger.client.auth.*;
+import io.swagger.client.model.*;
+
+import java.util.Arrays;
+
+import org.junit.*;
+import static org.junit.Assert.*;
 
-/**
- * API tests for UserApi
- */
 public class UserApiTest {
+    UserApi api = null;
 
-    private final UserApi api = new UserApi();
-
-    
-    /**
-     * Create user
-     *
-     * This can only be done by the logged in user.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void createUserTest() throws ApiException {
-        User body = null;
-        // api.createUser(body);
-
-        // TODO: test validations
+    @Before
+    public void setup() {
+        api = new UserApi();
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
     }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void createUsersWithArrayInputTest() throws ApiException {
-        List<User> body = null;
-        // api.createUsersWithArrayInput(body);
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
     @Test
-    public void createUsersWithListInputTest() throws ApiException {
-        List<User> body = null;
-        // api.createUsersWithListInput(body);
+    public void testCreateUser() throws Exception {
+        User user = createUser();
 
-        // TODO: test validations
+        api.createUser(user);
+
+        User fetched = api.getUserByName(user.getUsername());
+        assertEquals(user.getId(), fetched.getId());
     }
-    
-    /**
-     * Delete user
-     *
-     * This can only be done by the logged in user.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void deleteUserTest() throws ApiException {
-        String username = null;
-        // api.deleteUser(username);
+    public void testCreateUsersWithArray() throws Exception {
+        User user1 = createUser();
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
+
+        User fetched = api.getUserByName(user1.getUsername());
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
-    /**
-     * Get user by user name
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void getUserByNameTest() throws ApiException {
-        String username = null;
-        // User response = api.getUserByName(username);
+    public void testCreateUsersWithList() throws Exception {
+        User user1 = createUser();
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
+
+        User fetched = api.getUserByName(user1.getUsername());
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
-    /**
-     * Logs user into the system
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void loginUserTest() throws ApiException {
-        String username = null;
-        String password = null;
-        // String response = api.loginUser(username, password);
+    public void testLoginUser() throws Exception {
+        User user = createUser();
+        api.createUser(user);
 
-        // TODO: test validations
+        String token = api.loginUser(user.getUsername(), user.getPassword());
+        assertTrue(token.startsWith("logged in user session:"));
     }
-    
-    /**
-     * Logs out current logged in user session
-     *
-     * 
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
+
     @Test
-    public void logoutUserTest() throws ApiException {
-        // api.logoutUser();
-
-        // TODO: test validations
+    public void logoutUser() throws Exception {
+        api.logoutUser();
     }
-    
-    /**
-     * Updated user
-     *
-     * This can only be done by the logged in user.
-     *
-     * @throws ApiException
-     *          if the Api call fails
-     */
-    @Test
-    public void updateUserTest() throws ApiException {
-        String username = null;
-        User body = null;
-        // api.updateUser(username, body);
 
-        // TODO: test validations
+    private User createUser() {
+        User user = new User();
+        user.setId(TestUtils.nextId());
+        user.setUsername("fred" + user.getId());
+        user.setFirstName("Fred");
+        user.setLastName("Meyer");
+        user.setEmail("fred@fredmeyer.com");
+        user.setPassword("xxXXxx");
+        user.setPhone("408-867-5309");
+        user.setUserStatus(123);
+
+        return user;
     }
-    
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java
deleted file mode 100644
index e378356d0d4d..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package io.swagger.petstore.test;
-
-import com.google.gson.reflect.TypeToken;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.*;
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class PetApiTest {
-    PetApi api = null;
-
-    @Before
-    public void setup() {
-        api = new PetApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-    }
-
-    @Test
-    public void testApiClient() {
-        // the default api client is used
-        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
-        assertNotNull(api.getApiClient());
-        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-
-        ApiClient oldClient = api.getApiClient();
-
-        ApiClient newClient = new ApiClient();
-        newClient.setBasePath("http://example.com");
-        newClient.setDebugging(true);
-
-        // set api client via constructor
-        api = new PetApi(newClient);
-        assertNotNull(api.getApiClient());
-        assertEquals("http://example.com", api.getApiClient().getBasePath());
-        assertTrue(api.getApiClient().isDebugging());
-
-        // set api client via setter method
-        api.setApiClient(oldClient);
-        assertNotNull(api.getApiClient());
-        assertEquals("http://petstore.swagger.io/v2", api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-    }
-
-    @Test
-    public void testCreateAndGetPet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    /*
-    @Test
-    public void testCreateAndGetPetWithByteArray() throws Exception {
-        Pet pet = createRandomPet();
-        byte[] bytes = serializeJson(pet, api.getApiClient()).getBytes();
-        api.addPetUsingByteArray(bytes);
-
-        byte[] fetchedBytes = api.petPetIdtestingByteArraytrueGet(pet.getId());
-        Type type = new TypeToken<Pet>(){}.getType();
-        Pet fetched = deserializeJson(new String(fetchedBytes), type, api.getApiClient());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-    */
-
-    @Test
-    public void testCreateAndGetPetWithHttpInfo() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPetWithHttpInfo(pet);
-
-        ApiResponse<Pet> resp = api.getPetByIdWithHttpInfo(pet.getId());
-        assertEquals(200, resp.getStatusCode());
-        assertEquals("application/json", resp.getHeaders().get("Content-Type").get(0));
-        Pet fetched = resp.getData();
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testCreateAndGetPetAsync() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-        // to store returned Pet or error message/exception
-        final Map<String, Object> result = new HashMap<String, Object>();
-
-        api.getPetByIdAsync(pet.getId(), new ApiCallback<Pet>() {
-            @Override
-            public void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
-                result.put("error", e.getMessage());
-            }
-
-            @Override
-            public void onSuccess(Pet pet, int statusCode, Map<String, List<String>> responseHeaders) {
-                result.put("pet", pet);
-            }
-
-            @Override
-            public void onUploadProgress(long bytesWritten, long contentLength, boolean done) {
-                //empty
-            }
-
-            @Override
-            public void onDownloadProgress(long bytesRead, long contentLength, boolean done) {
-                //empty
-            }
-        });
-        // the API call should be executed asynchronously, so result should be empty at the moment
-        assertTrue(result.isEmpty());
-
-        // wait for the asynchronous call to finish (at most 10 seconds)
-        final int maxTry = 10;
-        int tryCount = 1;
-        Pet fetched = null;
-        do {
-            if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
-            Thread.sleep(1000);
-            tryCount += 1;
-            if (result.get("error") != null) fail((String) result.get("error"));
-            if (result.get("pet") != null) {
-                fetched = (Pet) result.get("pet");
-                break;
-            }
-        } while (result.isEmpty());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-
-        // test getting a nonexistent pet
-        result.clear();
-        api.getPetByIdAsync(new Long(-10000), new ApiCallback<Pet>() {
-            @Override
-            public void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
-                result.put("exception", e);
-            }
-
-            @Override
-            public void onSuccess(Pet pet, int statusCode, Map<String, List<String>> responseHeaders) {
-                result.put("pet", pet);
-            }
-
-            @Override
-            public void onUploadProgress(long bytesWritten, long contentLength, boolean done) {
-                //empty
-            }
-
-            @Override
-            public void onDownloadProgress(long bytesRead, long contentLength, boolean done) {
-                //empty
-            }
-        });
-        // the API call should be executed asynchronously, so result should be empty at the moment
-        assertTrue(result.isEmpty());
-
-        // wait for the asynchronous call to finish (at most 10 seconds)
-        tryCount = 1;
-        ApiException exception = null;
-        do {
-            if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
-            Thread.sleep(1000);
-            tryCount += 1;
-            if (result.get("pet") != null) fail("expected an error");
-            if (result.get("exception") != null) {
-                exception = (ApiException) result.get("exception");
-                break;
-            }
-        } while (result.isEmpty());
-        assertNotNull(exception);
-        assertEquals(404, exception.getCode());
-        assertEquals("Not Found", exception.getMessage());
-        assertEquals("application/json", exception.getResponseHeaders().get("Content-Type").get(0));
-    }
-
-    /*
-    @Test
-    public void testGetPetByIdInObject() throws Exception {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("pet " + pet.getId());
-
-        Category category = new Category();
-        category.setId(TestUtils.nextId());
-        category.setName("category " + category.getId());
-        pet.setCategory(category);
-
-        pet.setStatus(Pet.StatusEnum.PENDING);
-        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1"});
-        pet.setPhotoUrls(photos);
-
-        api.addPet(pet);
-
-        InlineResponse200 fetched = api.getPetByIdInObject(pet.getId());
-        assertEquals(pet.getId(), fetched.getId());
-        assertEquals(pet.getName(), fetched.getName());
-
-        Object categoryObj = fetched.getCategory();
-        assertNotNull(categoryObj);
-        assertTrue(categoryObj instanceof Map);
-
-        Map categoryMap = (Map) categoryObj;
-        Object categoryIdObj = categoryMap.get("id");
-        // NOTE: Gson parses integer value to double.
-        assertTrue(categoryIdObj instanceof Double);
-        Long categoryIdLong = ((Double) categoryIdObj).longValue();
-        assertEquals(category.getId(), categoryIdLong);
-        assertEquals(category.getName(), categoryMap.get("name"));
-    }
-    */
-
-    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-
-        api.updatePet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testFindPetsByStatus() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.PENDING);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"pending"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<Tag> tags = new ArrayList<Tag>();
-        Tag tag1 = new Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("frank");
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-
-        api.updatePetWithForm(fetched.getId(), "furt", null);
-        Pet updated = api.getPetById(fetched.getId());
-
-        assertEquals(updated.getName(), "furt");
-    }
-
-    @Test
-    public void testDeletePet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(fetched.getId(), null);
-
-        try {
-            fetched = api.getPetById(fetched.getId());
-            fail("expected an error");
-        } catch (ApiException e) {
-            assertEquals(404, e.getCode());
-        }
-    }
-
-    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        File file = new File("hello.txt");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-        writer.write("Hello world!");
-        writer.close();
-
-        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-
-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-    }
-
-    private Pet createRandomPet() {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("gorilla");
-
-        Category category = new Category();
-        category.setName("really-happy");
-
-        pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
-        pet.setPhotoUrls(photos);
-
-        return pet;
-    }
-
-    private String serializeJson(Object o, ApiClient apiClient) {
-        return apiClient.getJSON().serialize(o);
-    }
-
-    private <T> T deserializeJson(String json, Type type, ApiClient apiClient) {
-        return (T) apiClient.getJSON().deserialize(json, type);
-    }
-}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
deleted file mode 100644
index 0d1910dc1e74..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.TestUtils;
-import io.swagger.client.ApiException;
-
-import io.swagger.client.*;
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-import java.text.SimpleDateFormat;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class StoreApiTest {
-    StoreApi api = null;
-
-    @Before
-    public void setup() {
-        api = new StoreApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-        // set custom date format that is used by the petstore server
-        // Note: it would still work without this setting as okhttp-gson Java client supports
-        // various date formats by default (with lenientDatetimeFormat enabled), including
-        // the one used by petstore server
-        api.getApiClient().setDatetimeFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
-        api.getApiClient().setLenientDatetimeFormat(false);
-    }
-
-    @Test
-    public void testGetInventory() throws Exception {
-        Map<String, Integer> inventory = api.getInventory();
-        assertTrue(inventory.keySet().size() > 0);
-    }
-
-    /*
-    @Test
-    public void testGetInventoryInObject() throws Exception {
-        Object inventoryObj = api.getInventoryInObject();
-        assertTrue(inventoryObj instanceof Map);
-
-        Map inventoryMap = (Map) inventoryObj;
-        assertTrue(inventoryMap.keySet().size() > 0);
-
-        Map.Entry firstEntry = (Map.Entry) inventoryMap.entrySet().iterator().next();
-        assertTrue(firstEntry.getKey() instanceof String);
-        // NOTE: Gson parses integer value to double.
-        assertTrue(firstEntry.getValue() instanceof Double);
-    }
-    */
-
-    @Test
-    public void testPlaceOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(order.getId(), fetched.getId());
-        assertEquals(order.getPetId(), fetched.getPetId());
-        assertEquals(order.getQuantity(), fetched.getQuantity());
-    }
-
-    @Test
-    public void testDeleteOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(fetched.getId(), order.getId());
-
-        api.deleteOrder(String.valueOf(order.getId()));
-
-        try {
-            api.getOrderById(order.getId());
-            // fail("expected an error");
-        } catch (ApiException e) {
-            // ok
-        }
-    }
-
-    private Order createOrder() {
-        Order order = new Order();
-        order.setPetId(new Long(200));
-        order.setQuantity(new Integer(13));
-        order.setShipDate(new java.util.Date());
-        order.setStatus(Order.StatusEnum.PLACED);
-        order.setComplete(true);
-
-        try {
-          Field idField = Order.class.getDeclaredField("id");
-          idField.setAccessible(true);
-          idField.set(order, TestUtils.nextId());
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
-
-        return order;
-    }
-}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java
deleted file mode 100644
index 195e5c1e8613..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.api.*;
-import io.swagger.client.auth.*;
-import io.swagger.client.model.*;
-
-import java.util.Arrays;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class UserApiTest {
-    UserApi api = null;
-
-    @Before
-    public void setup() {
-        api = new UserApi();
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-    }
-
-    @Test
-    public void testCreateUser() throws Exception {
-        User user = createUser();
-
-        api.createUser(user);
-
-        User fetched = api.getUserByName(user.getUsername());
-        assertEquals(user.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithArray() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithList() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testLoginUser() throws Exception {
-        User user = createUser();
-        api.createUser(user);
-
-        String token = api.loginUser(user.getUsername(), user.getPassword());
-        assertTrue(token.startsWith("logged in user session:"));
-    }
-
-    @Test
-    public void logoutUser() throws Exception {
-        api.logoutUser();
-    }
-
-    private User createUser() {
-        User user = new User();
-        user.setId(TestUtils.nextId());
-        user.setUsername("fred" + user.getId());
-        user.setFirstName("Fred");
-        user.setLastName("Meyer");
-        user.setEmail("fred@fredmeyer.com");
-        user.setPassword("xxXXxx");
-        user.setPhone("408-867-5309");
-        user.setUserStatus(123);
-
-        return user;
-    }
-}

From 2fe9cd2ba04cfdd5968493b203f5ddbed52c4120 Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Thu, 9 Jun 2016 18:41:44 +0200
Subject: [PATCH 123/139] add joda support to retrofit 1 clients

---
 bin/java-petstore-retrofit.sh                 |   4 +-
 .../libraries/retrofit/ApiClient.mustache     |  67 +++++
 .../libraries/retrofit/build.gradle.mustache  |   2 +
 .../libraries/retrofit/build.sbt.mustache     |   1 +
 .../Java/libraries/retrofit/pom.mustache      |   6 +
 .../petstore/java/retrofit/build.gradle       |   2 +
 .../client/petstore/java/retrofit/build.sbt   |   1 +
 samples/client/petstore/java/retrofit/gradlew |   0
 samples/client/petstore/java/retrofit/pom.xml |   6 +
 .../java/io/swagger/client/ApiClient.java     |  67 +++++
 .../java/io/swagger/client/StringUtil.java    |  27 +-
 .../java/io/swagger/client/api/FakeApi.java   |   7 +-
 .../io/swagger/client/auth/OAuthFlow.java     |  27 +-
 .../io/swagger/client/model/FormatTest.java   |  15 +-
 ...ropertiesAndAdditionalPropertiesClass.java |   8 +-
 .../java/io/swagger/client/model/Order.java   |   8 +-
 .../io/swagger/client/api/PetApiTest.java     | 251 +++++++++++-------
 .../io/swagger/client/api/StoreApiTest.java   | 113 ++++----
 .../io/swagger/client/api/UserApiTest.java    | 156 ++++-------
 .../io/swagger/petstore/test/PetApiTest.java  | 191 -------------
 .../swagger/petstore/test/StoreApiTest.java   |  78 ------
 .../io/swagger/petstore/test/UserApiTest.java |  86 ------
 22 files changed, 492 insertions(+), 631 deletions(-)
 mode change 100755 => 100644 samples/client/petstore/java/retrofit/gradlew
 delete mode 100644 samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
 delete mode 100644 samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java
 delete mode 100644 samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java

diff --git a/bin/java-petstore-retrofit.sh b/bin/java-petstore-retrofit.sh
index db4001e4c9ed..63ded78c5496 100755
--- a/bin/java-petstore-retrofit.sh
+++ b/bin/java-petstore-retrofit.sh
@@ -26,6 +26,8 @@ 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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit.json -o samples/client/petstore/java/retrofit"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit.json -o samples/client/petstore/java/retrofit  -DdateLibrary=joda,hideGenerationTimestamp=true"
 
+rm -rf samples/client/petstore/java/retrofit/src/main
+find samples/client/petstore/java/retrofit -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache
index 183fb5f27cef..c7b86b66b9c8 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/ApiClient.mustache
@@ -9,6 +9,10 @@ import java.util.Map;
 
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 
 import retrofit.RestAdapter;
 import retrofit.client.OkClient;
@@ -22,6 +26,9 @@ import retrofit.mime.TypedOutput;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.squareup.okhttp.Interceptor;
 import com.squareup.okhttp.OkHttpClient;
 
@@ -108,6 +115,8 @@ public class ApiClient {
    public void createDefaultAdapter() {
         Gson gson = new GsonBuilder()
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+                .registerTypeAdapter(DateTime.class, new DateTimeTypeAdapter())
+                .registerTypeAdapter(LocalDate.class, new LocalDateTypeAdapter())
                 .create();
 
         okClient = new OkHttpClient();
@@ -339,3 +348,61 @@ class GsonConverterWrapper implements Converter {
 
     }
 }
+
+/**
+ * Gson TypeAdapter for Joda DateTime type
+ */
+class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
+
+    @Override
+    public void write(JsonWriter out, DateTime date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public DateTime read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseDateTime(date);
+        }
+    }
+}
+
+/**
+ * Gson TypeAdapter for Joda DateTime type
+ */
+class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.date();
+
+    @Override
+    public void write(JsonWriter out, LocalDate date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public LocalDate read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseLocalDate(date);
+        }
+    }
+}
\ No newline at end of file
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 6be9ba586f3e..179bda3b8d86 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
@@ -99,6 +99,7 @@ ext {
     retrofit_version = "1.9.0"
     swagger_annotations_version = "1.5.8"
     junit_version = "4.12"
+    jodatime_version = "2.9.3"
 }
 
 dependencies {
@@ -106,5 +107,6 @@ dependencies {
     compile "com.squareup.retrofit:retrofit:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile "joda-time:joda-time:$jodatime_version"
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
index 174cb829ab68..56f6cee13ab1 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.sbt.mustache
@@ -13,6 +13,7 @@ lazy val root = (project in file(".")).
       "com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "joda-time" % "joda-time" % "2.9.3" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
index 9a917f19caff..c9991c230e50 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
@@ -127,6 +127,11 @@
       <artifactId>okhttp</artifactId>
       <version>${okhttp-version}</version>
     </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime-version}</version>
+  </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -140,6 +145,7 @@
     <swagger-core-version>1.5.8</swagger-core-version>
     <retrofit-version>1.9.0</retrofit-version>
     <okhttp-version>2.7.5</okhttp-version>
+    <jodatime-version>2.9.3</jodatime-version>
     <oltu-version>1.0.1</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/client/petstore/java/retrofit/build.gradle b/samples/client/petstore/java/retrofit/build.gradle
index 079d1240a395..401b362d1726 100644
--- a/samples/client/petstore/java/retrofit/build.gradle
+++ b/samples/client/petstore/java/retrofit/build.gradle
@@ -99,6 +99,7 @@ ext {
     retrofit_version = "1.9.0"
     swagger_annotations_version = "1.5.8"
     junit_version = "4.12"
+    jodatime_version = "2.9.3"
 }
 
 dependencies {
@@ -106,5 +107,6 @@ dependencies {
     compile "com.squareup.retrofit:retrofit:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile "joda-time:joda-time:$jodatime_version"
     testCompile "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/retrofit/build.sbt b/samples/client/petstore/java/retrofit/build.sbt
index bb75af8c3795..629c85c2bf33 100644
--- a/samples/client/petstore/java/retrofit/build.sbt
+++ b/samples/client/petstore/java/retrofit/build.sbt
@@ -13,6 +13,7 @@ lazy val root = (project in file(".")).
       "com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      "joda-time" % "joda-time" % "2.9.3" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/samples/client/petstore/java/retrofit/gradlew b/samples/client/petstore/java/retrofit/gradlew
old mode 100755
new mode 100644
diff --git a/samples/client/petstore/java/retrofit/pom.xml b/samples/client/petstore/java/retrofit/pom.xml
index 2fe5ddc8efc7..ee6ce62988f5 100644
--- a/samples/client/petstore/java/retrofit/pom.xml
+++ b/samples/client/petstore/java/retrofit/pom.xml
@@ -127,6 +127,11 @@
       <artifactId>okhttp</artifactId>
       <version>${okhttp-version}</version>
     </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime-version}</version>
+  </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -140,6 +145,7 @@
     <swagger-core-version>1.5.8</swagger-core-version>
     <retrofit-version>1.9.0</retrofit-version>
     <okhttp-version>2.7.5</okhttp-version>
+    <jodatime-version>2.9.3</jodatime-version>
     <oltu-version>1.0.1</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java
index 6540997c3198..fe5ad9b37feb 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/ApiClient.java
@@ -9,6 +9,10 @@ import java.util.Map;
 
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 
 import retrofit.RestAdapter;
 import retrofit.client.OkClient;
@@ -22,6 +26,9 @@ import retrofit.mime.TypedOutput;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.squareup.okhttp.Interceptor;
 import com.squareup.okhttp.OkHttpClient;
 
@@ -107,6 +114,8 @@ public class ApiClient {
    public void createDefaultAdapter() {
         Gson gson = new GsonBuilder()
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+                .registerTypeAdapter(DateTime.class, new DateTimeTypeAdapter())
+                .registerTypeAdapter(LocalDate.class, new LocalDateTypeAdapter())
                 .create();
 
         okClient = new OkHttpClient();
@@ -338,3 +347,61 @@ class GsonConverterWrapper implements Converter {
 
     }
 }
+
+/**
+ * Gson TypeAdapter for Joda DateTime type
+ */
+class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
+
+    @Override
+    public void write(JsonWriter out, DateTime date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public DateTime read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseDateTime(date);
+        }
+    }
+}
+
+/**
+ * Gson TypeAdapter for Joda DateTime type
+ */
+class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.date();
+
+    @Override
+    public void write(JsonWriter out, LocalDate date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public LocalDate read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseLocalDate(date);
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java
index c6db75c37085..03c6c81e434f 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,31 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-04T20:43:54.025+08:00")
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java
index a77872ee5ba7..02b97c10bf83 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java
@@ -6,8 +6,9 @@ import retrofit.Callback;
 import retrofit.http.*;
 import retrofit.mime.*;
 
+import org.joda.time.LocalDate;
 import java.math.BigDecimal;
-import java.util.Date;
+import org.joda.time.DateTime;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,7 +38,7 @@ public interface FakeApi {
   @FormUrlEncoded
   @POST("/fake")
   Void testEndpointParameters(
-    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("string") String string, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("binary") byte[] binary, @Field("date") Date date, @Field("dateTime") Date dateTime, @Field("password") String password
+    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("string") String string, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password
   );
 
   /**
@@ -62,6 +63,6 @@ public interface FakeApi {
   @FormUrlEncoded
   @POST("/fake")
   void testEndpointParameters(
-    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("string") String string, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("binary") byte[] binary, @Field("date") Date date, @Field("dateTime") Date dateTime, @Field("password") String password, Callback<Void> cb
+    @Field("number") BigDecimal number, @Field("double") Double _double, @Field("string") String string, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password, Callback<Void> cb
   );
 }
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/OAuthFlow.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/OAuthFlow.java
index 597ec99b48b7..ec1f942b0f26 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/OAuthFlow.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/auth/OAuthFlow.java
@@ -1,5 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 public enum OAuthFlow {
     accessCode, implicit, password, application
-}
\ No newline at end of file
+}
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
index 694335531fde..6063cf33f77b 100644
--- 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
@@ -4,7 +4,8 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -42,10 +43,10 @@ public class FormatTest   {
   private byte[] binary = null;
 
   @SerializedName("date")
-  private Date date = null;
+  private LocalDate date = null;
 
   @SerializedName("dateTime")
-  private Date dateTime = null;
+  private DateTime dateTime = null;
 
   @SerializedName("uuid")
   private String uuid = null;
@@ -156,20 +157,20 @@ public class FormatTest   {
   /**
    **/
   @ApiModelProperty(required = true, value = "")
-  public Date getDate() {
+  public LocalDate getDate() {
     return date;
   }
-  public void setDate(Date date) {
+  public void setDate(LocalDate date) {
     this.date = date;
   }
 
   /**
    **/
   @ApiModelProperty(value = "")
-  public Date getDateTime() {
+  public DateTime getDateTime() {
     return dateTime;
   }
-  public void setDateTime(Date dateTime) {
+  public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d4afc9964406..cf7f73c705ff 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -4,10 +4,10 @@ import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.joda.time.DateTime;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -21,7 +21,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   private String uuid = null;
 
   @SerializedName("dateTime")
-  private Date dateTime = null;
+  private DateTime dateTime = null;
 
   @SerializedName("map")
   private Map<String, Animal> map = new HashMap<String, Animal>();
@@ -39,10 +39,10 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   /**
    **/
   @ApiModelProperty(value = "")
-  public Date getDateTime() {
+  public DateTime getDateTime() {
     return dateTime;
   }
-  public void setDateTime(Date dateTime) {
+  public void setDateTime(DateTime dateTime) {
     this.dateTime = dateTime;
   }
 
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 2f774c13834e..569d1c0fe461 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
@@ -3,7 +3,7 @@ package io.swagger.client.model;
 import java.util.Objects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import org.joda.time.DateTime;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -23,7 +23,7 @@ public class Order   {
   private Integer quantity = null;
 
   @SerializedName("shipDate")
-  private Date shipDate = null;
+  private DateTime shipDate = null;
 
 
   /**
@@ -90,10 +90,10 @@ public class Order   {
   /**
    **/
   @ApiModelProperty(value = "")
-  public Date getShipDate() {
+  public DateTime getShipDate() {
     return shipDate;
   }
-  public void setShipDate(Date shipDate) {
+  public void setShipDate(DateTime shipDate) {
     this.shipDate = shipDate;
   }
 
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/PetApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/PetApiTest.java
index 39b4dc05ee05..70f8b5aa13fb 100644
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/PetApiTest.java
@@ -1,137 +1,190 @@
 package io.swagger.client.api;
 
-import io.swagger.client.ApiClient;
-import io.swagger.client.model.Pet;
-import io.swagger.client.model.ModelApiResponse;
+import io.swagger.TestUtils;
+
+import io.swagger.client.*;
+import io.swagger.client.CollectionFormats.*;
+import io.swagger.client.model.*;
+
+import retrofit.RetrofitError;
+import retrofit.mime.TypedFile;
+
+import java.io.BufferedWriter;
 import java.io.File;
-import org.junit.Before;
-import org.junit.Test;
-
+import java.io.FileWriter;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
-/**
- * API tests for PetApi
- */
+import org.junit.*;
+import static org.junit.Assert.*;
+
 public class PetApiTest {
-
-    private PetApi api;
+    PetApi api = null;
 
     @Before
     public void setup() {
         api = new ApiClient().createService(PetApi.class);
     }
 
-    
-    /**
-     * Add a new pet to the store
-     *
-     * 
-     */
     @Test
-    public void addPetTest() {
-        Pet body = null;
-        // Void response = api.addPet(body);
+    public void testCreateAndGetPet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
 
-        // TODO: test validations
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * Deletes a pet
-     *
-     * 
-     */
+
     @Test
-    public void deletePetTest() {
-        Long petId = null;
-        String apiKey = null;
-        // Void response = api.deletePet(petId, apiKey);
+    public void testUpdatePet() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
 
-        // TODO: test validations
+        api.updatePet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
-    /**
-     * Finds Pets by status
-     *
-     * Multiple status values can be provided with comma separated strings
-     */
+
     @Test
-    public void findPetsByStatusTest() {
-        List<String> status = null;
-        // List<Pet> response = api.findPetsByStatus(status);
+    public void testFindPetsByStatus() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
 
-        // TODO: test validations
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByStatus(new CSVParams("available"));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+
+        assertTrue(found);
     }
-    
-    /**
-     * Finds Pets by tags
-     *
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     */
+
     @Test
-    public void findPetsByTagsTest() {
-        List<String> tags = null;
-        // List<Pet> response = api.findPetsByTags(tags);
+    public void testFindPetsByTags() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("monster");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
 
-        // TODO: test validations
+        List<Tag> tags = new ArrayList<Tag>();
+        Tag tag1 = new Tag();
+        tag1.setName("friendly");
+        tags.add(tag1);
+        pet.setTags(tags);
+
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByTags(new CSVParams("friendly"));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+        assertTrue(found);
     }
-    
-    /**
-     * Find pet by ID
-     *
-     * Returns a single pet
-     */
+
     @Test
-    public void getPetByIdTest() {
-        Long petId = null;
-        // Pet response = api.getPetById(petId);
+    public void testUpdatePetWithForm() throws Exception {
+        Pet pet = createRandomPet();
+        pet.setName("frank");
+        api.addPet(pet);
 
-        // TODO: test validations
+        Pet fetched = api.getPetById(pet.getId());
+
+        api.updatePetWithForm(fetched.getId(), "furt", null);
+        Pet updated = api.getPetById(fetched.getId());
+
+        assertEquals(updated.getName(), "furt");
     }
-    
-    /**
-     * Update an existing pet
-     *
-     * 
-     */
+
     @Test
-    public void updatePetTest() {
-        Pet body = null;
-        // Void response = api.updatePet(body);
+    public void testDeletePet() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
 
-        // TODO: test validations
+        Pet fetched = api.getPetById(pet.getId());
+        api.deletePet(fetched.getId(), null);
+
+        try {
+            fetched = api.getPetById(fetched.getId());
+            fail("expected an error");
+        } catch (RetrofitError e) {
+            assertEquals(404, e.getResponse().getStatus());
+        }
     }
-    
-    /**
-     * Updates a pet in the store with form data
-     *
-     * 
-     */
+
     @Test
-    public void updatePetWithFormTest() {
-        Long petId = null;
-        String name = null;
-        String status = null;
-        // Void response = api.updatePetWithForm(petId, name, status);
+    public void testUploadFile() throws Exception {
+        Pet pet = createRandomPet();
+        api.addPet(pet);
 
-        // TODO: test validations
+        File file = new File("hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+        writer.write("Hello world!");
+        writer.close();
+
+        api.uploadFile(pet.getId(), "a test file", new TypedFile("text/plain", file));
     }
-    
-    /**
-     * uploads an image
-     *
-     * 
-     */
+
     @Test
-    public void uploadFileTest() {
-        Long petId = null;
-        String additionalMetadata = null;
-        File file = null;
-        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
+    public void testEqualsAndHashCode() {
+        Pet pet1 = new Pet();
+        Pet pet2 = new Pet();
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
 
-        // TODO: test validations
+        pet2.setName("really-happy");
+        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertFalse(pet1.equals(pet2));
+        assertFalse(pet2.equals(pet1));
+        assertFalse(pet1.hashCode() == (pet2.hashCode()));
+        assertTrue(pet2.equals(pet2));
+        assertTrue(pet2.hashCode() == pet2.hashCode());
+
+        pet1.setName("really-happy");
+        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+    }
+
+    private Pet createRandomPet() {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("gorilla");
+
+        Category category = new Category();
+        category.setName("really-happy");
+
+        pet.setCategory(category);
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+        pet.setPhotoUrls(photos);
+
+        return pet;
     }
-    
 }
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/StoreApiTest.java
index 1da787edf19c..a290fadb8477 100644
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/StoreApiTest.java
@@ -1,77 +1,80 @@
 package io.swagger.client.api;
 
-import io.swagger.client.ApiClient;
-import io.swagger.client.model.Order;
-import org.junit.Before;
-import org.junit.Test;
+import io.swagger.TestUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import io.swagger.client.ApiClient;
+import io.swagger.client.model.*;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import retrofit.RetrofitError;
+
+import java.lang.reflect.Field;
 import java.util.Map;
 
-/**
- * API tests for StoreApi
- */
-public class StoreApiTest {
+import org.junit.*;
+import static org.junit.Assert.*;
 
-    private StoreApi api;
+public class StoreApiTest {
+    StoreApi api = null;
 
     @Before
     public void setup() {
         api = new ApiClient().createService(StoreApi.class);
     }
 
-    
-    /**
-     * Delete purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     */
     @Test
-    public void deleteOrderTest() {
-        String orderId = null;
-        // Void response = api.deleteOrder(orderId);
-
-        // TODO: test validations
+    public void testGetInventory() throws Exception {
+        Map<String, Integer> inventory = api.getInventory();
+        assertTrue(inventory.keySet().size() > 0);
     }
-    
-    /**
-     * Returns pet inventories by status
-     *
-     * Returns a map of status codes to quantities
-     */
+
     @Test
-    public void getInventoryTest() {
-        // Map<String, Integer> response = api.getInventory();
+    public void testPlaceOrder() throws Exception {
+        Order order = createOrder();
+        api.placeOrder(order);
 
-        // TODO: test validations
+        Order fetched = api.getOrderById(order.getId());
+        assertEquals(order.getId(), fetched.getId());
+        assertEquals(order.getPetId(), fetched.getPetId());
+        assertEquals(order.getQuantity(), fetched.getQuantity());
+        assertEquals(order.getShipDate().withZone(DateTimeZone.UTC), fetched.getShipDate().withZone(DateTimeZone.UTC));
     }
-    
-    /**
-     * Find purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     */
+
     @Test
-    public void getOrderByIdTest() {
-        Long orderId = null;
-        // Order response = api.getOrderById(orderId);
+    public void testDeleteOrder() throws Exception {
+        Order order = createOrder();
+        api.placeOrder(order);
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Place an order for a pet
-     *
-     * 
-     */
-    @Test
-    public void placeOrderTest() {
-        Order body = null;
-        // Order response = api.placeOrder(body);
+        Order fetched = api.getOrderById(order.getId());
+        assertEquals(fetched.getId(), order.getId());
 
-        // TODO: test validations
+        api.deleteOrder(String.valueOf(order.getId()));
+
+        try {
+            api.getOrderById(order.getId());
+            // fail("expected an error");
+        } catch (RetrofitError e) {
+            // ok
+        }
+    }
+
+    private Order createOrder() {
+        Order order = new Order();
+        order.setPetId(new Long(200));
+        order.setQuantity(new Integer(13));
+        order.setShipDate(DateTime.now());
+        order.setStatus(Order.StatusEnum.PLACED);
+        order.setComplete(true);
+
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
+        return order;
     }
-    
 }
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/UserApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/UserApiTest.java
index cd8553d84194..84fae0e990f4 100644
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/client/api/UserApiTest.java
@@ -1,131 +1,85 @@
 package io.swagger.client.api;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
-import io.swagger.client.model.User;
-import org.junit.Before;
-import org.junit.Test;
+import io.swagger.client.model.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
-/**
- * API tests for UserApi
- */
+import java.util.Arrays;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
 public class UserApiTest {
-
-    private UserApi api;
+    UserApi api = null;
 
     @Before
     public void setup() {
         api = new ApiClient().createService(UserApi.class);
     }
 
-    
-    /**
-     * Create user
-     *
-     * This can only be done by the logged in user.
-     */
     @Test
-    public void createUserTest() {
-        User body = null;
-        // Void response = api.createUser(body);
+    public void testCreateUser() throws Exception {
+        User user = createUser();
 
-        // TODO: test validations
+        api.createUser(user);
+
+        User fetched = api.getUserByName(user.getUsername());
+        assertEquals(user.getId(), fetched.getId());
     }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
+
     @Test
-    public void createUsersWithArrayInputTest() {
-        List<User> body = null;
-        // Void response = api.createUsersWithArrayInput(body);
+    public void testCreateUsersWithArray() throws Exception {
+        User user1 = createUser();
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
+
+        User fetched = api.getUserByName(user1.getUsername());
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
+
     @Test
-    public void createUsersWithListInputTest() {
-        List<User> body = null;
-        // Void response = api.createUsersWithListInput(body);
+    public void testCreateUsersWithList() throws Exception {
+        User user1 = createUser();
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
+
+        User fetched = api.getUserByName(user1.getUsername());
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
-    /**
-     * Delete user
-     *
-     * This can only be done by the logged in user.
-     */
+
     @Test
-    public void deleteUserTest() {
-        String username = null;
-        // Void response = api.deleteUser(username);
+    public void testLoginUser() throws Exception {
+        User user = createUser();
+        api.createUser(user);
 
-        // TODO: test validations
+        String token = api.loginUser(user.getUsername(), user.getPassword());
+        assertTrue(token.startsWith("logged in user session:"));
     }
-    
-    /**
-     * Get user by user name
-     *
-     * 
-     */
+
     @Test
-    public void getUserByNameTest() {
-        String username = null;
-        // User response = api.getUserByName(username);
-
-        // TODO: test validations
+    public void logoutUser() throws Exception {
+        api.logoutUser();
     }
-    
-    /**
-     * Logs user into the system
-     *
-     * 
-     */
-    @Test
-    public void loginUserTest() {
-        String username = null;
-        String password = null;
-        // String response = api.loginUser(username, password);
 
-        // TODO: test validations
-    }
-    
-    /**
-     * Logs out current logged in user session
-     *
-     * 
-     */
-    @Test
-    public void logoutUserTest() {
-        // Void response = api.logoutUser();
+    private User createUser() {
+        User user = new User();
+        user.setId(TestUtils.nextId());
+        user.setUsername("fred" + user.getId());
+        user.setFirstName("Fred");
+        user.setLastName("Meyer");
+        user.setEmail("fred@fredmeyer.com");
+        user.setPassword("xxXXxx");
+        user.setPhone("408-867-5309");
+        user.setUserStatus(123);
 
-        // TODO: test validations
+        return user;
     }
-    
-    /**
-     * Updated user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void updateUserTest() {
-        String username = null;
-        User body = null;
-        // Void response = api.updateUser(username, body);
-
-        // TODO: test validations
-    }
-    
 }
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
deleted file mode 100644
index 9fa93650d545..000000000000
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/PetApiTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.*;
-import io.swagger.client.CollectionFormats.*;
-import io.swagger.client.api.*;
-import io.swagger.client.model.*;
-
-import retrofit.RetrofitError;
-import retrofit.mime.TypedFile;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class PetApiTest {
-    PetApi api = null;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(PetApi.class);
-    }
-
-    @Test
-    public void testCreateAndGetPet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-
-        api.updatePet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testFindPetsByStatus() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByStatus(new CSVParams("available"));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-    }
-
-    @Test
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<Tag> tags = new ArrayList<Tag>();
-        Tag tag1 = new Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByTags(new CSVParams("friendly"));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-    }
-
-    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("frank");
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-
-        api.updatePetWithForm(fetched.getId(), "furt", null);
-        Pet updated = api.getPetById(fetched.getId());
-
-        assertEquals(updated.getName(), "furt");
-    }
-
-    @Test
-    public void testDeletePet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(fetched.getId(), null);
-
-        try {
-            fetched = api.getPetById(fetched.getId());
-            fail("expected an error");
-        } catch (RetrofitError e) {
-            assertEquals(404, e.getResponse().getStatus());
-        }
-    }
-
-    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        File file = new File("hello.txt");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-        writer.write("Hello world!");
-        writer.close();
-
-        api.uploadFile(pet.getId(), "a test file", new TypedFile("text/plain", file));
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-
-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-    }
-
-    private Pet createRandomPet() {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("gorilla");
-
-        Category category = new Category();
-        category.setName("really-happy");
-
-        pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
-        pet.setPhotoUrls(photos);
-
-        return pet;
-    }
-}
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java
deleted file mode 100644
index c823245355a7..000000000000
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/StoreApiTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.ApiClient;
-import io.swagger.client.api.*;
-import io.swagger.client.model.*;
-
-import retrofit.RetrofitError;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class StoreApiTest {
-    StoreApi api = null;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(StoreApi.class);
-    }
-
-    @Test
-    public void testGetInventory() throws Exception {
-        Map<String, Integer> inventory = api.getInventory();
-        assertTrue(inventory.keySet().size() > 0);
-    }
-
-    @Test
-    public void testPlaceOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(order.getId(), fetched.getId());
-        assertEquals(order.getPetId(), fetched.getPetId());
-        assertEquals(order.getQuantity(), fetched.getQuantity());
-    }
-
-    @Test
-    public void testDeleteOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(fetched.getId(), order.getId());
-
-        api.deleteOrder(String.valueOf(order.getId()));
-
-        try {
-            api.getOrderById(order.getId());
-            // fail("expected an error");
-        } catch (RetrofitError e) {
-            // ok
-        }
-    }
-
-    private Order createOrder() {
-        Order order = new Order();
-        order.setPetId(new Long(200));
-        order.setQuantity(new Integer(13));
-        order.setShipDate(new java.util.Date());
-        order.setStatus(Order.StatusEnum.PLACED);
-        order.setComplete(true);
-
-        try {
-          Field idField = Order.class.getDeclaredField("id");
-          idField.setAccessible(true);
-          idField.set(order, TestUtils.nextId());
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
-
-        return order;
-    }
-}
diff --git a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java
deleted file mode 100644
index 9b949445cc30..000000000000
--- a/samples/client/petstore/java/retrofit/src/test/java/io/swagger/petstore/test/UserApiTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.ApiClient;
-import io.swagger.client.api.*;
-import io.swagger.client.model.*;
-
-
-import java.util.Arrays;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class UserApiTest {
-    UserApi api = null;
-
-    @Before
-    public void setup() {
-        api = new ApiClient().createService(UserApi.class);
-    }
-
-    @Test
-    public void testCreateUser() throws Exception {
-        User user = createUser();
-
-        api.createUser(user);
-
-        User fetched = api.getUserByName(user.getUsername());
-        assertEquals(user.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithArray() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithList() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testLoginUser() throws Exception {
-        User user = createUser();
-        api.createUser(user);
-
-        String token = api.loginUser(user.getUsername(), user.getPassword());
-        assertTrue(token.startsWith("logged in user session:"));
-    }
-
-    @Test
-    public void logoutUser() throws Exception {
-        api.logoutUser();
-    }
-
-    private User createUser() {
-        User user = new User();
-        user.setId(TestUtils.nextId());
-        user.setUsername("fred" + user.getId());
-        user.setFirstName("Fred");
-        user.setLastName("Meyer");
-        user.setEmail("fred@fredmeyer.com");
-        user.setPassword("xxXXxx");
-        user.setPhone("408-867-5309");
-        user.setUserStatus(123);
-
-        return user;
-    }
-}

From d8eb708e23c7ac1d2b512e8a351d4fae0010ed2d Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Thu, 9 Jun 2016 21:59:45 +0200
Subject: [PATCH 124/139] add joda support to spring-boot and use it in sample

---
 bin/springboot-petstore-server.sh                      |  4 +++-
 .../JavaSpringBoot/generatedAnnotation.mustache        |  2 +-
 .../src/main/resources/JavaSpringBoot/pom.mustache     |  9 +++++++++
 .../JavaSpringBoot/swaggerDocumentationConfig.mustache |  2 ++
 samples/server/petstore/springboot/pom.xml             |  9 +++++++++
 .../src/main/java/io/swagger/api/ApiException.java     |  2 +-
 .../src/main/java/io/swagger/api/ApiOriginFilter.java  |  2 +-
 .../main/java/io/swagger/api/ApiResponseMessage.java   |  2 +-
 .../main/java/io/swagger/api/NotFoundException.java    |  2 +-
 .../src/main/java/io/swagger/api/PetApi.java           |  2 +-
 .../src/main/java/io/swagger/api/PetApiController.java |  2 +-
 .../src/main/java/io/swagger/api/StoreApi.java         |  2 +-
 .../main/java/io/swagger/api/StoreApiController.java   |  2 +-
 .../src/main/java/io/swagger/api/UserApi.java          |  2 +-
 .../main/java/io/swagger/api/UserApiController.java    |  2 +-
 .../configuration/SwaggerDocumentationConfig.java      |  4 +++-
 .../src/main/java/io/swagger/model/Category.java       |  2 +-
 .../main/java/io/swagger/model/ModelApiResponse.java   |  2 +-
 .../src/main/java/io/swagger/model/Order.java          | 10 +++++-----
 .../springboot/src/main/java/io/swagger/model/Pet.java |  2 +-
 .../springboot/src/main/java/io/swagger/model/Tag.java |  2 +-
 .../src/main/java/io/swagger/model/User.java           |  2 +-
 22 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/bin/springboot-petstore-server.sh b/bin/springboot-petstore-server.sh
index 83d810ba5954..1655952525a6 100755
--- a/bin/springboot-petstore-server.sh
+++ b/bin/springboot-petstore-server.sh
@@ -26,6 +26,8 @@ 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/JavaSpringBoot -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l springboot -o samples/server/petstore/springboot"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpringBoot -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l springboot -o samples/server/petstore/springboot -DdateLibrary=joda,hideGenerationTimestamp=true"
 
+rm -rf samples/server/petstore/springboot/src/main
+find samples/server/petstore/springboot -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/generatedAnnotation.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/generatedAnnotation.mustache
index 49110fc1ad93..a47b6faa85b9 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/generatedAnnotation.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/generatedAnnotation.mustache
@@ -1 +1 @@
-@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}")
\ No newline at end of file
+{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/pom.mustache
index ab4449ee580d..53c3652cb45b 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/pom.mustache
@@ -50,5 +50,14 @@
 			<artifactId>springfox-swagger-ui</artifactId>
 			<version>${springfox-version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-joda</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/swaggerDocumentationConfig.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/swaggerDocumentationConfig.mustache
index 1af646a6908a..970739e1b979 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringBoot/swaggerDocumentationConfig.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringBoot/swaggerDocumentationConfig.mustache
@@ -34,6 +34,8 @@ public class SwaggerDocumentationConfig {
 				.select()
 					.apis(RequestHandlerSelectors.basePackage("{{apiPackage}}"))
 					.build()
+				.directModelSubstitute(org.joda.time.LocalDate.class, java.sql.Date.class)
+				.directModelSubstitute(org.joda.time.DateTime.class, java.util.Date.class)
 				.apiInfo(apiInfo());
     }
 
diff --git a/samples/server/petstore/springboot/pom.xml b/samples/server/petstore/springboot/pom.xml
index 139b3da9ab47..0002871db8f0 100644
--- a/samples/server/petstore/springboot/pom.xml
+++ b/samples/server/petstore/springboot/pom.xml
@@ -50,5 +50,14 @@
 			<artifactId>springfox-swagger-ui</artifactId>
 			<version>${springfox-version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-joda</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java
index 9da33ef61cf1..7fa61c50d242 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class ApiException extends Exception{
 	private int code;
 	public ApiException (int code, String msg) {
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java
index a62f9cf5a04e..f0f62dc72065 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class ApiOriginFilter implements javax.servlet.Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java
index 96257d752b86..33f95878e549 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class ApiResponseMessage {
 	public static final int ERROR = 1;
 	public static final int WARNING = 2;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java
index dbc07fc45452..295109d7fc4a 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class NotFoundException extends ApiException {
 	private int code;
 	public NotFoundException (int code, String msg) {
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
index 08c6882eb46b..bb63b7e11d6b 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
@@ -23,7 +23,7 @@ import java.util.List;
 import static org.springframework.http.MediaType.*;
 
 @Api(value = "pet", description = "the pet API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public interface PetApi {
 
   @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = {
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java
index 64e909444641..ec3bbf3e7470 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java
@@ -21,7 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
 
 @Controller
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class PetApiController implements PetApi {
     public ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @RequestBody Pet body) {
       // do some magic!
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
index 901d46bee81f..2fb7585dbdd8 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
@@ -22,7 +22,7 @@ import java.util.List;
 import static org.springframework.http.MediaType.*;
 
 @Api(value = "store", description = "the store API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public interface StoreApi {
 
   @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java
index 04178b670f47..92de5eb86b4b 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApiController.java
@@ -20,7 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
 
 @Controller
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class StoreApiController implements StoreApi {
     public ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId) {
       // do some magic!
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
index da170f5eb3e7..3877be4e8add 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
@@ -22,7 +22,7 @@ import java.util.List;
 import static org.springframework.http.MediaType.*;
 
 @Api(value = "user", description = "the user API")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public interface UserApi {
 
   @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class)
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java
index 8af34d5d47a3..f855d358ea5a 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApiController.java
@@ -20,7 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
 
 @Controller
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class UserApiController implements UserApi {
     public ResponseEntity<Void> createUser(@ApiParam(value = "Created user object" ,required=true ) @RequestBody User body) {
       // do some magic!
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java b/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java
index 9dcf5890183c..282773a2d30b 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/SwaggerDocumentationConfig.java
@@ -13,7 +13,7 @@ import springfox.documentation.spring.web.plugins.Docket;
 
 
 @Configuration
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class SwaggerDocumentationConfig {
 
     ApiInfo apiInfo() {
@@ -34,6 +34,8 @@ public class SwaggerDocumentationConfig {
 				.select()
 					.apis(RequestHandlerSelectors.basePackage("io.swagger.api"))
 					.build()
+				.directModelSubstitute(org.joda.time.LocalDate.class, java.sql.Date.class)
+				.directModelSubstitute(org.joda.time.DateTime.class, java.util.Date.class)
 				.apiInfo(apiInfo());
     }
 
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
index da5fcf8299c1..d7aa14a8c759 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Category.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class Category  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
index 0f5c4078ae9e..50163623706b 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/ModelApiResponse.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class ModelApiResponse  {
   
   private Integer code = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java
index ae7fbc45add2..941bfe67c2ff 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Order.java
@@ -4,7 +4,7 @@ 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;
+import org.joda.time.DateTime;
 
 import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -13,13 +13,13 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class Order  {
   
   private Long id = null;
   private Long petId = null;
   private Integer quantity = null;
-  private Date shipDate = null;
+  private DateTime shipDate = null;
   public enum StatusEnum {
      placed,  approved,  delivered, 
   };
@@ -64,10 +64,10 @@ public class Order  {
    **/
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
-  public Date getShipDate() {
+  public DateTime getShipDate() {
     return shipDate;
   }
-  public void setShipDate(Date shipDate) {
+  public void setShipDate(DateTime shipDate) {
     this.shipDate = shipDate;
   }
 
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java
index de7615f484dc..aabffb593e4d 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class Pet  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
index 174ff984fc35..e9ef2ca57048 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/model/Tag.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 
 
 @ApiModel(description = "")
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class Tag  {
   
   private Long id = null;
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java b/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java
index e22fd5071d5f..76ac713c8ee6 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/model/User.java
+++ b/samples/server/petstore/springboot/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.SpringBootServerCodegen", date = "2016-06-06T14:29:50.468+02:00")
+
 public class User  {
   
   private Long id = null;

From b418719804d92b4532c7554a021c7eb035f2057b Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Fri, 10 Jun 2016 14:30:32 +0800
Subject: [PATCH 125/139] update sample, update shell script with messages
 about removing files

---
 bin/java-petstore-jersey2.sh                  |   1 +
 bin/java-petstore.sh                          |   1 +
 .../java/io/swagger/client/ApiClient.java     |   2 +-
 .../java/io/swagger/client/ApiException.java  | 132 +++++++++++-------
 .../java/io/swagger/client/Configuration.java |  59 ++++++--
 .../src/main/java/io/swagger/client/Pair.java |  25 ++++
 .../java/io/swagger/client/StringUtil.java    |  25 ++++
 .../java/io/swagger/client/api/FakeApi.java   |   2 +-
 .../java/io/swagger/client/api/PetApi.java    |   2 +-
 .../io/swagger/client/auth/ApiKeyAuth.java    |  25 ++++
 .../swagger/client/auth/Authentication.java   |  34 ++++-
 .../io/swagger/client/auth/HttpBasicAuth.java |  25 ++++
 .../java/io/swagger/client/auth/OAuth.java    |  25 ++++
 .../io/swagger/client/auth/OAuthFlow.java     |  27 +++-
 .../java/io/swagger/client/ApiClient.java     |   2 +-
 .../java/io/swagger/client/ApiException.java  | 132 +++++++++++-------
 .../java/io/swagger/client/Configuration.java |  59 ++++++--
 .../src/main/java/io/swagger/client/Pair.java |  25 ++++
 .../java/io/swagger/client/StringUtil.java    |  25 ++++
 .../java/io/swagger/client/api/FakeApi.java   |   2 +-
 .../java/io/swagger/client/api/PetApi.java    |   2 +-
 .../io/swagger/client/auth/ApiKeyAuth.java    |  25 ++++
 .../swagger/client/auth/Authentication.java   |  34 ++++-
 .../io/swagger/client/auth/HttpBasicAuth.java |  25 ++++
 .../java/io/swagger/client/auth/OAuth.java    |  25 ++++
 .../io/swagger/client/auth/OAuthFlow.java     |  27 +++-
 26 files changed, 628 insertions(+), 140 deletions(-)

diff --git a/bin/java-petstore-jersey2.sh b/bin/java-petstore-jersey2.sh
index 014af660cd82..335652f79bb7 100755
--- a/bin/java-petstore-jersey2.sh
+++ b/bin/java-petstore-jersey2.sh
@@ -28,6 +28,7 @@ fi
 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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-jersey2.json -o samples/client/petstore/java/jersey2 -DdateLibrary=joda,hideGenerationTimestamp=true"
 
+echo "Removing files and folders under samples/client/petstore/java/jersey2/src/main"
 rm -rf samples/client/petstore/java/jersey2/src/main
 find samples/client/petstore/java/jersey2 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore.sh b/bin/java-petstore.sh
index 576798ee24b7..b2773945ea28 100755
--- a/bin/java-petstore.sh
+++ b/bin/java-petstore.sh
@@ -28,6 +28,7 @@ fi
 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-with-fake-endpoints-models-for-testing.yaml -l java -o samples/client/petstore/java/default -DdateLibrary=joda,hideGenerationTimestamp=true"
 
+echo "Removing files and folders under samples/client/petstore/java/default/src/main"
 rm -rf samples/client/petstore/java/default/src/main
 find samples/client/petstore/java/default -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
index ba846404249a..0d7898329d0c 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java
@@ -75,8 +75,8 @@ public class ApiClient {
 
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();
-    authentications.put("petstore_auth", new OAuth());
     authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+    authentications.put("petstore_auth", new OAuth());
     // Prevent the authentications from being modified.
     authentications = Collections.unmodifiableMap(authentications);
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
index 27395e86ba98..600bb507f09e 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiException.java
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
 import java.util.Map;
@@ -5,65 +30,74 @@ import java.util.List;
 
 
 public class ApiException extends Exception {
-  private int code = 0;
-  private Map<String, List<String>> responseHeaders = null;
-  private String responseBody = null;
+    private int code = 0;
+    private Map<String, List<String>> responseHeaders = null;
+    private String responseBody = null;
 
-  public ApiException() {}
+    public ApiException() {}
 
-  public ApiException(Throwable throwable) {
-    super(throwable);
-  }
+    public ApiException(Throwable throwable) {
+        super(throwable);
+    }
 
-  public ApiException(String message) {
-    super(message);
-  }
+    public ApiException(String message) {
+        super(message);
+    }
 
-  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    super(message, throwable);
-    this.code = code;
-    this.responseHeaders = responseHeaders;
-    this.responseBody = responseBody;
-  }
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        super(message, throwable);
+        this.code = code;
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
 
-  public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    this(message, (Throwable) null, code, responseHeaders, responseBody);
-  }
+    public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(message, (Throwable) null, code, responseHeaders, responseBody);
+    }
 
-  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
-    this(message, throwable, code, responseHeaders, null);
-  }
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
+        this(message, throwable, code, responseHeaders, null);
+    }
 
-  public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    this((String) null, (Throwable) null, code, responseHeaders, responseBody);
-  }
+    public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+    }
 
-  public ApiException(int code, String message) {
-    super(message);
-    this.code = code;
-  }
+    public ApiException(int code, String message) {
+        super(message);
+        this.code = code;
+    }
 
-  public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
-    this(code, message);
-    this.responseHeaders = responseHeaders;
-    this.responseBody = responseBody;
-  }
+    public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(code, message);
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
 
-  public int getCode() {
-    return code;
-  }
+    /**
+     * Get the HTTP status code.
+     *
+     * @return HTTP status code
+     */
+    public int getCode() {
+        return code;
+    }
 
-  /**
-   * Get the HTTP response headers.
-   */
-  public Map<String, List<String>> getResponseHeaders() {
-    return responseHeaders;
-  }
+    /**
+     * Get the HTTP response headers.
+     *
+     * @return A map of list of string
+     */
+    public Map<String, List<String>> getResponseHeaders() {
+        return responseHeaders;
+    }
 
-  /**
-   * Get the HTTP response body.
-   */
-  public String getResponseBody() {
-    return responseBody;
-  }
+    /**
+     * Get the HTTP response body.
+     *
+     * @return Response body in the form of string
+     */
+    public String getResponseBody() {
+        return responseBody;
+    }
 }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
index 19b0ebeae4e7..cbdadd6262da 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Configuration.java
@@ -1,22 +1,51 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
 
 public class Configuration {
-  private static ApiClient defaultApiClient = new ApiClient();
+    private static ApiClient defaultApiClient = new ApiClient();
 
-  /**
-   * Get the default API client, which would be used when creating API
-   * instances without providing an API client.
-   */
-  public static ApiClient getDefaultApiClient() {
-    return defaultApiClient;
-   }
+    /**
+     * Get the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @return Default API client
+     */
+    public static ApiClient getDefaultApiClient() {
+        return defaultApiClient;
+    }
 
-  /**
-   * Set the default API client, which would be used when creating API
-   * instances without providing an API client.
-   */
-  public static void setDefaultApiClient(ApiClient apiClient) {
-    defaultApiClient = apiClient;
-  }
+    /**
+     * Set the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @param apiClient API client
+     */
+    public static void setDefaultApiClient(ApiClient apiClient) {
+        defaultApiClient = apiClient;
+    }
 }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java
index d8d32210b105..4b44c415812b 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/Pair.java
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
index 1383dd0decb0..03c6c81e434f 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/StringUtil.java
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
 
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/FakeApi.java
index dc9faf57ea60..18ec9428c16c 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/api/FakeApi.java
@@ -9,8 +9,8 @@ import io.swagger.client.model.*;
 import io.swagger.client.Pair;
 
 import org.joda.time.LocalDate;
-import java.math.BigDecimal;
 import org.joda.time.DateTime;
+import java.math.BigDecimal;
 
 
 import java.util.ArrayList;
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 50a6ecff737d..0816f9a2961b 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
@@ -9,8 +9,8 @@ import io.swagger.client.model.*;
 import io.swagger.client.Pair;
 
 import io.swagger.client.model.Pet;
-import io.swagger.client.model.ModelApiResponse;
 import java.io.File;
+import io.swagger.client.model.ModelApiResponse;
 
 
 import java.util.ArrayList;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index 6882dbc41c08..6ba15566b609 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java
index 98b1a6900b93..a063a6998b54 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/Authentication.java
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
@@ -6,6 +31,11 @@ import java.util.Map;
 import java.util.List;
 
 public interface Authentication {
-  /** Apply authentication settings to header and query params. */
-  void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
+    /**
+     * Apply authentication settings to header and query params.
+     *
+     * @param queryParams List of query parameters
+     * @param headerParams Map of header parameters
+     */
+    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
 }
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index 64f2c887377b..5895370e4d4b 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java
index 76d2917f24ea..8802ebc92c81 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuth.java
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
diff --git a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuthFlow.java b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuthFlow.java
index 597ec99b48b7..ec1f942b0f26 100644
--- a/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuthFlow.java
+++ b/samples/client/petstore/java/default/src/main/java/io/swagger/client/auth/OAuthFlow.java
@@ -1,5 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 public enum OAuthFlow {
     accessCode, implicit, password, application
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
index d82f0db0239b..a2607bfd5168 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
@@ -84,8 +84,8 @@ public class ApiClient {
 
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();
-    authentications.put("petstore_auth", new OAuth());
     authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
+    authentications.put("petstore_auth", new OAuth());
     // Prevent the authentications from being modified.
     authentications = Collections.unmodifiableMap(authentications);
   }
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 27395e86ba98..600bb507f09e 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
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
 import java.util.Map;
@@ -5,65 +30,74 @@ import java.util.List;
 
 
 public class ApiException extends Exception {
-  private int code = 0;
-  private Map<String, List<String>> responseHeaders = null;
-  private String responseBody = null;
+    private int code = 0;
+    private Map<String, List<String>> responseHeaders = null;
+    private String responseBody = null;
 
-  public ApiException() {}
+    public ApiException() {}
 
-  public ApiException(Throwable throwable) {
-    super(throwable);
-  }
+    public ApiException(Throwable throwable) {
+        super(throwable);
+    }
 
-  public ApiException(String message) {
-    super(message);
-  }
+    public ApiException(String message) {
+        super(message);
+    }
 
-  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    super(message, throwable);
-    this.code = code;
-    this.responseHeaders = responseHeaders;
-    this.responseBody = responseBody;
-  }
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        super(message, throwable);
+        this.code = code;
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
 
-  public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    this(message, (Throwable) null, code, responseHeaders, responseBody);
-  }
+    public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(message, (Throwable) null, code, responseHeaders, responseBody);
+    }
 
-  public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
-    this(message, throwable, code, responseHeaders, null);
-  }
+    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
+        this(message, throwable, code, responseHeaders, null);
+    }
 
-  public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-    this((String) null, (Throwable) null, code, responseHeaders, responseBody);
-  }
+    public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+    }
 
-  public ApiException(int code, String message) {
-    super(message);
-    this.code = code;
-  }
+    public ApiException(int code, String message) {
+        super(message);
+        this.code = code;
+    }
 
-  public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
-    this(code, message);
-    this.responseHeaders = responseHeaders;
-    this.responseBody = responseBody;
-  }
+    public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
+        this(code, message);
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
 
-  public int getCode() {
-    return code;
-  }
+    /**
+     * Get the HTTP status code.
+     *
+     * @return HTTP status code
+     */
+    public int getCode() {
+        return code;
+    }
 
-  /**
-   * Get the HTTP response headers.
-   */
-  public Map<String, List<String>> getResponseHeaders() {
-    return responseHeaders;
-  }
+    /**
+     * Get the HTTP response headers.
+     *
+     * @return A map of list of string
+     */
+    public Map<String, List<String>> getResponseHeaders() {
+        return responseHeaders;
+    }
 
-  /**
-   * Get the HTTP response body.
-   */
-  public String getResponseBody() {
-    return responseBody;
-  }
+    /**
+     * Get the HTTP response body.
+     *
+     * @return Response body in the form of string
+     */
+    public String getResponseBody() {
+        return responseBody;
+    }
 }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java
index 19b0ebeae4e7..cbdadd6262da 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,22 +1,51 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
 
 public class Configuration {
-  private static ApiClient defaultApiClient = new ApiClient();
+    private static ApiClient defaultApiClient = new ApiClient();
 
-  /**
-   * Get the default API client, which would be used when creating API
-   * instances without providing an API client.
-   */
-  public static ApiClient getDefaultApiClient() {
-    return defaultApiClient;
-   }
+    /**
+     * Get the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @return Default API client
+     */
+    public static ApiClient getDefaultApiClient() {
+        return defaultApiClient;
+    }
 
-  /**
-   * Set the default API client, which would be used when creating API
-   * instances without providing an API client.
-   */
-  public static void setDefaultApiClient(ApiClient apiClient) {
-    defaultApiClient = apiClient;
-  }
+    /**
+     * Set the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @param apiClient API client
+     */
+    public static void setDefaultApiClient(ApiClient apiClient) {
+        defaultApiClient = apiClient;
+    }
 }
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 d8d32210b105..4b44c415812b 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,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
 
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 1383dd0decb0..03c6c81e434f 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,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
index ce4830a1f77f..b8b499c4dee0 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
@@ -8,8 +8,8 @@ import io.swagger.client.Pair;
 import javax.ws.rs.core.GenericType;
 
 import org.joda.time.LocalDate;
-import java.math.BigDecimal;
 import org.joda.time.DateTime;
+import java.math.BigDecimal;
 
 import java.util.ArrayList;
 import java.util.HashMap;
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 ad66598406da..ab85c4ac3946 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
@@ -8,8 +8,8 @@ import io.swagger.client.Pair;
 import javax.ws.rs.core.GenericType;
 
 import io.swagger.client.model.Pet;
-import io.swagger.client.model.ModelApiResponse;
 import java.io.File;
+import io.swagger.client.model.ModelApiResponse;
 
 import java.util.ArrayList;
 import java.util.HashMap;
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 6882dbc41c08..6ba15566b609 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
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/Authentication.java
index 98b1a6900b93..a063a6998b54 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/Authentication.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/Authentication.java
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
@@ -6,6 +31,11 @@ import java.util.Map;
 import java.util.List;
 
 public interface Authentication {
-  /** Apply authentication settings to header and query params. */
-  void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
+    /**
+     * Apply authentication settings to header and query params.
+     *
+     * @param queryParams List of query parameters
+     * @param headerParams Map of header parameters
+     */
+    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams);
 }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index 64f2c887377b..5895370e4d4b 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
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
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 76d2917f24ea..8802ebc92c81 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
@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 import io.swagger.client.Pair;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuthFlow.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuthFlow.java
index 597ec99b48b7..ec1f942b0f26 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuthFlow.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuthFlow.java
@@ -1,5 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 public enum OAuthFlow {
     accessCode, implicit, password, application
-}
\ No newline at end of file
+}

From 3f51ff3314cc1dca318ac1c2fa7db4953c5e0048 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Fri, 10 Jun 2016 16:34:59 +0800
Subject: [PATCH 126/139] add wording about removing files and folders in the
 output folder

---
 bin/java-petstore-retrofit.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/java-petstore-retrofit.sh b/bin/java-petstore-retrofit.sh
index 63ded78c5496..0866cdfa580b 100755
--- a/bin/java-petstore-retrofit.sh
+++ b/bin/java-petstore-retrofit.sh
@@ -28,6 +28,7 @@ fi
 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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit.json -o samples/client/petstore/java/retrofit  -DdateLibrary=joda,hideGenerationTimestamp=true"
 
+echo "Removing files and folders under samples/client/petstore/java/retrofit/src/main"
 rm -rf samples/client/petstore/java/retrofit/src/main
 find samples/client/petstore/java/retrofit -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags

From a33eb3132e8cdaf3b1b7f42575c68c7f60e9a476 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Fri, 10 Jun 2016 17:01:27 +0800
Subject: [PATCH 127/139] add message about rmeoving files/folders under output
 folder

---
 bin/springboot-petstore-server.sh                               | 1 +
 .../springboot/src/main/java/io/swagger/Swagger2SpringBoot.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/springboot-petstore-server.sh b/bin/springboot-petstore-server.sh
index 1655952525a6..9e79d42cc862 100755
--- a/bin/springboot-petstore-server.sh
+++ b/bin/springboot-petstore-server.sh
@@ -28,6 +28,7 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpringBoot -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l springboot -o samples/server/petstore/springboot -DdateLibrary=joda,hideGenerationTimestamp=true"
 
+echo "Removing files and folders under samples/server/petstore/springboot/src/main"
 rm -rf samples/server/petstore/springboot/src/main
 find samples/server/petstore/springboot -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/Swagger2SpringBoot.java b/samples/server/petstore/springboot/src/main/java/io/swagger/Swagger2SpringBoot.java
index 2cc65db2b815..4317ba2f1a6b 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/Swagger2SpringBoot.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/Swagger2SpringBoot.java
@@ -33,4 +33,4 @@ public class Swagger2SpringBoot implements CommandLineRunner {
 		}
 
 	}
-}
\ No newline at end of file
+}

From 0f3569e982a912bc51da4552daed3775c132a148 Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Fri, 10 Jun 2016 12:17:36 +0200
Subject: [PATCH 128/139] set joda as default dateLibrary for java codegens
 that support it

Fix #3087
---
 bin/java-petstore-feign.sh                    |  2 +-
 bin/java-petstore-jersey2.sh                  |  2 +-
 bin/java-petstore-okhttp-gson.sh              |  2 +-
 bin/java-petstore-retrofit.sh                 |  2 +-
 bin/java-petstore-retrofit2.sh                |  2 +-
 bin/java-petstore-retrofit2rx.sh              |  2 +-
 bin/java-petstore.sh                          |  2 +-
 bin/springboot-petstore-server.sh             |  2 +-
 .../AbstractJavaJAXRSServerCodegen.java       |  1 +
 .../languages/GroovyClientCodegen.java        |  1 +
 .../codegen/languages/JavaClientCodegen.java  |  3 ++-
 .../languages/JavaInflectorServerCodegen.java |  1 +
 .../languages/JavaResteasyServerCodegen.java  |  1 +
 .../languages/SpringMVCServerCodegen.java     |  1 +
 .../petstore/java/okhttp-gson/hello.txt       |  1 -
 .../client/petstore/java/retrofit/hello.txt   |  1 -
 .../java/io/swagger/client/StringUtil.java    | 27 ++++++++++++++++++-
 .../io/swagger/client/auth/OAuthFlow.java     | 27 ++++++++++++++++++-
 .../java/io/swagger/client/StringUtil.java    | 27 ++++++++++++++++++-
 .../io/swagger/client/auth/OAuthFlow.java     | 27 ++++++++++++++++++-
 20 files changed, 119 insertions(+), 15 deletions(-)
 delete mode 100644 samples/client/petstore/java/okhttp-gson/hello.txt
 delete mode 100644 samples/client/petstore/java/retrofit/hello.txt

diff --git a/bin/java-petstore-feign.sh b/bin/java-petstore-feign.sh
index 40dbc592f7ec..61c4621a1f60 100755
--- a/bin/java-petstore-feign.sh
+++ b/bin/java-petstore-feign.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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-feign.json -o samples/client/petstore/java/feign -DdateLibrary=joda,hideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-feign.json -o samples/client/petstore/java/feign -DhideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore-jersey2.sh b/bin/java-petstore-jersey2.sh
index 335652f79bb7..0850bdbb4f40 100755
--- a/bin/java-petstore-jersey2.sh
+++ b/bin/java-petstore-jersey2.sh
@@ -26,7 +26,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"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-jersey2.json -o samples/client/petstore/java/jersey2 -DdateLibrary=joda,hideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-jersey2.json -o samples/client/petstore/java/jersey2 -DhideGenerationTimestamp=true"
 
 echo "Removing files and folders under samples/client/petstore/java/jersey2/src/main"
 rm -rf samples/client/petstore/java/jersey2/src/main
diff --git a/bin/java-petstore-okhttp-gson.sh b/bin/java-petstore-okhttp-gson.sh
index 521c8ca4826c..492cd5ff4a4e 100755
--- a/bin/java-petstore-okhttp-gson.sh
+++ b/bin/java-petstore-okhttp-gson.sh
@@ -26,7 +26,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"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-okhttp-gson.json -o samples/client/petstore/java/okhttp-gson -DdateLibrary=joda,hideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-okhttp-gson.json -o samples/client/petstore/java/okhttp-gson -DhideGenerationTimestamp=true"
 
 rm -rf samples/client/petstore/java/okhttp-gson/src/main
 find samples/client/petstore/java/okhttp-gson -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
diff --git a/bin/java-petstore-retrofit.sh b/bin/java-petstore-retrofit.sh
index 0866cdfa580b..3b370fde7ddc 100755
--- a/bin/java-petstore-retrofit.sh
+++ b/bin/java-petstore-retrofit.sh
@@ -26,7 +26,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"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit.json -o samples/client/petstore/java/retrofit  -DdateLibrary=joda,hideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit.json -o samples/client/petstore/java/retrofit -DhideGenerationTimestamp=true"
 
 echo "Removing files and folders under samples/client/petstore/java/retrofit/src/main"
 rm -rf samples/client/petstore/java/retrofit/src/main
diff --git a/bin/java-petstore-retrofit2.sh b/bin/java-petstore-retrofit2.sh
index 14175ce72a2a..8cf9468c3a13 100755
--- a/bin/java-petstore-retrofit2.sh
+++ b/bin/java-petstore-retrofit2.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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2.json -o samples/client/petstore/java/retrofit2 -DdateLibrary=joda"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2.json -o samples/client/petstore/java/retrofit2 -DhideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore-retrofit2rx.sh b/bin/java-petstore-retrofit2rx.sh
index c62da51daa89..af62352c03ff 100755
--- a/bin/java-petstore-retrofit2rx.sh
+++ b/bin/java-petstore-retrofit2rx.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-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2rx.json -o samples/client/petstore/java/retrofit2rx -DuseRxJava=true,dateLibrary=joda"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2rx.json -o samples/client/petstore/java/retrofit2rx -DuseRxJava=true,hideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore.sh b/bin/java-petstore.sh
index b2773945ea28..be6472d7aad6 100755
--- a/bin/java-petstore.sh
+++ b/bin/java-petstore.sh
@@ -26,7 +26,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"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -o samples/client/petstore/java/default -DdateLibrary=joda,hideGenerationTimestamp=true"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -o samples/client/petstore/java/default -DhideGenerationTimestamp=true"
 
 echo "Removing files and folders under samples/client/petstore/java/default/src/main"
 rm -rf samples/client/petstore/java/default/src/main
diff --git a/bin/springboot-petstore-server.sh b/bin/springboot-petstore-server.sh
index 9e79d42cc862..7fe3ac60e534 100755
--- a/bin/springboot-petstore-server.sh
+++ b/bin/springboot-petstore-server.sh
@@ -26,7 +26,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"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpringBoot -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l springboot -o samples/server/petstore/springboot -DdateLibrary=joda,hideGenerationTimestamp=true"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpringBoot -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l springboot -o samples/server/petstore/springboot -DhideGenerationTimestamp=true"
 
 echo "Removing files and folders under samples/server/petstore/springboot/src/main"
 rm -rf samples/server/petstore/springboot/src/main
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java
index 27f435250a0c..fbb2831ab8b5 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java
@@ -26,6 +26,7 @@ public abstract class AbstractJavaJAXRSServerCodegen extends JavaClientCodegen {
     public AbstractJavaJAXRSServerCodegen()
     {
         super();
+        dateLibrary = "legacy";
         apiTestTemplateFiles.clear(); // TODO: add test template
     }
 
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GroovyClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GroovyClientCodegen.java
index 1ed9604fbf43..5b26662531f0 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GroovyClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GroovyClientCodegen.java
@@ -27,6 +27,7 @@ public class GroovyClientCodegen extends JavaClientCodegen {
         configPackage = "io.swagger.configuration";
         invokerPackage = "io.swagger.api";
         artifactId = "swagger-spring-mvc-server";
+        dateLibrary = "legacy";
 
         additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
         additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
index 16c9f9ae12b9..c80bb0ed23fd 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -30,7 +30,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
     public static final String RETROFIT_1 = "retrofit";
     public static final String RETROFIT_2 = "retrofit2";
 
-    protected String dateLibrary = "default";
+    protected String dateLibrary = "joda";
     protected String invokerPackage = "io.swagger.client";
     protected String groupId = "io.swagger";
     protected String artifactId = "swagger-java-client";
@@ -128,6 +128,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
         Map<String, String> dateOptions = new HashMap<String, String>();
         dateOptions.put("java8", "Java 8 native");
         dateOptions.put("joda", "Joda");
+        dateOptions.put("legacy", "Legacy java.util.Date");
         dateLibrary.setEnum(dateOptions);
 
         cliOptions.add(dateLibrary);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
index bb32ee9ab8db..8a08bf758a3f 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
@@ -29,6 +29,7 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen {
         embeddedTemplateDir = templateDir = "JavaInflector";
         invokerPackage = "io.swagger.handler";
         artifactId = "swagger-inflector-server";
+        dateLibrary = "legacy";
 
         apiPackage = System.getProperty("swagger.codegen.inflector.apipackage", "io.swagger.handler");
         modelPackage = System.getProperty("swagger.codegen.inflector.modelpackage", "io.swagger.model");
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java
index 5717c902740c..4c13fd50f0b7 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java
@@ -34,6 +34,7 @@ public class JavaResteasyServerCodegen extends JavaClientCodegen implements Code
         apiTestTemplateFiles.clear(); // TODO: add test template
         apiPackage = "io.swagger.api";
         modelPackage = "io.swagger.model";
+        dateLibrary = "legacy";
 
         additionalProperties.put("title", title);
 
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 18b2f872d566..47c67a4ec6dd 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
@@ -25,6 +25,7 @@ public class SpringMVCServerCodegen extends JavaClientCodegen implements Codegen
         configPackage = "io.swagger.configuration";
         invokerPackage = "io.swagger.api";
         artifactId = "swagger-spring-mvc-server";
+        dateLibrary = "legacy";
 
         additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
         additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
diff --git a/samples/client/petstore/java/okhttp-gson/hello.txt b/samples/client/petstore/java/okhttp-gson/hello.txt
deleted file mode 100644
index 6769dd60bdf5..000000000000
--- a/samples/client/petstore/java/okhttp-gson/hello.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit/hello.txt b/samples/client/petstore/java/retrofit/hello.txt
deleted file mode 100644
index 6769dd60bdf5..000000000000
--- a/samples/client/petstore/java/retrofit/hello.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
\ No newline at end of file
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 344f523df419..03c6c81e434f 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,31 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-08T18:45:27.896+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/auth/OAuthFlow.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthFlow.java
index 597ec99b48b7..ec1f942b0f26 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthFlow.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuthFlow.java
@@ -1,5 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 public enum OAuthFlow {
     accessCode, implicit, password, application
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
index 391c1c016c6f..03c6c81e434f 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,31 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-08T18:44:17.529+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/auth/OAuthFlow.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuthFlow.java
index 597ec99b48b7..ec1f942b0f26 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuthFlow.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuthFlow.java
@@ -1,5 +1,30 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client.auth;
 
 public enum OAuthFlow {
     accessCode, implicit, password, application
-}
\ No newline at end of file
+}

From 196930cf493c90b72d43b69e76530dd8a2ab72a5 Mon Sep 17 00:00:00 2001
From: Jim Schubert <james.schubert@gmail.com>
Date: Fri, 10 Jun 2016 08:10:12 -0400
Subject: [PATCH 129/139] [csharp] Include ExceptionFactory property on
 IApiAccessor interface

---
 .../src/main/resources/csharp/IApiAccessor.mustache          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/swagger-codegen/src/main/resources/csharp/IApiAccessor.mustache b/modules/swagger-codegen/src/main/resources/csharp/IApiAccessor.mustache
index 22db465efaa0..df236b8f8c8a 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/IApiAccessor.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/IApiAccessor.mustache
@@ -24,5 +24,10 @@ namespace {{packageName}}.Client
         /// </summary>
         /// <value>The base path</value>
         String GetBasePath();
+        
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        ExceptionFactory ExceptionFactory { get; set; }
     }
 }

From c209cb25efbb37277abddde15fa354c7ce946f3d Mon Sep 17 00:00:00 2001
From: Jim Schubert <james.schubert@gmail.com>
Date: Fri, 10 Jun 2016 08:10:50 -0400
Subject: [PATCH 130/139] [csharp] Regenerate petstore client

---
 .../csharp/SwaggerClient/IO.Swagger.sln       |  10 +-
 .../petstore/csharp/SwaggerClient/README.md   |  16 +-
 .../csharp/SwaggerClient/docs/FakeApi.md      |   6 +-
 .../csharp/SwaggerClient/docs/FormatTest.md   |   2 +-
 .../IO.Swagger.Test/IO.Swagger.Test.csproj    |   2 +-
 .../src/IO.Swagger/Api/FakeApi.cs             |  56 ++++--
 .../src/IO.Swagger/Api/PetApi.cs              | 166 +++++++++++-------
 .../src/IO.Swagger/Api/StoreApi.cs            |  94 ++++++----
 .../src/IO.Swagger/Api/UserApi.cs             | 166 +++++++++++-------
 .../src/IO.Swagger/Client/ApiClient.cs        |  22 ++-
 .../src/IO.Swagger/Client/Configuration.cs    |  11 ++
 .../src/IO.Swagger/Client/ExceptionFactory.cs |   7 +
 .../src/IO.Swagger/Client/IApiAccessor.cs     |   5 +
 .../src/IO.Swagger/IO.Swagger.csproj          |   2 +-
 .../src/IO.Swagger/Model/FormatTest.cs        |   4 +-
 15 files changed, 370 insertions(+), 199 deletions(-)
 create mode 100644 samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ExceptionFactory.cs

diff --git a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
index c0a42faae525..740ca6561ace 100644
--- a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
+++ b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 VisualStudioVersion = 12.0.0.0
 MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{C81D6286-7BA5-4920-8591-F59169CCE4A4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{EE727567-9CAF-4258-AA0E-FDF89487D7D6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger.Test", "src\IO.Swagger.Test\IO.Swagger.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
 EndProject
@@ -12,10 +12,10 @@ Debug|Any CPU = Debug|Any CPU
 Release|Any CPU = Release|Any CPU
 EndGlobalSection
 GlobalSection(ProjectConfigurationPlatforms) = postSolution
-{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Release|Any CPU.Build.0 = Release|Any CPU
+{EE727567-9CAF-4258-AA0E-FDF89487D7D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+{EE727567-9CAF-4258-AA0E-FDF89487D7D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+{EE727567-9CAF-4258-AA0E-FDF89487D7D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+{EE727567-9CAF-4258-AA0E-FDF89487D7D6}.Release|Any CPU.Build.0 = Release|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/samples/client/petstore/csharp/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClient/README.md
index d9dcb59b2da6..c94e740d7b3f 100644
--- a/samples/client/petstore/csharp/SwaggerClient/README.md
+++ b/samples/client/petstore/csharp/SwaggerClient/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build date: 2016-05-29T17:27:36.037+08:00
+- Build date: 2016-06-10T08:07:39.769-04:00
 - Build package: class io.swagger.codegen.languages.CSharpClientCodegen
 
 ## Frameworks supported
@@ -54,7 +54,7 @@ namespace Example
         {
             
             var apiInstance = new FakeApi();
-            var number = 3.4;  // double? | None
+            var number = 3.4;  // decimal? | None
             var _double = 1.2;  // double? | None
             var _string = _string_example;  // string | None
             var _byte = B;  // byte[] | None
@@ -138,12 +138,6 @@ Class | Method | HTTP request | Description
 ## Documentation for Authorization
 
 
-### api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
 ### petstore_auth
 
 - **Type**: OAuth
@@ -153,3 +147,9 @@ Class | Method | HTTP request | Description
   - 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
+
diff --git a/samples/client/petstore/csharp/SwaggerClient/docs/FakeApi.md b/samples/client/petstore/csharp/SwaggerClient/docs/FakeApi.md
index e43252749995..cc24d4dfa078 100644
--- a/samples/client/petstore/csharp/SwaggerClient/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/SwaggerClient/docs/FakeApi.md
@@ -8,7 +8,7 @@ Method | HTTP request | Description
 
 
 # **TestEndpointParameters**
-> void TestEndpointParameters (double? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null)
+> void TestEndpointParameters (decimal? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -30,7 +30,7 @@ namespace Example
         {
             
             var apiInstance = new FakeApi();
-            var number = 3.4;  // double? | None
+            var number = 3.4;  // decimal? | None
             var _double = 1.2;  // double? | None
             var _string = _string_example;  // string | None
             var _byte = B;  // byte[] | None
@@ -61,7 +61,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **number** | **double?**| None | 
+ **number** | **decimal?**| None | 
  **_double** | **double?**| None | 
  **_string** | **string**| None | 
  **_byte** | **byte[]**| None | 
diff --git a/samples/client/petstore/csharp/SwaggerClient/docs/FormatTest.md b/samples/client/petstore/csharp/SwaggerClient/docs/FormatTest.md
index 7ddfad04d05e..1d366bd7cab4 100644
--- a/samples/client/petstore/csharp/SwaggerClient/docs/FormatTest.md
+++ b/samples/client/petstore/csharp/SwaggerClient/docs/FormatTest.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **Integer** | **int?** |  | [optional] 
 **Int32** | **int?** |  | [optional] 
 **Int64** | **long?** |  | [optional] 
-**Number** | **double?** |  | 
+**Number** | **decimal?** |  | 
 **_Float** | **float?** |  | [optional] 
 **_Double** | **double?** |  | [optional] 
 **_String** | **string** |  | [optional] 
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
index 4e4b161e2558..2cc0dd9525cd 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
@@ -86,7 +86,7 @@ limitations under the License.
   <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
       <ProjectReference Include="..\IO.Swagger\IO.Swagger.csproj">
-          <Project>{C81D6286-7BA5-4920-8591-F59169CCE4A4}</Project>
+          <Project>{EE727567-9CAF-4258-AA0E-FDF89487D7D6}</Project>
           <Name>IO.Swagger</Name>
       </ProjectReference>
   </ItemGroup>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/FakeApi.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/FakeApi.cs
index 00ce83ef910a..973771809a28 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/FakeApi.cs
@@ -55,7 +55,7 @@ namespace IO.Swagger.Api
         /// <param name="dateTime">None (optional)</param>
         /// <param name="password">None (optional)</param>
         /// <returns></returns>
-        void TestEndpointParameters (double? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null);
+        void TestEndpointParameters (decimal? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -77,7 +77,7 @@ namespace IO.Swagger.Api
         /// <param name="dateTime">None (optional)</param>
         /// <param name="password">None (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> TestEndpointParametersWithHttpInfo (double? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null);
+        ApiResponse<Object> TestEndpointParametersWithHttpInfo (decimal? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
@@ -100,7 +100,7 @@ namespace IO.Swagger.Api
         /// <param name="dateTime">None (optional)</param>
         /// <param name="password">None (optional)</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task TestEndpointParametersAsync (double? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null);
+        System.Threading.Tasks.Task TestEndpointParametersAsync (decimal? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null);
 
         /// <summary>
         /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -122,7 +122,7 @@ namespace IO.Swagger.Api
         /// <param name="dateTime">None (optional)</param>
         /// <param name="password">None (optional)</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> TestEndpointParametersAsyncWithHttpInfo (double? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null);
+        System.Threading.Tasks.Task<ApiResponse<Object>> TestEndpointParametersAsyncWithHttpInfo (decimal? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null);
         #endregion Asynchronous Operations
     }
 
@@ -131,6 +131,8 @@ namespace IO.Swagger.Api
     /// </summary>
     public partial class FakeApi : IFakeApi
     {
+        private IO.Swagger.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="FakeApi"/> class.
         /// </summary>
@@ -139,6 +141,8 @@ namespace IO.Swagger.Api
         {
             this.Configuration = new Configuration(new ApiClient(basePath));
 
+            ExceptionFactory = IO.Swagger.Client.Configuration.DefaultExceptionFactory;
+
             // ensure API client has configuration ready
             if (Configuration.ApiClient.Configuration == null)
             {
@@ -159,6 +163,8 @@ namespace IO.Swagger.Api
             else
                 this.Configuration = configuration;
 
+            ExceptionFactory = IO.Swagger.Client.Configuration.DefaultExceptionFactory;
+
             // ensure API client has configuration ready
             if (Configuration.ApiClient.Configuration == null)
             {
@@ -191,6 +197,22 @@ namespace IO.Swagger.Api
         /// <value>An instance of the Configuration</value>
         public Configuration Configuration {get; set;}
 
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public IO.Swagger.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
         /// <summary>
         /// Gets the default header.
         /// </summary>
@@ -230,7 +252,7 @@ namespace IO.Swagger.Api
         /// <param name="dateTime">None (optional)</param>
         /// <param name="password">None (optional)</param>
         /// <returns></returns>
-        public void TestEndpointParameters (double? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null)
+        public void TestEndpointParameters (decimal? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null)
         {
              TestEndpointParametersWithHttpInfo(number, _double, _string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
         }
@@ -252,7 +274,7 @@ namespace IO.Swagger.Api
         /// <param name="dateTime">None (optional)</param>
         /// <param name="password">None (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> TestEndpointParametersWithHttpInfo (double? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null)
+        public ApiResponse<Object> TestEndpointParametersWithHttpInfo (decimal? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null)
         {
             // verify the required parameter 'number' is set
             if (number == null)
@@ -315,10 +337,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling TestEndpointParameters: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling TestEndpointParameters: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestEndpointParameters", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -343,7 +366,7 @@ namespace IO.Swagger.Api
         /// <param name="dateTime">None (optional)</param>
         /// <param name="password">None (optional)</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task TestEndpointParametersAsync (double? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null)
+        public async System.Threading.Tasks.Task TestEndpointParametersAsync (decimal? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null)
         {
              await TestEndpointParametersAsyncWithHttpInfo(number, _double, _string, _byte, integer, int32, int64, _float, binary, date, dateTime, password);
 
@@ -366,7 +389,7 @@ namespace IO.Swagger.Api
         /// <param name="dateTime">None (optional)</param>
         /// <param name="password">None (optional)</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> TestEndpointParametersAsyncWithHttpInfo (double? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> TestEndpointParametersAsyncWithHttpInfo (decimal? number, double? _double, string _string, byte[] _byte, int? integer = null, int? int32 = null, long? int64 = null, float? _float = null, byte[] binary = null, DateTime? date = null, DateTime? dateTime = null, string password = null)
         {
             // verify the required parameter 'number' is set
             if (number == null)
@@ -429,10 +452,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling TestEndpointParameters: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling TestEndpointParameters: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TestEndpointParameters", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/PetApi.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/PetApi.cs
index e147d33ccebd..abf5a0595b28 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/PetApi.cs
@@ -402,6 +402,8 @@ namespace IO.Swagger.Api
     /// </summary>
     public partial class PetApi : IPetApi
     {
+        private IO.Swagger.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PetApi"/> class.
         /// </summary>
@@ -410,6 +412,8 @@ namespace IO.Swagger.Api
         {
             this.Configuration = new Configuration(new ApiClient(basePath));
 
+            ExceptionFactory = IO.Swagger.Client.Configuration.DefaultExceptionFactory;
+
             // ensure API client has configuration ready
             if (Configuration.ApiClient.Configuration == null)
             {
@@ -430,6 +434,8 @@ namespace IO.Swagger.Api
             else
                 this.Configuration = configuration;
 
+            ExceptionFactory = IO.Swagger.Client.Configuration.DefaultExceptionFactory;
+
             // ensure API client has configuration ready
             if (Configuration.ApiClient.Configuration == null)
             {
@@ -462,6 +468,22 @@ namespace IO.Swagger.Api
         /// <value>An instance of the Configuration</value>
         public Configuration Configuration {get; set;}
 
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public IO.Swagger.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
         /// <summary>
         /// Gets the default header.
         /// </summary>
@@ -557,10 +579,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling AddPet: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling AddPet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddPet", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -642,10 +665,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling AddPet: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling AddPet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddPet", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -720,10 +744,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling DeletePet: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling DeletePet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeletePet", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -799,10 +824,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling DeletePet: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling DeletePet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeletePet", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -875,10 +901,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling FindPetsByStatus: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling FindPetsByStatus: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FindPetsByStatus", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<List<Pet>>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -952,10 +979,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling FindPetsByStatus: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling FindPetsByStatus: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FindPetsByStatus", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<List<Pet>>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -1028,10 +1056,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling FindPetsByTags: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling FindPetsByTags: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FindPetsByTags", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<List<Pet>>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -1105,10 +1134,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling FindPetsByTags: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling FindPetsByTags: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FindPetsByTags", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<List<Pet>>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -1181,10 +1211,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetPetById: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetPetById: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPetById", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<Pet>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -1257,10 +1288,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetPetById: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetPetById: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPetById", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<Pet>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -1341,10 +1373,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling UpdatePet: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling UpdatePet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePet", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -1426,10 +1459,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling UpdatePet: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling UpdatePet: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePet", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -1508,10 +1542,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling UpdatePetWithForm: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling UpdatePetWithForm: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePetWithForm", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -1591,10 +1626,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling UpdatePetWithForm: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling UpdatePetWithForm: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePetWithForm", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -1673,10 +1709,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling UploadFile: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling UploadFile: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadFile", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<ApiResponse>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -1756,10 +1793,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling UploadFile: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling UploadFile: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadFile", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<ApiResponse>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/StoreApi.cs
index ed5dd54ec40a..3fbbe71b8ca8 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/StoreApi.cs
@@ -210,6 +210,8 @@ namespace IO.Swagger.Api
     /// </summary>
     public partial class StoreApi : IStoreApi
     {
+        private IO.Swagger.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreApi"/> class.
         /// </summary>
@@ -218,6 +220,8 @@ namespace IO.Swagger.Api
         {
             this.Configuration = new Configuration(new ApiClient(basePath));
 
+            ExceptionFactory = IO.Swagger.Client.Configuration.DefaultExceptionFactory;
+
             // ensure API client has configuration ready
             if (Configuration.ApiClient.Configuration == null)
             {
@@ -238,6 +242,8 @@ namespace IO.Swagger.Api
             else
                 this.Configuration = configuration;
 
+            ExceptionFactory = IO.Swagger.Client.Configuration.DefaultExceptionFactory;
+
             // ensure API client has configuration ready
             if (Configuration.ApiClient.Configuration == null)
             {
@@ -270,6 +276,22 @@ namespace IO.Swagger.Api
         /// <value>An instance of the Configuration</value>
         public Configuration Configuration {get; set;}
 
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public IO.Swagger.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
         /// <summary>
         /// Gets the default header.
         /// </summary>
@@ -350,10 +372,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling DeleteOrder: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling DeleteOrder: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteOrder", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -420,10 +443,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling DeleteOrder: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling DeleteOrder: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteOrder", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -489,10 +513,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetInventory: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetInventory: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetInventory", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<Dictionary<string, int?>>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -558,10 +583,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetInventory: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetInventory: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetInventory", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<Dictionary<string, int?>>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -628,10 +654,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetOrderById: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetOrderById: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetOrderById", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<Order>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -699,10 +726,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetOrderById: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetOrderById: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetOrderById", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<Order>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -776,10 +804,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling PlaceOrder: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling PlaceOrder: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("PlaceOrder", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<Order>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -854,10 +883,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling PlaceOrder: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling PlaceOrder: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("PlaceOrder", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<Order>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/UserApi.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/UserApi.cs
index 6cb5bee041c0..6fb6244264ee 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Api/UserApi.cs
@@ -386,6 +386,8 @@ namespace IO.Swagger.Api
     /// </summary>
     public partial class UserApi : IUserApi
     {
+        private IO.Swagger.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserApi"/> class.
         /// </summary>
@@ -394,6 +396,8 @@ namespace IO.Swagger.Api
         {
             this.Configuration = new Configuration(new ApiClient(basePath));
 
+            ExceptionFactory = IO.Swagger.Client.Configuration.DefaultExceptionFactory;
+
             // ensure API client has configuration ready
             if (Configuration.ApiClient.Configuration == null)
             {
@@ -414,6 +418,8 @@ namespace IO.Swagger.Api
             else
                 this.Configuration = configuration;
 
+            ExceptionFactory = IO.Swagger.Client.Configuration.DefaultExceptionFactory;
+
             // ensure API client has configuration ready
             if (Configuration.ApiClient.Configuration == null)
             {
@@ -446,6 +452,22 @@ namespace IO.Swagger.Api
         /// <value>An instance of the Configuration</value>
         public Configuration Configuration {get; set;}
 
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public IO.Swagger.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
         /// <summary>
         /// Gets the default header.
         /// </summary>
@@ -533,10 +555,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUser: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -610,10 +633,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUser: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -686,10 +710,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithArrayInput: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithArrayInput: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUsersWithArrayInput", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -763,10 +788,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithArrayInput: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithArrayInput: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUsersWithArrayInput", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -839,10 +865,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithListInput: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithListInput: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUsersWithListInput", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -916,10 +943,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithListInput: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling CreateUsersWithListInput: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUsersWithListInput", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -985,10 +1013,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling DeleteUser: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling DeleteUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -1055,10 +1084,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling DeleteUser: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling DeleteUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -1125,10 +1155,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetUserByName: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetUserByName: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserByName", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<User>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -1196,10 +1227,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling GetUserByName: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling GetUserByName: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserByName", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<User>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -1272,10 +1304,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling LoginUser: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling LoginUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("LoginUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<string>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -1349,10 +1382,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling LoginUser: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling LoginUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("LoginUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             return new ApiResponse<string>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
@@ -1412,10 +1446,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling LogoutUser: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling LogoutUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("LogoutUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -1476,10 +1511,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling LogoutUser: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling LogoutUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("LogoutUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -1558,10 +1594,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling UpdateUser: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling UpdateUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
@@ -1641,10 +1678,11 @@ namespace IO.Swagger.Api
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-            if (localVarStatusCode >= 400)
-                throw new ApiException (localVarStatusCode, "Error calling UpdateUser: " + localVarResponse.Content, localVarResponse.Content);
-            else if (localVarStatusCode == 0)
-                throw new ApiException (localVarStatusCode, "Error calling UpdateUser: " + localVarResponse.ErrorMessage, localVarResponse.ErrorMessage);
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
             
             return new ApiResponse<Object>(localVarStatusCode,
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ApiClient.cs
index 4331456ceaa3..c5a2de83da18 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ApiClient.cs
@@ -36,15 +36,28 @@ using RestSharp;
 namespace IO.Swagger.Client
 {
     /// <summary>
-    /// API client is mainly responible for making the HTTP call to the API backend.
+    /// API client is mainly responsible for making the HTTP call to the API backend.
     /// </summary>
-    public class ApiClient
+    public partial class ApiClient
     {
         private JsonSerializerSettings serializerSettings = new JsonSerializerSettings
         {
             ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor
         };
 
+        /// <summary>
+        /// Allows for extending request processing for <see cref="ApiClient"/> generated code.
+        /// </summary>
+        /// <param name="request">The RestSharp request object</param>
+        partial void InterceptRequest(IRestRequest request);
+
+        /// <summary>
+        /// Allows for extending response processing for <see cref="ApiClient"/> generated code.
+        /// </summary>
+        /// <param name="request">The RestSharp request object</param>
+        /// <param name="response">The RestSharp response object</param>
+        partial void InterceptResponse(IRestRequest request, IRestResponse response);
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiClient" /> class
         /// with default configuration and base path (http://petstore.swagger.io/v2).
@@ -177,7 +190,10 @@ namespace IO.Swagger.Client
             // set user agent
             RestClient.UserAgent = Configuration.UserAgent;
 
+            InterceptRequest(request);
             var response = RestClient.Execute(request);
+            InterceptResponse(request, response);
+
             return (Object) response;
         }
         /// <summary>
@@ -202,7 +218,9 @@ namespace IO.Swagger.Client
             var request = PrepareRequest(
                 path, method, queryParams, postBody, headerParams, formParams, fileParams,
                 pathParams, contentType);
+            InterceptRequest(request);
             var response = await RestClient.ExecuteTaskAsync(request);
+            InterceptResponse(request, response);
             return (Object)response;
         }
 
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/Configuration.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/Configuration.cs
index 451f6d613543..533b994dab29 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/Configuration.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/Configuration.cs
@@ -101,6 +101,17 @@ namespace IO.Swagger.Client
         /// <value>Configuration.</value>
         public static Configuration Default = new Configuration();
 
+        /// <summary>
+        /// Default creation of exceptions for a given method name and response object
+        /// </summary>
+        public static readonly ExceptionFactory DefaultExceptionFactory = (methodName, response) =>
+        {
+            int status = (int) response.StatusCode;
+            if (status >= 400) return new ApiException(status, String.Format("Error calling {0}: {1}", methodName, response.Content), response.Content);
+            if (status == 0) return new ApiException(status, String.Format("Error calling {0}: {1}", methodName, response.ErrorMessage), response.ErrorMessage);
+            return null;
+        };
+
         /// <summary>
         /// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
         /// </summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ExceptionFactory.cs
new file mode 100644
index 000000000000..24e5fad478f2
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ExceptionFactory.cs
@@ -0,0 +1,7 @@
+using System;
+using RestSharp;
+
+namespace IO.Swagger.Client
+{
+    public delegate Exception ExceptionFactory(string methodName, IRestResponse response);
+}
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/IApiAccessor.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/IApiAccessor.cs
index 1c91ef500031..65ff8bef73b9 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/IApiAccessor.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/IApiAccessor.cs
@@ -45,5 +45,10 @@ namespace IO.Swagger.Client
         /// </summary>
         /// <value>The base path</value>
         String GetBasePath();
+        
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        ExceptionFactory ExceptionFactory { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
index 20fdb3385e16..a484b5b50267 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
@@ -24,7 +24,7 @@ limitations under the License.
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C81D6286-7BA5-4920-8591-F59169CCE4A4}</ProjectGuid>
+    <ProjectGuid>{EE727567-9CAF-4258-AA0E-FDF89487D7D6}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swagger Library</RootNamespace>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs
index eb1a6a8924be..5e50732ee0bf 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs
@@ -60,7 +60,7 @@ namespace IO.Swagger.Model
         /// <param name="DateTime">DateTime.</param>
         /// <param name="Uuid">Uuid.</param>
         /// <param name="Password">Password (required).</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, DateTime? DateTime = null, Guid? Uuid = null, string Password = null)
+        public FormatTest(int? Integer = null, int? Int32 = null, long? Int64 = null, decimal? Number = null, float? _Float = null, double? _Double = null, string _String = null, byte[] _Byte = null, byte[] Binary = null, DateTime? Date = null, DateTime? DateTime = null, Guid? Uuid = null, string Password = null)
         {
             // to ensure "Number" is required (not null)
             if (Number == null)
@@ -128,7 +128,7 @@ namespace IO.Swagger.Model
         /// Gets or Sets Number
         /// </summary>
         [DataMember(Name="number", EmitDefaultValue=false)]
-        public double? Number { get; set; }
+        public decimal? Number { get; set; }
         /// <summary>
         /// Gets or Sets _Float
         /// </summary>

From d924a1411bf0037731f1807fb8f9d82ce17197ad Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Fri, 10 Jun 2016 21:58:16 +0800
Subject: [PATCH 131/139] remove debugging flag, add batch file for rails5
 generator

---
 bin/rails5-petstore-server.sh          |  2 +-
 bin/windows/rails5-petstore-server.bat | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100755 bin/windows/rails5-petstore-server.bat

diff --git a/bin/rails5-petstore-server.sh b/bin/rails5-petstore-server.sh
index 9997a83f6a7b..28b3ca3069bb 100755
--- a/bin/rails5-petstore-server.sh
+++ b/bin/rails5-petstore-server.sh
@@ -25,7 +25,7 @@ then
 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 -DdebugSupportingFiles"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="$@ generate -t modules/swagger-codegen/src/main/resources/rails5 -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l rails5 -o samples/server/petstore/rails5"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/rails5-petstore-server.bat b/bin/windows/rails5-petstore-server.bat
new file mode 100755
index 000000000000..a03162797841
--- /dev/null
+++ b/bin/windows/rails5-petstore-server.bat
@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -t modules\swagger-codegen\src\main\resources\rails5 -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l rails5 -o samples\server\petstore\rails5\
+
+java %JAVA_OPTS% -jar %executable% %ags%

From 7de95c52c1e047d9ae3adb9f01f7e27fdb586963 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Fri, 10 Jun 2016 22:43:56 +0800
Subject: [PATCH 132/139] add apache 2.0 license to perl api client

---
 .../main/resources/perl/ApiClient.mustache    |   6 +
 .../main/resources/perl/ApiFactory.mustache   |   6 +
 .../src/main/resources/perl/AutoDoc.mustache  |   6 +
 .../main/resources/perl/BaseObject.mustache   |   6 +
 .../resources/perl/Configuration.mustache     |   6 +
 .../src/main/resources/perl/Role.mustache     |   6 +
 .../src/main/resources/perl/api.mustache      |  17 +-
 .../src/main/resources/perl/api_test.mustache |  19 +-
 .../src/main/resources/perl/object.mustache   |   9 +-
 .../main/resources/perl/object_test.mustache  |   7 +-
 .../petstore/perl/.swagger-codegen-ignore     |  23 ++
 samples/client/petstore/perl/LICENSE          | 201 +++++++++++++
 samples/client/petstore/perl/README.md        |  52 +++-
 .../perl/docs/AdditionalPropertiesClass.md    |  16 ++
 samples/client/petstore/perl/docs/Animal.md   |   1 +
 .../client/petstore/perl/docs/AnimalFarm.md   |  14 +
 .../client/petstore/perl/docs/ArrayTest.md    |  17 ++
 samples/client/petstore/perl/docs/Cat.md      |   1 +
 samples/client/petstore/perl/docs/Dog.md      |   1 +
 .../client/petstore/perl/docs/EnumClass.md    |  14 +
 samples/client/petstore/perl/docs/EnumTest.md |  17 ++
 samples/client/petstore/perl/docs/FakeApi.md  |  79 ++++++
 .../client/petstore/perl/docs/FormatTest.md   |   7 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |  17 ++
 samples/client/petstore/perl/docs/Name.md     |   2 +
 samples/client/petstore/perl/docs/PetApi.md   | 200 ++-----------
 .../petstore/perl/docs/ReadOnlyFirst.md       |  16 ++
 samples/client/petstore/perl/docs/StoreApi.md | 136 +--------
 samples/client/petstore/perl/git_push.sh      |   4 +-
 .../perl/lib/WWW/SwaggerClient/ApiClient.pm   |  31 ++
 .../perl/lib/WWW/SwaggerClient/ApiFactory.pm  |  31 ++
 .../lib/WWW/SwaggerClient/Configuration.pm    |  31 ++
 .../perl/lib/WWW/SwaggerClient/FakeApi.pm     | 264 ++++++++++++++++++
 .../Object/AdditionalPropertiesClass.pm       | 198 +++++++++++++
 .../lib/WWW/SwaggerClient/Object/Animal.pm    |  78 +++++-
 .../WWW/SwaggerClient/Object/AnimalFarm.pm    | 182 ++++++++++++
 .../WWW/SwaggerClient/Object/ApiResponse.pm   |  65 ++++-
 .../lib/WWW/SwaggerClient/Object/ArrayTest.pm | 207 ++++++++++++++
 .../perl/lib/WWW/SwaggerClient/Object/Cat.pm  |  74 ++++-
 .../lib/WWW/SwaggerClient/Object/Category.pm  |  65 ++++-
 .../perl/lib/WWW/SwaggerClient/Object/Dog.pm  |  74 ++++-
 .../lib/WWW/SwaggerClient/Object/EnumClass.pm | 182 ++++++++++++
 .../lib/WWW/SwaggerClient/Object/EnumTest.pm  | 207 ++++++++++++++
 .../WWW/SwaggerClient/Object/FormatTest.pm    |  74 ++++-
 ...dPropertiesAndAdditionalPropertiesClass.pm | 207 ++++++++++++++
 .../SwaggerClient/Object/Model200Response.pm  |  65 ++++-
 .../WWW/SwaggerClient/Object/ModelReturn.pm   |  65 ++++-
 .../perl/lib/WWW/SwaggerClient/Object/Name.pm |  87 +++++-
 .../lib/WWW/SwaggerClient/Object/Order.pm     |  65 ++++-
 .../perl/lib/WWW/SwaggerClient/Object/Pet.pm  |  65 ++++-
 .../WWW/SwaggerClient/Object/ReadOnlyFirst.pm | 198 +++++++++++++
 .../SwaggerClient/Object/SpecialModelName.pm  |  65 ++++-
 .../perl/lib/WWW/SwaggerClient/Object/Tag.pm  |  65 ++++-
 .../perl/lib/WWW/SwaggerClient/Object/User.pm |  65 ++++-
 .../perl/lib/WWW/SwaggerClient/PetApi.pm      |  42 ++-
 .../perl/lib/WWW/SwaggerClient/Role.pm        |  35 ++-
 .../lib/WWW/SwaggerClient/Role/AutoDoc.pm     |  31 ++
 .../perl/lib/WWW/SwaggerClient/StoreApi.pm    |  42 ++-
 .../perl/lib/WWW/SwaggerClient/UserApi.pm     |  42 ++-
 .../perl/t/AdditionalPropertiesClassTest.t    |  17 ++
 .../client/petstore/perl/t/AnimalFarmTest.t   |  17 ++
 .../client/petstore/perl/t/ArrayTestTest.t    |  17 ++
 .../client/petstore/perl/t/EnumClassTest.t    |  17 ++
 samples/client/petstore/perl/t/EnumTestTest.t |  17 ++
 samples/client/petstore/perl/t/FakeApiTest.t  |  52 ++++
 ...opertiesAndAdditionalPropertiesClassTest.t |  17 ++
 .../petstore/perl/t/ReadOnlyFirstTest.t       |  17 ++
 67 files changed, 3562 insertions(+), 417 deletions(-)
 create mode 100644 samples/client/petstore/perl/.swagger-codegen-ignore
 create mode 100644 samples/client/petstore/perl/LICENSE
 create mode 100644 samples/client/petstore/perl/docs/AdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/perl/docs/AnimalFarm.md
 create mode 100644 samples/client/petstore/perl/docs/ArrayTest.md
 create mode 100644 samples/client/petstore/perl/docs/EnumClass.md
 create mode 100644 samples/client/petstore/perl/docs/EnumTest.md
 create mode 100644 samples/client/petstore/perl/docs/FakeApi.md
 create mode 100644 samples/client/petstore/perl/docs/MixedPropertiesAndAdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/perl/docs/ReadOnlyFirst.md
 create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/FakeApi.pm
 create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/AdditionalPropertiesClass.pm
 create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/AnimalFarm.pm
 create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ArrayTest.pm
 create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/EnumClass.pm
 create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/EnumTest.pm
 create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/MixedPropertiesAndAdditionalPropertiesClass.pm
 create mode 100644 samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ReadOnlyFirst.pm
 create mode 100644 samples/client/petstore/perl/t/AdditionalPropertiesClassTest.t
 create mode 100644 samples/client/petstore/perl/t/AnimalFarmTest.t
 create mode 100644 samples/client/petstore/perl/t/ArrayTestTest.t
 create mode 100644 samples/client/petstore/perl/t/EnumClassTest.t
 create mode 100644 samples/client/petstore/perl/t/EnumTestTest.t
 create mode 100644 samples/client/petstore/perl/t/FakeApiTest.t
 create mode 100644 samples/client/petstore/perl/t/MixedPropertiesAndAdditionalPropertiesClassTest.t
 create mode 100644 samples/client/petstore/perl/t/ReadOnlyFirstTest.t

diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache
index 401a33eddad3..4da9f8fb41ea 100644
--- a/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache
@@ -1,3 +1,9 @@
+{{>partial_license}}
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package {{moduleName}}::ApiClient;
 
 use strict;
diff --git a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache
index ef5f322a0146..cbda8660c20e 100644
--- a/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache
@@ -1,3 +1,9 @@
+{{>partial_license}}
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package {{moduleName}}::ApiFactory;
 
 use strict;
diff --git a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache
index 3c10c2450feb..2d5eb5208cff 100644
--- a/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/AutoDoc.mustache
@@ -1,3 +1,9 @@
+{{>partial_license}}
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package {{moduleName}}::Role::AutoDoc;
 use List::MoreUtils qw(uniq);
 
diff --git a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache
index 9f262543acd2..80ecda42a4db 100644
--- a/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/BaseObject.mustache
@@ -1,3 +1,9 @@
+{{>partial_license}}
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
diff --git a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache
index e0ed9bf32956..500d816b1787 100644
--- a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache
@@ -1,3 +1,9 @@
+{{>partial_license}}
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package {{moduleName}}::Configuration;
 
 use strict;
diff --git a/modules/swagger-codegen/src/main/resources/perl/Role.mustache b/modules/swagger-codegen/src/main/resources/perl/Role.mustache
index fb343ccb8906..0c8c1a0375bb 100644
--- a/modules/swagger-codegen/src/main/resources/perl/Role.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/Role.mustache
@@ -1,3 +1,9 @@
+{{>partial_license}}
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package {{moduleName}}::Role;
 use utf8;
 
diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache
index d7ece2d1e652..3ac7f4359086 100644
--- a/modules/swagger-codegen/src/main/resources/perl/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache
@@ -1,21 +1,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.
-#
+{{>partial_license}}
 #
 # NOTE: This class is auto generated by the swagger code generator program. 
 # Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
 #
 package {{moduleName}}::{{classname}};
 
diff --git a/modules/swagger-codegen/src/main/resources/perl/api_test.mustache b/modules/swagger-codegen/src/main/resources/perl/api_test.mustache
index 98d1e9cce993..6ae0a8b286a4 100644
--- a/modules/swagger-codegen/src/main/resources/perl/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/api_test.mustache
@@ -1,21 +1,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.
-#
+{{>partial_license}}
 #
 # NOTE: This class is auto generated by Swagger Codegen
-# Please update the test case below to test the API endpoints.
+# Please update the test cases below to test the API endpoints.
+# Ref: https://github.com/swagger-api/swagger-codegen
 #
 use Test::More tests => 1; #TODO update number of test cases
 use Test::Exception;
diff --git a/modules/swagger-codegen/src/main/resources/perl/object.mustache b/modules/swagger-codegen/src/main/resources/perl/object.mustache
index 126c6409c7f4..bb19479c61d0 100644
--- a/modules/swagger-codegen/src/main/resources/perl/object.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/object.mustache
@@ -1,3 +1,9 @@
+{{>partial_license}}
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 {{#models}}
 {{#model}}
 package {{moduleName}}::Object::{{classname}};
@@ -19,7 +25,8 @@ use base ("Class::Accessor", "Class::Data::Inheritable");
 #
 #{{description}}
 #
-#NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
 {{>BaseObject}}
diff --git a/modules/swagger-codegen/src/main/resources/perl/object_test.mustache b/modules/swagger-codegen/src/main/resources/perl/object_test.mustache
index dd76f9ac2d77..08ea9200a0ab 100644
--- a/modules/swagger-codegen/src/main/resources/perl/object_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/object_test.mustache
@@ -1,6 +1,9 @@
+{{>partial_license}}
+#
 # NOTE: This class is auto generated by the Swagger Codegen
-# Please update the test case below to test the model.
-
+# Please update the test cases below to test the model.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 use Test::More tests => 2;
 use Test::Exception;
 
diff --git a/samples/client/petstore/perl/.swagger-codegen-ignore b/samples/client/petstore/perl/.swagger-codegen-ignore
new file mode 100644
index 000000000000..19d3377182e2
--- /dev/null
+++ b/samples/client/petstore/perl/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/perl/LICENSE b/samples/client/petstore/perl/LICENSE
new file mode 100644
index 000000000000..8dada3edaf50
--- /dev/null
+++ b/samples/client/petstore/perl/LICENSE
@@ -0,0 +1,201 @@
+                                 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 {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md
index a4c5c47558a6..5e12d98f02f2 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 spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose.
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
 
 # 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-04-13T22:41:41.133+08:00
+- Build date: 2016-06-10T22:39:40.931+08:00
 - Build package: class io.swagger.codegen.languages.PerlClientCodegen
 
 ## A note on Moose
@@ -223,6 +223,7 @@ Each of these calls returns a hashref with various useful pieces of information.
 
 To load the API packages:
 ```perl
+use WWW::SwaggerClient::FakeApi;
 use WWW::SwaggerClient::PetApi;
 use WWW::SwaggerClient::StoreApi;
 use WWW::SwaggerClient::UserApi;
@@ -231,17 +232,24 @@ use WWW::SwaggerClient::UserApi;
 
 To load the models:
 ```perl
+use WWW::SwaggerClient::Object::AdditionalPropertiesClass;
 use WWW::SwaggerClient::Object::Animal;
+use WWW::SwaggerClient::Object::AnimalFarm;
 use WWW::SwaggerClient::Object::ApiResponse;
+use WWW::SwaggerClient::Object::ArrayTest;
 use WWW::SwaggerClient::Object::Cat;
 use WWW::SwaggerClient::Object::Category;
 use WWW::SwaggerClient::Object::Dog;
+use WWW::SwaggerClient::Object::EnumClass;
+use WWW::SwaggerClient::Object::EnumTest;
 use WWW::SwaggerClient::Object::FormatTest;
+use WWW::SwaggerClient::Object::MixedPropertiesAndAdditionalPropertiesClass;
 use WWW::SwaggerClient::Object::Model200Response;
 use WWW::SwaggerClient::Object::ModelReturn;
 use WWW::SwaggerClient::Object::Name;
 use WWW::SwaggerClient::Object::Order;
 use WWW::SwaggerClient::Object::Pet;
+use WWW::SwaggerClient::Object::ReadOnlyFirst;
 use WWW::SwaggerClient::Object::SpecialModelName;
 use WWW::SwaggerClient::Object::Tag;
 use WWW::SwaggerClient::Object::User;
@@ -256,22 +264,30 @@ use lib 'lib';
 use strict;
 use warnings;
 # load the API package
+use WWW::SwaggerClient::FakeApi;
 use WWW::SwaggerClient::PetApi;
 use WWW::SwaggerClient::StoreApi;
 use WWW::SwaggerClient::UserApi;
 
 # load the models
+use WWW::SwaggerClient::Object::AdditionalPropertiesClass;
 use WWW::SwaggerClient::Object::Animal;
+use WWW::SwaggerClient::Object::AnimalFarm;
 use WWW::SwaggerClient::Object::ApiResponse;
+use WWW::SwaggerClient::Object::ArrayTest;
 use WWW::SwaggerClient::Object::Cat;
 use WWW::SwaggerClient::Object::Category;
 use WWW::SwaggerClient::Object::Dog;
+use WWW::SwaggerClient::Object::EnumClass;
+use WWW::SwaggerClient::Object::EnumTest;
 use WWW::SwaggerClient::Object::FormatTest;
+use WWW::SwaggerClient::Object::MixedPropertiesAndAdditionalPropertiesClass;
 use WWW::SwaggerClient::Object::Model200Response;
 use WWW::SwaggerClient::Object::ModelReturn;
 use WWW::SwaggerClient::Object::Name;
 use WWW::SwaggerClient::Object::Order;
 use WWW::SwaggerClient::Object::Pet;
+use WWW::SwaggerClient::Object::ReadOnlyFirst;
 use WWW::SwaggerClient::Object::SpecialModelName;
 use WWW::SwaggerClient::Object::Tag;
 use WWW::SwaggerClient::Object::User;
@@ -279,17 +295,25 @@ use WWW::SwaggerClient::Object::User;
 # for displaying the API response data
 use Data::Dumper;
 
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $body = WWW::SwaggerClient::Object::Pet->new(); # Pet | Pet object that needs to be added to the store
+my $api_instance = WWW::SwaggerClient::FakeApi->new();
+my $number = 3.4; # Number | None
+my $double = 1.2; # double | None
+my $string = 'string_example'; # string | None
+my $byte = 'B'; # string | None
+my $integer = 56; # int | None
+my $int32 = 56; # int | None
+my $int64 = 789; # int | None
+my $float = 3.4; # double | None
+my $binary = 'B'; # string | None
+my $date = DateTime->from_epoch(epoch => str2time('2013-10-20')); # DateTime | None
+my $date_time = DateTime->from_epoch(epoch => str2time('2013-10-20T19:20:30+01:00')); # DateTime | None
+my $password = 'password_example'; # string | None
 
 eval {
-    $api_instance->add_pet(body => $body);
+    $api_instance->test_endpoint_parameters(number => $number, double => $double, string => $string, byte => $byte, integer => $integer, int32 => $int32, int64 => $int64, float => $float, binary => $binary, date => $date, date_time => $date_time, password => $password);
 };
 if ($@) {
-    warn "Exception when calling PetApi->add_pet: $@\n";
+    warn "Exception when calling FakeApi->test_endpoint_parameters: $@\n";
 }
 
 ```
@@ -300,6 +324,7 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
+*FakeApi* | [**test_endpoint_parameters**](docs/FakeApi.md#test_endpoint_parameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 *PetApi* | [**add_pet**](docs/PetApi.md#add_pet) | **POST** /pet | Add 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
@@ -323,17 +348,24 @@ Class | Method | HTTP request | Description
 
 
 # DOCUMENTATION FOR MODELS
+ - [WWW::SwaggerClient::Object::AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
  - [WWW::SwaggerClient::Object::Animal](docs/Animal.md)
+ - [WWW::SwaggerClient::Object::AnimalFarm](docs/AnimalFarm.md)
  - [WWW::SwaggerClient::Object::ApiResponse](docs/ApiResponse.md)
+ - [WWW::SwaggerClient::Object::ArrayTest](docs/ArrayTest.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::EnumClass](docs/EnumClass.md)
+ - [WWW::SwaggerClient::Object::EnumTest](docs/EnumTest.md)
  - [WWW::SwaggerClient::Object::FormatTest](docs/FormatTest.md)
+ - [WWW::SwaggerClient::Object::MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [WWW::SwaggerClient::Object::Model200Response](docs/Model200Response.md)
  - [WWW::SwaggerClient::Object::ModelReturn](docs/ModelReturn.md)
  - [WWW::SwaggerClient::Object::Name](docs/Name.md)
  - [WWW::SwaggerClient::Object::Order](docs/Order.md)
  - [WWW::SwaggerClient::Object::Pet](docs/Pet.md)
+ - [WWW::SwaggerClient::Object::ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [WWW::SwaggerClient::Object::SpecialModelName](docs/SpecialModelName.md)
  - [WWW::SwaggerClient::Object::Tag](docs/Tag.md)
  - [WWW::SwaggerClient::Object::User](docs/User.md)
@@ -351,7 +383,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/perl/docs/AdditionalPropertiesClass.md b/samples/client/petstore/perl/docs/AdditionalPropertiesClass.md
new file mode 100644
index 000000000000..ab590075a142
--- /dev/null
+++ b/samples/client/petstore/perl/docs/AdditionalPropertiesClass.md
@@ -0,0 +1,16 @@
+# WWW::SwaggerClient::Object::AdditionalPropertiesClass
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::AdditionalPropertiesClass;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**map_property** | **HASH[string,string]** |  | [optional] 
+**map_of_map_property** | **HASH[string,HASH[string,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/Animal.md b/samples/client/petstore/perl/docs/Animal.md
index d243a90905dc..38cc8ac06908 100644
--- a/samples/client/petstore/perl/docs/Animal.md
+++ b/samples/client/petstore/perl/docs/Animal.md
@@ -9,6 +9,7 @@ use WWW::SwaggerClient::Object::Animal;
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **class_name** | **string** |  | 
+**color** | **string** |  | [optional] [default to &#39;red&#39;]
 
 [[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/AnimalFarm.md b/samples/client/petstore/perl/docs/AnimalFarm.md
new file mode 100644
index 000000000000..18848e9c0baa
--- /dev/null
+++ b/samples/client/petstore/perl/docs/AnimalFarm.md
@@ -0,0 +1,14 @@
+# WWW::SwaggerClient::Object::AnimalFarm
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::AnimalFarm;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/ArrayTest.md b/samples/client/petstore/perl/docs/ArrayTest.md
new file mode 100644
index 000000000000..635c26a893a8
--- /dev/null
+++ b/samples/client/petstore/perl/docs/ArrayTest.md
@@ -0,0 +1,17 @@
+# WWW::SwaggerClient::Object::ArrayTest
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::ArrayTest;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**array_of_string** | **ARRAY[string]** |  | [optional] 
+**array_array_of_integer** | **ARRAY[ARRAY[int]]** |  | [optional] 
+**array_array_of_model** | **ARRAY[ARRAY[ReadOnlyFirst]]** |  | [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/Cat.md b/samples/client/petstore/perl/docs/Cat.md
index 978e42023944..0539f73e502b 100644
--- a/samples/client/petstore/perl/docs/Cat.md
+++ b/samples/client/petstore/perl/docs/Cat.md
@@ -9,6 +9,7 @@ use WWW::SwaggerClient::Object::Cat;
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **class_name** | **string** |  | 
+**color** | **string** |  | [optional] [default to &#39;red&#39;]
 **declawed** | **boolean** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/perl/docs/Dog.md b/samples/client/petstore/perl/docs/Dog.md
index 16e399c3aaee..16d3972d2b5d 100644
--- a/samples/client/petstore/perl/docs/Dog.md
+++ b/samples/client/petstore/perl/docs/Dog.md
@@ -9,6 +9,7 @@ use WWW::SwaggerClient::Object::Dog;
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **class_name** | **string** |  | 
+**color** | **string** |  | [optional] [default to &#39;red&#39;]
 **breed** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/perl/docs/EnumClass.md b/samples/client/petstore/perl/docs/EnumClass.md
new file mode 100644
index 000000000000..c4e40dbf06bc
--- /dev/null
+++ b/samples/client/petstore/perl/docs/EnumClass.md
@@ -0,0 +1,14 @@
+# WWW::SwaggerClient::Object::EnumClass
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::EnumClass;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[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/EnumTest.md b/samples/client/petstore/perl/docs/EnumTest.md
new file mode 100644
index 000000000000..0c3416150e1c
--- /dev/null
+++ b/samples/client/petstore/perl/docs/EnumTest.md
@@ -0,0 +1,17 @@
+# WWW::SwaggerClient::Object::EnumTest
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::EnumTest;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**enum_string** | **string** |  | [optional] 
+**enum_integer** | **int** |  | [optional] 
+**enum_number** | **double** |  | [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/FakeApi.md b/samples/client/petstore/perl/docs/FakeApi.md
new file mode 100644
index 000000000000..94c13795a10a
--- /dev/null
+++ b/samples/client/petstore/perl/docs/FakeApi.md
@@ -0,0 +1,79 @@
+# WWW::SwaggerClient::FakeApi
+
+## Load the API package
+```perl
+use WWW::SwaggerClient::Object::FakeApi;
+```
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**test_endpoint_parameters**](FakeApi.md#test_endpoint_parameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+
+# **test_endpoint_parameters**
+> test_endpoint_parameters(number => $number, double => $double, string => $string, byte => $byte, integer => $integer, int32 => $int32, int64 => $int64, float => $float, binary => $binary, date => $date, date_time => $date_time, password => $password)
+
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+### Example 
+```perl
+use Data::Dumper;
+
+my $api_instance = WWW::SwaggerClient::FakeApi->new();
+my $number = 3.4; # Number | None
+my $double = 1.2; # double | None
+my $string = 'string_example'; # string | None
+my $byte = 'B'; # string | None
+my $integer = 56; # int | None
+my $int32 = 56; # int | None
+my $int64 = 789; # int | None
+my $float = 3.4; # double | None
+my $binary = 'B'; # string | None
+my $date = DateTime->from_epoch(epoch => str2time('2013-10-20')); # DateTime | None
+my $date_time = DateTime->from_epoch(epoch => str2time('2013-10-20T19:20:30+01:00')); # DateTime | None
+my $password = 'password_example'; # string | None
+
+eval { 
+    $api_instance->test_endpoint_parameters(number => $number, double => $double, string => $string, byte => $byte, integer => $integer, int32 => $int32, int64 => $int64, float => $float, binary => $binary, date => $date, date_time => $date_time, password => $password);
+};
+if ($@) {
+    warn "Exception when calling FakeApi->test_endpoint_parameters: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **number** | **Number**| None | 
+ **double** | **double**| None | 
+ **string** | **string**| None | 
+ **byte** | **string**| None | 
+ **integer** | **int**| None | [optional] 
+ **int32** | **int**| None | [optional] 
+ **int64** | **int**| None | [optional] 
+ **float** | **double**| None | [optional] 
+ **binary** | **string**| None | [optional] 
+ **date** | **DateTime**| None | [optional] 
+ **date_time** | **DateTime**| None | [optional] 
+ **password** | **string**| None | [optional] 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
+ - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/perl/docs/FormatTest.md b/samples/client/petstore/perl/docs/FormatTest.md
index 60cd71ac61fa..9ba3aeaf17b8 100644
--- a/samples/client/petstore/perl/docs/FormatTest.md
+++ b/samples/client/petstore/perl/docs/FormatTest.md
@@ -15,11 +15,12 @@ Name | Type | Description | Notes
 **float** | **double** |  | [optional] 
 **double** | **double** |  | [optional] 
 **string** | **string** |  | [optional] 
-**byte** | **string** |  | [optional] 
+**byte** | **string** |  | 
 **binary** | **string** |  | [optional] 
-**date** | **DateTime** |  | [optional] 
+**date** | **DateTime** |  | 
 **date_time** | **DateTime** |  | [optional] 
-**password** | **string** |  | [optional] 
+**uuid** | [**UUID**](UUID.md) |  | [optional] 
+**password** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/perl/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/perl/docs/MixedPropertiesAndAdditionalPropertiesClass.md
new file mode 100644
index 000000000000..28bf101a8a14
--- /dev/null
+++ b/samples/client/petstore/perl/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -0,0 +1,17 @@
+# WWW::SwaggerClient::Object::MixedPropertiesAndAdditionalPropertiesClass
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::MixedPropertiesAndAdditionalPropertiesClass;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**uuid** | [**UUID**](UUID.md) |  | [optional] 
+**date_time** | **DateTime** |  | [optional] 
+**map** | [**HASH[string,Animal]**](Animal.md) |  | [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 7109642a08b7..1407fb99bcbe 100644
--- a/samples/client/petstore/perl/docs/Name.md
+++ b/samples/client/petstore/perl/docs/Name.md
@@ -10,6 +10,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **int** |  | 
 **snake_case** | **int** |  | [optional] 
+**property** | **string** |  | [optional] 
+**_123_number** | **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/PetApi.md b/samples/client/petstore/perl/docs/PetApi.md
index 829dc3a08ef3..c2f4e2ce4eed 100644
--- a/samples/client/petstore/perl/docs/PetApi.md
+++ b/samples/client/petstore/perl/docs/PetApi.md
@@ -10,13 +10,10 @@ 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&#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&#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
@@ -51,7 +48,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | [optional] 
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
 
 ### Return type
 
@@ -64,53 +61,7 @@ void (empty response body)
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
- - **Accept**: application/json, application/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **add_pet_using_byte_array**
-> add_pet_using_byte_array(body => $body)
-
-Fake endpoint to test byte array in body parameter for adding a new pet to the store
-
-
-
-### Example 
-```perl
-use Data::Dumper;
-
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $body = WWW::SwaggerClient::Object::string->new(); # string | Pet object in the form of byte array
-
-eval { 
-    $api_instance->add_pet_using_byte_array(body => $body);
-};
-if ($@) {
-    warn "Exception when calling PetApi->add_pet_using_byte_array: $@\n";
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **body** | **string**| Pet object in the form of byte array | [optional] 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
- - **Content-Type**: application/json, application/xml
- - **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,7 +109,7 @@ void (empty response body)
 ### 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)
 
@@ -177,7 +128,7 @@ use Data::Dumper;
 $WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
 
 my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $status = (); # ARRAY[string] | Status values that need to be considered for query
+my $status = (); # ARRAY[string] | Status values that need to be considered for filter
 
 eval { 
     my $result = $api_instance->find_pets_by_status(status => $status);
@@ -192,7 +143,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**ARRAY[string]**](string.md)| Status values that need to be considered for query | [optional] [default to available]
+ **status** | [**ARRAY[string]**](string.md)| Status values that need to be considered for filter | 
 
 ### Return type
 
@@ -205,7 +156,7 @@ Name | Type | Description  | Notes
 ### 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)
 
@@ -214,7 +165,7 @@ Name | Type | Description  | Notes
 
 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.
 
 ### Example 
 ```perl
@@ -239,7 +190,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**ARRAY[string]**](string.md)| Tags to filter by | [optional] 
+ **tags** | [**ARRAY[string]**](string.md)| Tags to filter by | 
 
 ### Return type
 
@@ -252,7 +203,7 @@ Name | Type | Description  | Notes
 ### 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)
 
@@ -261,7 +212,7 @@ Name | Type | Description  | Notes
 
 Find pet by ID
 
-Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+Returns a single pet
 
 ### Example 
 ```perl
@@ -271,11 +222,9 @@ use Data::Dumper;
 $WWW::SwaggerClient::Configuration::api_key->{'api_key'} = 'YOUR_API_KEY';
 # uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 #$WWW::SwaggerClient::Configuration::api_key_prefix->{'api_key'} = "Bearer";
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
 
 my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $pet_id = 789; # int | ID of pet that needs to be fetched
+my $pet_id = 789; # int | ID of pet to return
 
 eval { 
     my $result = $api_instance->get_pet_by_id(pet_id => $pet_id);
@@ -290,7 +239,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| ID of pet that needs to be fetched | 
+ **pet_id** | **int**| ID of pet to return | 
 
 ### Return type
 
@@ -298,114 +247,12 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+[api_key](../README.md#api_key)
 
 ### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_pet_by_id_in_object**
-> InlineResponse200 get_pet_by_id_in_object(pet_id => $pet_id)
-
-Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
-
-Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
-
-### Example 
-```perl
-use Data::Dumper;
-
-# Configure API key authorization: api_key
-$WWW::SwaggerClient::Configuration::api_key->{'api_key'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-#$WWW::SwaggerClient::Configuration::api_key_prefix->{'api_key'} = "Bearer";
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $pet_id = 789; # int | ID of pet that needs to be fetched
-
-eval { 
-    my $result = $api_instance->get_pet_by_id_in_object(pet_id => $pet_id);
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling PetApi->get_pet_by_id_in_object: $@\n";
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| ID of pet that needs to be fetched | 
-
-### Return type
-
-[**InlineResponse200**](InlineResponse200.md)
-
-### Authorization
-
-[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **pet_pet_idtesting_byte_arraytrue_get**
-> string pet_pet_idtesting_byte_arraytrue_get(pet_id => $pet_id)
-
-Fake endpoint to test byte array return by 'Find pet by ID'
-
-Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
-
-### Example 
-```perl
-use Data::Dumper;
-
-# Configure API key authorization: api_key
-$WWW::SwaggerClient::Configuration::api_key->{'api_key'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-#$WWW::SwaggerClient::Configuration::api_key_prefix->{'api_key'} = "Bearer";
-# Configure OAuth2 access token for authorization: petstore_auth
-$WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
-
-my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $pet_id = 789; # int | ID of pet that needs to be fetched
-
-eval { 
-    my $result = $api_instance->pet_pet_idtesting_byte_arraytrue_get(pet_id => $pet_id);
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling PetApi->pet_pet_idtesting_byte_arraytrue_get: $@\n";
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **int**| ID of pet that needs to be fetched | 
-
-### Return type
-
-**string**
-
-### Authorization
-
-[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
-
-### HTTP 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)
 
@@ -438,7 +285,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | [optional] 
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
 
 ### Return type
 
@@ -451,7 +298,7 @@ void (empty response body)
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
- - **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)
 
@@ -470,7 +317,7 @@ use Data::Dumper;
 $WWW::SwaggerClient::Configuration::access_token = 'YOUR_ACCESS_TOKEN';
 
 my $api_instance = WWW::SwaggerClient::PetApi->new();
-my $pet_id = 'pet_id_example'; # string | ID of pet that needs to be updated
+my $pet_id = 789; # int | ID of pet that needs to be updated
 my $name = 'name_example'; # string | Updated name of the pet
 my $status = 'status_example'; # string | Updated status of the pet
 
@@ -486,7 +333,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet_id** | **string**| ID of pet that needs to be updated | 
+ **pet_id** | **int**| ID of pet that needs to be updated | 
  **name** | **string**| Updated name of the pet | [optional] 
  **status** | **string**| Updated status of the pet | [optional] 
 
@@ -501,12 +348,12 @@ void (empty response body)
 ### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
- - **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)
 
 # **upload_file**
-> upload_file(pet_id => $pet_id, additional_metadata => $additional_metadata, file => $file)
+> ApiResponse upload_file(pet_id => $pet_id, additional_metadata => $additional_metadata, file => $file)
 
 uploads an image
 
@@ -525,7 +372,8 @@ my $additional_metadata = 'additional_metadata_example'; # string | Additional d
 my $file = '/path/to/file.txt'; # File | file to upload
 
 eval { 
-    $api_instance->upload_file(pet_id => $pet_id, additional_metadata => $additional_metadata, file => $file);
+    my $result = $api_instance->upload_file(pet_id => $pet_id, additional_metadata => $additional_metadata, file => $file);
+    print Dumper($result);
 };
 if ($@) {
     warn "Exception when calling PetApi->upload_file: $@\n";
@@ -542,7 +390,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-void (empty response body)
+[**ApiResponse**](ApiResponse.md)
 
 ### Authorization
 
@@ -551,7 +399,7 @@ void (empty response body)
 ### HTTP request headers
 
  - **Content-Type**: multipart/form-data
- - **Accept**: application/json, application/xml
+ - **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/perl/docs/ReadOnlyFirst.md b/samples/client/petstore/perl/docs/ReadOnlyFirst.md
new file mode 100644
index 000000000000..51f643016bcd
--- /dev/null
+++ b/samples/client/petstore/perl/docs/ReadOnlyFirst.md
@@ -0,0 +1,16 @@
+# WWW::SwaggerClient::Object::ReadOnlyFirst
+
+## Load the model package
+```perl
+use WWW::SwaggerClient::Object::ReadOnlyFirst;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**bar** | **string** |  | [optional] 
+**baz** | **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/StoreApi.md b/samples/client/petstore/perl/docs/StoreApi.md
index c5eb55a3f124..f0681b471678 100644
--- a/samples/client/petstore/perl/docs/StoreApi.md
+++ b/samples/client/petstore/perl/docs/StoreApi.md
@@ -10,9 +10,7 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**delete_order**](StoreApi.md#delete_order) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
-[**find_orders_by_status**](StoreApi.md#find_orders_by_status) | **GET** /store/findByStatus | Finds orders by status
 [**get_inventory**](StoreApi.md#get_inventory) | **GET** /store/inventory | Returns pet inventories by status
-[**get_inventory_in_object**](StoreApi.md#get_inventory_in_object) | **GET** /store/inventory?response&#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
 
@@ -56,60 +54,7 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **find_orders_by_status**
-> ARRAY[Order] find_orders_by_status(status => $status)
-
-Finds orders by status
-
-A single status value can be provided as a string
-
-### Example 
-```perl
-use Data::Dumper;
-
-# Configure API key authorization: test_api_client_id
-$WWW::SwaggerClient::Configuration::api_key->{'x-test_api_client_id'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-#$WWW::SwaggerClient::Configuration::api_key_prefix->{'x-test_api_client_id'} = "Bearer";
-# Configure API key authorization: test_api_client_secret
-$WWW::SwaggerClient::Configuration::api_key->{'x-test_api_client_secret'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-#$WWW::SwaggerClient::Configuration::api_key_prefix->{'x-test_api_client_secret'} = "Bearer";
-
-my $api_instance = WWW::SwaggerClient::StoreApi->new();
-my $status = 'status_example'; # string | Status value that needs to be considered for query
-
-eval { 
-    my $result = $api_instance->find_orders_by_status(status => $status);
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling StoreApi->find_orders_by_status: $@\n";
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **status** | **string**| Status value that needs to be considered for query | [optional] [default to placed]
-
-### Return type
-
-[**ARRAY[Order]**](Order.md)
-
-### Authorization
-
-[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
-
-### HTTP 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)
 
@@ -154,52 +99,7 @@ This endpoint does not need any parameter.
 ### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-# **get_inventory_in_object**
-> object get_inventory_in_object()
-
-Fake endpoint to test arbitrary object return by 'Get inventory'
-
-Returns an arbitrary object which is actually a map of status codes to quantities
-
-### Example 
-```perl
-use Data::Dumper;
-
-# Configure API key authorization: api_key
-$WWW::SwaggerClient::Configuration::api_key->{'api_key'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-#$WWW::SwaggerClient::Configuration::api_key_prefix->{'api_key'} = "Bearer";
-
-my $api_instance = WWW::SwaggerClient::StoreApi->new();
-
-eval { 
-    my $result = $api_instance->get_inventory_in_object();
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling StoreApi->get_inventory_in_object: $@\n";
-}
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-**object**
-
-### Authorization
-
-[api_key](../README.md#api_key)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, application/xml
+ - **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)
 
@@ -214,17 +114,8 @@ For valid response try integer IDs with value <= 5 or > 10. Other values will ge
 ```perl
 use Data::Dumper;
 
-# Configure API key authorization: test_api_key_header
-$WWW::SwaggerClient::Configuration::api_key->{'test_api_key_header'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-#$WWW::SwaggerClient::Configuration::api_key_prefix->{'test_api_key_header'} = "Bearer";
-# Configure API key authorization: test_api_key_query
-$WWW::SwaggerClient::Configuration::api_key->{'test_api_key_query'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-#$WWW::SwaggerClient::Configuration::api_key_prefix->{'test_api_key_query'} = "Bearer";
-
 my $api_instance = WWW::SwaggerClient::StoreApi->new();
-my $order_id = 'order_id_example'; # string | ID of pet that needs to be fetched
+my $order_id = 789; # int | ID of pet that needs to be fetched
 
 eval { 
     my $result = $api_instance->get_order_by_id(order_id => $order_id);
@@ -239,7 +130,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **order_id** | **string**| ID of pet that needs to be fetched | 
+ **order_id** | **int**| ID of pet that needs to be fetched | 
 
 ### Return type
 
@@ -247,12 +138,12 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-[test_api_key_header](../README.md#test_api_key_header), [test_api_key_query](../README.md#test_api_key_query)
+No authorization required
 
 ### 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,15 +158,6 @@ Place an order for a pet
 ```perl
 use Data::Dumper;
 
-# Configure API key authorization: test_api_client_id
-$WWW::SwaggerClient::Configuration::api_key->{'x-test_api_client_id'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-#$WWW::SwaggerClient::Configuration::api_key_prefix->{'x-test_api_client_id'} = "Bearer";
-# Configure API key authorization: test_api_client_secret
-$WWW::SwaggerClient::Configuration::api_key->{'x-test_api_client_secret'} = 'YOUR_API_KEY';
-# uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-#$WWW::SwaggerClient::Configuration::api_key_prefix->{'x-test_api_client_secret'} = "Bearer";
-
 my $api_instance = WWW::SwaggerClient::StoreApi->new();
 my $body = WWW::SwaggerClient::Object::Order->new(); # Order | order placed for purchasing the pet
 
@@ -292,7 +174,7 @@ if ($@) {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Order**](Order.md)| order placed for purchasing the pet | [optional] 
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet | 
 
 ### Return type
 
@@ -300,12 +182,12 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-[test_api_client_id](../README.md#test_api_client_id), [test_api_client_secret](../README.md#test_api_client_secret)
+No authorization required
 
 ### 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/git_push.sh b/samples/client/petstore/perl/git_push.sh
index 1a36388db023..ed374619b139 100644
--- a/samples/client/petstore/perl/git_push.sh
+++ b/samples/client/petstore/perl/git_push.sh
@@ -8,12 +8,12 @@ git_repo_id=$2
 release_note=$3
 
 if [ "$git_user_id" = "" ]; then
-    git_user_id="YOUR_GIT_USR_ID"
+    git_user_id="GIT_USER_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"
+    git_repo_id="GIT_REPO_ID"
     echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
 fi
 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
index 3dfa6633ee53..9b990cd26b03 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::ApiClient;
 
 use strict;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm
index 0ffd54984209..daf6735e804b 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::ApiFactory;
 
 use strict;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm
index 150db4cfac2e..e99ca4df5fa0 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Configuration;
 
 use strict;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/FakeApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/FakeApi.pm
new file mode 100644
index 000000000000..905690756bb9
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/FakeApi.pm
@@ -0,0 +1,264 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+package WWW::SwaggerClient::FakeApi;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8; 
+use Exporter;
+use Carp qw( croak );
+use Log::Any qw($log);
+
+use WWW::SwaggerClient::ApiClient;
+use WWW::SwaggerClient::Configuration;
+
+use base "Class::Data::Inheritable";
+
+__PACKAGE__->mk_classdata('method_documentation' => {});
+
+sub new {
+    my $class   = shift;
+    my (%self) = (
+        'api_client' => WWW::SwaggerClient::ApiClient->instance,
+        @_
+    );
+
+    #my $self = {
+    #    #api_client => $options->{api_client}
+    #    api_client => $default_api_client
+    #}; 
+
+    bless \%self, $class;
+
+}
+
+
+#
+# test_endpoint_parameters
+#
+# Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+# 
+# @param Number $number None (required)
+# @param double $double None (required)
+# @param string $string None (required)
+# @param string $byte None (required)
+# @param int $integer None (optional)
+# @param int $int32 None (optional)
+# @param int $int64 None (optional)
+# @param double $float None (optional)
+# @param string $binary None (optional)
+# @param DateTime $date None (optional)
+# @param DateTime $date_time None (optional)
+# @param string $password None (optional)
+{
+    my $params = {
+    'number' => {
+        data_type => 'Number',
+        description => 'None',
+        required => '1',
+    },
+    'double' => {
+        data_type => 'double',
+        description => 'None',
+        required => '1',
+    },
+    'string' => {
+        data_type => 'string',
+        description => 'None',
+        required => '1',
+    },
+    'byte' => {
+        data_type => 'string',
+        description => 'None',
+        required => '1',
+    },
+    'integer' => {
+        data_type => 'int',
+        description => 'None',
+        required => '0',
+    },
+    'int32' => {
+        data_type => 'int',
+        description => 'None',
+        required => '0',
+    },
+    'int64' => {
+        data_type => 'int',
+        description => 'None',
+        required => '0',
+    },
+    'float' => {
+        data_type => 'double',
+        description => 'None',
+        required => '0',
+    },
+    'binary' => {
+        data_type => 'string',
+        description => 'None',
+        required => '0',
+    },
+    'date' => {
+        data_type => 'DateTime',
+        description => 'None',
+        required => '0',
+    },
+    'date_time' => {
+        data_type => 'DateTime',
+        description => 'None',
+        required => '0',
+    },
+    'password' => {
+        data_type => 'string',
+        description => 'None',
+        required => '0',
+    },
+    };
+    __PACKAGE__->method_documentation->{ test_endpoint_parameters } = { 
+    	summary => 'Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ',
+        params => $params,
+        returns => undef,
+        };
+}
+# @return void
+#
+sub test_endpoint_parameters {
+    my ($self, %args) = @_;
+
+    # verify the required parameter 'number' is set
+    unless (exists $args{'number'}) {
+      croak("Missing the required parameter 'number' when calling test_endpoint_parameters");
+    }
+
+    # verify the required parameter 'double' is set
+    unless (exists $args{'double'}) {
+      croak("Missing the required parameter 'double' when calling test_endpoint_parameters");
+    }
+
+    # verify the required parameter 'string' is set
+    unless (exists $args{'string'}) {
+      croak("Missing the required parameter 'string' when calling test_endpoint_parameters");
+    }
+
+    # verify the required parameter 'byte' is set
+    unless (exists $args{'byte'}) {
+      croak("Missing the required parameter 'byte' when calling test_endpoint_parameters");
+    }
+
+    # parse inputs
+    my $_resource_path = '/fake';
+    $_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/xml; charset=utf-8', 'application/json; charset=utf-8');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/xml; charset=utf-8', 'application/json; charset=utf-8');
+
+    # form params
+    if ( exists $args{'integer'} ) {
+                $form_params->{'integer'} = $self->{api_client}->to_form_value($args{'integer'});
+    }
+    
+    # form params
+    if ( exists $args{'int32'} ) {
+                $form_params->{'int32'} = $self->{api_client}->to_form_value($args{'int32'});
+    }
+    
+    # form params
+    if ( exists $args{'int64'} ) {
+                $form_params->{'int64'} = $self->{api_client}->to_form_value($args{'int64'});
+    }
+    
+    # form params
+    if ( exists $args{'number'} ) {
+                $form_params->{'number'} = $self->{api_client}->to_form_value($args{'number'});
+    }
+    
+    # form params
+    if ( exists $args{'float'} ) {
+                $form_params->{'float'} = $self->{api_client}->to_form_value($args{'float'});
+    }
+    
+    # form params
+    if ( exists $args{'double'} ) {
+                $form_params->{'double'} = $self->{api_client}->to_form_value($args{'double'});
+    }
+    
+    # form params
+    if ( exists $args{'string'} ) {
+                $form_params->{'string'} = $self->{api_client}->to_form_value($args{'string'});
+    }
+    
+    # form params
+    if ( exists $args{'byte'} ) {
+                $form_params->{'byte'} = $self->{api_client}->to_form_value($args{'byte'});
+    }
+    
+    # form params
+    if ( exists $args{'binary'} ) {
+                $form_params->{'binary'} = $self->{api_client}->to_form_value($args{'binary'});
+    }
+    
+    # form params
+    if ( exists $args{'date'} ) {
+                $form_params->{'date'} = $self->{api_client}->to_form_value($args{'date'});
+    }
+    
+    # form params
+    if ( exists $args{'date_time'} ) {
+                $form_params->{'dateTime'} = $self->{api_client}->to_form_value($args{'date_time'});
+    }
+    
+    # form params
+    if ( exists $args{'password'} ) {
+                $form_params->{'password'} = $self->{api_client}->to_form_value($args{'password'});
+    }
+    
+    my $_body_data;
+    # authentication setting, if any
+    my $auth_settings = [qw()];
+
+    # make the API Call
+    $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    return;
+}
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/AdditionalPropertiesClass.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/AdditionalPropertiesClass.pm
new file mode 100644
index 000000000000..76c1f19543ca
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/AdditionalPropertiesClass.pm
@@ -0,0 +1,198 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+package WWW::SwaggerClient::Object::AdditionalPropertiesClass;
+
+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.
+# REF: https://github.com/swagger-api/swagger-codegen
+#
+
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+__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 => 'AdditionalPropertiesClass',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'map_property' => {
+    	datatype => 'HASH[string,string]',
+    	base_name => 'map_property',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'map_of_map_property' => {
+    	datatype => 'HASH[string,HASH[string,string]]',
+    	base_name => 'map_of_map_property',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+});
+
+__PACKAGE__->swagger_types( {
+    'map_property' => 'HASH[string,string]',
+    'map_of_map_property' => 'HASH[string,HASH[string,string]]'
+} );
+
+__PACKAGE__->attribute_map( {
+    'map_property' => 'map_property',
+    'map_of_map_property' => 'map_of_map_property'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
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 eb1b10034e9a..443701ce3267 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Animal.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Animal.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::Animal;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
@@ -110,14 +173,23 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
+    'color' => {
+    	datatype => 'string',
+    	base_name => 'color',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
 });
 
 __PACKAGE__->swagger_types( {
-    'class_name' => 'string'
+    'class_name' => 'string',
+    'color' => 'string'
 } );
 
 __PACKAGE__->attribute_map( {
-    'class_name' => 'className'
+    'class_name' => 'className',
+    'color' => 'color'
 } );
 
 __PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/AnimalFarm.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/AnimalFarm.pm
new file mode 100644
index 000000000000..32424c88e52e
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/AnimalFarm.pm
@@ -0,0 +1,182 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+package WWW::SwaggerClient::Object::AnimalFarm;
+
+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.
+# REF: https://github.com/swagger-api/swagger-codegen
+#
+
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+__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 => 'AnimalFarm',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+});
+
+__PACKAGE__->swagger_types( {
+    
+} );
+
+__PACKAGE__->attribute_map( {
+    
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm
index 9203da585b76..d1ee5704703b 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ApiResponse.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::ApiResponse;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ArrayTest.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ArrayTest.pm
new file mode 100644
index 000000000000..fa169ba46745
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ArrayTest.pm
@@ -0,0 +1,207 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+package WWW::SwaggerClient::Object::ArrayTest;
+
+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.
+# REF: https://github.com/swagger-api/swagger-codegen
+#
+
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+__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 => 'ArrayTest',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'array_of_string' => {
+    	datatype => 'ARRAY[string]',
+    	base_name => 'array_of_string',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'array_array_of_integer' => {
+    	datatype => 'ARRAY[ARRAY[int]]',
+    	base_name => 'array_array_of_integer',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'array_array_of_model' => {
+    	datatype => 'ARRAY[ARRAY[ReadOnlyFirst]]',
+    	base_name => 'array_array_of_model',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+});
+
+__PACKAGE__->swagger_types( {
+    'array_of_string' => 'ARRAY[string]',
+    'array_array_of_integer' => 'ARRAY[ARRAY[int]]',
+    'array_array_of_model' => 'ARRAY[ARRAY[ReadOnlyFirst]]'
+} );
+
+__PACKAGE__->attribute_map( {
+    'array_of_string' => 'array_of_string',
+    'array_array_of_integer' => 'array_array_of_integer',
+    'array_array_of_model' => 'array_array_of_model'
+} );
+
+__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 41e542afd9f3..16d524d0c2d2 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Cat.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Cat.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::Cat;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
@@ -110,6 +173,13 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
+    'color' => {
+    	datatype => 'string',
+    	base_name => 'color',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
     'declawed' => {
     	datatype => 'boolean',
     	base_name => 'declawed',
@@ -121,11 +191,13 @@ __PACKAGE__->method_documentation({
 
 __PACKAGE__->swagger_types( {
     'class_name' => 'string',
+    'color' => 'string',
     'declawed' => 'boolean'
 } );
 
 __PACKAGE__->attribute_map( {
     'class_name' => 'className',
+    'color' => 'color',
     'declawed' => 'declawed'
 } );
 
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 2d49d6a99b86..30b83ba1e650 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Category.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::Category;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
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 6ac41e2a9ff6..4964f4dd97e0 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Dog.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Dog.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::Dog;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
@@ -110,6 +173,13 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
+    'color' => {
+    	datatype => 'string',
+    	base_name => 'color',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
     'breed' => {
     	datatype => 'string',
     	base_name => 'breed',
@@ -121,11 +191,13 @@ __PACKAGE__->method_documentation({
 
 __PACKAGE__->swagger_types( {
     'class_name' => 'string',
+    'color' => 'string',
     'breed' => 'string'
 } );
 
 __PACKAGE__->attribute_map( {
     'class_name' => 'className',
+    'color' => 'color',
     'breed' => 'breed'
 } );
 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/EnumClass.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/EnumClass.pm
new file mode 100644
index 000000000000..89ad6d8cc71c
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/EnumClass.pm
@@ -0,0 +1,182 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+package WWW::SwaggerClient::Object::EnumClass;
+
+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.
+# REF: https://github.com/swagger-api/swagger-codegen
+#
+
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+__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 => 'EnumClass',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+});
+
+__PACKAGE__->swagger_types( {
+    
+} );
+
+__PACKAGE__->attribute_map( {
+    
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/EnumTest.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/EnumTest.pm
new file mode 100644
index 000000000000..d1806d2b8039
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/EnumTest.pm
@@ -0,0 +1,207 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+package WWW::SwaggerClient::Object::EnumTest;
+
+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.
+# REF: https://github.com/swagger-api/swagger-codegen
+#
+
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+__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 => 'EnumTest',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'enum_string' => {
+    	datatype => 'string',
+    	base_name => 'enum_string',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'enum_integer' => {
+    	datatype => 'int',
+    	base_name => 'enum_integer',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'enum_number' => {
+    	datatype => 'double',
+    	base_name => 'enum_number',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+});
+
+__PACKAGE__->swagger_types( {
+    'enum_string' => 'string',
+    'enum_integer' => 'int',
+    'enum_number' => 'double'
+} );
+
+__PACKAGE__->attribute_map( {
+    'enum_string' => 'enum_string',
+    'enum_integer' => 'enum_integer',
+    'enum_number' => 'enum_number'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/FormatTest.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/FormatTest.pm
index 725c290b11d9..c5779fbe5b9f 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/FormatTest.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/FormatTest.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::FormatTest;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
@@ -180,6 +243,13 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
+    'uuid' => {
+    	datatype => 'UUID',
+    	base_name => 'uuid',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
     'password' => {
     	datatype => 'string',
     	base_name => 'password',
@@ -201,6 +271,7 @@ __PACKAGE__->swagger_types( {
     'binary' => 'string',
     'date' => 'DateTime',
     'date_time' => 'DateTime',
+    'uuid' => 'UUID',
     'password' => 'string'
 } );
 
@@ -216,6 +287,7 @@ __PACKAGE__->attribute_map( {
     'binary' => 'binary',
     'date' => 'date',
     'date_time' => 'dateTime',
+    'uuid' => 'uuid',
     'password' => 'password'
 } );
 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/MixedPropertiesAndAdditionalPropertiesClass.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/MixedPropertiesAndAdditionalPropertiesClass.pm
new file mode 100644
index 000000000000..50a42581c274
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/MixedPropertiesAndAdditionalPropertiesClass.pm
@@ -0,0 +1,207 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+package WWW::SwaggerClient::Object::MixedPropertiesAndAdditionalPropertiesClass;
+
+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.
+# REF: https://github.com/swagger-api/swagger-codegen
+#
+
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+__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 => 'MixedPropertiesAndAdditionalPropertiesClass',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'uuid' => {
+    	datatype => 'UUID',
+    	base_name => 'uuid',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'date_time' => {
+    	datatype => 'DateTime',
+    	base_name => 'dateTime',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'map' => {
+    	datatype => 'HASH[string,Animal]',
+    	base_name => 'map',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+});
+
+__PACKAGE__->swagger_types( {
+    'uuid' => 'UUID',
+    'date_time' => 'DateTime',
+    'map' => 'HASH[string,Animal]'
+} );
+
+__PACKAGE__->attribute_map( {
+    'uuid' => 'uuid',
+    'date_time' => 'dateTime',
+    'map' => 'map'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Model200Response.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Model200Response.pm
index d64f94977536..7bb7cce1a6ed 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Model200Response.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Model200Response.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::Model200Response;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
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 682d26d7436e..09af2a0884b3 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ModelReturn.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ModelReturn.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::ModelReturn;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
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 b5a58e0d5fa9..50d950fb29a8 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Name.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Name.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::Name;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
@@ -117,16 +180,34 @@ __PACKAGE__->method_documentation({
     	format => '',
     	read_only => '',
     		},
+    'property' => {
+    	datatype => 'string',
+    	base_name => 'property',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    '_123_number' => {
+    	datatype => 'int',
+    	base_name => '123Number',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
 });
 
 __PACKAGE__->swagger_types( {
     'name' => 'int',
-    'snake_case' => 'int'
+    'snake_case' => 'int',
+    'property' => 'string',
+    '_123_number' => 'int'
 } );
 
 __PACKAGE__->attribute_map( {
     'name' => 'name',
-    'snake_case' => 'snake_case'
+    'snake_case' => 'snake_case',
+    'property' => 'property',
+    '_123_number' => '123Number'
 } );
 
 __PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
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 6590dba22937..c8fef7564cba 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Order.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::Order;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
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 50334ab062a8..e63f9a4a75a4 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Pet.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::Pet;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ReadOnlyFirst.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ReadOnlyFirst.pm
new file mode 100644
index 000000000000..45141fdd1ca3
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/ReadOnlyFirst.pm
@@ -0,0 +1,198 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+package WWW::SwaggerClient::Object::ReadOnlyFirst;
+
+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.
+# REF: https://github.com/swagger-api/swagger-codegen
+#
+
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
+__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 => 'ReadOnlyFirst',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'bar' => {
+    	datatype => 'string',
+    	base_name => 'bar',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+    'baz' => {
+    	datatype => 'string',
+    	base_name => 'baz',
+    	description => '',
+    	format => '',
+    	read_only => '',
+    		},
+});
+
+__PACKAGE__->swagger_types( {
+    'bar' => 'string',
+    'baz' => 'string'
+} );
+
+__PACKAGE__->attribute_map( {
+    'bar' => 'bar',
+    'baz' => 'baz'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/SpecialModelName.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/SpecialModelName.pm
index 5666b39c07b8..e051fd994b63 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/SpecialModelName.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/SpecialModelName.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::SpecialModelName;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
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 b60ccc4a0056..250a23c68702 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/Tag.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::Tag;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
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 8b0555d8aaaf..b5c5fcc6e7ea 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Object/User.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Object::User;
 
 require 5.6.0;
@@ -17,9 +48,41 @@ 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.
+# NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+# REF: https://github.com/swagger-api/swagger-codegen
 #
 
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 __PACKAGE__->mk_classdata('attribute_map' => {});
 __PACKAGE__->mk_classdata('swagger_types' => {});
 __PACKAGE__->mk_classdata('method_documentation' => {}); 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
index fd1b40923026..ecb7d70bf5b2 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
@@ -1,21 +1,33 @@
-#
-# 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.
-#
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
 #
 # NOTE: This class is auto generated by the swagger code generator program. 
 # Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
 #
 package WWW::SwaggerClient::PetApi;
 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm
index e72b12a22b85..cc146cb18901 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Role;
 use utf8;
 
@@ -37,7 +68,7 @@ has version_info => ( is => 'ro',
                       default => sub { {
                           app_name => 'Swagger Petstore',
                           app_version => '1.0.0',
-                          generated_date => '2016-04-13T22:41:41.133+08:00',
+                          generated_date => '2016-06-10T22:39:40.931+08:00',
                           generator_class => 'class io.swagger.codegen.languages.PerlClientCodegen',
                       } },
                       documentation => 'Information about the application version and the codegen codebase version'
@@ -103,7 +134,7 @@ Automatically generated by the Perl Swagger Codegen project:
 
 =over 4 
 
-=item Build date: 2016-04-13T22:41:41.133+08:00
+=item Build date: 2016-06-10T22:39:40.931+08:00
 
 =item Build package: class io.swagger.codegen.languages.PerlClientCodegen
 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm
index d57c96c1798d..55e8af85228b 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Role/AutoDoc.pm
@@ -1,3 +1,34 @@
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by the swagger code generator program. 
+# Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
+#
 package WWW::SwaggerClient::Role::AutoDoc;
 use List::MoreUtils qw(uniq);
 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
index 16a4f13cb1e3..f29c64ec1a12 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
@@ -1,21 +1,33 @@
-#
-# 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.
-#
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
 #
 # NOTE: This class is auto generated by the swagger code generator program. 
 # Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
 #
 package WWW::SwaggerClient::StoreApi;
 
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
index 75f56f562930..b6b5252e93e2 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
@@ -1,21 +1,33 @@
-#
-# 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.
-#
+=begin comment
+
+Swagger Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+
+OpenAPI spec version: 1.0.0
+Contact: apiteam@swagger.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+
+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.
+
+=end comment
+
+=cut
+
 #
 # NOTE: This class is auto generated by the swagger code generator program. 
 # Do not edit the class manually.
+# Ref: https://github.com/swagger-api/swagger-codegen
 #
 package WWW::SwaggerClient::UserApi;
 
diff --git a/samples/client/petstore/perl/t/AdditionalPropertiesClassTest.t b/samples/client/petstore/perl/t/AdditionalPropertiesClassTest.t
new file mode 100644
index 000000000000..03aa037413f1
--- /dev/null
+++ b/samples/client/petstore/perl/t/AdditionalPropertiesClassTest.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::AdditionalPropertiesClass');
+
+my $instance = WWW::SwaggerClient::Object::AdditionalPropertiesClass->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::AdditionalPropertiesClass');
+
diff --git a/samples/client/petstore/perl/t/AnimalFarmTest.t b/samples/client/petstore/perl/t/AnimalFarmTest.t
new file mode 100644
index 000000000000..4c795259eec2
--- /dev/null
+++ b/samples/client/petstore/perl/t/AnimalFarmTest.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::AnimalFarm');
+
+my $instance = WWW::SwaggerClient::Object::AnimalFarm->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::AnimalFarm');
+
diff --git a/samples/client/petstore/perl/t/ArrayTestTest.t b/samples/client/petstore/perl/t/ArrayTestTest.t
new file mode 100644
index 000000000000..3873ad597878
--- /dev/null
+++ b/samples/client/petstore/perl/t/ArrayTestTest.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::ArrayTest');
+
+my $instance = WWW::SwaggerClient::Object::ArrayTest->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::ArrayTest');
+
diff --git a/samples/client/petstore/perl/t/EnumClassTest.t b/samples/client/petstore/perl/t/EnumClassTest.t
new file mode 100644
index 000000000000..c1843e3bab4d
--- /dev/null
+++ b/samples/client/petstore/perl/t/EnumClassTest.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::EnumClass');
+
+my $instance = WWW::SwaggerClient::Object::EnumClass->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::EnumClass');
+
diff --git a/samples/client/petstore/perl/t/EnumTestTest.t b/samples/client/petstore/perl/t/EnumTestTest.t
new file mode 100644
index 000000000000..6a72a3da4f70
--- /dev/null
+++ b/samples/client/petstore/perl/t/EnumTestTest.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::EnumTest');
+
+my $instance = WWW::SwaggerClient::Object::EnumTest->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::EnumTest');
+
diff --git a/samples/client/petstore/perl/t/FakeApiTest.t b/samples/client/petstore/perl/t/FakeApiTest.t
new file mode 100644
index 000000000000..e57a0e5a0483
--- /dev/null
+++ b/samples/client/petstore/perl/t/FakeApiTest.t
@@ -0,0 +1,52 @@
+#
+# Copyright 2016 SmartBear Software
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+# NOTE: This class is auto generated by Swagger Codegen
+# Please update the test case below to test the API endpoints.
+#
+use Test::More tests => 1; #TODO update number of test cases
+use Test::Exception;
+
+use lib 'lib';
+use strict;
+use warnings;
+
+use_ok('WWW::SwaggerClient::FakeApi');
+
+my $api = WWW::SwaggerClient::FakeApi->new();
+isa_ok($api, 'WWW::SwaggerClient::FakeApi');
+
+#
+# test_endpoint_parameters test
+#
+{
+    my $number = undef; # replace NULL with a proper value
+    my $double = undef; # replace NULL with a proper value
+    my $string = undef; # replace NULL with a proper value
+    my $byte = undef; # replace NULL with a proper value
+    my $integer = undef; # replace NULL with a proper value
+    my $int32 = undef; # replace NULL with a proper value
+    my $int64 = undef; # replace NULL with a proper value
+    my $float = undef; # replace NULL with a proper value
+    my $binary = undef; # replace NULL with a proper value
+    my $date = undef; # replace NULL with a proper value
+    my $date_time = undef; # replace NULL with a proper value
+    my $password = undef; # replace NULL with a proper value
+    my $result = $api->test_endpoint_parameters(number => $number, double => $double, string => $string, byte => $byte, integer => $integer, int32 => $int32, int64 => $int64, float => $float, binary => $binary, date => $date, date_time => $date_time, password => $password);
+}
+
+
+1;
diff --git a/samples/client/petstore/perl/t/MixedPropertiesAndAdditionalPropertiesClassTest.t b/samples/client/petstore/perl/t/MixedPropertiesAndAdditionalPropertiesClassTest.t
new file mode 100644
index 000000000000..b6f764e82103
--- /dev/null
+++ b/samples/client/petstore/perl/t/MixedPropertiesAndAdditionalPropertiesClassTest.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::MixedPropertiesAndAdditionalPropertiesClass');
+
+my $instance = WWW::SwaggerClient::Object::MixedPropertiesAndAdditionalPropertiesClass->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::MixedPropertiesAndAdditionalPropertiesClass');
+
diff --git a/samples/client/petstore/perl/t/ReadOnlyFirstTest.t b/samples/client/petstore/perl/t/ReadOnlyFirstTest.t
new file mode 100644
index 000000000000..9c35358bee10
--- /dev/null
+++ b/samples/client/petstore/perl/t/ReadOnlyFirstTest.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::ReadOnlyFirst');
+
+my $instance = WWW::SwaggerClient::Object::ReadOnlyFirst->new();
+
+isa_ok($instance, 'WWW::SwaggerClient::Object::ReadOnlyFirst');
+

From 1221a8350474e3e27e3ba081fe34b5d1e5478f2b Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sat, 11 Jun 2016 10:35:50 +0800
Subject: [PATCH 133/139] add python ci

---
 .travis.yml                             |  1 +
 pom.xml                                 | 13 +++++++++++++
 samples/client/petstore/python/Makefile |  4 ++--
 samples/client/petstore/python/pom.xml  |  4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ea9cf505b82f..eae1588454c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ before_install:
   # required when sudo: required for the Ruby petstore tests
   - gem install bundler
   - npm install -g typescript
+  - pip install virtualenv
 
 install:
 
diff --git a/pom.xml b/pom.xml
index af8c8544e817..40ebc9bb85f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -522,6 +522,18 @@
                 <module>samples/client/petstore/typescript-node/npm</module>
             </modules>
         </profile>
+        <profile>
+            <id>python-client</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/python</module>
+            </modules>
+        </profile>
         <profile>
             <id>ruby-client</id>
             <activation>
@@ -557,6 +569,7 @@
             <modules>
                 <!-- run ruby test first which has a random delay script to
                      avoid issues with running 2 CI jobs in parallel.       -->
+                <module>samples/client/petstore/python</module>
                 <module>samples/client/petstore/ruby</module>
                 <module>samples/client/petstore/typescript-fetch/tests/default</module>
                 <module>samples/client/petstore/typescript-fetch/builds/default</module>
diff --git a/samples/client/petstore/python/Makefile b/samples/client/petstore/python/Makefile
index 0f65e0c6ac34..52033cee7038 100644
--- a/samples/client/petstore/python/Makefile
+++ b/samples/client/petstore/python/Makefile
@@ -15,7 +15,7 @@ clean:
 		find . -name "__pycache__" -delete
 
 test: clean 
-		bash ./test.sh
+		bash ./test_python2.sh
 
 test-all: clean 
-		bash ./test-all.sh
+		bash ./test_python2_and_3.sh
diff --git a/samples/client/petstore/python/pom.xml b/samples/client/petstore/python/pom.xml
index 147938617d2c..6eaa49eaea95 100644
--- a/samples/client/petstore/python/pom.xml
+++ b/samples/client/petstore/python/pom.xml
@@ -1,6 +1,6 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.wordnik</groupId>
+    <groupId>io.swagger</groupId>
     <artifactId>PythonPetstoreClientTests</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
@@ -35,7 +35,7 @@
                         <configuration>
                             <executable>make</executable>
                             <arguments>
-                                <argument>test</argument>
+                                <argument>test-all</argument>
                             </arguments>
                         </configuration>
                     </execution>

From 661aa25c3dfa628212caf045c8da52e6940810e6 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sat, 11 Jun 2016 10:38:22 +0800
Subject: [PATCH 134/139] sudo to install virtualenv

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index eae1588454c8..1a0be745a6e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
   # required when sudo: required for the Ruby petstore tests
   - gem install bundler
   - npm install -g typescript
-  - pip install virtualenv
+  - sudo pip install virtualenv
 
 install:
 

From bc04ebed94ea8036cb3bef86835dc482a57e5778 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sat, 11 Jun 2016 23:44:48 +0800
Subject: [PATCH 135/139] add mono script to nunit test csharp client

---
 .gitignore                                    |  1 +
 .../languages/CSharpClientCodegen.java        |  2 ++
 .../main/resources/csharp/api_test.mustache   |  8 +++---
 .../resources/csharp/compile-mono.sh.mustache |  5 ++++
 .../main/resources/csharp/model_test.mustache |  8 ++++--
 .../resources/csharp/mono_nunit_test.mustache | 28 +++++++++++++++++++
 .../resources/csharp/packages.config.mustache |  2 +-
 .../csharp/packages_test.config.mustache      |  4 +--
 .../csharp/SwaggerClient/IO.Swagger.sln       | 10 +++----
 .../petstore/csharp/SwaggerClient/README.md   | 14 +++++-----
 .../petstore/csharp/SwaggerClient/build.sh    |  5 ++++
 .../csharp/SwaggerClient/mono_nunit_test.sh   | 25 +++++++++++++++++
 .../IO.Swagger.Test/IO.Swagger.Test.csproj    |  2 +-
 .../src/IO.Swagger/IO.Swagger.csproj          |  2 +-
 14 files changed, 92 insertions(+), 24 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
 create mode 100644 samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh

diff --git a/.gitignore b/.gitignore
index 5eba3895f59f..3118eafbcfd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,6 +112,7 @@ samples/client/petstore/csharp/SwaggerClient/bin
 samples/client/petstore/csharp/SwaggerClient/obj/Debug/
 samples/client/petstore/csharp/SwaggerClient/bin/Debug/
 samples/client/petstore/csharp/SwaggerClient/packages
+samples/client/petstore/csharp/SwaggerClient/TestResult.xml
 
 # Python
 *.pyc
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 7546d89e9688..ef3baedd78ea 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
@@ -238,6 +238,8 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
 
         supportingFiles.add(new SupportingFile("compile.mustache", "", "build.bat"));
         supportingFiles.add(new SupportingFile("compile-mono.sh.mustache", "", "build.sh"));
+        // shell script to run the nunit test
+        supportingFiles.add(new SupportingFile("mono_nunit_test.mustache", "", "mono_nunit_test.sh"));
 
         // copy package.config to nuget's standard location for project-level installs
         supportingFiles.add(new SupportingFile("packages.config.mustache", packageFolder + File.separator, "packages.config"));
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 cc487fb681ec..84904b8c08b3 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache
@@ -61,12 +61,12 @@ namespace {{packageName}}.Test
         [Test]
         public void {{operationId}}Test()
         {
-            // TODO: add unit test for the method '{{operationId}}'
+            // TODO uncomment below to test the method '{{operationId}}'
             {{#allParams}}
-            {{{dataType}}} {{paramName}} = null; // TODO: replace null with proper value
+            //{{{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}}
+            //{{#returnType}}var response = {{/returnType}}instance.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+            {{#returnType}}//Assert.IsInstanceOf<{{{returnType}}}> (response, "response is {{{returnType}}}");{{/returnType}}
         }
         {{/operation}}{{/operations}}
     }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
index f93437eb0c81..2d3e96b96779 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
@@ -2,14 +2,19 @@
 frameworkVersion={{targetFrameworkNuget}}
 netfx=${frameworkVersion#net}
 
+echo "[INFO] Target framework: ${frameworkVersion}"
+
+echo "[INFO] Download nuget and packages"
 wget -nc https://nuget.org/nuget.exe;
 mozroots --import --sync
 mono nuget.exe install src/{{packageName}}/packages.config -o packages;
 mkdir -p bin;
 
+echo "[INFO] Copy DLLs to the 'bin' folder"
 cp packages/Newtonsoft.Json.8.0.2/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
 cp packages/RestSharp.105.1.0/lib/{{targetFrameworkNuget}}/RestSharp.dll bin/RestSharp.dll;
 
+echo "[INFO] Run 'mcs' to build bin/{{{packageName}}}.dll"
 mcs -sdk:${netfx} -r:bin/Newtonsoft.Json.dll,\
 bin/RestSharp.dll,\
 System.Runtime.Serialization.dll \
diff --git a/modules/swagger-codegen/src/main/resources/csharp/model_test.mustache b/modules/swagger-codegen/src/main/resources/csharp/model_test.mustache
index f9dd3c08efca..6fcc4672b32e 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/model_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/model_test.mustache
@@ -33,7 +33,8 @@ namespace {{packageName}}.Test
         [SetUp]
         public void Init()
         {
-            instance = new {{classname}}();
+            // TODO uncomment below to create an instance of {{classname}}
+            //instance = new {{classname}}();
         }
 
         /// <summary>
@@ -51,7 +52,8 @@ namespace {{packageName}}.Test
         [Test]
         public void {{classname}}InstanceTest()
         {
-            Assert.IsInstanceOf<{{classname}}> (instance, "instance is a {{classname}}");
+            // TODO uncomment below to test "IsInstanceOf" {{classname}}
+            //Assert.IsInstanceOf<{{classname}}> (instance, "variable 'instance' is a {{classname}}");
         }
 
         {{#vars}}
@@ -61,7 +63,7 @@ namespace {{packageName}}.Test
         [Test]
         public void {{name}}Test()
         {
-            // TODO: unit test for the property '{{name}}'
+            // TODO unit test for the property '{{name}}'
         }
         {{/vars}}
 
diff --git a/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache b/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
new file mode 100644
index 000000000000..33b960ac82bf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+wget -nc https://nuget.org/nuget.exe
+mozroots --import --sync
+
+echo "[INFO] remove bin/Debug/SwaggerClientTest.dll"
+rm src/IO.Swagger.Test/bin/Debug/{{{packageName}}}.Test.dll 2> /dev/null
+
+echo "[INFO] install NUnit runners via NuGet"
+wget -nc https://nuget.org/nuget.exe
+mozroots --import --sync
+mono nuget.exe install src/{{{packageName}}}.Test/packages.config -o packages
+
+echo "[INFO] Copy DLLs to the 'bin' folder"
+# for project {{{packageName}}}
+cp packages/Newtonsoft.Json.8.0.3/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll src/{{{packageName}}}/bin/Debug/Newtonsoft.Json.dll
+cp packages/RestSharp.105.1.0/lib/{{targetFrameworkNuget}}/RestSharp.dll src/{{{packageName}}}/bin/Debug/RestSharp.dll
+cp packages/NUnit.2.6.4/lib/nunit.framework.dll src/{{{packageName}}}/bin/Debug/nunit.framework.dll
+# for project {{{packageName}}}.Test
+cp packages/Newtonsoft.Json.8.0.3/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll src/{{{packageName}}}.Test/bin/Debug/Newtonsoft.Json.dll
+cp packages/RestSharp.105.1.0/lib/{{targetFrameworkNuget}}/RestSharp.dll src/{{{packageName}}}.Test/bin/Debug/RestSharp.dll
+cp packages/NUnit.2.6.4/lib/nunit.framework.dll src/{{{packageName}}}.Test/bin/Debug/nunit.framework.dll
+
+echo "[INFO] Install NUnit runners via NuGet"
+mono nuget.exe install NUnit.Runners -Version 2.6.4 -OutputDirectory packages 
+
+echo "[INFO] build the solution and run the unit test"
+xbuild {{{packageName}}}.sln && \
+    mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe src/{{{packageName}}}.Test/bin/debug/{{{packageName}}}.Test.dll
diff --git a/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache b/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache
index bd4428e687e0..d9e5dea7d9f1 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="RestSharp" version="105.1.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
 </packages>
diff --git a/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache b/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache
index 5464714bcef7..7e6f45753912 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.3" targetFramework="{{targetFrameworkNuget}}" />
+  <package id="NUnit" version="2.6.4" targetFramework="{{targetFrameworkNuget}}" />
   <package id="RestSharp" version="105.1.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
 </packages>
diff --git a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
index 740ca6561ace..dc645198f380 100644
--- a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
+++ b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 VisualStudioVersion = 12.0.0.0
 MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{EE727567-9CAF-4258-AA0E-FDF89487D7D6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{7B057377-44BA-47A5-AC6B-70EEB6034E6F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger.Test", "src\IO.Swagger.Test\IO.Swagger.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
 EndProject
@@ -12,10 +12,10 @@ Debug|Any CPU = Debug|Any CPU
 Release|Any CPU = Release|Any CPU
 EndGlobalSection
 GlobalSection(ProjectConfigurationPlatforms) = postSolution
-{EE727567-9CAF-4258-AA0E-FDF89487D7D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{EE727567-9CAF-4258-AA0E-FDF89487D7D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{EE727567-9CAF-4258-AA0E-FDF89487D7D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{EE727567-9CAF-4258-AA0E-FDF89487D7D6}.Release|Any CPU.Build.0 = Release|Any CPU
+{7B057377-44BA-47A5-AC6B-70EEB6034E6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+{7B057377-44BA-47A5-AC6B-70EEB6034E6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+{7B057377-44BA-47A5-AC6B-70EEB6034E6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+{7B057377-44BA-47A5-AC6B-70EEB6034E6F}.Release|Any CPU.Build.0 = Release|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/samples/client/petstore/csharp/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClient/README.md
index c94e740d7b3f..38d36d714935 100644
--- a/samples/client/petstore/csharp/SwaggerClient/README.md
+++ b/samples/client/petstore/csharp/SwaggerClient/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build date: 2016-06-10T08:07:39.769-04:00
+- Build date: 2016-06-11T23:10:58.942+08:00
 - Build package: class io.swagger.codegen.languages.CSharpClientCodegen
 
 ## Frameworks supported
@@ -138,6 +138,12 @@ Class | Method | HTTP request | Description
 ## Documentation for Authorization
 
 
+### api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
 ### petstore_auth
 
 - **Type**: OAuth
@@ -147,9 +153,3 @@ Class | Method | HTTP request | Description
   - 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
-
diff --git a/samples/client/petstore/csharp/SwaggerClient/build.sh b/samples/client/petstore/csharp/SwaggerClient/build.sh
index 159673fd60c1..88180f68398e 100644
--- a/samples/client/petstore/csharp/SwaggerClient/build.sh
+++ b/samples/client/petstore/csharp/SwaggerClient/build.sh
@@ -2,14 +2,19 @@
 frameworkVersion=net45
 netfx=${frameworkVersion#net}
 
+echo "[INFO] Target framework: ${frameworkVersion}"
+
+echo "[INFO] Download nuget and packages"
 wget -nc https://nuget.org/nuget.exe;
 mozroots --import --sync
 mono nuget.exe install src/IO.Swagger/packages.config -o packages;
 mkdir -p bin;
 
+echo "[INFO] Copy DLLs to the 'bin' folder"
 cp packages/Newtonsoft.Json.8.0.2/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
 cp packages/RestSharp.105.1.0/lib/net45/RestSharp.dll bin/RestSharp.dll;
 
+echo "[INFO] Run 'mcs' to build bin/IO.Swagger.dll"
 mcs -sdk:${netfx} -r:bin/Newtonsoft.Json.dll,\
 bin/RestSharp.dll,\
 System.Runtime.Serialization.dll \
diff --git a/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh b/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh
new file mode 100644
index 000000000000..e2be7882f395
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+wget -nc https://nuget.org/nuget.exe;
+mozroots --import --sync
+
+echo "[INFO] remove bin/Debug/SwaggerClientTest.dll"
+rm src/IO.Swagger.Test/bin/Debug/IO.Swagger.Test.dll 2> /dev/null
+
+echo "[INFO] install NUnit runners via NuGet"
+wget -nc https://nuget.org/nuget.exe;
+mozroots --import --sync
+mono nuget.exe install src/IO.Swagger.Test/packages.config -o packages;
+
+echo "[INFO] Copy DLLs to the 'bin' folder"
+# for project IO.Swagger
+cp packages/Newtonsoft.Json.8.0.2/lib/net45/Newtonsoft.Json.dll src/IO.Swagger/bin/Debug/Newtonsoft.Json.dll
+cp packages/RestSharp.105.1.0/lib/net45/RestSharp.dll src/IO.Swagger/bin/Debug/RestSharp.dll
+cp packages/NUnit.2.6.3/lib/nunit.framework.dll src/IO.Swagger/bin/Debug/nunit.framework.dll
+# for project IO.Swagger.Test
+cp packages/Newtonsoft.Json.8.0.2/lib/net45/Newtonsoft.Json.dll src/IO.Swagger.Test/bin/Debug/Newtonsoft.Json.dll
+cp packages/RestSharp.105.1.0/lib/net45/RestSharp.dll src/IO.Swagger.Test/bin/Debug/RestSharp.dll
+cp packages/NUnit.2.6.3/lib/nunit.framework.dll src/IO.Swagger.Test/bin/Debug/nunit.framework.dll
+
+echo "[INFO] build the solution and run the unit test"
+xbuild IO.Swagger.sln && \
+    mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe src/IO.Swagger.Test/bin/debug/IO.Swagger.Test.dll
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
index 2cc0dd9525cd..2ba51f5afa61 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
@@ -86,7 +86,7 @@ limitations under the License.
   <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
       <ProjectReference Include="..\IO.Swagger\IO.Swagger.csproj">
-          <Project>{EE727567-9CAF-4258-AA0E-FDF89487D7D6}</Project>
+          <Project>{7B057377-44BA-47A5-AC6B-70EEB6034E6F}</Project>
           <Name>IO.Swagger</Name>
       </ProjectReference>
   </ItemGroup>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
index a484b5b50267..9164a6b3fb03 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
@@ -24,7 +24,7 @@ limitations under the License.
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{EE727567-9CAF-4258-AA0E-FDF89487D7D6}</ProjectGuid>
+    <ProjectGuid>{7B057377-44BA-47A5-AC6B-70EEB6034E6F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swagger Library</RootNamespace>

From 4b6d372bffbf871bb3e1d7241122533fa49178ed Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sun, 12 Jun 2016 00:39:56 +0800
Subject: [PATCH 136/139] update C# json to 8.0.3

---
 .../src/main/resources/csharp/Project.mustache   |  8 ++++----
 .../main/resources/csharp/TestProject.mustache   | 16 ++++++++--------
 .../resources/csharp/mono_nunit_test.mustache    |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/csharp/Project.mustache b/modules/swagger-codegen/src/main/resources/csharp/Project.mustache
index a8e18ea91acd..7a4c741ca4af 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/Project.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/Project.mustache
@@ -71,10 +71,10 @@ limitations under the License.
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\Newtonsoft.Json.8.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
         <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll</HintPath>
diff --git a/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache b/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache
index 2866dcb0601d..07448f9cfef0 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache
@@ -71,10 +71,10 @@ limitations under the License.
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
     <Reference Include="Newtonsoft.Json">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\Newtonsoft.Json.8.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
         <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll</HintPath>
@@ -83,10 +83,10 @@ limitations under the License.
         <HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache b/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
index 33b960ac82bf..32eabefe317a 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
@@ -23,6 +23,6 @@ cp packages/NUnit.2.6.4/lib/nunit.framework.dll src/{{{packageName}}}.Test/bin/D
 echo "[INFO] Install NUnit runners via NuGet"
 mono nuget.exe install NUnit.Runners -Version 2.6.4 -OutputDirectory packages 
 
-echo "[INFO] build the solution and run the unit test"
+echo "[INFO] Build the solution and run the unit test"
 xbuild {{{packageName}}}.sln && \
     mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe src/{{{packageName}}}.Test/bin/debug/{{{packageName}}}.Test.dll

From 6ddf34ce8aa7047591b97182e9da7c7e59e0a11d Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sun, 12 Jun 2016 01:56:31 +0800
Subject: [PATCH 137/139] update nunit to 3.2.1

---
 .../resources/csharp/TestProject.mustache     |  8 +++----
 .../main/resources/csharp/api_test.mustache   |  3 ++-
 .../resources/csharp/compile-mono.sh.mustache |  2 +-
 .../main/resources/csharp/compile.mustache    |  2 +-
 .../main/resources/csharp/model_test.mustache |  7 ++++---
 .../resources/csharp/mono_nunit_test.mustache | 14 ++-----------
 .../csharp/packages_test.config.mustache      |  2 +-
 .../csharp/SwaggerClient/IO.Swagger.sln       | 10 ++++-----
 .../petstore/csharp/SwaggerClient/README.md   |  2 +-
 .../petstore/csharp/SwaggerClient/build.bat   |  2 +-
 .../petstore/csharp/SwaggerClient/build.sh    |  2 +-
 .../csharp/SwaggerClient/mono_nunit_test.sh   | 21 +++++++------------
 .../IO.Swagger.Test/IO.Swagger.Test.csproj    | 18 ++++++++--------
 .../src/IO.Swagger.Test/packages.config       |  4 ++--
 .../src/IO.Swagger/IO.Swagger.csproj          | 10 ++++-----
 .../src/IO.Swagger/packages.config            |  2 +-
 16 files changed, 47 insertions(+), 62 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache b/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache
index 07448f9cfef0..f01a7e25dbb7 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache
@@ -83,10 +83,10 @@ limitations under the License.
         <HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('{{binRelativePath}}')">{{binRelativePath}}\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
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 84904b8c08b3..4a4c2f98952c 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache
@@ -51,7 +51,8 @@ namespace {{packageName}}.Test
         [Test]
         public void {{operationId}}InstanceTest()
         {
-            Assert.IsInstanceOf<{{classname}}> (instance, "instance is a {{classname}}");
+            // TODO uncomment below to test 'IsInstanceOfType' {{classname}}
+            Assert.IsInstanceOfType(typeof({{classname}}), instance, "instance is a {{classname}}");
         }
 
         {{#operations}}{{#operation}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
index 2d3e96b96779..ea35b5d0b9cc 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
@@ -11,7 +11,7 @@ mono nuget.exe install src/{{packageName}}/packages.config -o packages;
 mkdir -p bin;
 
 echo "[INFO] Copy DLLs to the 'bin' folder"
-cp packages/Newtonsoft.Json.8.0.2/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
+cp packages/Newtonsoft.Json.8.0.3/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
 cp packages/RestSharp.105.1.0/lib/{{targetFrameworkNuget}}/RestSharp.dll bin/RestSharp.dll;
 
 echo "[INFO] Run 'mcs' to build bin/{{{packageName}}}.dll"
diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
index 7f6dcfe0713d..0164719456ae 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
@@ -8,7 +8,7 @@ if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient
 
 if not exist ".\bin" mkdir bin
 
-copy packages\Newtonsoft.Json.8.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
+copy packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
 copy packages\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll bin\RestSharp.dll
 
 %CSCPATH%\csc /reference:bin\Newtonsoft.Json.dll;bin\RestSharp.dll /target:library /out:bin\{{packageName}}.dll /recurse:src\{{packageName}}\*.cs /doc:bin\{{packageName}}.xml
diff --git a/modules/swagger-codegen/src/main/resources/csharp/model_test.mustache b/modules/swagger-codegen/src/main/resources/csharp/model_test.mustache
index 6fcc4672b32e..233534a33481 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/model_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/model_test.mustache
@@ -25,7 +25,8 @@ namespace {{packageName}}.Test
     [TestFixture]
     public class {{classname}}Tests
     {
-        private {{classname}} instance;
+        // TODO uncomment below to declare an instance variable for {{classname}}
+        //private {{classname}} instance;
 
         /// <summary>
         /// Setup before each test
@@ -52,8 +53,8 @@ namespace {{packageName}}.Test
         [Test]
         public void {{classname}}InstanceTest()
         {
-            // TODO uncomment below to test "IsInstanceOf" {{classname}}
-            //Assert.IsInstanceOf<{{classname}}> (instance, "variable 'instance' is a {{classname}}");
+            // TODO uncomment below to test "IsInstanceOfType" {{classname}}
+            //Assert.IsInstanceOfType<{{classname}}> (instance, "variable 'instance' is a {{classname}}");
         }
 
         {{#vars}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache b/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
index 32eabefe317a..52daa1c50635 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
@@ -10,19 +10,9 @@ wget -nc https://nuget.org/nuget.exe
 mozroots --import --sync
 mono nuget.exe install src/{{{packageName}}}.Test/packages.config -o packages
 
-echo "[INFO] Copy DLLs to the 'bin' folder"
-# for project {{{packageName}}}
-cp packages/Newtonsoft.Json.8.0.3/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll src/{{{packageName}}}/bin/Debug/Newtonsoft.Json.dll
-cp packages/RestSharp.105.1.0/lib/{{targetFrameworkNuget}}/RestSharp.dll src/{{{packageName}}}/bin/Debug/RestSharp.dll
-cp packages/NUnit.2.6.4/lib/nunit.framework.dll src/{{{packageName}}}/bin/Debug/nunit.framework.dll
-# for project {{{packageName}}}.Test
-cp packages/Newtonsoft.Json.8.0.3/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll src/{{{packageName}}}.Test/bin/Debug/Newtonsoft.Json.dll
-cp packages/RestSharp.105.1.0/lib/{{targetFrameworkNuget}}/RestSharp.dll src/{{{packageName}}}.Test/bin/Debug/RestSharp.dll
-cp packages/NUnit.2.6.4/lib/nunit.framework.dll src/{{{packageName}}}.Test/bin/Debug/nunit.framework.dll
-
 echo "[INFO] Install NUnit runners via NuGet"
-mono nuget.exe install NUnit.Runners -Version 2.6.4 -OutputDirectory packages 
+mono nuget.exe install NUnit.Runners -Version 3.2.1 -OutputDirectory packages 
 
 echo "[INFO] Build the solution and run the unit test"
 xbuild {{{packageName}}}.sln && \
-    mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe src/{{{packageName}}}.Test/bin/debug/{{{packageName}}}.Test.dll
+    mono ./packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe src/{{{packageName}}}.Test/bin/debug/{{{packageName}}}.Test.dll
diff --git a/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache b/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache
index 7e6f45753912..95192a480bf7 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.4" targetFramework="{{targetFrameworkNuget}}" />
+  <package id="NUnit" version="3.2.1" targetFramework="{{targetFrameworkNuget}}" />
   <package id="RestSharp" version="105.1.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
 </packages>
diff --git a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
index dc645198f380..6fc67c0bb518 100644
--- a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
+++ b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 VisualStudioVersion = 12.0.0.0
 MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{7B057377-44BA-47A5-AC6B-70EEB6034E6F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{64A65E8F-EACE-4663-9B82-B565E01CFEAE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger.Test", "src\IO.Swagger.Test\IO.Swagger.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
 EndProject
@@ -12,10 +12,10 @@ Debug|Any CPU = Debug|Any CPU
 Release|Any CPU = Release|Any CPU
 EndGlobalSection
 GlobalSection(ProjectConfigurationPlatforms) = postSolution
-{7B057377-44BA-47A5-AC6B-70EEB6034E6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{7B057377-44BA-47A5-AC6B-70EEB6034E6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{7B057377-44BA-47A5-AC6B-70EEB6034E6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{7B057377-44BA-47A5-AC6B-70EEB6034E6F}.Release|Any CPU.Build.0 = Release|Any CPU
+{64A65E8F-EACE-4663-9B82-B565E01CFEAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+{64A65E8F-EACE-4663-9B82-B565E01CFEAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+{64A65E8F-EACE-4663-9B82-B565E01CFEAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+{64A65E8F-EACE-4663-9B82-B565E01CFEAE}.Release|Any CPU.Build.0 = Release|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/samples/client/petstore/csharp/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClient/README.md
index 38d36d714935..8191778b36e5 100644
--- a/samples/client/petstore/csharp/SwaggerClient/README.md
+++ b/samples/client/petstore/csharp/SwaggerClient/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build date: 2016-06-11T23:10:58.942+08:00
+- Build date: 2016-06-12T01:56:22.092+08:00
 - Build package: class io.swagger.codegen.languages.CSharpClientCodegen
 
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp/SwaggerClient/build.bat b/samples/client/petstore/csharp/SwaggerClient/build.bat
index 80a13e482317..b0cdda9c0b21 100644
--- a/samples/client/petstore/csharp/SwaggerClient/build.bat
+++ b/samples/client/petstore/csharp/SwaggerClient/build.bat
@@ -8,7 +8,7 @@ if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient
 
 if not exist ".\bin" mkdir bin
 
-copy packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
+copy packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
 copy packages\RestSharp.105.1.0\lib\net45\RestSharp.dll bin\RestSharp.dll
 
 %CSCPATH%\csc /reference:bin\Newtonsoft.Json.dll;bin\RestSharp.dll /target:library /out:bin\IO.Swagger.dll /recurse:src\IO.Swagger\*.cs /doc:bin\IO.Swagger.xml
diff --git a/samples/client/petstore/csharp/SwaggerClient/build.sh b/samples/client/petstore/csharp/SwaggerClient/build.sh
index 88180f68398e..63cf08bc35c5 100644
--- a/samples/client/petstore/csharp/SwaggerClient/build.sh
+++ b/samples/client/petstore/csharp/SwaggerClient/build.sh
@@ -11,7 +11,7 @@ mono nuget.exe install src/IO.Swagger/packages.config -o packages;
 mkdir -p bin;
 
 echo "[INFO] Copy DLLs to the 'bin' folder"
-cp packages/Newtonsoft.Json.8.0.2/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
+cp packages/Newtonsoft.Json.8.0.3/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
 cp packages/RestSharp.105.1.0/lib/net45/RestSharp.dll bin/RestSharp.dll;
 
 echo "[INFO] Run 'mcs' to build bin/IO.Swagger.dll"
diff --git a/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh b/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh
index e2be7882f395..43d936184483 100644
--- a/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh
+++ b/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh
@@ -1,25 +1,18 @@
 #!/usr/bin/env bash
-wget -nc https://nuget.org/nuget.exe;
+wget -nc https://nuget.org/nuget.exe
 mozroots --import --sync
 
 echo "[INFO] remove bin/Debug/SwaggerClientTest.dll"
 rm src/IO.Swagger.Test/bin/Debug/IO.Swagger.Test.dll 2> /dev/null
 
 echo "[INFO] install NUnit runners via NuGet"
-wget -nc https://nuget.org/nuget.exe;
+wget -nc https://nuget.org/nuget.exe
 mozroots --import --sync
-mono nuget.exe install src/IO.Swagger.Test/packages.config -o packages;
+mono nuget.exe install src/IO.Swagger.Test/packages.config -o packages
 
-echo "[INFO] Copy DLLs to the 'bin' folder"
-# for project IO.Swagger
-cp packages/Newtonsoft.Json.8.0.2/lib/net45/Newtonsoft.Json.dll src/IO.Swagger/bin/Debug/Newtonsoft.Json.dll
-cp packages/RestSharp.105.1.0/lib/net45/RestSharp.dll src/IO.Swagger/bin/Debug/RestSharp.dll
-cp packages/NUnit.2.6.3/lib/nunit.framework.dll src/IO.Swagger/bin/Debug/nunit.framework.dll
-# for project IO.Swagger.Test
-cp packages/Newtonsoft.Json.8.0.2/lib/net45/Newtonsoft.Json.dll src/IO.Swagger.Test/bin/Debug/Newtonsoft.Json.dll
-cp packages/RestSharp.105.1.0/lib/net45/RestSharp.dll src/IO.Swagger.Test/bin/Debug/RestSharp.dll
-cp packages/NUnit.2.6.3/lib/nunit.framework.dll src/IO.Swagger.Test/bin/Debug/nunit.framework.dll
+echo "[INFO] Install NUnit runners via NuGet"
+mono nuget.exe install NUnit.Runners -Version 3.2.1 -OutputDirectory packages 
 
-echo "[INFO] build the solution and run the unit test"
+echo "[INFO] Build the solution and run the unit test"
 xbuild IO.Swagger.sln && \
-    mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe src/IO.Swagger.Test/bin/debug/IO.Swagger.Test.dll
+    mono ./packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe src/IO.Swagger.Test/bin/debug/IO.Swagger.Test.dll
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
index 2ba51f5afa61..9f21997895be 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
@@ -59,10 +59,10 @@ limitations under the License.
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
     <Reference Include="Newtonsoft.Json">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
         <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
@@ -71,10 +71,10 @@ limitations under the License.
         <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -86,7 +86,7 @@ limitations under the License.
   <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
       <ProjectReference Include="..\IO.Swagger\IO.Swagger.csproj">
-          <Project>{7B057377-44BA-47A5-AC6B-70EEB6034E6F}</Project>
+          <Project>{64A65E8F-EACE-4663-9B82-B565E01CFEAE}</Project>
           <Name>IO.Swagger</Name>
       </ProjectReference>
   </ItemGroup>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/packages.config b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/packages.config
index a8a3491f63d9..317248179b66 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/packages.config
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.3" targetFramework="net45" />
+  <package id="NUnit" version="3.2.1" targetFramework="net45" />
   <package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" developmentDependency="true" />
 </packages>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
index 9164a6b3fb03..844d959bcff8 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
@@ -24,7 +24,7 @@ limitations under the License.
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7B057377-44BA-47A5-AC6B-70EEB6034E6F}</ProjectGuid>
+    <ProjectGuid>{64A65E8F-EACE-4663-9B82-B565E01CFEAE}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swagger Library</RootNamespace>
@@ -59,10 +59,10 @@ limitations under the License.
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
         <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/packages.config b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/packages.config
index 91f17cd0819d..80f617d6d9f4 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/packages.config
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" developmentDependency="true" />
 </packages>

From bca3d24d20ec557aa0f4a4cc5ec19d9522364c91 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sun, 12 Jun 2016 12:41:35 +0800
Subject: [PATCH 138/139] fix test cases, fix warning in exceptionfactory,
 update .swagger-codegen-ignore for c# to keep logo file (for upload test)

---
 .../csharp/ExceptionFactory.mustache          |  8 ++++
 .../main/resources/csharp/api_test.mustache   |  6 +--
 .../resources/csharp/compile-mono.sh.mustache | 25 ++++++++++-
 .../main/resources/csharp/compile.mustache    | 14 +++++++
 .../resources/csharp/mono_nunit_test.mustache | 15 +++++++
 .../SwaggerClient/.swagger-codegen-ignore     |  1 +
 .../csharp/SwaggerClient/IO.Swagger.sln       | 10 ++---
 .../petstore/csharp/SwaggerClient/README.md   |  2 +-
 .../petstore/csharp/SwaggerClient/build.bat   | 14 +++++++
 .../petstore/csharp/SwaggerClient/build.sh    | 25 ++++++++++-
 .../csharp/SwaggerClient/mono_nunit_test.sh   | 15 +++++++
 .../src/IO.Swagger.Test/Api/FakeApiTests.cs   |  2 +-
 .../src/IO.Swagger.Test/Api/PetApiTests.cs    | 36 ++++++++--------
 .../src/IO.Swagger.Test/Api/StoreApiTests.cs  |  4 +-
 .../src/IO.Swagger.Test/Api/UserApiTests.cs   |  2 +-
 .../IO.Swagger.Test/IO.Swagger.Test.csproj    | 42 ++++++++++---------
 .../Model/AdditionalPropertiesClassTests.cs   |  2 +-
 .../IO.Swagger.Test/Model/AnimalFarmTests.cs  |  2 +-
 .../src/IO.Swagger.Test/Model/AnimalTests.cs  |  2 +-
 .../IO.Swagger.Test/Model/ApiResponseTests.cs |  2 +-
 .../IO.Swagger.Test/Model/ArrayTestTests.cs   |  2 +-
 .../src/IO.Swagger.Test/Model/CatTests.cs     |  2 +-
 .../IO.Swagger.Test/Model/CategoryTests.cs    |  2 +-
 .../src/IO.Swagger.Test/Model/DogTests.cs     |  2 +-
 .../IO.Swagger.Test/Model/EnumClassTests.cs   |  2 +-
 .../IO.Swagger.Test/Model/EnumTestTests.cs    |  2 +-
 .../IO.Swagger.Test/Model/FormatTestTests.cs  |  2 +-
 ...ertiesAndAdditionalPropertiesClassTests.cs |  2 +-
 .../Model/Model200ResponseTests.cs            |  2 +-
 .../IO.Swagger.Test/Model/ModelReturnTests.cs |  2 +-
 .../src/IO.Swagger.Test/Model/NameTests.cs    |  2 +-
 .../src/IO.Swagger.Test/Model/OrderTests.cs   |  2 +-
 .../src/IO.Swagger.Test/Model/PetTests.cs     |  2 +-
 .../Model/ReadOnlyFirstTests.cs               |  2 +-
 .../Model/SpecialModelNameTests.cs            |  2 +-
 .../src/IO.Swagger.Test/Model/TagTests.cs     |  2 +-
 .../src/IO.Swagger.Test/Model/UserTests.cs    |  2 +-
 .../src/IO.Swagger/Client/ExceptionFactory.cs | 29 +++++++++++++
 .../src/IO.Swagger/IO.Swagger.csproj          |  2 +-
 39 files changed, 219 insertions(+), 75 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/csharp/ExceptionFactory.mustache b/modules/swagger-codegen/src/main/resources/csharp/ExceptionFactory.mustache
index ad3cd2ac02f5..c25b88ee6141 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ExceptionFactory.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ExceptionFactory.mustache
@@ -1,7 +1,15 @@
+{{>partial_header}}
+
 using System;
 using RestSharp;
 
 namespace {{packageName}}.Client
 {
+    /// <summary>
+    /// A delegate to ExceptionFactory method
+    /// </summary>
+    /// <param name="methodName">Method name</param>
+    /// <param name="response">Response</param>
+    /// <returns>Exceptions</returns>    
     public delegate Exception ExceptionFactory(string methodName, IRestResponse response);
 }
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 4a4c2f98952c..f3f1caeaf0ae 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api_test.mustache
@@ -51,7 +51,7 @@ namespace {{packageName}}.Test
         [Test]
         public void {{operationId}}InstanceTest()
         {
-            // TODO uncomment below to test 'IsInstanceOfType' {{classname}}
+            // test 'IsInstanceOfType' {{classname}}
             Assert.IsInstanceOfType(typeof({{classname}}), instance, "instance is a {{classname}}");
         }
 
@@ -62,9 +62,9 @@ namespace {{packageName}}.Test
         [Test]
         public void {{operationId}}Test()
         {
-            // TODO uncomment below to test the method '{{operationId}}'
+            // TODO uncomment below to test the method and replace null with proper value
             {{#allParams}}
-            //{{{dataType}}} {{paramName}} = null; // TODO: replace null with proper value
+            //{{{dataType}}} {{paramName}} = null;
             {{/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/compile-mono.sh.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
index ea35b5d0b9cc..7aab36570905 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+#
+# Generated by: https://github.com/swagger-api/swagger-codegen.git
+#
+# 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.
+
 frameworkVersion={{targetFrameworkNuget}}
 netfx=${frameworkVersion#net}
 
@@ -8,9 +23,9 @@ echo "[INFO] Download nuget and packages"
 wget -nc https://nuget.org/nuget.exe;
 mozroots --import --sync
 mono nuget.exe install src/{{packageName}}/packages.config -o packages;
-mkdir -p bin;
 
 echo "[INFO] Copy DLLs to the 'bin' folder"
+mkdir -p bin;
 cp packages/Newtonsoft.Json.8.0.3/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
 cp packages/RestSharp.105.1.0/lib/{{targetFrameworkNuget}}/RestSharp.dll bin/RestSharp.dll;
 
@@ -23,3 +38,11 @@ System.Runtime.Serialization.dll \
 -recurse:'src/{{packageName}}/*.cs' \
 -doc:bin/{{packageName}}.xml \
 -platform:anycpu
+
+if [ $? -ne 0 ]
+then
+  echo "[ERROR] Compilation failed with exit code $?"
+  exit 1
+else
+  echo "[INFO] bin/{{{packageName}}}.dll was created successfully"
+fi
diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
index 0164719456ae..5da333f4e72c 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
@@ -1,3 +1,17 @@
+:: Generated by: https://github.com/swagger-api/swagger-codegen.git
+::
+:: 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.
+
 @echo off
 
 {{#supportsAsync}}SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319{{/supportsAsync}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache b/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
index 52daa1c50635..114e86a7a285 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+#
+# Generated by: https://github.com/swagger-api/swagger-codegen.git
+#
+# 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.
+
 wget -nc https://nuget.org/nuget.exe
 mozroots --import --sync
 
diff --git a/samples/client/petstore/csharp/SwaggerClient/.swagger-codegen-ignore b/samples/client/petstore/csharp/SwaggerClient/.swagger-codegen-ignore
index 19d3377182e2..61ed08d34550 100644
--- a/samples/client/petstore/csharp/SwaggerClient/.swagger-codegen-ignore
+++ b/samples/client/petstore/csharp/SwaggerClient/.swagger-codegen-ignore
@@ -21,3 +21,4 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
+src/IO.Swagger.Test/IO.Swagger.Test.csproj
diff --git a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
index 6fc67c0bb518..95488d816b98 100644
--- a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
+++ b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 VisualStudioVersion = 12.0.0.0
 MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{64A65E8F-EACE-4663-9B82-B565E01CFEAE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{7B20DAE3-B510-4814-8986-CF1B89EA039E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger.Test", "src\IO.Swagger.Test\IO.Swagger.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
 EndProject
@@ -12,10 +12,10 @@ Debug|Any CPU = Debug|Any CPU
 Release|Any CPU = Release|Any CPU
 EndGlobalSection
 GlobalSection(ProjectConfigurationPlatforms) = postSolution
-{64A65E8F-EACE-4663-9B82-B565E01CFEAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{64A65E8F-EACE-4663-9B82-B565E01CFEAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{64A65E8F-EACE-4663-9B82-B565E01CFEAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{64A65E8F-EACE-4663-9B82-B565E01CFEAE}.Release|Any CPU.Build.0 = Release|Any CPU
+{7B20DAE3-B510-4814-8986-CF1B89EA039E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+{7B20DAE3-B510-4814-8986-CF1B89EA039E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+{7B20DAE3-B510-4814-8986-CF1B89EA039E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+{7B20DAE3-B510-4814-8986-CF1B89EA039E}.Release|Any CPU.Build.0 = Release|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/samples/client/petstore/csharp/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClient/README.md
index 8191778b36e5..a0bd07807404 100644
--- a/samples/client/petstore/csharp/SwaggerClient/README.md
+++ b/samples/client/petstore/csharp/SwaggerClient/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build date: 2016-06-12T01:56:22.092+08:00
+- Build date: 2016-06-12T12:38:46.317+08:00
 - Build package: class io.swagger.codegen.languages.CSharpClientCodegen
 
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp/SwaggerClient/build.bat b/samples/client/petstore/csharp/SwaggerClient/build.bat
index b0cdda9c0b21..ae94b120d7b8 100644
--- a/samples/client/petstore/csharp/SwaggerClient/build.bat
+++ b/samples/client/petstore/csharp/SwaggerClient/build.bat
@@ -1,3 +1,17 @@
+:: Generated by: https://github.com/swagger-api/swagger-codegen.git
+::
+:: 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.
+
 @echo off
 
 SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
diff --git a/samples/client/petstore/csharp/SwaggerClient/build.sh b/samples/client/petstore/csharp/SwaggerClient/build.sh
index 63cf08bc35c5..25228f3cc368 100644
--- a/samples/client/petstore/csharp/SwaggerClient/build.sh
+++ b/samples/client/petstore/csharp/SwaggerClient/build.sh
@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+#
+# Generated by: https://github.com/swagger-api/swagger-codegen.git
+#
+# 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.
+
 frameworkVersion=net45
 netfx=${frameworkVersion#net}
 
@@ -8,9 +23,9 @@ echo "[INFO] Download nuget and packages"
 wget -nc https://nuget.org/nuget.exe;
 mozroots --import --sync
 mono nuget.exe install src/IO.Swagger/packages.config -o packages;
-mkdir -p bin;
 
 echo "[INFO] Copy DLLs to the 'bin' folder"
+mkdir -p bin;
 cp packages/Newtonsoft.Json.8.0.3/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
 cp packages/RestSharp.105.1.0/lib/net45/RestSharp.dll bin/RestSharp.dll;
 
@@ -23,3 +38,11 @@ System.Runtime.Serialization.dll \
 -recurse:'src/IO.Swagger/*.cs' \
 -doc:bin/IO.Swagger.xml \
 -platform:anycpu
+
+if [ $? -ne 0 ]
+then
+  echo "[ERROR] Compilation failed with exit code $?"
+  exit 1
+else
+  echo "[INFO] bin/IO.Swagger.dll was created successfully"
+fi
diff --git a/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh b/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh
index 43d936184483..45626ecad481 100644
--- a/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh
+++ b/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh
@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+#
+# Generated by: https://github.com/swagger-api/swagger-codegen.git
+#
+# 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.
+
 wget -nc https://nuget.org/nuget.exe
 mozroots --import --sync
 
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/FakeApiTests.cs
index 71a4063af4ea..7f537b165588 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/FakeApiTests.cs
@@ -48,7 +48,7 @@ namespace IO.Swagger.Test
         [Test]
         public void InstanceTest()
         {
-            Assert.IsInstanceOf<FakeApi> (instance, "instance is a FakeApi");
+			Assert.IsInstanceOfType(typeof(FakeApi), instance, "instance is a FakeApi");
         }
 
         
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/PetApiTests.cs
index b9dae814b68d..0d517af68b5a 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/PetApiTests.cs
@@ -97,7 +97,7 @@ namespace IO.Swagger.Test
         [Test]
         public void InstanceTest()
         {
-            Assert.IsInstanceOf<PetApi> (instance, "instance is a PetApi");
+			Assert.IsInstanceOfType(typeof(PetApi), instance, "instance is a PetApi");
         }
 
         
@@ -134,7 +134,7 @@ namespace IO.Swagger.Test
 			List<Pet> listPet = petApi.FindPetsByTags (tagsList);
 			foreach (Pet pet in listPet) // Loop through List with foreach.
 			{
-				Assert.IsInstanceOf<Pet> (pet, "Response is a Pet");
+				Assert.IsInstanceOfType(typeof(Pet), pet, "Response is a Pet");
 				Assert.AreEqual ("csharp sample tag name1", pet.Tags[0]);
 			}
         }
@@ -147,7 +147,7 @@ namespace IO.Swagger.Test
         {
 			List<string> tags = new List<String>(new String[] {"pet"});
             var response = instance.FindPetsByTags(tags);
-            Assert.IsInstanceOf<List<Pet>> (response, "response is List<Pet>");
+			Assert.IsInstanceOfType(typeof(List<Pet>), response, "response is List<Pet>");
         }
         
         /// <summary>
@@ -161,19 +161,19 @@ namespace IO.Swagger.Test
 
 			PetApi petApi = new PetApi (c1);
 			Pet response = petApi.GetPetById (petId);
-			Assert.IsInstanceOf<Pet> (response, "Response is a Pet");
+			Assert.IsInstanceOfType(typeof(Pet), response, "Response is a Pet");
 
 			Assert.AreEqual ("Csharp test", response.Name);
 			Assert.AreEqual (Pet.StatusEnum.Available, response.Status);
 
-			Assert.IsInstanceOf<List<Tag>> (response.Tags, "Response.Tags is a Array");
+			Assert.IsInstanceOfType(typeof(List<Tag>), response.Tags, "Response.Tags is a Array");
 			Assert.AreEqual (petId, response.Tags [0].Id);
 			Assert.AreEqual ("csharp sample tag name1", response.Tags [0].Name);
 
-			Assert.IsInstanceOf<List<String>> (response.PhotoUrls, "Response.PhotoUrls is a Array");
+			Assert.IsInstanceOfType(typeof(List<String>), response.PhotoUrls, "Response.PhotoUrls is a Array");
 			Assert.AreEqual ("sample photoUrls", response.PhotoUrls [0]);
 
-			Assert.IsInstanceOf<Category> (response.Category, "Response.Category is a Category");
+			Assert.IsInstanceOfType(typeof(Category), response.Category, "Response.Category is a Category");
 			Assert.AreEqual (56, response.Category.Id);
 			Assert.AreEqual ("sample category name2", response.Category.Name);
         }
@@ -187,19 +187,19 @@ namespace IO.Swagger.Test
 			PetApi petApi = new PetApi ();
 			var task = petApi.GetPetByIdAsync (petId);
 			Pet response = task.Result;
-			Assert.IsInstanceOf<Pet> (response, "Response is a Pet");
+			Assert.IsInstanceOfType(typeof(Pet), response, "Response is a Pet");
 
 			Assert.AreEqual ("Csharp test", response.Name);
 			Assert.AreEqual (Pet.StatusEnum.Available, response.Status);
 
-			Assert.IsInstanceOf<List<Tag>> (response.Tags, "Response.Tags is a Array");
+			Assert.IsInstanceOfType(typeof(List<Tag>), response.Tags, "Response.Tags is a Array");
 			Assert.AreEqual (petId, response.Tags [0].Id);
 			Assert.AreEqual ("csharp sample tag name1", response.Tags [0].Name);
 
-			Assert.IsInstanceOf<List<String>> (response.PhotoUrls, "Response.PhotoUrls is a Array");
+			Assert.IsInstanceOfType(typeof(List<String>), response.PhotoUrls, "Response.PhotoUrls is a Array");
 			Assert.AreEqual ("sample photoUrls", response.PhotoUrls [0]);
 
-			Assert.IsInstanceOf<Category> (response.Category, "Response.Category is a Category");
+			Assert.IsInstanceOfType(typeof(Category), response.Category, "Response.Category is a Category");
 			Assert.AreEqual (56, response.Category.Id);
 			Assert.AreEqual ("sample category name2", response.Category.Name);
 
@@ -219,19 +219,19 @@ namespace IO.Swagger.Test
 			Assert.AreEqual (task.Result.Headers["Content-Type"], "application/json");
 
 			Pet response = task.Result.Data;
-			Assert.IsInstanceOf<Pet> (response, "Response is a Pet");
+			Assert.IsInstanceOfType(typeof(Pet), response, "Response is a Pet");
 
 			Assert.AreEqual ("Csharp test", response.Name);
 			Assert.AreEqual (Pet.StatusEnum.Available, response.Status);
 
-			Assert.IsInstanceOf<List<Tag>> (response.Tags, "Response.Tags is a Array");
+			Assert.IsInstanceOfType(typeof(List<Tag>), response.Tags, "Response.Tags is a Array");
 			Assert.AreEqual (petId, response.Tags [0].Id);
 			Assert.AreEqual ("csharp sample tag name1", response.Tags [0].Name);
 
-			Assert.IsInstanceOf<List<String>> (response.PhotoUrls, "Response.PhotoUrls is a Array");
+			Assert.IsInstanceOfType(typeof(List<String>), response.PhotoUrls, "Response.PhotoUrls is a Array");
 			Assert.AreEqual ("sample photoUrls", response.PhotoUrls [0]);
 
-			Assert.IsInstanceOf<Category> (response.Category, "Response.Category is a Category");
+			Assert.IsInstanceOfType(typeof(Category), response.Category, "Response.Category is a Category");
 			Assert.AreEqual (56, response.Category.Id);
 			Assert.AreEqual ("sample category name2", response.Category.Name);
 
@@ -258,9 +258,9 @@ namespace IO.Swagger.Test
 			petApi.UpdatePetWithForm (petId, "new form name", "pending");
 
 			Pet response = petApi.GetPetById (petId);
-			Assert.IsInstanceOf<Pet> (response, "Response is a Pet");
-			Assert.IsInstanceOf<Category> (response.Category, "Response.Category is a Category");
-			Assert.IsInstanceOf<List<Tag>> (response.Tags, "Response.Tags is a Array");
+			Assert.IsInstanceOfType(typeof(Pet), response, "Response is a Pet");
+			Assert.IsInstanceOfType(typeof(Category), response.Category, "Response.Category is a Category");
+			Assert.IsInstanceOfType(typeof(List<Tag>), response.Tags, "Response.Tags is a Array");
 
 			Assert.AreEqual ("new form name", response.Name);
 			Assert.AreEqual (Pet.StatusEnum.Pending, response.Status);
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/StoreApiTests.cs
index e1237b51c0be..2ca3b35f30df 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/StoreApiTests.cs
@@ -50,7 +50,7 @@ namespace IO.Swagger.Test
         [Test]
         public void InstanceTest()
         {
-            Assert.IsInstanceOf<StoreApi> (instance, "instance is a StoreApi");
+			Assert.IsInstanceOfType(typeof(StoreApi), instance, "instance is a StoreApi");
         }
 
         
@@ -84,7 +84,7 @@ namespace IO.Swagger.Test
 
 			foreach(KeyValuePair<string, int?> entry in response)
 			{
-				Assert.IsInstanceOf (typeof(int?), entry.Value);
+				Assert.IsInstanceOfType(typeof(int?), entry.Value);
 			}
         }
         
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/UserApiTests.cs
index 77f6bd5ec99a..31edf4929234 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Api/UserApiTests.cs
@@ -49,7 +49,7 @@ namespace IO.Swagger.Test
         [Test]
         public void InstanceTest()
         {
-            Assert.IsInstanceOf<UserApi> (instance, "instance is a UserApi");
+			Assert.IsInstanceOfType(typeof(UserApi), instance, "instance is a UserApi");
         }
 
         
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
index 9f21997895be..5660f132a37b 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
@@ -20,7 +20,7 @@ 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.
 -->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -59,36 +59,38 @@ limitations under the License.
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
     <Reference Include="Newtonsoft.Json">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+      <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+      <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
+      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
+      <HintPath Condition="Exists('..\packages')">..\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
+      <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
+      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.3.2.1\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="**\*.cs"/>
+    <Compile Include="**\*.cs" />
   </ItemGroup>
   <ItemGroup>
-      <None Include="packages.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-      <ProjectReference Include="..\IO.Swagger\IO.Swagger.csproj">
-          <Project>{64A65E8F-EACE-4663-9B82-B565E01CFEAE}</Project>
-          <Name>IO.Swagger</Name>
-      </ProjectReference>
+    <ProjectReference Include="..\IO.Swagger\IO.Swagger.csproj">
+      <Project>{85AE8212-9819-4224-A9E5-B93419EC927B}</Project>
+      <Name>IO.Swagger</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="swagger-logo.png" />
   </ItemGroup>
 </Project>
-
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AdditionalPropertiesClassTests.cs
index fca6d20d0dc4..b4680801e4cf 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AdditionalPropertiesClassTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AdditionalPropertiesClassTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void AdditionalPropertiesClassInstanceTest()
         {
-            Assert.IsInstanceOf<AdditionalPropertiesClass> (instance, "instance is a AdditionalPropertiesClass");
+			Assert.IsInstanceOfType(typeof(AdditionalPropertiesClass), instance, "instance is a AdditionalPropertiesClass");
         }
 
 
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AnimalFarmTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AnimalFarmTests.cs
index 5baa4d934852..6e824fbfd842 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AnimalFarmTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AnimalFarmTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void AnimalFarmInstanceTest()
         {
-            Assert.IsInstanceOf<AnimalFarm> (instance, "instance is a AnimalFarm");
+			Assert.IsInstanceOfType(typeof(AnimalFarm), instance, "instance is a AnimalFarm");
         }
 
 
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AnimalTests.cs
index e7356e3750da..59cd4d76d688 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AnimalTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/AnimalTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void AnimalInstanceTest()
         {
-            Assert.IsInstanceOf<Animal> (instance, "instance is a Animal");
+			Assert.IsInstanceOfType(typeof(Animal), instance, "instance is a Animal");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ApiResponseTests.cs
index c2535cdadb3c..13d4310916b1 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ApiResponseTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ApiResponseTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void ApiResponseInstanceTest()
         {
-            Assert.IsInstanceOf<ApiResponse> (instance, "instance is a ApiResponse");
+			Assert.IsInstanceOfType(typeof(ApiResponse), instance, "instance is a ApiResponse");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ArrayTestTests.cs
index fd6b6f31d86b..c063340171fc 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ArrayTestTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ArrayTestTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void ArrayTestInstanceTest()
         {
-            Assert.IsInstanceOf<ArrayTest> (instance, "instance is a ArrayTest");
+			Assert.IsInstanceOfType(typeof(ArrayTest), instance, "instance is a ArrayTest");
         }
 
 
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/CatTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/CatTests.cs
index 72e65f60bf0f..8a6abb12f622 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/CatTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/CatTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void CatInstanceTest()
         {
-            Assert.IsInstanceOf<Cat> (instance, "instance is a Cat");
+			Assert.IsInstanceOfType(typeof(Cat), instance, "instance is a Cat");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/CategoryTests.cs
index 96e5d946c0b2..3c7ba0499aac 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/CategoryTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/CategoryTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void CategoryInstanceTest()
         {
-            Assert.IsInstanceOf<Category> (instance, "instance is a Category");
+			Assert.IsInstanceOfType(typeof(Category), instance, "instance is a Category");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/DogTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/DogTests.cs
index 624c16d479db..5d3b6fef1759 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/DogTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/DogTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void DogInstanceTest()
         {
-            Assert.IsInstanceOf<Dog> (instance, "instance is a Dog");
+			Assert.IsInstanceOfType(typeof(Dog), instance, "instance is a Dog");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/EnumClassTests.cs
index d2a3fc86c789..154e3c7b57a4 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/EnumClassTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/EnumClassTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void EnumClassInstanceTest()
         {
-            Assert.IsInstanceOf<EnumClass> (instance, "instance is a EnumClass");
+			Assert.IsInstanceOfType(typeof(EnumClass), instance, "instance is a EnumClass");
         }
 
 		/// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/EnumTestTests.cs
index 2679b0852332..9ea929a0cd6f 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/EnumTestTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/EnumTestTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void EnumTestInstanceTest()
         {
-            Assert.IsInstanceOf<EnumTest> (instance, "instance is a EnumTest");
+			Assert.IsInstanceOfType(typeof(EnumTest), instance, "instance is a EnumTest");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/FormatTestTests.cs
index e1d59bcc1741..1d2d334a45e4 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/FormatTestTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/FormatTestTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void FormatTestInstanceTest()
         {
-            Assert.IsInstanceOf<FormatTest> (instance, "instance is a FormatTest");
+			Assert.IsInstanceOfType(typeof(FormatTest), instance, "instance is a FormatTest");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
index e21779241db6..2157758ec1f2 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void MixedPropertiesAndAdditionalPropertiesClassInstanceTest()
         {
-            Assert.IsInstanceOf<MixedPropertiesAndAdditionalPropertiesClass> (instance, "instance is a MixedPropertiesAndAdditionalPropertiesClass");
+			Assert.IsInstanceOfType(typeof(MixedPropertiesAndAdditionalPropertiesClass), instance, "instance is a MixedPropertiesAndAdditionalPropertiesClass");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/Model200ResponseTests.cs
index eb55902a998c..13bbc1b1c7df 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/Model200ResponseTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/Model200ResponseTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void Model200ResponseInstanceTest()
         {
-            Assert.IsInstanceOf<Model200Response> (instance, "instance is a Model200Response");
+			Assert.IsInstanceOfType(typeof(Model200Response), instance, "instance is a Model200Response");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ModelReturnTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ModelReturnTests.cs
index 1c620b732417..53e62fc51a33 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ModelReturnTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ModelReturnTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void ModelReturnInstanceTest()
         {
-            Assert.IsInstanceOf<ModelReturn> (instance, "instance is a ModelReturn");
+			Assert.IsInstanceOfType(typeof(ModelReturn), instance, "instance is a ModelReturn");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/NameTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/NameTests.cs
index d8fbafe238c0..d1e0deec41f3 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/NameTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/NameTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void NameInstanceTest()
         {
-            Assert.IsInstanceOf<Name> (instance, "instance is a Name");
+			Assert.IsInstanceOfType(typeof(Name), instance, "instance is a Name");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/OrderTests.cs
index 2d55d2300f9c..799b6ef43f8a 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/OrderTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/OrderTests.cs
@@ -57,7 +57,7 @@ namespace IO.Swagger.Test
         [Test]
         public void OrderInstanceTest()
         {
-            Assert.IsInstanceOf<Order> (instance, "instance is a Order");
+			Assert.IsInstanceOfType(typeof(Order), instance, "instance is a Order");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/PetTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/PetTests.cs
index 24be033f6c59..7029264ee06e 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/PetTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/PetTests.cs
@@ -49,7 +49,7 @@ namespace IO.Swagger.Test
         [Test]
         public void PetInstanceTest()
         {
-            Assert.IsInstanceOf<Pet> (instance, "instance is a Pet");
+			Assert.IsInstanceOfType(typeof(Pet), instance, "instance is a Pet");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ReadOnlyFirstTests.cs
index 9aa3cec42b25..e0c4029546b0 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ReadOnlyFirstTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/ReadOnlyFirstTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void ReadOnlyFirstInstanceTest()
         {
-            Assert.IsInstanceOf<ReadOnlyFirst> (instance, "instance is a ReadOnlyFirst");
+			Assert.IsInstanceOfType(typeof(ReadOnlyFirst), instance, "instance is a ReadOnlyFirst");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/SpecialModelNameTests.cs
index 21051e71f543..eec6e837449e 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/SpecialModelNameTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/SpecialModelNameTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void SpecialModelNameInstanceTest()
         {
-            Assert.IsInstanceOf<SpecialModelName> (instance, "instance is a SpecialModelName");
+			Assert.IsInstanceOfType(typeof(SpecialModelName), instance, "instance is a SpecialModelName");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/TagTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/TagTests.cs
index 4fff0e4c12d0..2b78594eb6f4 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/TagTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/TagTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void TagInstanceTest()
         {
-            Assert.IsInstanceOf<Tag> (instance, "instance is a Tag");
+			Assert.IsInstanceOfType(typeof(Tag), instance, "instance is a Tag");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/UserTests.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/UserTests.cs
index 38f2667c4031..59451079ebff 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/UserTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/Model/UserTests.cs
@@ -47,7 +47,7 @@ namespace IO.Swagger.Test
         [Test]
         public void UserInstanceTest()
         {
-            Assert.IsInstanceOf<User> (instance, "instance is a User");
+			Assert.IsInstanceOfType(typeof(User), instance, "instance is a User");
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ExceptionFactory.cs
index 24e5fad478f2..579cb8618c21 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ExceptionFactory.cs
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Client/ExceptionFactory.cs
@@ -1,7 +1,36 @@
+/* 
+ * Swagger Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ *
+ * 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.
+ */
+
+
 using System;
 using RestSharp;
 
 namespace IO.Swagger.Client
 {
+    /// <summary>
+    /// A delegate to ExceptionFactory method
+    /// </summary>
+    /// <param name="methodName">Method name</param>
+    /// <param name="response">Response</param>
+    /// <returns>Exceptions</returns>    
     public delegate Exception ExceptionFactory(string methodName, IRestResponse response);
 }
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
index 844d959bcff8..d878c8123962 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
@@ -24,7 +24,7 @@ limitations under the License.
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{64A65E8F-EACE-4663-9B82-B565E01CFEAE}</ProjectGuid>
+    <ProjectGuid>{7B20DAE3-B510-4814-8986-CF1B89EA039E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swagger Library</RootNamespace>

From 16d89a47b7aeae451d519682159565426ad6e9ac Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sun, 12 Jun 2016 16:45:49 +0800
Subject: [PATCH 139/139] add travis file for C# client

---
 .../languages/CSharpClientCodegen.java        |  5 ++++-
 .../resources/csharp/mono_nunit_test.mustache |  2 +-
 .../src/main/resources/csharp/travis.mustache | 21 +++++++++++++++++++
 .../petstore/csharp/SwaggerClient/.travis.yml | 21 +++++++++++++++++++
 .../csharp/SwaggerClient/IO.Swagger.sln       | 10 ++++-----
 .../petstore/csharp/SwaggerClient/README.md   |  2 +-
 .../csharp/SwaggerClient/mono_nunit_test.sh   |  2 +-
 .../src/IO.Swagger/IO.Swagger.csproj          |  2 +-
 8 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/csharp/travis.mustache
 create mode 100644 samples/client/petstore/csharp/SwaggerClient/.travis.yml

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 ef3baedd78ea..4265f67709cd 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
@@ -243,6 +243,8 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
 
         // copy package.config to nuget's standard location for project-level installs
         supportingFiles.add(new SupportingFile("packages.config.mustache", packageFolder + File.separator, "packages.config"));
+        // .travis.yml for travis-ci.org CI
+        supportingFiles.add(new SupportingFile("travis.mustache", "", ".travis.yml"));
 
         if(Boolean.FALSE.equals(excludeTests)) {
             supportingFiles.add(new SupportingFile("packages_test.config.mustache", testPackageFolder + File.separator, "packages.config"));
@@ -252,7 +254,8 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
         supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
         // apache v2 license
-        supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
+        // UPDATE (20160612) no longer needed as the Apache v2 LICENSE is added globally
+        //supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
 
         if (optionalAssemblyInfoFlag) {
             supportingFiles.add(new SupportingFile("AssemblyInfo.mustache", packageFolder + File.separator + "Properties", "AssemblyInfo.cs"));
diff --git a/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache b/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
index 114e86a7a285..b4d1cd74ca63 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/mono_nunit_test.mustache
@@ -30,4 +30,4 @@ mono nuget.exe install NUnit.Runners -Version 3.2.1 -OutputDirectory packages
 
 echo "[INFO] Build the solution and run the unit test"
 xbuild {{{packageName}}}.sln && \
-    mono ./packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe src/{{{packageName}}}.Test/bin/debug/{{{packageName}}}.Test.dll
+    mono ./packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe src/{{{packageName}}}.Test/bin/Debug/{{{packageName}}}.Test.dll
diff --git a/modules/swagger-codegen/src/main/resources/csharp/travis.mustache b/modules/swagger-codegen/src/main/resources/csharp/travis.mustache
new file mode 100644
index 000000000000..983f06b71562
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/travis.mustache
@@ -0,0 +1,21 @@
+#
+# Generated by: https://github.com/swagger-api/swagger-codegen.git
+#
+# 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.
+#
+language: csharp
+mono:
+  - latest
+solution: {{{packageName}}}.sln
+script:
+  - /bin/sh ./mono_nunit_test.sh
diff --git a/samples/client/petstore/csharp/SwaggerClient/.travis.yml b/samples/client/petstore/csharp/SwaggerClient/.travis.yml
new file mode 100644
index 000000000000..4096e0b50d47
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClient/.travis.yml
@@ -0,0 +1,21 @@
+#
+# Generated by: https://github.com/swagger-api/swagger-codegen.git
+#
+# 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.
+#
+language: csharp
+mono:
+  - latest
+solution: IO.Swagger.sln
+script:
+  - /bin/sh ./mono_nunit_test.sh
diff --git a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
index 95488d816b98..143ffeb1629f 100644
--- a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
+++ b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 VisualStudioVersion = 12.0.0.0
 MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{7B20DAE3-B510-4814-8986-CF1B89EA039E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{BF42B49D-37A0-49C4-A405-24CD946ADAA7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger.Test", "src\IO.Swagger.Test\IO.Swagger.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
 EndProject
@@ -12,10 +12,10 @@ Debug|Any CPU = Debug|Any CPU
 Release|Any CPU = Release|Any CPU
 EndGlobalSection
 GlobalSection(ProjectConfigurationPlatforms) = postSolution
-{7B20DAE3-B510-4814-8986-CF1B89EA039E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{7B20DAE3-B510-4814-8986-CF1B89EA039E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{7B20DAE3-B510-4814-8986-CF1B89EA039E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{7B20DAE3-B510-4814-8986-CF1B89EA039E}.Release|Any CPU.Build.0 = Release|Any CPU
+{BF42B49D-37A0-49C4-A405-24CD946ADAA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+{BF42B49D-37A0-49C4-A405-24CD946ADAA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+{BF42B49D-37A0-49C4-A405-24CD946ADAA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+{BF42B49D-37A0-49C4-A405-24CD946ADAA7}.Release|Any CPU.Build.0 = Release|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/samples/client/petstore/csharp/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClient/README.md
index a0bd07807404..c5a53af127dc 100644
--- a/samples/client/petstore/csharp/SwaggerClient/README.md
+++ b/samples/client/petstore/csharp/SwaggerClient/README.md
@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build date: 2016-06-12T12:38:46.317+08:00
+- Build date: 2016-06-12T16:29:47.553+08:00
 - Build package: class io.swagger.codegen.languages.CSharpClientCodegen
 
 ## Frameworks supported
diff --git a/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh b/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh
index 45626ecad481..e70329427878 100644
--- a/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh
+++ b/samples/client/petstore/csharp/SwaggerClient/mono_nunit_test.sh
@@ -30,4 +30,4 @@ mono nuget.exe install NUnit.Runners -Version 3.2.1 -OutputDirectory packages
 
 echo "[INFO] Build the solution and run the unit test"
 xbuild IO.Swagger.sln && \
-    mono ./packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe src/IO.Swagger.Test/bin/debug/IO.Swagger.Test.dll
+    mono ./packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe src/IO.Swagger.Test/bin/Debug/IO.Swagger.Test.dll
diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
index d878c8123962..7a78c9e7e693 100644
--- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
+++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
@@ -24,7 +24,7 @@ limitations under the License.
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7B20DAE3-B510-4814-8986-CF1B89EA039E}</ProjectGuid>
+    <ProjectGuid>{BF42B49D-37A0-49C4-A405-24CD946ADAA7}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swagger Library</RootNamespace>