diff --git a/.gitignore b/.gitignore
index fd191d36195..55ef266102f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,21 +93,6 @@ samples/client/petstore/java/jersey2-java6/project/
 samples/client/petstore/java/jersey2-java8/project/
 samples/client/petstore/java/jersey2/project/
 
-#PHP
-samples/client/petstore/php/OpenAPIToolsClient-php/composer.lock
-samples/client/petstore/php/OpenAPIToolsClient-php/vendor/
-samples/client/petstore/silex/SwaggerServer/composer.lock
-samples/client/petstore/silex/SwaggerServer/venodr/
-**/vendor/
-**/composer.lock
-
-#PHP-Symfony
-samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/cache/
-samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/logs/
-
-#PHP-laravel
-samples/server/petstore/php-laravel/node_modules
-
 # Perl
 samples/client/petstore/perl/deep_module_test/
 
diff --git a/.hub.cli.dockerfile b/.hub.cli.dockerfile
new file mode 100644
index 00000000000..a3686f52ee3
--- /dev/null
+++ b/.hub.cli.dockerfile
@@ -0,0 +1,36 @@
+## The builder labeled image acts as a transient container which is meant to
+## hold all non-artifact code.
+##
+## You can build _just_ this part with:
+##     docker --target builder -t container-name:builder -f .hub.cli.dockerfile .
+FROM jimschubert/8-jdk-alpine-mvn:1.0 as builder
+
+RUN set -x && \
+    apk add --no-cache bash
+
+ENV GEN_DIR /opt/openapi-generator
+WORKDIR ${GEN_DIR}
+COPY . ${GEN_DIR}
+
+# Pre-compile openapi-generator-cli
+RUN mvn -am -pl "modules/openapi-generator-cli" package
+
+## The final (release) image
+## The resulting container here only needs the target jar
+## and ca-certificates (to be able to query HTTPS hosted specs)
+FROM openjdk:8-jre-alpine
+
+ENV GEN_DIR /opt/openapi-generator
+
+RUN apk --no-cache add ca-certificates bash
+RUN mkdir -p ${GEN_DIR}/modules/openapi-generator-cli/target
+
+WORKDIR ${GEN_DIR}/modules/openapi-generator-cli/target
+
+COPY --from=builder ${GEN_DIR}/modules/openapi-generator-cli/target/openapi-generator-cli.jar ${GEN_DIR}/modules/openapi-generator-cli/target/openapi-generator-cli.jar
+
+COPY docker-entrypoint.sh /usr/local/bin/
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+CMD ["help"]
diff --git a/.hub.online.dockerfile b/.hub.online.dockerfile
new file mode 100644
index 00000000000..96eda34d32b
--- /dev/null
+++ b/.hub.online.dockerfile
@@ -0,0 +1,35 @@
+## The builder labeled image acts as a transient container which is meant to
+## hold all non-artifact code.
+##
+## You can build _just_ this part with:
+##     docker --target builder -t container-name:builder -f .hub.online.dockerfile .
+FROM jimschubert/8-jdk-alpine-mvn:1.0 as builder
+
+RUN set -x && \
+    apk add --no-cache bash
+
+ENV GEN_DIR /opt/openapi-generator
+WORKDIR ${GEN_DIR}
+COPY . ${GEN_DIR}
+
+# Pre-compile openapi-generator-online
+RUN mvn -am -pl "modules/openapi-generator-online" package
+
+## The final (release) image
+## The resulting container here only needs the target jar
+FROM openjdk:8-jre-alpine
+
+ENV GEN_DIR /opt/openapi-generator
+ENV TARGET_DIR /generator
+
+RUN mkdir -p ${TARGET_DIR}
+
+WORKDIR ${TARGET_DIR}
+
+COPY --from=builder ${GEN_DIR}/modules/openapi-generator-online/target/openapi-generator-*.jar ${TARGET_DIR}/openapi-generator-online.jar
+
+ENV GENERATOR_HOST=http://localhost
+
+EXPOSE 8080
+
+CMD ["java", "-jar", "/generator/openapi-generator-online.jar"]
diff --git a/.travis.yml b/.travis.yml
index 159d08b7a1c..9d83b1a1bb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,8 @@ cache:
   - $HOME/.cargo
   - $HOME/.stack
   - $HOME/samples/server/petstore/cpp-pistache/pistache
+  - $HOME/.npm  
+  - $HOME/.rvm/gems/ruby-2.4.1
 
 services:
   - docker
@@ -57,7 +59,7 @@ before_install:
   - gem install bundler
   - npm install -g typescript
   - npm install -g npm
-  - npm install -g elm
+  - npm install -g elm@0.18.0-exp5
   - npm config set registry http://registry.npmjs.org/
   # set python 3.6.3 as default
   - source ~/virtualenv/python3.6/bin/activate
diff --git a/CI/samples.ci/client/petstore/java/test-manual/jersey1/ApiClientTest.java b/CI/samples.ci/client/petstore/java/test-manual/jersey1/ApiClientTest.java
index a890ead935f..405267d4131 100644
--- a/CI/samples.ci/client/petstore/java/test-manual/jersey1/ApiClientTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/jersey1/ApiClientTest.java
@@ -28,7 +28,7 @@ public class ApiClientTest {
         assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
 
         // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
         dateStr = "2015-11-07T13:49:09+10:00";
diff --git a/CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java b/CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java
index 6fb1e54b679..09659fb4700 100644
--- a/CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java
@@ -28,7 +28,7 @@ public class ApiClientTest {
         assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
 
         // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
         dateStr = "2015-11-07T13:49:09+10:00";
diff --git a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/JSONTest.java b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/JSONTest.java
index e7687d0b33b..1c825e39256 100644
--- a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/JSONTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/JSONTest.java
@@ -12,6 +12,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 import java.util.TimeZone;
 
 import okio.ByteString;
@@ -46,7 +47,7 @@ public class JSONTest {
         assertEquals(json.deserialize("\"2015-11-07T03:49:09.356" + getCurrentTimezoneOffset() + "\"", java.sql.Date.class).toString(), date.toString());
 
         // custom date format: without day
-        DateFormat format = new SimpleDateFormat("yyyy-MM");
+        DateFormat format = new SimpleDateFormat("yyyy-MM", Locale.ROOT);
         apiClient.setSqlDateFormat(format);
         String dateStr = "\"2015-11\"";
         assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11-07T03:49:09Z\"", java.sql.Date.class)));
@@ -79,7 +80,7 @@ public class JSONTest {
         assertEquals(utcDate, json.serialize(date));
 
         // custom datetime format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
 
@@ -190,10 +191,10 @@ public class JSONTest {
     public static String getCurrentTimezoneOffset() {
 
         TimeZone tz = TimeZone.getDefault();
-        Calendar cal = GregorianCalendar.getInstance(tz);
+        Calendar cal = GregorianCalendar.getInstance(tz, Locale.ROOT);
         int offsetInMillis = tz.getOffset(cal.getTimeInMillis());
 
-        String offset = String.format("%02d:%02d", Math.abs(offsetInMillis / 3600000), Math.abs((offsetInMillis / 60000) % 60));
+        String offset = String.format(Locale.ROOT,"%02d:%02d", Math.abs(offsetInMillis / 3600000), Math.abs((offsetInMillis / 60000) % 60));
         offset = (offsetInMillis >= 0 ? "+" : "-") + offset;
 
         return offset;
diff --git a/CI/samples.ci/client/petstore/java/test-manual/resttemplate/ApiClientTest.java b/CI/samples.ci/client/petstore/java/test-manual/resttemplate/ApiClientTest.java
index 2113f5d2453..a6bedae3e95 100644
--- a/CI/samples.ci/client/petstore/java/test-manual/resttemplate/ApiClientTest.java
+++ b/CI/samples.ci/client/petstore/java/test-manual/resttemplate/ApiClientTest.java
@@ -34,7 +34,7 @@ public class ApiClientTest {
         assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
 
         // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
         dateStr = "2015-11-07T13:49:09+10:00";
diff --git a/README.md b/README.md
index 45f98af8552..ee102011cb2 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`3.2.2`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`3.2.3`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
 [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
@@ -84,8 +84,8 @@ OpenAPI Generator Version    | Release Date | Notes
 ---------------------------- | ------------ | -----
 4.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.0-SNAPSHOT/)| TBD | Major release with breaking changes (no fallback)
 3.3.0 (upcoming minor release)| TBD | Minor release (breaking changes with fallbacks)
-3.2.2 (current master, upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/3.2.2-SNAPSHOT/)| TBD | Bugfix release
-[3.2.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.2.1) (latest stable release) | 14.08.2018 | Bugfix release
+3.2.3 (current master, upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/3.2.3-SNAPSHOT/)| TBD | Bugfix release
+[3.2.2](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.2.2) (latest stable release) | 22.08.2018 | Bugfix release
 
 OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0
 
@@ -141,16 +141,16 @@ See the different versions of the [openapi-generator-cli](https://mvnrepository.
 
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
 
-JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.1/openapi-generator-cli-3.2.1.jar`
+JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.2/openapi-generator-cli-3.2.2.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.1/openapi-generator-cli-3.2.1.jar -O openapi-generator-cli.jar
+wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.2/openapi-generator-cli-3.2.2.jar -O openapi-generator-cli.jar
 ```
 
 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 ```
-Invoke-WebRequest -OutFile openapi-generator-cli.jar http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.1/openapi-generator-cli-3.2.1.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.2.2/openapi-generator-cli-3.2.2.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -163,7 +163,7 @@ export PATH=${JAVA_HOME}/bin:$PATH
 
 ### Launcher Script
 
-One downside to manual jar downloads is that you don't keep up-to-date with the latest released version. We have a Bash launcher script at [bin/utils/openapi-generator.cli.sh](./bin/utils/openapi-generator.cli.sh) which resolves this issue.
+One downside to manual jar downloads is that you don't keep up-to-date with the latest released version. We have a Bash launcher script at [bin/utils/openapi-generator.cli.sh](./bin/utils/openapi-generator-cli.sh) which resolves this issue.
 
 To install the launcher script, copy the contents of the script to a location on your path and make the script executable.
 
@@ -406,13 +406,14 @@ SYNOPSIS
                 [--invoker-package <invoker package>]
                 [(-l <language> | --lang <language>)]
                 [--language-specific-primitives <language specific primitives>...]
-                [--library <library>] [--model-name-prefix <model name prefix>]
+                [--library <library>] [--log-to-stderr]
+                [--model-name-prefix <model name prefix>]
                 [--model-name-suffix <model name suffix>]
                 [--model-package <model package>]
                 [(-o <output directory> | --output <output directory>)]
                 [--release-note <release note>] [--remove-operation-id-prefix]
                 [--reserved-words-mappings <reserved word mappings>...]
-                [(-s | --skip-overwrite)]
+                [(-s | --skip-overwrite)] [--skip-validate-spec]
                 [(-t <template directory> | --template-dir <template directory>)]
                 [--type-mappings <type mappings>...] [(-v | --verbose)]
 
@@ -472,6 +473,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Raiffeisen Schweiz Genossenschaft](https://www.raiffeisen.ch)
 - [RepreZen API Studio](https://www.reprezen.com/swagger-openapi-code-generation-api-first-microservices-enterprise-development)
 - [REST United](https://restunited.com)
+- [Suva](https://www.suva.ch/)
 - [Telstra](https://dev.telstra.com)
 - [unblu inc.](https://www.unblu.com/)
 
@@ -482,7 +484,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2018/05/15 - [REST API仕様からAPIクライアントやスタブサーバを自動生成する「OpenAPI Generator」オープンソースで公開。Swagger Codegenからのフォーク](https://www.publickey1.jp/blog/18/rest_apiapiopenapi_generatorswagger_generator.html) by [Publickey](https://www.publickey1.jp)
 - 2018/06/08 - [Swagger Codegen is now OpenAPI Generator](https://angular.schule/blog/2018-06-swagger-codegen-is-now-openapi-generator) by [JohannesHoppe](https://github.com/JohannesHoppe)
 - 2018/06/21 - [Connect your JHipster apps to the world of APIs with OpenAPI and gRPC](https://fr.slideshare.net/chbornet/jhipster-conf-2018-connect-your-jhipster-apps-to-the-world-of-apis-with-openapi-and-grpc) by [Christophe Bornet](https://github.com/cbornet) at [JHipster Conf 2018](https://jhipster-conf.github.io/)
-- 2018/06/27 - [Lessons Learned from Leading an Open-Source Project Supporting 30+ Programming Languages](https://speakerdeck.com/wing328/lessons-learned-from-leading-an-open-source-project-supporting-30-plus-programming-languages) - [William Cheng](https://github.com/wing328) at [LinuxCon + ContainerCon + CloudOpen China 2018](https://www.lfasiallc.com/events/lc3-2018/)
+- 2018/06/27 - [Lessons Learned from Leading an Open-Source Project Supporting 30+ Programming Languages](https://speakerdeck.com/wing328/lessons-learned-from-leading-an-open-source-project-supporting-30-plus-programming-languages) - [William Cheng](https://github.com/wing328) at [LinuxCon + ContainerCon + CloudOpen China 2018](http://bit.ly/2waDKKX)
 - 2018/07/19 - [OpenAPI Generator Contribution Quickstart - RingCentral Go SDK](https://medium.com/ringcentral-developers/openapi-generator-for-go-contribution-quickstart-8cc72bf37b53) by [John Wang](https://github.com/grokify)
 
 ## [6 - About Us](#table-of-contents)
diff --git a/bin/security/silex-petstore-server.sh b/bin/security/silex-petstore-server.sh
index 23df8d1e9c6..0ac5b929f66 100755
--- a/bin/security/silex-petstore-server.sh
+++ b/bin/security/silex-petstore-server.sh
@@ -27,6 +27,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/openapi-generator/src/main/resources/php-silex -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -g php-silex -o samples/server/petstore-security-test/silex $@"
+ags="generate -t modules/openapi-generator/src/main/resources/php-silex -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -g php-silex -o samples/server/petstore-security-test/silex/SwaggerServer $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/utils/ensure-up-to-date b/bin/utils/ensure-up-to-date
index d6b71925769..6e2fd3a1ec2 100755
--- a/bin/utils/ensure-up-to-date
+++ b/bin/utils/ensure-up-to-date
@@ -10,7 +10,7 @@ echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
 sleep 5
 
 # LIST OF SCRIPTS:
-./bin/ruby-petstore.sh > /dev/null 2>&1
+./bin/ruby-client-petstore.sh > /dev/null 2>&1
 ./bin/java-petstore-all.sh > /dev/null 2>&1
 ./bin/java-jaxrs-petstore-server-all.sh > /dev/null 2>&1
 ./bin/spring-all-pestore.sh > /dev/null 2>&1
diff --git a/docs/customization.md b/docs/customization.md
index ec1a534c98d..32b784d7f6b 100644
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -35,6 +35,8 @@ These names can be anything you like. If you are building a client for the white
 
 **NOTE** Convention is to use kebab casing for names passed to `-n`. Example, `scala-finatra` would become `ScalaFinatraGenerator`.
 
+#### Use your new generator with the CLI
+
 To compile your library, enter the `out/generators/my-codegen` directory, run `mvn package` and execute the generator:
 
 ```sh
@@ -50,11 +52,59 @@ Note the `my-codegen` is an option for `-g` now, and you can use the usual argum
 
 ```sh
 java -cp out/codegens/customCodegen/target/my-codegen-openapi-generator-1.0.0.jar:modules/openapi-generator-cli/target/openapi-generator-cli.jar \
-  io.openapitools.codegen.OpenAPIGenerator generate -g my-codegen \
+  org.openapitools.codegen.OpenAPIGenerator generate -g my-codegen \
   -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
   -o ./out/myClient
 ```
 
+For Windows users:
+```
+java -cp out/codegens/customCodegen/target/my-codegen-openapi-generator-1.0.0.jar;modules/openapi-generator-cli/target/openapi-generator-cli.jar \
+  org.openapitools.codegen.OpenAPIGenerator generate -g my-codegen \
+  -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
+  -o ./out/myClient
+```
+
+#### Use your new generator with the maven plugin
+
+Install your library to your local maven repository by running:
+
+```
+mvn clean install -f out/generators/my-codegen
+```
+
+This will install `org.openapitools:my-codegen-openapi-generator:1.0.0` to your local maven repository.
+
+You can use this as additional dependency of the `openapi-generator-maven-plugin` plugin and use `my-codegen` as `generatorName` value:
+
+```xml
+<plugin>
+  <groupId>org.openapitools</groupId>
+  <artifactId>openapi-generator-maven-plugin</artifactId>
+  <version>${openapi-generator-version}</version>
+  <executions>
+    <execution>
+      <id>generate-client-code</id>
+      <goals>
+        <goal>generate</goal>
+      </goals>
+      <configuration>
+        <generatorName>my-codegen</generatorName>
+        <!-- other configuration ... -->
+      </configuration>
+    </execution>
+  </executions>
+  <dependencies>
+    <dependency>
+      <groupId>org.openapitools</groupId>
+      <artifactId>my-codegen-openapi-generator</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+  </dependencies>
+</plugin>
+```
+
+If you publish your artifact to a distant maven repository, do not forget to add this repository as `pluginRepository` for your project.
 
 ### Selective generation
 You may not want to generate *all* models in your project.  Likewise you may want just one or two apis to be written.  If that's the case, you can use system properties to control the output:
@@ -106,6 +156,14 @@ java -Dapis -DmodelTests=false {opts}
 
 When using selective generation, _only_ the templates needed for the specific generation will be used.
 
+To skip models defined as the form parameters in "requestBody", please use `skipFormModel` (default to false) (this option is introduced at v3.2.2)
+
+```sh
+java -DskipFormModel=true
+```
+
+This option will be helpful to skip model generation due to the form parameter, which is defined differently in OAS3 as there's no form parameter in OAS3
+
 ### Ignore file format
 
 OpenAPI Generator supports a `.openapi-generator-ignore` file, similar to `.gitignore` or `.dockerignore` you're probably already familiar with.
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java
index 305bb9a4119..002c17b1e17 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java
@@ -24,6 +24,8 @@ import io.airlift.airline.ParseOptionMissingException;
 import io.airlift.airline.ParseOptionMissingValueException;
 import org.openapitools.codegen.cmd.*;
 
+import java.util.Locale;
+
 /**
  * User: lanwen Date: 24.03.15 Time: 17:56
  * <p>
@@ -40,6 +42,7 @@ public class OpenAPIGenerator {
                 Cli.<Runnable>builder("openapi-generator-cli")
                         .withDescription(
                                 String.format(
+                                        Locale.ROOT,
                                         "OpenAPI generator CLI (version %s).",
                                         version))
                         .withDefaultCommand(ListGenerators.class)
@@ -69,10 +72,10 @@ public class OpenAPIGenerator {
                 System.exit(1);
             }
         } catch (ParseArgumentsUnexpectedException e) {
-            System.err.printf("[error] %s%n%nSee 'openapi-generator-cli help' for usage.%n", e.getMessage());
+            System.err.printf(Locale.ROOT,"[error] %s%n%nSee 'openapi-generator-cli help' for usage.%n", e.getMessage());
             System.exit(1);
         } catch (ParseOptionMissingException | ParseOptionMissingValueException e) {
-            System.err.printf("[error] %s%n", e.getMessage());
+            System.err.printf(Locale.ROOT,"[error] %s%n", e.getMessage());
             System.exit(1);
         }
     }
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
index 8c4db2af9e4..ae3613c41a9 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
@@ -17,6 +17,8 @@
 
 package org.openapitools.codegen.cmd;
 
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.core.spi.FilterAttachable;
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
 import org.openapitools.codegen.ClientOptInput;
@@ -32,6 +34,7 @@ import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * User: lanwen Date: 24.03.15 Time: 20:22
@@ -199,8 +202,23 @@ public class Generate implements Runnable {
             description = "Skips the default behavior of validating an input specification.")
     private Boolean skipValidateSpec;
 
+    @Option(name = {"--log-to-stderr"},
+            title = "Log to STDERR",
+            description = "write all log messages (not just errors) to STDOUT."
+                    + " Useful for piping the JSON output of debug options (e.g. `-DdebugOperations`) to an external parser directly while testing a generator.")
+    private Boolean logToStderr;
+
     @Override
     public void run() {
+        if (logToStderr != null) {
+            LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+            Stream.of(Logger.ROOT_LOGGER_NAME, "io.swagger", "org.openapitools")
+                    .map(lc::getLogger)
+                    .peek(logger -> logger.detachAppender("STDOUT"))
+                    .reduce((logger, next) -> logger.getName().equals(Logger.ROOT_LOGGER_NAME) ? logger : next)
+                    .map(root -> root.getAppender("STDERR"))
+                    .ifPresent(FilterAttachable::clearAllFilters);
+        }
 
         // attempt to read from config file
         CodegenConfigurator configurator = CodegenConfigurator.fromFile(configFile);
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Langs.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Langs.java
index b2506988504..f7f025a3e7e 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Langs.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Langs.java
@@ -21,6 +21,8 @@ import ch.lambdaj.collection.LambdaIterable;
 import io.airlift.airline.Command;
 import org.openapitools.codegen.CodegenConfig;
 
+import java.util.Locale;
+
 import static ch.lambdaj.Lambda.on;
 import static ch.lambdaj.collection.LambdaCollections.with;
 import static java.util.ServiceLoader.load;
@@ -34,6 +36,6 @@ public class Langs implements Runnable {
     public void run() {
         LambdaIterable<String> langs =
                 with(load(CodegenConfig.class)).extract(on(CodegenConfig.class).getName());
-        System.out.printf("Available languages (generators): %s%n", langs);
+        System.out.printf(Locale.ROOT, "Available languages (generators): %s%n", langs);
     }
 }
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java
index 8add50af445..edd85ff79af 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java
@@ -9,6 +9,7 @@ import org.openapitools.codegen.CodegenType;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 
 // NOTE: List can later have subcommands such as list languages, list types, list frameworks, etc.
 @Command(name = "list", description = "Lists the available generators")
@@ -53,6 +54,6 @@ public class ListGenerators implements Runnable {
             }
         }
 
-        System.out.printf("%s%n", sb.toString());
+        System.out.printf(Locale.ROOT,"%s%n", sb.toString());
     }
 }
diff --git a/modules/openapi-generator-gradle-plugin/README.adoc b/modules/openapi-generator-gradle-plugin/README.adoc
index ba0eb6dab25..c1fb0d0b8d2 100644
--- a/modules/openapi-generator-gradle-plugin/README.adoc
+++ b/modules/openapi-generator-gradle-plugin/README.adoc
@@ -2,6 +2,9 @@
 
 This document describes the gradle plugin for OpenAPI Generator.
 
+This gradle plugin offers a declarative DSL via _extensions_ (these are Gradle project extensions).
+These map almost fully 1:1 with the options you'd pass to the CLI or Maven plugin. The plugin maps the extensions to a task of the same name to provide a clean API. If you're interested in the extension/task mapping concept from a high-level, you can https://docs.gradle.org/current/userguide/custom_plugins.html#sec:mapping_extension_properties_to_task_properties[check out Gradle's docs].
+
 == Tasks
 
 Tasks are listed under the "OpenAPI Tools" tasks heading.
@@ -24,6 +27,17 @@ Tasks are listed under the "OpenAPI Tools" tasks heading.
 |Validates an Open API 2.0 or 3.x specification document.
 |===
 
+
+[NOTE]
+====
+The plugin implements the above tasks as project extensions of the same name. If you'd like to declare
+these tasks as dependencies to other tasks (using `dependsOn`), you'll need  a task reference. e.g.:
+
+```
+compileJava.dependsOn tasks.openApiGenerate
+```
+====
+
 == Plugin Setup
 
 [source,groovy]
@@ -34,7 +48,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath "org.openapitools:openapi-generator-gradle-plugin:3.2.1"
+    classpath "org.openapitools:openapi-generator-gradle-plugin:3.2.2"
   }
 }
 
@@ -455,3 +469,65 @@ Run with --stacktrace option to get the stack trace. Run with --info or --debug
 ----
 $ ./gradlew openApiValidate --input=/Users/jim/projects/openapi-generator/modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 ----
+
+=== Generate multiple sources
+
+If you want to perform multiple generation tasks, you'd want to create a task that inherits from the `GenerateTask`.
+Examples can be found in https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle[samples/local-spec/build.gradle].
+
+You can define any number of generator tasks; the generated code does _not_ need to be a JVM language.
+
+```gradle
+task buildGoClient(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask){
+    generatorName = "go"
+    inputSpec = "$rootDir/petstore-v3.0.yaml".toString()
+    additionalProperties = [
+            packageName: "petstore"
+    ]
+    outputDir = "$buildDir/go".toString()
+    configOptions = [
+            dateLibrary: "threetenp"
+    ]
+}
+task buildKotlinClient(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask){
+    generatorName = "kotlin"
+    inputSpec = "$rootDir/petstore-v3.0.yaml".toString()
+    outputDir = "$buildDir/kotlin".toString()
+    apiPackage = "org.openapitools.example.api"
+    invokerPackage = "org.openapitools.example.invoker"
+    modelPackage = "org.openapitools.example.model"
+    configOptions = [
+            dateLibrary: "java8"
+    ]
+    systemProperties = [
+            modelDocs: "false"
+    ]
+}
+```
+
+To execute your specs, you'd then do:
+
+```
+./gradlew buildGoClient buildKotlinClient
+```
+
+If you want to simplify the execution, you could create a new task with `dependsOn`.
+
+```gradle
+task codegen(dependsOn: ['buildGoClient', 'buildKotlinClient'])
+```
+
+Or, if you're generating the code on compile, you can add these as a dependency to `compileJava` or any other existing task.
+You can also mix the default task `openApiGenerate` with custom tasks:
+
+```gradle
+compileJava.dependsOn buildKotlinClient, tasks.openApiGenerate
+```
+
+[NOTE]
+====
+`openApiGenerate` is a project extension _and_ a task. If you want to use this in `dependsOn`,
+you need a task reference or instance. One way to do this is to access it as `tasks.openApiGenerate`.
+
+You can run `gradle tasks --debug` to see this registration.
+====
diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md b/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md
index 81987ca3168..13889d521b8 100644
--- a/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md
+++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md
@@ -17,5 +17,5 @@ gradle generateGoWithInvalidSpec
 The samples can be tested against other versions of the plugin using the `openApiGeneratorVersion` property. For example:
 
 ```bash
-gradle -PopenApiGeneratorVersion=3.2.1 openApiValidate
+gradle -PopenApiGeneratorVersion=3.2.2 openApiValidate
 ```
diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
index 48df3c91578..ed174a94c40 100644
--- a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
+++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
@@ -1 +1 @@
-openApiGeneratorVersion=3.2.1
+openApiGeneratorVersion=3.2.2
diff --git a/modules/openapi-generator-maven-plugin/README.md b/modules/openapi-generator-maven-plugin/README.md
index bbef0ba27e5..299ebbab346 100644
--- a/modules/openapi-generator-maven-plugin/README.md
+++ b/modules/openapi-generator-maven-plugin/README.md
@@ -11,7 +11,7 @@ Add to your `build->plugins` section (default phase is `generate-sources` phase)
 <plugin>
     <groupId>org.openapitools</groupId>
     <artifactId>openapi-generator-maven-plugin</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <executions>
         <execution>
             <goals>
diff --git a/modules/openapi-generator-maven-plugin/examples/java-client.xml b/modules/openapi-generator-maven-plugin/examples/java-client.xml
index 30051bff0d2..05b285d9ce8 100644
--- a/modules/openapi-generator-maven-plugin/examples/java-client.xml
+++ b/modules/openapi-generator-maven-plugin/examples/java-client.xml
@@ -12,7 +12,7 @@
             <plugin>
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.2</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
index a4f1d89aaf5..35e5ce02e4a 100644
--- a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
+++ b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
@@ -12,7 +12,7 @@
             <plugin>
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.2</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/modules/openapi-generator-maven-plugin/examples/non-java.xml b/modules/openapi-generator-maven-plugin/examples/non-java.xml
index 9b5adfee0be..eece8d6efbe 100644
--- a/modules/openapi-generator-maven-plugin/examples/non-java.xml
+++ b/modules/openapi-generator-maven-plugin/examples/non-java.xml
@@ -12,7 +12,7 @@
             <plugin>
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.2</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/service/Generator.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/service/Generator.java
index 9bef912f138..90d6db132d7 100644
--- a/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/service/Generator.java
+++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/service/Generator.java
@@ -19,11 +19,16 @@ package org.openapitools.codegen.online.service;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.parser.OpenAPIParser;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.parser.core.models.ParseOptions;
-import org.openapitools.codegen.*;
-import io.swagger.v3.parser.core.models.AuthorizationValue;
 import io.swagger.v3.core.util.Json;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.parser.core.models.AuthorizationValue;
+import io.swagger.v3.parser.core.models.ParseOptions;
+import org.openapitools.codegen.CliOption;
+import org.openapitools.codegen.ClientOptInput;
+import org.openapitools.codegen.ClientOpts;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenConfigLoader;
+import org.openapitools.codegen.DefaultGenerator;
 import org.openapitools.codegen.online.model.GeneratorInput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,6 +39,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class Generator {
@@ -44,7 +50,7 @@ public class Generator {
         try {
             config = CodegenConfigLoader.forName(language);
         } catch (Exception e) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, String.format("Unsupported target %s supplied. %s",
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, String.format(Locale.ROOT,"Unsupported target %s supplied. %s",
                     language, e));
         }
         Map<String, CliOption> map = new LinkedHashMap<>();
@@ -77,7 +83,7 @@ public class Generator {
     }
 
     private static String generate(String language, GeneratorInput opts, Type type) {
-        LOGGER.debug(String.format("generate %s for %s", type.getTypeName(), language));
+        LOGGER.debug(String.format(Locale.ROOT,"generate %s for %s", type.getTypeName(), language));
         if (opts == null) {
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "No options were supplied");
         }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
index e91d00d4ce3..61b98db1bef 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
@@ -23,6 +23,8 @@ import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.oas.models.servers.ServerVariable;
 
 import java.util.List;
 import java.util.Map;
@@ -113,6 +115,10 @@ public interface CodegenConfig {
 
     List<CodegenSecurity> fromSecurity(Map<String, SecurityScheme> schemas);
 
+    List<CodegenServer> fromServers(List<Server> servers);
+  
+    List<CodegenServerVariable> fromServerVariables(Map<String, ServerVariable> variables);
+    
     Set<String> defaultIncludes();
 
     Map<String, String> typeMapping();
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
index 9aa86e73645..d96fda52687 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
@@ -31,6 +31,7 @@ public class CodegenConstants {
     public static final String API_TESTS = "apiTests";
     public static final String API_DOCS = "apiDocs";
     public static final String WITH_XML = "withXml";
+    public static final String SKIP_FORM_MODEL = "skipFormModel";
     /* /end System Properties */
 
     public static final String API_PACKAGE = "apiPackage";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
index 279d796f05f..80ff121c361 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
@@ -22,6 +22,7 @@ import io.swagger.v3.oas.models.ExternalDocumentation;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -76,7 +77,7 @@ public class CodegenModel {
 
     @Override
     public String toString() {
-        return String.format("%s(%s)", name, classname);
+        return String.format(Locale.ROOT, "%s(%s)", name, classname);
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
index 0e7e96d1b54..1e66e45edef 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
@@ -25,6 +25,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -196,7 +197,7 @@ public class CodegenOperation {
      * @return true if act as Restful update method, false otherwise
      */
     public boolean isRestfulUpdate() {
-        return Arrays.asList("PUT", "PATCH").contains(httpMethod.toUpperCase()) && isMemberPath();
+        return Arrays.asList("PUT", "PATCH").contains(httpMethod.toUpperCase(Locale.ROOT)) && isMemberPath();
     }
 
     /**
@@ -205,7 +206,7 @@ public class CodegenOperation {
      * @return true request method is PUT, PATCH or POST; false otherwise
      */
     public boolean isBodyAllowed() {
-        return Arrays.asList("PUT", "PATCH", "POST").contains(httpMethod.toUpperCase());
+        return Arrays.asList("PUT", "PATCH", "POST").contains(httpMethod.toUpperCase(Locale.ROOT));
     }
 
     /**
@@ -232,7 +233,7 @@ public class CodegenOperation {
      * @return the substring
      */
     private String pathWithoutBaseName() {
-        return baseName != null ? path.replace("/" + baseName.toLowerCase(), "") : path;
+        return baseName != null ? path.replace("/" + baseName.toLowerCase(Locale.ROOT), "") : path;
     }
 
     /**
@@ -248,7 +249,7 @@ public class CodegenOperation {
 
     @Override
     public String toString() {
-        return String.format("%s(%s)", baseName, path);
+        return String.format(Locale.ROOT, "%s(%s)", baseName, path);
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
index da21e3416bc..de026b2d3e0 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
@@ -59,7 +59,9 @@ public class CodegenProperty implements Cloneable {
     public boolean isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isFile, isBoolean, isDate, isDateTime, isUuid;
     public boolean isListContainer, isMapContainer;
     public boolean isEnum;
-    public boolean isReadOnly = false;
+    public boolean isReadOnly;
+    public boolean isWriteOnly;
+    public boolean isNullable;
     public List<String> _enum;
     public Map<String, Object> allowableValues;
     public CodegenProperty items;
@@ -437,6 +439,8 @@ public class CodegenProperty implements Cloneable {
         result = prime * result + ((isNotContainer ? 13:31));
         result = prime * result + ((isPrimitiveType  ? 13:31));
         result = prime * result + ((isReadOnly  ? 13:31));
+        result = prime * result + ((isWriteOnly  ? 13:31));
+        result = prime * result + ((isNullable  ? 13:31));
         result = prime * result + ((items == null) ? 0 : items.hashCode());
         result = prime * result + ((mostInnerItems == null) ? 0 : mostInnerItems.hashCode());
         result = prime * result + ((jsonSchema == null) ? 0 : jsonSchema.hashCode());
@@ -587,6 +591,12 @@ public class CodegenProperty implements Cloneable {
         if (this.isReadOnly != other.isReadOnly) {
             return false;
         }
+        if (this.isWriteOnly != other.isWriteOnly) {
+            return false;
+        }
+        if (this.isNullable != other.isNullable) {
+            return false;
+        }
         if (this._enum != other._enum && (this._enum == null || !this._enum.equals(other._enum))) {
             return false;
         }
@@ -769,6 +779,8 @@ public class CodegenProperty implements Cloneable {
                 ", isMapContainer=" + isMapContainer +
                 ", isEnum=" + isEnum +
                 ", isReadOnly=" + isReadOnly +
+                ", isWriteOnly=" + isWriteOnly+
+                ", isNullable=" + isNullable +
                 ", _enum=" + _enum +
                 ", allowableValues=" + allowableValues +
                 ", items=" + items +
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
index 020f1ccbe30..aebc0aa9dbc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
@@ -20,6 +20,7 @@ package org.openapitools.codegen;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class CodegenResponse {
@@ -47,7 +48,7 @@ public class CodegenResponse {
 
     @Override
     public String toString() {
-        return String.format("%s(%s)", code, containerType);
+        return String.format(Locale.ROOT, "%s(%s)", code, containerType);
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenSecurity.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenSecurity.java
index d028ebf3775..3f267a53045 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenSecurity.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenSecurity.java
@@ -21,6 +21,7 @@ import io.swagger.v3.oas.models.security.Scopes;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class CodegenSecurity {
@@ -38,7 +39,7 @@ public class CodegenSecurity {
 
     @Override
     public String toString() {
-        return String.format("%s(%s)", name, type);
+        return String.format(Locale.ROOT, "%s(%s)", name, type);
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenServer.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenServer.java
new file mode 100644
index 00000000000..0708d4407fc
--- /dev/null
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenServer.java
@@ -0,0 +1,9 @@
+package org.openapitools.codegen;
+
+import java.util.List;
+
+public class CodegenServer {
+    public String url;
+    public String description;
+    public List<CodegenServerVariable> variables;
+}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenServerVariable.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenServerVariable.java
new file mode 100644
index 00000000000..15e9db55b67
--- /dev/null
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenServerVariable.java
@@ -0,0 +1,10 @@
+package org.openapitools.codegen;
+
+import java.util.List;
+
+public class CodegenServerVariable {
+    public String name;
+    public String defaultValue;
+    public String description;
+    public List<String> enumValues;
+}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenType.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenType.java
index bb763889532..958fabc2b85 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenType.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenType.java
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 public enum CodegenType {
@@ -30,7 +31,7 @@ public enum CodegenType {
 
     @JsonCreator
     public static CodegenType forValue(String value) {
-        return names.get(value.toLowerCase());
+        return names.get(value.toLowerCase(Locale.ROOT));
     }
 
     @JsonValue
@@ -50,4 +51,4 @@ public enum CodegenType {
         names.put("documentation", DOCUMENTATION);
         names.put("other", OTHER);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 46790890a85..61d1ae83155 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -43,6 +43,8 @@ import io.swagger.v3.oas.models.responses.ApiResponses;
 import io.swagger.v3.oas.models.security.OAuthFlow;
 import io.swagger.v3.oas.models.security.OAuthFlows;
 import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.oas.models.servers.ServerVariable;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 
 import org.apache.commons.lang3.ObjectUtils;
@@ -64,7 +66,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -72,7 +76,6 @@ import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class);
@@ -182,7 +185,7 @@ public class DefaultCodegen implements CodegenConfig {
                     .get(CodegenConstants.REMOVE_OPERATION_ID_PREFIX).toString()));
         }
 
-        if (additionalProperties.containsKey(CodegenConstants.DOCEXTENSION)){
+        if (additionalProperties.containsKey(CodegenConstants.DOCEXTENSION)) {
             this.setDocExtension(String.valueOf(additionalProperties
                     .get(CodegenConstants.DOCEXTENSION).toString()));
         }
@@ -355,7 +358,7 @@ public class DefaultCodegen implements CodegenConfig {
             return "EMPTY";
         }
 
-        String var = value.replaceAll("\\W+", "_").toUpperCase();
+        String var = value.replaceAll("\\W+", "_").toUpperCase(Locale.ROOT);
         if (var.matches("\\d.*")) {
             return "_" + var;
         } else {
@@ -768,7 +771,7 @@ public class DefaultCodegen implements CodegenConfig {
     public String toVarName(String name) {
         if (reservedWords.contains(name)) {
             return escapeReservedWord(name);
-        } else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains( "" + ((char) character)))) {
+        } else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains("" + ((char) character)))) {
             return escapeSpecialCharacters(name, null, null);
         } else {
             return name;
@@ -786,7 +789,7 @@ public class DefaultCodegen implements CodegenConfig {
         name = removeNonNameElementToCamelCase(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         if (reservedWords.contains(name)) {
             return escapeReservedWord(name);
-        } else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains( "" + ((char) character)))) {
+        } else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains("" + ((char) character)))) {
             return escapeSpecialCharacters(name, null, null);
         }
         return name;
@@ -829,8 +832,8 @@ public class DefaultCodegen implements CodegenConfig {
     /**
      * Return the name with escaped characters.
      *
-     * @param name the name to be escaped
-     * @param charactersToAllow characters that are not escaped
+     * @param name                   the name to be escaped
+     * @param charactersToAllow      characters that are not escaped
      * @param appdendixToReplacement String to append to replaced characters.
      * @return the escaped word
      * <p>
@@ -838,15 +841,15 @@ public class DefaultCodegen implements CodegenConfig {
      */
     public String escapeSpecialCharacters(String name, List<String> charactersToAllow, String appdendixToReplacement) {
         String result = (String) ((CharSequence) name).chars().mapToObj(c -> {
-          String character = "" + (char) c;
-          if (charactersToAllow != null && charactersToAllow.contains(character)) {
-              return character;
-          } else if (specialCharReplacements.containsKey(character)) {
-              return specialCharReplacements.get(character) + (appdendixToReplacement != null ? appdendixToReplacement: "");
-          } else {
-              return character;
-          }
-        }).reduce( (c1, c2) -> "" + c1 + c2).orElse(null);
+            String character = "" + (char) c;
+            if (charactersToAllow != null && charactersToAllow.contains(character)) {
+                return character;
+            } else if (specialCharReplacements.containsKey(character)) {
+                return specialCharReplacements.get(character) + (appdendixToReplacement != null ? appdendixToReplacement : "");
+            } else {
+                return character;
+            }
+        }).reduce((c1, c2) -> "" + c1 + c2).orElse(null);
 
         if (result != null) return result;
         throw new RuntimeException("Word '" + name + "' could not be escaped.");
@@ -1091,7 +1094,7 @@ public class DefaultCodegen implements CodegenConfig {
      */
     public String toInstantiationType(Schema schema) {
         if (ModelUtils.isMapSchema(schema)) {
-            Schema additionalProperties = (Schema) schema.getAdditionalProperties();
+            Schema additionalProperties = ModelUtils.getAdditionalProperties(schema);
             String type = additionalProperties.getType();
             if (null == type) {
                 LOGGER.error("No Type defined for Additional Property " + additionalProperties + "\n" //
@@ -1680,13 +1683,13 @@ public class DefaultCodegen implements CodegenConfig {
     }
 
     private CodegenDiscriminator createDiscriminator(String schemaName, Schema schema, Map<String, Schema> allDefinitions) {
-        if(schema.getDiscriminator() == null) {
+        if (schema.getDiscriminator() == null) {
             return null;
         }
         CodegenDiscriminator discriminator = new CodegenDiscriminator();
         discriminator.setPropertyName(schema.getDiscriminator().getPropertyName());
         discriminator.setMapping(schema.getDiscriminator().getMapping());
-        if(schema.getDiscriminator().getMapping() != null && !schema.getDiscriminator().getMapping().isEmpty()) {
+        if (schema.getDiscriminator().getMapping() != null && !schema.getDiscriminator().getMapping().isEmpty()) {
             for (Entry<String, String> e : schema.getDiscriminator().getMapping().entrySet()) {
                 String name = ModelUtils.getSimpleRef(e.getValue());
                 discriminator.getMappedModels().add(new MappedModel(e.getKey(), name));
@@ -1695,9 +1698,9 @@ public class DefaultCodegen implements CodegenConfig {
             allDefinitions.forEach((childName, child) -> {
                 if (child instanceof ComposedSchema && ((ComposedSchema) child).getAllOf() != null) {
                     Set<String> parentSchemas = ((ComposedSchema) child).getAllOf().stream()
-                        .filter(s -> s.get$ref() != null)
-                        .map(s -> ModelUtils.getSimpleRef(s.get$ref()))
-                        .collect(Collectors.toSet());
+                            .filter(s -> s.get$ref() != null)
+                            .map(s -> ModelUtils.getSimpleRef(s.get$ref()))
+                            .collect(Collectors.toSet());
                     if (parentSchemas.contains(schemaName)) {
                         discriminator.getMappedModels().add(new MappedModel(childName, childName));
                     }
@@ -1783,6 +1786,13 @@ public class DefaultCodegen implements CodegenConfig {
         if (p.getReadOnly() != null) {
             property.isReadOnly = p.getReadOnly();
         }
+        if (p.getWriteOnly() != null) {
+            property.isWriteOnly = p.getWriteOnly();
+        }
+        if (p.getNullable() != null) {
+            property.isNullable = p.getNullable();
+        }
+
         if (p.getXml() != null) {
             if (p.getXml().getAttribute() != null) {
                 property.isXmlAttribute = p.getXml().getAttribute();
@@ -1995,7 +2005,7 @@ public class DefaultCodegen implements CodegenConfig {
             property.maxItems = p.getMaxProperties();
 
             // handle inner property
-            CodegenProperty cp = fromProperty("inner", (Schema) p.getAdditionalProperties());
+            CodegenProperty cp = fromProperty("inner", ModelUtils.getAdditionalProperties(p));
             updatePropertyForMap(property, cp);
         } else { // model
             // TODO revise the logic below
@@ -2257,7 +2267,7 @@ public class DefaultCodegen implements CodegenConfig {
             for (String key : operation.getResponses().keySet()) {
                 ApiResponse response = operation.getResponses().get(key);
                 addProducesInfo(openAPI, response, op);
-                CodegenResponse r = fromResponse(key, response);
+                CodegenResponse r = fromResponse(openAPI, key, response);
                 r.hasMore = true;
                 if (r.baseType != null &&
                         !defaultIncludes.contains(r.baseType) &&
@@ -2285,7 +2295,7 @@ public class DefaultCodegen implements CodegenConfig {
                         CodegenProperty innerProperty = fromProperty("response", as.getItems());
                         op.returnBaseType = innerProperty.baseType;
                     } else if (ModelUtils.isMapSchema(responseSchema)) {
-                        CodegenProperty innerProperty = fromProperty("response", (Schema) responseSchema.getAdditionalProperties());
+                        CodegenProperty innerProperty = fromProperty("response", ModelUtils.getAdditionalProperties(responseSchema));
                         op.returnBaseType = innerProperty.baseType;
                     } else {
                         if (cm.complexType != null) {
@@ -2326,7 +2336,7 @@ public class DefaultCodegen implements CodegenConfig {
                         op.returnTypeIsPrimitive = true;
                     }
                 }
-                addHeaders(methodResponse, op.responseHeaders);
+                addHeaders(openAPI, methodResponse, op.responseHeaders);
             }
         }
 
@@ -2366,7 +2376,7 @@ public class DefaultCodegen implements CodegenConfig {
                     bodyParameterName = (String) op.vendorExtensions.get("x-codegen-request-body-name");
                 }
                 bodyParam = fromRequestBody(requestBody, schemas, imports, bodyParameterName);
-                bodyParam.description = requestBody.getDescription();
+                bodyParam.description = escapeText(requestBody.getDescription());
                 postProcessParameter(bodyParam);
 
                 bodyParams.add(bodyParam);
@@ -2443,7 +2453,7 @@ public class DefaultCodegen implements CodegenConfig {
         }
 
         op.bodyParam = bodyParam;
-        op.httpMethod = httpMethod.toUpperCase();
+        op.httpMethod = httpMethod.toUpperCase(Locale.ROOT);
 
         // move "required" parameters in front of "optional" parameters
         if (sortParamsByRequiredFlag) {
@@ -2503,11 +2513,12 @@ public class DefaultCodegen implements CodegenConfig {
     /**
      * Convert OAS Response object to Codegen Response object
      *
+     * @param openAPI      a OAS object representing the spec
      * @param responseCode HTTP response code
      * @param response     OAS Response object
      * @return Codegen Response object
      */
-    public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
+    public CodegenResponse fromResponse(OpenAPI openAPI, String responseCode, ApiResponse response) {
         CodegenResponse r = CodegenModelFactory.newInstance(CodegenModelType.RESPONSE);
         if ("default".equals(responseCode)) {
             r.code = "0";
@@ -2524,7 +2535,7 @@ public class DefaultCodegen implements CodegenConfig {
         if (response.getExtensions() != null && !response.getExtensions().isEmpty()) {
             r.vendorExtensions.putAll(response.getExtensions());
         }
-        addHeaders(response, r.headers);
+        addHeaders(openAPI, response, r.headers);
         r.hasHeaders = !r.headers.isEmpty();
 
         if (r.schema != null) {
@@ -2671,7 +2682,7 @@ public class DefaultCodegen implements CodegenConfig {
                 }
 
             } else if (ModelUtils.isMapSchema(parameterSchema)) { // for map parameter
-                CodegenProperty codegenProperty = fromProperty("inner", (Schema) parameterSchema.getAdditionalProperties());
+                CodegenProperty codegenProperty = fromProperty("inner", ModelUtils.getAdditionalProperties(parameterSchema));
                 codegenParameter.items = codegenProperty;
                 codegenParameter.mostInnerItems = codegenProperty.mostInnerItems;
                 codegenParameter.baseType = codegenProperty.dataType;
@@ -2896,7 +2907,7 @@ public class DefaultCodegen implements CodegenConfig {
     // TODO revise below as it should be replaced by ModelUtils.isByteArraySchema(parameterSchema)
     public boolean isDataTypeBinary(String dataType) {
         if (dataType != null) {
-            return dataType.toLowerCase().startsWith("byte");
+            return dataType.toLowerCase(Locale.ROOT).startsWith("byte");
         } else {
             return false;
         }
@@ -2905,7 +2916,7 @@ public class DefaultCodegen implements CodegenConfig {
     // TODO revise below as it should be replaced by ModelUtils.isFileSchema(parameterSchema)
     public boolean isDataTypeFile(String dataType) {
         if (dataType != null) {
-            return dataType.toLowerCase().equals("file");
+            return dataType.toLowerCase(Locale.ROOT).equals("file");
         } else {
             return false;
         }
@@ -2993,12 +3004,12 @@ public class DefaultCodegen implements CodegenConfig {
     protected void setReservedWordsLowerCase(List<String> words) {
         reservedWords = new HashSet<String>();
         for (String word : words) {
-            reservedWords.add(word.toLowerCase());
+            reservedWords.add(word.toLowerCase(Locale.ROOT));
         }
     }
 
     protected boolean isReservedWord(String word) {
-        return word != null && reservedWords.contains(word.toLowerCase());
+        return word != null && reservedWords.contains(word.toLowerCase(Locale.ROOT));
     }
 
     /**
@@ -3070,12 +3081,15 @@ public class DefaultCodegen implements CodegenConfig {
      * @param response   API response
      * @param properties list of codegen property
      */
-    private void addHeaders(ApiResponse response, List<CodegenProperty> properties) {
+    private void addHeaders(OpenAPI openAPI, ApiResponse response, List<CodegenProperty> properties) {
         if (response.getHeaders() != null) {
             for (Map.Entry<String, Header> headers : response.getHeaders().entrySet()) {
-                CodegenProperty cp = fromProperty(headers.getKey(), headers.getValue().getSchema());
-                cp.setDescription(escapeText(headers.getValue().getDescription()));
-                cp.setUnescapedDescription(headers.getValue().getDescription());
+                String description = headers.getValue().getDescription();
+                // follow the $ref
+                Header header = ModelUtils.getReferencedHeader(openAPI, headers.getValue());
+                CodegenProperty cp = fromProperty(headers.getKey(), header.getSchema());
+                cp.setDescription(escapeText(description));
+                cp.setUnescapedDescription(description);
                 properties.add(cp);
             }
         }
@@ -3124,7 +3138,7 @@ public class DefaultCodegen implements CodegenConfig {
             LOGGER.warn("generated unique operationId `" + uniqueName + "`");
         }
         co.operationId = uniqueName;
-        co.operationIdLowerCase = uniqueName.toLowerCase();
+        co.operationIdLowerCase = uniqueName.toLowerCase(Locale.ROOT);
         co.operationIdCamelCase = DefaultCodegen.camelize(uniqueName);
         co.operationIdSnakeCase = DefaultCodegen.underscore(uniqueName);
         opList.add(co);
@@ -3170,7 +3184,7 @@ public class DefaultCodegen implements CodegenConfig {
         word = word.replace('-', '_');
         // replace space with underscore
         word = word.replace(' ', '_');
-        word = word.toLowerCase();
+        word = word.toLowerCase(Locale.ROOT);
         return word;
     }
 
@@ -3334,7 +3348,7 @@ public class DefaultCodegen implements CodegenConfig {
      * @param schemas The complete set of model definitions (schemas).
      * @return A mapping from model name to type alias
      */
-    private static Map<String, String> getAllAliases(Map<String, Schema> schemas) {
+    static Map<String, String> getAllAliases(Map<String, Schema> schemas) {
         if (schemas == null || schemas.isEmpty()) {
             return new HashMap<>();
         }
@@ -3377,7 +3391,7 @@ public class DefaultCodegen implements CodegenConfig {
                 .map(StringUtils::capitalize)
                 .collect(Collectors.joining(""));
         if (result.length() > 0) {
-            result = result.substring(0, 1).toLowerCase() + result.substring(1);
+            result = result.substring(0, 1).toLowerCase(Locale.ROOT) + result.substring(1);
         }
         return result;
     }
@@ -3406,7 +3420,7 @@ public class DefaultCodegen implements CodegenConfig {
         Pattern p = Pattern.compile("\\/(.?)");
         Matcher m = p.matcher(word);
         while (m.find()) {
-            word = m.replaceFirst("." + m.group(1)/*.toUpperCase()*/); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+            word = m.replaceFirst("." + m.group(1)/*.toUpperCase(Locale.ROOT)*/); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
             m = p.matcher(word);
         }
 
@@ -3422,7 +3436,7 @@ public class DefaultCodegen implements CodegenConfig {
 
         m = p.matcher(word);
         while (m.find()) {
-            word = m.replaceFirst("" + Character.toUpperCase(m.group(1).charAt(0)) + m.group(1).substring(1)/*.toUpperCase()*/);
+            word = m.replaceFirst("" + Character.toUpperCase(m.group(1).charAt(0)) + m.group(1).substring(1)/*.toUpperCase(Locale.ROOT)*/);
             m = p.matcher(word);
         }
 
@@ -3430,7 +3444,7 @@ public class DefaultCodegen implements CodegenConfig {
         p = Pattern.compile("(\\.?)(\\w)([^\\.]*)$");
         m = p.matcher(word);
         if (m.find()) {
-            String rep = m.group(1) + m.group(2).toUpperCase() + m.group(3);
+            String rep = m.group(1) + m.group(2).toUpperCase(Locale.ROOT) + m.group(3);
             rep = rep.replaceAll("\\$", "\\\\\\$");
             word = m.replaceAll(rep);
         }
@@ -3440,7 +3454,7 @@ public class DefaultCodegen implements CodegenConfig {
         m = p.matcher(word);
         while (m.find()) {
             String original = m.group(2);
-            String upperCase = original.toUpperCase();
+            String upperCase = original.toUpperCase(Locale.ROOT);
             if (original.equals(upperCase)) {
                 word = word.replaceFirst("_", "");
             } else {
@@ -3453,7 +3467,7 @@ public class DefaultCodegen implements CodegenConfig {
         p = Pattern.compile("(-)(.)");
         m = p.matcher(word);
         while (m.find()) {
-            word = m.replaceFirst(m.group(2).toUpperCase());
+            word = m.replaceFirst(m.group(2).toUpperCase(Locale.ROOT));
             m = p.matcher(word);
         }
 
@@ -3465,7 +3479,7 @@ public class DefaultCodegen implements CodegenConfig {
                 charAt = word.charAt(i);
             }
             i = i + 1;
-            word = word.substring(0, i).toLowerCase() + word.substring(i);
+            word = word.substring(0, i).toLowerCase(Locale.ROOT) + word.substring(i);
         }
 
         // remove all underscore
@@ -3488,7 +3502,7 @@ public class DefaultCodegen implements CodegenConfig {
      */
     public String apiDocFilename(String templateName, String tag) {
         String docExtension = getDocExtension();
-        String suffix = docExtension != null ? docExtension: apiDocTemplateFiles().get(templateName);
+        String suffix = docExtension != null ? docExtension : apiDocTemplateFiles().get(templateName);
         return apiDocFileFolder() + File.separator + toApiDocFilename(tag) + suffix;
     }
 
@@ -4239,7 +4253,7 @@ public class DefaultCodegen implements CodegenConfig {
                     codegenParameter.isPrimitiveType = false;
                     codegenParameter.isContainer = true;
                     codegenParameter.isListContainer = true;
-                    codegenParameter.description = s.getDescription();
+                    codegenParameter.description = escapeText(s.getDescription());
                     codegenParameter.dataType = getTypeDeclaration(s);
                     if (codegenParameter.baseType != null && codegenParameter.enumName != null) {
                         codegenParameter.datatypeWithEnum = codegenParameter.dataType.replace(codegenParameter.baseType, codegenParameter.enumName);
@@ -4365,7 +4379,7 @@ public class DefaultCodegen implements CodegenConfig {
         CodegenParameter codegenParameter = CodegenModelFactory.newInstance(CodegenModelType.PARAMETER);
         codegenParameter.baseName = "UNKNOWN_BASE_NAME";
         codegenParameter.paramName = "UNKNOWN_PARAM_NAME";
-        codegenParameter.description = body.getDescription();
+        codegenParameter.description = escapeText(body.getDescription());
         codegenParameter.required = body.getRequired() != null ? body.getRequired() : Boolean.FALSE;
         codegenParameter.isBodyParam = Boolean.TRUE;
 
@@ -4378,7 +4392,7 @@ public class DefaultCodegen implements CodegenConfig {
         }
 
         if (ModelUtils.isMapSchema(schema)) {
-            Schema inner = (Schema) schema.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(schema);
             if (inner == null) {
                 inner = new StringSchema().description("//TODO automatically added by openapi-generator");
                 schema.setAdditionalProperties(inner);
@@ -4423,7 +4437,7 @@ public class DefaultCodegen implements CodegenConfig {
             }
 
             if (StringUtils.isEmpty(bodyParameterName)) {
-                if(StringUtils.isEmpty(mostInnerItem.complexType)) {
+                if (StringUtils.isEmpty(mostInnerItem.complexType)) {
                     codegenParameter.baseName = "request_body";
                 } else {
                     codegenParameter.baseName = mostInnerItem.complexType;
@@ -4466,7 +4480,7 @@ public class DefaultCodegen implements CodegenConfig {
                 imports.add(codegenParameter.baseType);
             } else {
                 CodegenProperty codegenProperty = fromProperty("property", schema);
-                if (schema.getAdditionalProperties() != null) {// http body is map
+                if (ModelUtils.getAdditionalProperties(schema) != null) {// http body is map
                     LOGGER.error("Map should be supported. Please report to openapi-generator github repo about the issue.");
                 } else if (codegenProperty != null) {
                     String codegenModelName, codegenModelDescription;
@@ -4588,4 +4602,38 @@ public class DefaultCodegen implements CodegenConfig {
     public boolean isDataTypeString(String dataType) {
         return "String".equals(dataType);
     }
+
+    @Override
+    public List<CodegenServer> fromServers(List<Server> servers) {
+        if (servers == null) {
+            return Collections.emptyList();
+        }
+        List<CodegenServer> codegenServers = new LinkedList<>();
+        for (Server server : servers) {
+            CodegenServer cs = new CodegenServer();
+            cs.description = escapeText(server.getDescription());
+            cs.url = server.getUrl();
+            cs.variables = this.fromServerVariables(server.getVariables());
+            codegenServers.add(cs);
+        }
+        return codegenServers;
+    }
+
+    @Override
+    public List<CodegenServerVariable> fromServerVariables(Map<String, ServerVariable> variables) {
+        if (variables == null) {
+            return Collections.emptyList();
+        }
+        List<CodegenServerVariable> codegenServerVariables = new LinkedList<>();
+        for (Entry<String, ServerVariable> variableEntry : variables.entrySet()) {
+            CodegenServerVariable codegenServerVariable = new CodegenServerVariable();
+            ServerVariable variable = variableEntry.getValue();
+            codegenServerVariable.defaultValue = variable.getDefault();
+            codegenServerVariable.description = escapeText(variable.getDescription());
+            codegenServerVariable.enumValues = variable.getEnum();
+            codegenServerVariable.name = variableEntry.getKey();
+            codegenServerVariables.add(codegenServerVariable);
+        }
+        return codegenServerVariables;
+    }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
index 1ba9611cfd3..71e90105422 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -286,7 +286,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
     private void generateModelDocumentation(List<File> files, Map<String, Object> models, String modelName) throws IOException {
         for (String templateName : config.modelDocTemplateFiles().keySet()) {
             String docExtension = config.getDocExtension();
-            String suffix = docExtension!=null ? docExtension : config.modelDocTemplateFiles().get(templateName);
+            String suffix = docExtension != null ? docExtension : config.modelDocTemplateFiles().get(templateName);
             String filename = config.modelDocFileFolder() + File.separator + config.toModelDocFilename(modelName) + suffix;
             if (!config.shouldOverwrite(filename)) {
                 LOGGER.info("Skipped overwriting " + filename);
@@ -382,6 +382,10 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
             } */
         });
 
+        Boolean skipFormModel = System.getProperty(CodegenConstants.SKIP_FORM_MODEL) != null ?
+                Boolean.valueOf(System.getProperty(CodegenConstants.SKIP_FORM_MODEL)) :
+                getGeneratorPropertyDefaultSwitch(CodegenConstants.SKIP_FORM_MODEL, false);
+
         // process models only
         for (String name : modelKeys) {
             try {
@@ -393,8 +397,13 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
 
                 // don't generate models that are not used as object (e.g. form parameters)
                 if (unusedModels.contains(name)) {
-                    LOGGER.debug("Model " + name + " not generated since it's marked as unused (due to form parameters)");
-                    continue;
+                    if (Boolean.FALSE.equals(skipFormModel)) {
+                        // if skipFormModel sets to true, still generate the model and log the result
+                        LOGGER.info("Model " + name + " (marked as unused due to form parameters) is generated due to skipFormModel=false (default)");
+                    } else {
+                        LOGGER.info("Model " + name + " not generated since it's marked as unused (due to form parameters) and skipFormModel set to true");
+                        continue;
+                    }
                 }
 
                 Schema schema = schemas.get(name);
@@ -753,6 +762,12 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
             bundle.put("authMethods", authMethods);
             bundle.put("hasAuthMethods", true);
         }
+        
+        List<CodegenServer> servers = config.fromServers(openAPI.getServers());
+        if (servers != null && !servers.isEmpty()) {
+            bundle.put("servers", servers);
+            bundle.put("hasServers", true);
+        }
 
         if (openAPI.getExternalDocs() != null) {
             bundle.put("externalDocs", openAPI.getExternalDocs());
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
index 742942e4967..a17b13c15a6 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
@@ -238,7 +238,7 @@ public class InlineModelResolver {
                                     }
                                 } else if (property instanceof MapSchema) {
                                     MapSchema mp = (MapSchema) property;
-                                    Schema innerProperty = (Schema) mp.getAdditionalProperties();
+                                    Schema innerProperty = ModelUtils.getAdditionalProperties(mp);
                                     if (innerProperty instanceof ObjectSchema) {
                                         ObjectSchema op = (ObjectSchema) innerProperty;
                                         if (op.getProperties() != null && op.getProperties().size() > 0) {
@@ -431,7 +431,7 @@ public class InlineModelResolver {
                 }
             }
             if (ModelUtils.isMapSchema(property)) {
-                Schema inner = (Schema) property.getAdditionalProperties();
+                Schema inner = ModelUtils.getAdditionalProperties(property);
                 if (inner instanceof ObjectSchema) {
                     ObjectSchema op = (ObjectSchema) inner;
                     if (op.getProperties() != null && op.getProperties().size() > 0) {
@@ -519,7 +519,7 @@ public class InlineModelResolver {
         model.setDescription(description);
         model.setName(object.getName());
         model.setExample(example);
-        model.setItems((Schema) object.getAdditionalProperties());
+        model.setItems(ModelUtils.getAdditionalProperties(object));
         return model;
     }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/auth/AuthParser.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/auth/AuthParser.java
index 102b535cafd..798d9c1e03f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/auth/AuthParser.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/auth/AuthParser.java
@@ -21,6 +21,7 @@ import io.swagger.v3.parser.core.models.AuthorizationValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
@@ -39,8 +40,11 @@ public class AuthParser {
             for (String part : parts) {
                 String[] kvPair = part.split(":");
                 if (kvPair.length == 2) {
-                    // FIXME replace the deprecated method by decode(string, encoding). Which encoding is used ? Default UTF-8 ?
-                    auths.add(new AuthorizationValue(URLDecoder.decode(kvPair[0]), URLDecoder.decode(kvPair[1]), "header"));
+                    try {
+                        auths.add(new AuthorizationValue(URLDecoder.decode(kvPair[0], "UTF-8"), URLDecoder.decode(kvPair[1], "UTF-8"), "header"));
+                    } catch (UnsupportedEncodingException e) {
+                        LOGGER.warn(e.getMessage());
+                    }
                 }
             }
         }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
index 8ec858f2bfb..a1993a6d967 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
@@ -19,16 +19,33 @@ package org.openapitools.codegen.config;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
-import io.swagger.v3.oas.models.OpenAPI;
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.auth.AuthParser;
 import io.swagger.parser.OpenAPIParser;
 import io.swagger.v3.core.util.Json;
+import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.parser.core.models.AuthorizationValue;
 import io.swagger.v3.parser.core.models.ParseOptions;
 import io.swagger.v3.parser.core.models.SwaggerParseResult;
 import org.apache.commons.lang3.Validate;
-import org.openapitools.codegen.languages.*;
+import org.openapitools.codegen.CliOption;
+import org.openapitools.codegen.ClientOptInput;
+import org.openapitools.codegen.ClientOpts;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenConfigLoader;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.SpecValidationException;
+import org.openapitools.codegen.auth.AuthParser;
+import org.openapitools.codegen.languages.CSharpNancyFXServerCodegen;
+import org.openapitools.codegen.languages.CppQt5ClientCodegen;
+import org.openapitools.codegen.languages.CppRestSdkClientCodegen;
+import org.openapitools.codegen.languages.CppTizenClientCodegen;
+import org.openapitools.codegen.languages.JavaJerseyServerCodegen;
+import org.openapitools.codegen.languages.PhpLumenServerCodegen;
+import org.openapitools.codegen.languages.PhpSlimServerCodegen;
+import org.openapitools.codegen.languages.PhpZendExpressivePathHandlerServerCodegen;
+import org.openapitools.codegen.languages.RubySinatraServerCodegen;
+import org.openapitools.codegen.languages.ScalaAkkaClientCodegen;
+import org.openapitools.codegen.languages.ScalaHttpClientCodegen;
+import org.openapitools.codegen.languages.SwiftClientCodegen;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +57,7 @@ import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -139,7 +157,7 @@ public class CodegenConfigurator implements Serializable {
     public CodegenConfigurator setGeneratorName(final String generatorName) {
         if (nameMigrationMap.containsKey(generatorName)) {
             String newValue = nameMigrationMap.get(generatorName);
-            LOGGER.warn(String.format("The name '%s' is a deprecated. Please update to the new name of '%s'.", generatorName, newValue));
+            LOGGER.warn(String.format(Locale.ROOT, "The name '%s' is a deprecated. Please update to the new name of '%s'.", generatorName, newValue));
             this.generatorName = newValue;
         } else {
             this.generatorName = generatorName;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java
index 8bce5a3cd1e..47552634f4f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java
@@ -236,10 +236,10 @@ public class ExampleGenerator {
             Map<String, Object> mp = new HashMap<String, Object>();
             if (property.getName() != null) {
                 mp.put(property.getName(),
-                        resolvePropertyToExample(propertyName, mediaType, (Schema) property.getAdditionalProperties(), processedModels));
+                        resolvePropertyToExample(propertyName, mediaType, ModelUtils.getAdditionalProperties(property), processedModels));
             } else {
                 mp.put("key",
-                        resolvePropertyToExample(propertyName, mediaType, (Schema) property.getAdditionalProperties(), processedModels));
+                        resolvePropertyToExample(propertyName, mediaType, ModelUtils.getAdditionalProperties(property), processedModels));
             }
             return mp;
         } else if (ModelUtils.isUUIDSchema(property)) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/CodegenIgnoreProcessor.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/CodegenIgnoreProcessor.java
index e29da72cfca..fe7991a554f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/CodegenIgnoreProcessor.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/CodegenIgnoreProcessor.java
@@ -25,9 +25,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Presents a processing utility for parsing and evaluating files containing common ignore patterns. (.openapi-generator-ignore)
@@ -82,30 +84,30 @@ public class CodegenIgnoreProcessor {
                 loadCodegenRules(targetIgnoreFile);
                 this.ignoreFile = targetIgnoreFile;
             } catch (IOException e) {
-                LOGGER.error(String.format("Could not process %s.", targetIgnoreFile.getName()), e.getMessage());
+                LOGGER.error(String.format(Locale.ROOT, "Could not process %s.", targetIgnoreFile.getName()), e.getMessage());
             }
         } else if (!".swagger-codegen-ignore".equals(targetIgnoreFile.getName())) {
             final File legacyIgnoreFile = new File(targetIgnoreFile.getParentFile(), ".swagger-codegen-ignore");
             if (legacyIgnoreFile.exists() && legacyIgnoreFile.isFile()) {
-                LOGGER.info(String.format("Legacy support: '%s' file renamed to '%s'.", legacyIgnoreFile.getName(), targetIgnoreFile.getName()));
+                LOGGER.info(String.format(Locale.ROOT, "Legacy support: '%s' file renamed to '%s'.", legacyIgnoreFile.getName(), targetIgnoreFile.getName()));
                 try {
                     Files.move(legacyIgnoreFile, targetIgnoreFile);
                     loadFromFile(targetIgnoreFile);
                 } catch (IOException e) {
-                    LOGGER.error(String.format("Could not rename file: %s", e.getMessage()));
+                    LOGGER.error(String.format(Locale.ROOT, "Could not rename file: %s", e.getMessage()));
                 }
             } else {
                 // log info message
-                LOGGER.info(String.format("No %s file found.", targetIgnoreFile.getName()));
+                LOGGER.info(String.format(Locale.ROOT, "No %s file found.", targetIgnoreFile.getName()));
             }
         } else {
             // log info message
-            LOGGER.info(String.format("No %s file found.", targetIgnoreFile.getName()));
+            LOGGER.info(String.format(Locale.ROOT, "No %s file found.", targetIgnoreFile.getName()));
         }
     }
 
     void loadCodegenRules(final File codegenIgnore) throws IOException {
-        try (BufferedReader reader = new BufferedReader(new FileReader(codegenIgnore))) {
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(codegenIgnore), Charset.forName("UTF-8")))) {
             String line;
 
             // NOTE: Comments that start with a : (e.g. //:) are pulled from git documentation for .gitignore
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Rule.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Rule.java
index a2355dfaa64..079ac3c7a1a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Rule.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/rules/Rule.java
@@ -183,7 +183,6 @@ public abstract class Rule {
 
             }
         } catch (ParserException e) {
-            e.printStackTrace();
             return new InvalidRule(null, definition, e.getMessage());
         }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
index af2ef2c1d1b..d15b57315da 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
@@ -19,13 +19,11 @@ package org.openapitools.codegen.languages;
 
 import com.samskivert.mustache.Escapers;
 import com.samskivert.mustache.Mustache;
-
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.responses.ApiResponse;
-
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenModel;
@@ -43,6 +41,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 abstract public class AbstractAdaCodegen extends DefaultCodegen implements CodegenConfig {
@@ -180,7 +179,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
     }
 
     public String toFilename(String name) {
-        return name.replace(".", "-").toLowerCase();
+        return name.replace(".", "-").toLowerCase(Locale.ROOT);
     }
 
     /**
@@ -329,7 +328,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
             return getTypeDeclaration(inner) + "_Vectors.Vector";
         }
         if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             String name = getTypeDeclaration(inner) + "_Map";
             if (name.startsWith("Swagger.")) {
                 return name;
@@ -391,7 +390,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
                 String mt = media.get("mediaType");
                 if (mt != null) {
                     mt = mt.replace('/', '_');
-                    media.put("adaMediaType", mt.toUpperCase());
+                    media.put("adaMediaType", mt.toUpperCase(Locale.ROOT));
                     count++;
                 }
             }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
index cfae5b1a588..3968eaaca51 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
@@ -18,12 +18,12 @@
 package org.openapitools.codegen.languages;
 
 import java.util.*;
-import org.apache.commons.lang3.StringUtils;
 import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.CodegenParameter;
-import org.openapitools.codegen.CodegenModel;
-import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.CodegenType;
 import org.openapitools.codegen.DefaultCodegen;
@@ -90,7 +90,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
         // sanitize name
         name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
-        if (name.toLowerCase().matches("^_*class$")) {
+        if (name.toLowerCase(Locale.ROOT).matches("^_*class$")) {
             return "propertyClass";
         }
 
@@ -107,7 +107,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
         }
 
         if (startsWithTwoUppercaseLetters(name)) {
-            name = name.substring(0, 2).toLowerCase() + name.substring(2);
+            name = name.substring(0, 2).toLowerCase(Locale.ROOT) + name.substring(2);
         }
 
         // camelize (lower first character) the variable name
@@ -125,7 +125,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
     private boolean startsWithTwoUppercaseLetters(String name) {
         boolean startsWithTwoUppercaseLetters = false;
         if (name.length() > 1) {
-            startsWithTwoUppercaseLetters = name.substring(0, 2).equals(name.substring(0, 2).toUpperCase());
+            startsWithTwoUppercaseLetters = name.substring(0, 2).equals(name.substring(0, 2).toUpperCase(Locale.ROOT));
         }
         return startsWithTwoUppercaseLetters;
     }
@@ -196,7 +196,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
             }
             return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
 
             if (inner == null) {
                 LOGGER.warn(p.getName() + "(map property) does not have a proper inner type defined");
@@ -225,15 +225,15 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
                 return null;
             }
 
-            return String.format(pattern, getTypeDeclaration(ap.getItems()));
+            return String.format(Locale.ROOT, pattern, getTypeDeclaration(ap.getItems()));
         } else if (ModelUtils.isMapSchema(p)) {
             final MapSchema ap = (MapSchema) p;
             final String pattern = "new HashMap<%s>()";
-            if (ap.getAdditionalProperties() == null) {
+            if (ModelUtils.getAdditionalProperties(ap) == null) {
                 return null;
             }
 
-            return String.format(pattern, String.format("String, %s", getTypeDeclaration((Schema) ap.getAdditionalProperties())));
+            return String.format(Locale.ROOT, pattern, String.format(Locale.ROOT, "String, %s", getTypeDeclaration(ModelUtils.getAdditionalProperties(ap))));
         } else if (ModelUtils.isLongSchema(p)) {
             if (p.getDefault() != null) {
                 return p.getDefault().toString() + "l";
@@ -297,7 +297,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
             p.example = "'" + p.example + "'";
         } else if ("".equals(p.example) || p.example == null && p.dataType != "Object") {
             // Get an example object from the generated model
-            if (!isReservedWord(p.dataType.toLowerCase())) {
+            if (!isReservedWord(p.dataType.toLowerCase(Locale.ROOT))) {
                 p.example = p.dataType + ".getExample()";
             }
         } else {
@@ -332,7 +332,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
             } else if (example.isEmpty()) {
                 example = "2000, 1, 23";
             } else {
-                LOGGER.warn(String.format("The example provided for property '%s' is not a valid RFC3339 date. Defaulting to '2000-01-23'. [%s]", p
+                LOGGER.warn(String.format(Locale.ROOT, "The example provided for property '%s' is not a valid RFC3339 date. Defaulting to '2000-01-23'. [%s]", p
                         .getName(), example));
                 example = "2000, 1, 23";
             }
@@ -343,7 +343,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
             } else if (example.isEmpty()) {
                 example = "2000, 1, 23, 4, 56, 7";
             } else {
-                LOGGER.warn(String.format("The example provided for property '%s' is not a valid RFC3339 datetime. Defaulting to '2000-01-23T04-56-07Z'. [%s]", p
+                LOGGER.warn(String.format(Locale.ROOT, "The example provided for property '%s' is not a valid RFC3339 datetime. Defaulting to '2000-01-23T04-56-07Z'. [%s]", p
                         .getName(), example));
                 example = "2000, 1, 23, 4, 56, 7";
             }
@@ -366,7 +366,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
         } else if (ModelUtils.isLongSchema(p)) {
             example = example.isEmpty() ? "123456789L" : example + "L";
         } else if (ModelUtils.isMapSchema(p)) {
-            example = "new " + getTypeDeclaration(p) + "{'key'=>" + toExampleValue((Schema) p.getAdditionalProperties()) + "}";
+            example = "new " + getTypeDeclaration(p) + "{'key'=>" + toExampleValue(ModelUtils.getAdditionalProperties(p)) + "}";
 
         } else if (ModelUtils.isPasswordSchema(p)) {
             example = example.isEmpty() ? "password123" : escapeText(example);
@@ -526,7 +526,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
 
         // for symbol, e.g. $, #
         if (getSymbolName(value) != null) {
-            return getSymbolName(value).toUpperCase();
+            return getSymbolName(value).toUpperCase(Locale.ROOT);
         }
 
         // number
@@ -540,7 +540,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
         }
 
         // string
-        String var = value.replaceAll("\\W+", "_").toUpperCase();
+        String var = value.replaceAll("\\W+", "_").toUpperCase(Locale.ROOT);
         if (var.matches("\\d.*")) {
             return "_" + var;
         } else {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
index 023f6f51e12..92c9f536068 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -234,7 +234,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
         }
 
         if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
-            LOGGER.warn(String.format("%s is not used by C# generators. Please use %s",
+            LOGGER.warn(String.format(Locale.ROOT, "%s is not used by C# generators. Please use %s",
                     CodegenConstants.INVOKER_PACKAGE, CodegenConstants.PACKAGE_NAME));
         }
 
@@ -313,9 +313,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
 
         if (additionalProperties.containsKey(CodegenConstants.INTERFACE_PREFIX)) {
             String useInterfacePrefix = additionalProperties.get(CodegenConstants.INTERFACE_PREFIX).toString();
-            if ("false".equals(useInterfacePrefix.toLowerCase())) {
+            if ("false".equals(useInterfacePrefix.toLowerCase(Locale.ROOT))) {
                 setInterfacePrefix("");
-            } else if (!"true".equals(useInterfacePrefix.toLowerCase())) {
+            } else if (!"true".equals(useInterfacePrefix.toLowerCase(Locale.ROOT))) {
                 // NOTE: if user passes "true" explicitly, we use the default I- prefix. The other supported case here is a custom prefix.
                 setInterfacePrefix(sanitizeName(useInterfacePrefix));
             }
@@ -768,8 +768,8 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
         // NOTE: typeMapping here supports things like string/String, long/Long, datetime/DateTime as lowercase keys.
         //       Should we require explicit casing here (values are not insensitive).
         // TODO avoid using toLowerCase as typeMapping should be case-sensitive
-        if (typeMapping.containsKey(openAPIType.toLowerCase())) {
-            type = typeMapping.get(openAPIType.toLowerCase());
+        if (typeMapping.containsKey(openAPIType.toLowerCase(Locale.ROOT))) {
+            type = typeMapping.get(openAPIType.toLowerCase(Locale.ROOT));
             if (languageSpecificPrimitives.contains(type)) {
                 return type;
             }
@@ -811,7 +811,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
             return getArrayTypeDeclaration((ArraySchema) p);
         } else if (ModelUtils.isMapSchema(p)) {
             // Should we also support maps of maps?
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "<string, " + getTypeDeclaration(inner) + ">";
         }
         return super.getTypeDeclaration(p);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
index 55341daf942..116a27d1cac 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
@@ -17,15 +17,11 @@
 
 package org.openapitools.codegen.languages;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-
 import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
-
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
@@ -46,9 +42,12 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
+
 public abstract class AbstractEiffelCodegen extends DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractEiffelCodegen.class);
 
@@ -169,13 +168,13 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
     @Override
     public String toParamName(String name) {
         // params should be lowercase. E.g. "person: PERSON"
-        return toVarName(name).toLowerCase();
+        return toVarName(name).toLowerCase(Locale.ROOT);
     }
 
     @Override
     public String toModelName(String name) {
         // phone_number => PHONE_NUMBER
-        return toModelFilename(name).toUpperCase();
+        return toModelFilename(name).toUpperCase(Locale.ROOT);
     }
 
     @Override
@@ -221,7 +220,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
 
     @Override
     public String toApiTestFilename(String name) {
-        return toApiName(name).toLowerCase() + "_test";
+        return toApiName(name).toLowerCase(Locale.ROOT) + "_test";
     }
 
     @Override
@@ -229,7 +228,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
         if (name.length() == 0) {
             return "DEFAULT_API";
         }
-        return name.toUpperCase() + "_API";
+        return name.toUpperCase(Locale.ROOT) + "_API";
     }
 
     /**
@@ -269,7 +268,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
             }
         }
         if (!isNullOrEmpty(model.parentSchema)) {
-            model.parentSchema = model.parentSchema.toLowerCase();
+            model.parentSchema = model.parentSchema.toLowerCase(Locale.ROOT);
         }
     }
 
@@ -290,7 +289,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
             Schema inner = ap.getItems();
             return "LIST [" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
 
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         }
@@ -352,7 +351,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
         for (CodegenOperation operation : operations) {
             // http method verb conversion (e.g. PUT => Put)
 
-            operation.httpMethod = camelize(operation.httpMethod.toLowerCase());
+            operation.httpMethod = camelize(operation.httpMethod.toLowerCase(Locale.ROOT));
         }
 
         // remove model imports to avoid error
@@ -557,7 +556,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
     @Override
     public String toInstantiationType(Schema p) {
         if (ModelUtils.isMapSchema(p)) {
-            Schema additionalProperties2 = (Schema) p.getAdditionalProperties();
+            Schema additionalProperties2 = ModelUtils.getAdditionalProperties(p);
             String type = additionalProperties2.getType();
             if (null == type) {
                 LOGGER.error("No Type defined for Additional Schema " + additionalProperties2 + "\n" //
@@ -575,7 +574,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
     }
 
     public String unCamelize(String name) {
-        return name.replaceAll("(.)(\\p{Upper})", "$1_$2").toLowerCase();
+        return name.replaceAll("(.)(\\p{Upper})", "$1_$2").toLowerCase(Locale.ROOT);
     }
 
     public String toEiffelFeatureStyle(String operationId) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
index 2db13c3af69..e6d60a99df2 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -17,22 +17,16 @@
 
 package org.openapitools.codegen.languages;
 
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.utils.ModelUtils;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.core.util.Yaml;
-
-import java.util.*;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.*;
+
 public abstract class AbstractGoCodegen extends DefaultCodegen implements CodegenConfig {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractGoCodegen.class);
@@ -258,7 +252,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
             Schema inner = ap.getItems();
             return "[]" + getTypeDeclaration(inner);
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "[string]" + getTypeDeclaration(inner);
         }
         //return super.getTypeDeclaration(p);
@@ -335,7 +329,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
         List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
         for (CodegenOperation operation : operations) {
             // http method verb conversion (e.g. PUT => Put)
-            operation.httpMethod = camelize(operation.httpMethod.toLowerCase());
+            operation.httpMethod = camelize(operation.httpMethod.toLowerCase(Locale.ROOT));
         }
 
         // remove model imports to avoid error
@@ -389,7 +383,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
                     } else {
                         // Map optional type to dataType
                         param.vendorExtensions.put("x-optionalDataType",
-                                param.dataType.substring(0, 1).toUpperCase() + param.dataType.substring(1));
+                                param.dataType.substring(0, 1).toUpperCase(Locale.ROOT) + param.dataType.substring(1));
                     }
                 }
 
@@ -562,11 +556,11 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
 
         // for symbol, e.g. $, #
         if (getSymbolName(name) != null) {
-            return getSymbolName(name).toUpperCase();
+            return getSymbolName(name).toUpperCase(Locale.ROOT);
         }
 
         // string
-        String enumName = sanitizeName(underscore(name).toUpperCase());
+        String enumName = sanitizeName(underscore(name).toUpperCase(Locale.ROOT));
         enumName = enumName.replaceFirst("^_", "");
         enumName = enumName.replaceFirst("_$", "");
 
@@ -581,7 +575,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
 
     @Override
     public String toEnumName(CodegenProperty property) {
-        String enumName = underscore(toModelName(property.name)).toUpperCase();
+        String enumName = underscore(toModelName(property.name)).toUpperCase(Locale.ROOT);
 
         // remove [] for array or map of enum
         enumName = enumName.replace("[]", "");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index ea1b16fbfbe..eb0d56a9470 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -49,6 +49,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Pattern;
 
@@ -564,7 +565,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
         // sanitize name
         name = sanitizeName(name, "\\W-[\\$]"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
-        if (name.toLowerCase().matches("^_*class$")) {
+        if (name.toLowerCase(Locale.ROOT).matches("^_*class$")) {
             return "propertyClass";
         }
 
@@ -578,7 +579,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
         }
 
         if (startsWithTwoUppercaseLetters(name)) {
-            name = name.substring(0, 2).toLowerCase() + name.substring(2);
+            name = name.substring(0, 2).toLowerCase(Locale.ROOT) + name.substring(2);
         }
 
         // If name contains special chars -> replace them.
@@ -604,7 +605,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
     private boolean startsWithTwoUppercaseLetters(String name) {
         boolean startsWithTwoUppercaseLetters = false;
         if (name.length() > 1) {
-            startsWithTwoUppercaseLetters = name.substring(0, 2).equals(name.substring(0, 2).toUpperCase());
+            startsWithTwoUppercaseLetters = name.substring(0, 2).equals(name.substring(0, 2).toUpperCase(Locale.ROOT));
         }
         return startsWithTwoUppercaseLetters;
     }
@@ -679,7 +680,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
             }
             return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             if (inner == null) {
                 LOGGER.warn(p.getName() + "(map property) does not have a proper inner type defined. Default to string");
                 inner = new StringSchema().description("TODO default missing array inner type to string");
@@ -720,7 +721,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
                 }
             }
 
-            return String.format(pattern, typeDeclaration);
+            return String.format(Locale.ROOT, pattern, typeDeclaration);
         } else if (ModelUtils.isMapSchema(p)) {
             final String pattern;
             if (fullJavaUtil) {
@@ -728,11 +729,11 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
             } else {
                 pattern = "new HashMap<%s>()";
             }
-            if (p.getAdditionalProperties() == null) {
+            if (ModelUtils.getAdditionalProperties(p) == null) {
                 return null;
             }
 
-            String typeDeclaration = String.format("String, %s", getTypeDeclaration((Schema) p.getAdditionalProperties()));
+            String typeDeclaration = String.format(Locale.ROOT, "String, %s", getTypeDeclaration(ModelUtils.getAdditionalProperties(p)));
             Object java8obj = additionalProperties.get("java8");
             if (java8obj != null) {
                 Boolean java8 = Boolean.valueOf(java8obj.toString());
@@ -741,7 +742,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
                 }
             }
 
-            return String.format(pattern, typeDeclaration);
+            return String.format(Locale.ROOT, pattern, typeDeclaration);
         } else if (ModelUtils.isIntegerSchema(p)) {
             if (p.getDefault() != null) {
                 if (SchemaTypeUtil.INTEGER64_FORMAT.equals(p.getFormat())) {
@@ -1049,7 +1050,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
 
         // for symbol, e.g. $, #
         if (getSymbolName(value) != null) {
-            return getSymbolName(value).toUpperCase();
+            return getSymbolName(value).toUpperCase(Locale.ROOT);
         }
 
         // number
@@ -1063,7 +1064,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
         }
 
         // string
-        String var = value.replaceAll("\\W+", "_").toUpperCase();
+        String var = value.replaceAll("\\W+", "_").toUpperCase(Locale.ROOT);
         if (var.matches("\\d.*")) {
             return "_" + var;
         } else {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
index 726b69f73b3..774c96fe33f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -17,16 +17,13 @@
 
 package org.openapitools.codegen.languages;
 
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.utils.ModelUtils;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,6 +31,7 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 
 public abstract class AbstractKotlinCodegen extends DefaultCodegen implements CodegenConfig {
@@ -220,7 +218,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
     @Override
     public String escapeReservedWord(String name) {
         // TODO: Allow enum escaping as an option (e.g. backticks vs append/prepend underscore vs match model property escaping).
-        return String.format("`%s`", name);
+        return String.format(Locale.ROOT, "`%s`", name);
     }
 
     @Override
@@ -282,7 +280,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
         if (ModelUtils.isArraySchema(p)) {
             return getArrayTypeDeclaration((ArraySchema) p);
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
 
             // Maps will be keyed only by primitive Kotlin string
             return getSchemaType(p) + "<kotlin.String, " + getTypeDeclaration(inner) + ">";
@@ -414,7 +412,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
                 modified = underscore(modified);
                 break;
             case UPPERCASE:
-                modified = modified.toUpperCase();
+                modified = modified.toUpperCase(Locale.ROOT);
                 break;
         }
 
@@ -536,7 +534,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
     }
 
     private String titleCase(final String input) {
-        return input.substring(0, 1).toUpperCase() + input.substring(1);
+        return input.substring(0, 1).toUpperCase(Locale.ROOT) + input.substring(1);
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
index abc94c73ee2..98161179c1c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
@@ -1,5 +1,4 @@
-/*
- * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+/*ap Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
  * Copyright 2018 SmartBear Software
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,9 @@
 
 package org.openapitools.codegen.languages;
 
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConstants;
@@ -24,23 +26,20 @@ import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.CodegenParameter;
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.DefaultCodegen;
+import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.utils.ModelUtils;
-
-import io.swagger.v3.oas.models.media.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.regex.Matcher;
 
-import org.apache.commons.lang3.StringUtils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public abstract class AbstractPhpCodegen extends DefaultCodegen implements CodegenConfig {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPhpCodegen.class);
@@ -238,6 +237,9 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
 
         // apache v2 license
         // supportingFiles.add(new SupportingFile("LICENSE", "", "LICENSE"));
+
+        // all PHP codegens requires Composer, it means that we need to exclude from SVN at least vendor folder
+        supportingFiles.add(new SupportingFile(".gitignore", "", ".gitignore"));
     }
 
     public String getPackageName() {
@@ -328,7 +330,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
             Schema inner = ap.getItems();
             return getTypeDeclaration(inner) + "[]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "[string," + getTypeDeclaration(inner) + "]";
         } else if (StringUtils.isNotBlank(p.get$ref())) { // model
             String type = super.getTypeDeclaration(p);
@@ -623,7 +625,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
 
         // for symbol, e.g. $, #
         if (getSymbolName(name) != null) {
-            return (getSymbolName(name)).toUpperCase();
+            return (getSymbolName(name)).toUpperCase(Locale.ROOT);
         }
 
         // number
@@ -636,7 +638,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
         }
 
         // string
-        String enumName = sanitizeName(underscore(name).toUpperCase());
+        String enumName = sanitizeName(underscore(name).toUpperCase(Locale.ROOT));
         enumName = enumName.replaceFirst("^_", "");
         enumName = enumName.replaceFirst("_$", "");
 
@@ -649,7 +651,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
 
     @Override
     public String toEnumName(CodegenProperty property) {
-        String enumName = underscore(toModelName(property.name)).toUpperCase();
+        String enumName = underscore(toModelName(property.name)).toUpperCase(Locale.ROOT);
 
         // remove [] for array or map of enum
         enumName = enumName.replace("[]", "");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
index 5848febe0b2..b26a99dd43b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
@@ -19,12 +19,14 @@ package org.openapitools.codegen.languages;
 
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
-import org.openapitools.codegen.*;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
+import java.util.Locale;
 
 abstract class AbstractRubyCodegen extends DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractRubyCodegen.class);
@@ -88,7 +90,7 @@ abstract class AbstractRubyCodegen extends DefaultCodegen implements CodegenConf
             Schema inner = ((ArraySchema) schema).getItems();
             return getSchemaType(schema) + "<" + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(schema)) {
-            Schema inner = (Schema) schema.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(schema);
             return getSchemaType(schema) + "<String, " + getTypeDeclaration(inner) + ">";
         }
 
@@ -116,7 +118,7 @@ abstract class AbstractRubyCodegen extends DefaultCodegen implements CodegenConf
         name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         // if it's all uppper case, convert to lower case
         if (name.matches("^[A-Z_]*$")) {
-            name = name.toLowerCase();
+            name = name.toLowerCase(Locale.ROOT);
         }
 
         // camelize (lower first character) the variable name
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
index 4993950e862..05b9f4dea4e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
@@ -181,7 +181,7 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
 
             return getSchemaType(p) + "[String, " + getTypeDeclaration(inner) + "]";
         }
@@ -206,7 +206,7 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
     @Override
     public String toInstantiationType(Schema p) {
         if (ModelUtils.isMapSchema(p)) {
-            String inner = getSchemaType((Schema) p.getAdditionalProperties());
+            String inner = getSchemaType(ModelUtils.getAdditionalProperties(p));
             return instantiationTypes.get("map") + "[String, " + inner + "]";
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
@@ -235,7 +235,7 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
         } else if (ModelUtils.isIntegerSchema(p)) {
             return null;
         } else if (ModelUtils.isMapSchema(p)) {
-            String inner = getSchemaType((Schema) p.getAdditionalProperties());
+            String inner = getSchemaType(ModelUtils.getAdditionalProperties(p));
             return "new HashMap[String, " + inner + "]() ";
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
index 5a02de72028..491fdf0b03e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -227,7 +227,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
             Schema inner = ap.getItems();
             return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "{ [key: string]: " + getTypeDeclaration(inner) + "; }";
         } else if (ModelUtils.isFileSchema(p)) {
             return "any";
@@ -246,7 +246,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
             inner = mp1.getItems();
             return this.getSchemaType(p) + "<" + this.getParameterDataType(parameter, inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            inner = (Schema) p.getAdditionalProperties();
+            inner = ModelUtils.getAdditionalProperties(p);
             return "{ [key: string]: " + this.getParameterDataType(parameter, inner) + "; }";
         } else if (ModelUtils.isStringSchema(p)) {
             // Handle string enums
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java
index fd7f105715b..3a0731106f3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java
@@ -17,14 +17,18 @@
 
 package org.openapitools.codegen.languages;
 
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
-
-import org.apache.commons.lang3.StringUtils;
-import com.samskivert.mustache.Mustache;
-import com.samskivert.mustache.Template;
-import org.openapitools.codegen.*;
+import java.util.Locale;
 
 public class AdaCodegen extends AbstractAdaCodegen implements CodegenConfig {
 
@@ -71,7 +75,7 @@ public class AdaCodegen extends AbstractAdaCodegen implements CodegenConfig {
             // e.g. petstore.api (package name) => petstore_api (project name)
             projectName = packageName.replaceAll("\\.", "_");
         }
-        String configBaseName = modelPackage.toLowerCase();
+        String configBaseName = modelPackage.toLowerCase(Locale.ROOT);
         supportingFiles.add(new SupportingFile("gnat-project.mustache", "", toFilename(projectName) + ".gpr"));
         // supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("config.gpr", "", "config.gpr"));
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java
index 5432657766b..1e273095181 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java
@@ -19,7 +19,6 @@ package org.openapitools.codegen.languages;
 
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
-
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenType;
@@ -28,6 +27,7 @@ import org.openapitools.codegen.SupportingFile;
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
+import java.util.Locale;
 
 public class AdaServerCodegen extends AbstractAdaCodegen implements CodegenConfig {
 
@@ -76,7 +76,7 @@ public class AdaServerCodegen extends AbstractAdaCodegen implements CodegenConfi
             // e.g. petstore.api (package name) => petstore_api (project name)
             projectName = packageName.replaceAll("\\.", "_");
         }
-        String configBaseName = modelPackage.toLowerCase();
+        String configBaseName = modelPackage.toLowerCase(Locale.ROOT);
         supportingFiles.add(new SupportingFile("gnat-project.mustache", "", toFilename(projectName) + ".gpr"));
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("config.gpr", "", "config.gpr"));
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
index 65674eaf39c..ea267ac8cb8 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
@@ -189,7 +189,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
             Schema inner = ap.getItems();
             return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
 
             return getSchemaType(p) + "<String, " + getTypeDeclaration(inner) + ">";
         }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
index 8af857cc287..66dcb89a522 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
@@ -217,6 +217,7 @@ public class ApexClientCodegen extends AbstractApexCodegen {
         if (ModelUtils.isArraySchema(p)) {
             Schema inner = ((ArraySchema) p).getItems();
             out = String.format(
+                    Locale.ROOT,
                     "new List<%s>()",
                     inner == null ? "Object" : getTypeDeclaration(inner)
             );
@@ -227,14 +228,14 @@ public class ApexClientCodegen extends AbstractApexCodegen {
             Long def = (Long) p.getDefault();
             out = def == null ? out : def.toString() + "L";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             String s = inner == null ? "Object" : getTypeDeclaration(inner);
-            out = String.format("new Map<String, %s>()", s);
+            out = String.format(Locale.ROOT, "new Map<String, %s>()", s);
         } else if (ModelUtils.isStringSchema(p)) {
             if (p.getDefault() != null) {
                 String def = p.getDefault().toString();
                 if (def != null) {
-                    out = p.getEnum() == null ? String.format("'%s'", escapeText(def)) : def;
+                    out = p.getEnum() == null ? String.format(Locale.ROOT, "'%s'", escapeText(def)) : def;
                 }
             }
         } else {
@@ -270,7 +271,7 @@ public class ApexClientCodegen extends AbstractApexCodegen {
         if (apiVersion.matches("^\\d{2}(\\.0)?$")) {
             return apiVersion.substring(0, 2) + ".0";
         } else {
-            LOGGER.warn(String.format("specified API version is invalid: %s - defaulting to %s", apiVersion, this.apiVersion));
+            LOGGER.warn(String.format(Locale.ROOT, "specified API version is invalid: %s - defaulting to %s", apiVersion, this.apiVersion));
             return this.apiVersion;
         }
     }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
index 1c269a15d57..2ae16f32581 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
@@ -17,21 +17,21 @@
 
 package org.openapitools.codegen.languages;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-
 import com.samskivert.mustache.Mustache;
-
 import io.swagger.v3.oas.models.OpenAPI;
-
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.ModelUtils;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.utils.URLPathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.net.URL;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Map;
 
 import static java.util.UUID.randomUUID;
 
@@ -39,7 +39,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
 
     public static final String USE_SWASHBUCKLE = "useSwashbuckle";
 
-    private String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}";
+    private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
 
     @SuppressWarnings("hiding")
     protected Logger LOGGER = LoggerFactory.getLogger(AspNetCoreServerCodegen.class);
@@ -141,7 +141,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
             additionalProperties.put(USE_SWASHBUCKLE, useSwashbuckle);
         }
 
-        additionalProperties.put("dockerTag", packageName.toLowerCase());
+        additionalProperties.put("dockerTag", packageName.toLowerCase(Locale.ROOT));
 
         apiPackage = packageName + ".Controllers";
         modelPackage = packageName + ".Models";
@@ -211,7 +211,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
         }
 
         // Converts, for example, PUT to HttpPut for controller attributes
-        operation.httpMethod = "Http" + operation.httpMethod.substring(0, 1) + operation.httpMethod.substring(1).toLowerCase();
+        operation.httpMethod = "Http" + operation.httpMethod.substring(0, 1) + operation.httpMethod.substring(1).toLowerCase(Locale.ROOT);
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
index 2dd33784fe3..fa599d439f5 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
@@ -388,7 +388,7 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "[String, " + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
@@ -637,7 +637,7 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
                                 mapper.writerWithDefaultPrettyPrinter().writeValueAsString(
                                         definitions.get(p.dataType).getExample()));
                     } catch (JsonProcessingException e) {
-                        e.printStackTrace();
+                        LOGGER.warn(e.getMessage(), e);
                     }
                 } else {
                     /**
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
index 0e493b93286..470641d928a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -17,13 +17,9 @@
 
 package org.openapitools.codegen.languages;
 
-import static org.apache.commons.lang3.StringUtils.isEmpty;
-
 import com.google.common.collect.ImmutableMap;
 import com.samskivert.mustache.Mustache;
-
 import io.swagger.v3.oas.models.media.Schema;
-
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenModel;
@@ -40,8 +36,11 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+
 public class CSharpClientCodegen extends AbstractCSharpCodegen {
     @SuppressWarnings({"hiding"})
     private static final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
@@ -57,7 +56,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     // Defines the sdk option for targeted frameworks, which differs from targetFramework and targetFrameworkNuget
     private static final String MCS_NET_VERSION_KEY = "x-mcs-sdk";
 
-    protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase() + "}";
+    protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
     protected String clientPackage = "Org.OpenAPITools.Client";
     protected String localVariablePrefix = "";
     protected String apiDocPath = "docs/";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java
index 0180059a678..be5147d3dac 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java
@@ -17,17 +17,24 @@
 
 package org.openapitools.codegen.languages;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static org.apache.commons.lang3.StringUtils.capitalize;
-import static org.openapitools.codegen.CodegenConstants.*;
-import static org.openapitools.codegen.CodegenType.SERVER;
-import static java.util.Arrays.asList;
-import static java.util.UUID.randomUUID;
-
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.*;
-import io.swagger.v3.oas.models.*;
-import io.swagger.v3.oas.models.media.*;
+import com.google.common.base.Predicate;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Multimap;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.media.Schema;
+import org.openapitools.codegen.CodegenModel;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenProperty;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.utils.ModelUtils;
+import org.openapitools.codegen.utils.URLPathUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.net.URL;
@@ -36,20 +43,34 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static java.util.Arrays.asList;
+import static java.util.UUID.randomUUID;
+import static org.apache.commons.lang3.StringUtils.capitalize;
+import static org.openapitools.codegen.CodegenConstants.INTERFACE_PREFIX;
+import static org.openapitools.codegen.CodegenConstants.INTERFACE_PREFIX_DESC;
+import static org.openapitools.codegen.CodegenConstants.OPTIONAL_PROJECT_FILE;
+import static org.openapitools.codegen.CodegenConstants.OPTIONAL_PROJECT_FILE_DESC;
+import static org.openapitools.codegen.CodegenConstants.OPTIONAL_PROJECT_GUID;
+import static org.openapitools.codegen.CodegenConstants.OPTIONAL_PROJECT_GUID_DESC;
+import static org.openapitools.codegen.CodegenConstants.PACKAGE_NAME;
+import static org.openapitools.codegen.CodegenConstants.PACKAGE_VERSION;
+import static org.openapitools.codegen.CodegenConstants.RETURN_ICOLLECTION;
+import static org.openapitools.codegen.CodegenConstants.RETURN_ICOLLECTION_DESC;
+import static org.openapitools.codegen.CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG;
+import static org.openapitools.codegen.CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC;
+import static org.openapitools.codegen.CodegenConstants.SOURCE_FOLDER;
+import static org.openapitools.codegen.CodegenConstants.SOURCE_FOLDER_DESC;
+import static org.openapitools.codegen.CodegenConstants.USE_COLLECTION;
+import static org.openapitools.codegen.CodegenConstants.USE_COLLECTION_DESC;
+import static org.openapitools.codegen.CodegenConstants.USE_DATETIME_OFFSET;
+import static org.openapitools.codegen.CodegenConstants.USE_DATETIME_OFFSET_DESC;
+import static org.openapitools.codegen.CodegenType.SERVER;
 
 public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen {
     private static final Logger LOGGER = LoggerFactory.getLogger(CSharpNancyFXServerCodegen.class);
@@ -64,7 +85,7 @@ public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen {
     private static final Map<String, Predicate<Schema>> propertyToOpenAPITypeMapping =
             createPropertyToOpenAPITypeMapping();
 
-    private String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}";
+    private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
 
     private final Map<String, DependencyInfo> dependencies = new HashMap<>();
     private final Set<String> parentModels = new HashSet<>();
@@ -185,18 +206,18 @@ public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen {
             final String assemblyFramework = namespaceInfo.length > 3 ? namespaceInfo[3].trim() : "net45";
 
             if (isNullOrEmpty(model) || isNullOrEmpty(namespaceName)) {
-                LOGGER.warn(String.format("Could not import: '%s' - invalid namespace: '%s'", model, entry.getValue()));
+                LOGGER.warn(String.format(Locale.ROOT, "Could not import: '%s' - invalid namespace: '%s'", model, entry.getValue()));
                 importMapping.remove(model);
             } else {
-                LOGGER.info(String.format("Importing: '%s' from '%s' namespace.", model, namespaceName));
+                LOGGER.info(String.format(Locale.ROOT, "Importing: '%s' from '%s' namespace.", model, namespaceName));
                 importMapping.put(model, namespaceName);
             }
             if (!isNullOrEmpty(modelClass)) {
-                LOGGER.info(String.format("Mapping: '%s' class to '%s'", model, modelClass));
+                LOGGER.info(String.format(Locale.ROOT, "Mapping: '%s' class to '%s'", model, modelClass));
                 modelNameMapping.put(model, modelClass);
             }
             if (assembly != null && assemblyVersion != null) {
-                LOGGER.info(String.format("Adding dependency: '%s', version: '%s', framework: '%s'",
+                LOGGER.info(String.format(Locale.ROOT, "Adding dependency: '%s', version: '%s', framework: '%s'",
                         assembly, assemblyVersion, assemblyVersion));
                 dependencies.put(assembly, new DependencyInfo(assemblyVersion, assemblyFramework));
             }
@@ -248,7 +269,7 @@ public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen {
             operation.path = operation.path.replace("?", "/");
         }
         if (!isNullOrEmpty(operation.httpMethod)) {
-            operation.httpMethod = capitalize(operation.httpMethod.toLowerCase());
+            operation.httpMethod = capitalize(operation.httpMethod.toLowerCase(Locale.ROOT));
         }
     }
 
@@ -280,7 +301,7 @@ public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen {
         for (final CodegenProperty property : parent.vars) {
             final CodegenProperty duplicatedByParent = childPropertiesByName.get(property.name);
             if (duplicatedByParent != null) {
-                LOGGER.info(String.format("Property: '%s' in '%s' model is inherited from '%s'",
+                LOGGER.info(String.format(Locale.ROOT, "Property: '%s' in '%s' model is inherited from '%s'",
                         property.name, child.classname, parent.classname));
                 duplicatedByParent.isInherited = true;
                 final CodegenProperty parentVar = duplicatedByParent.clone();
@@ -322,7 +343,7 @@ public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen {
         } else {
             result = enumName;
         }
-        LOGGER.debug(String.format("toEnumVarName('%s', %s) = '%s'", name, datatype, enumName));
+        LOGGER.debug(String.format(Locale.ROOT, "toEnumVarName('%s', %s) = '%s'", name, datatype, enumName));
         return result;
     }
 
@@ -334,7 +355,7 @@ public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen {
         } else {
             apiName = capitalize(name);
         }
-        LOGGER.debug(String.format("toApiName('%s') = '%s'", name, apiName));
+        LOGGER.debug(String.format(Locale.ROOT, "toApiName('%s') = '%s'", name, apiName));
         return apiName;
     }
 
@@ -355,7 +376,7 @@ public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen {
         } else {
             result = null;
         }
-        LOGGER.debug(String.format("toModelImport('%s') = '%s'", name, result));
+        LOGGER.debug(String.format(Locale.ROOT, "toModelImport('%s') = '%s'", name, result));
         return result;
     }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java
index 604211bd703..89309b512d9 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java
@@ -17,6 +17,11 @@
 
 package org.openapitools.codegen.languages;
 
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConstants;
@@ -24,16 +29,11 @@ import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.CodegenType;
 import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.SupportingFile;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.info.*;
-
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
-import java.util.Map;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfig {
     private static final String PROJECT_NAME = "projectName";
@@ -221,7 +221,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
         List<CodegenOperation> ops = (List<CodegenOperation>) objs.get("operation");
         for (CodegenOperation op : ops) {
             // Convert httpMethod to lower case, e.g. "get", "post"
-            op.httpMethod = op.httpMethod.toLowerCase();
+            op.httpMethod = op.httpMethod.toLowerCase(Locale.ROOT);
         }
         return operations;
     }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java
index b9243aaa260..753e55f8d9c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java
@@ -19,7 +19,6 @@ package org.openapitools.codegen.languages;
 
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
-
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConstants;
@@ -32,6 +31,7 @@ import org.openapitools.codegen.utils.ModelUtils;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class ConfluenceWikiCodegen extends DefaultCodegen implements CodegenConfig {
@@ -99,7 +99,7 @@ public class ConfluenceWikiCodegen extends DefaultCodegen implements CodegenConf
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "[String, " + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
@@ -110,7 +110,7 @@ public class ConfluenceWikiCodegen extends DefaultCodegen implements CodegenConf
         Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
         List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
         for (CodegenOperation op : operationList) {
-            op.httpMethod = op.httpMethod.toLowerCase();
+            op.httpMethod = op.httpMethod.toLowerCase(Locale.ROOT);
         }
         return objs;
     }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java
index 322509976b4..70ba645a4e6 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java
@@ -22,7 +22,6 @@ import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.responses.ApiResponse;
-
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenOperation;
@@ -38,6 +37,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -198,8 +198,8 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen {
     public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<Object> allModels) {
         Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
         String classname = (String) operations.get("classname");
-        operations.put("classnameSnakeUpperCase", DefaultCodegen.underscore(classname).toUpperCase());
-        operations.put("classnameSnakeLowerCase", DefaultCodegen.underscore(classname).toLowerCase());
+        operations.put("classnameSnakeUpperCase", DefaultCodegen.underscore(classname).toUpperCase(Locale.ROOT));
+        operations.put("classnameSnakeLowerCase", DefaultCodegen.underscore(classname).toLowerCase(Locale.ROOT));
 
         List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
         for (CodegenOperation op : operationList) {
@@ -220,7 +220,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen {
                 }
             }
 
-            op.httpMethod = op.httpMethod.substring(0, 1).toUpperCase() + op.httpMethod.substring(1).toLowerCase();
+            op.httpMethod = op.httpMethod.substring(0, 1).toUpperCase(Locale.ROOT) + op.httpMethod.substring(1).toLowerCase(Locale.ROOT);
 
             for (CodegenParameter param : op.allParams) {
                 if (param.isFormParam) isParsingSupported = false;
@@ -305,7 +305,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen {
             return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">";
         }
         if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "<std::string, " + getTypeDeclaration(inner) + ">";
         }
         else if (ModelUtils.isByteArraySchema(p)) {
@@ -343,7 +343,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen {
         else if (ModelUtils.isByteArraySchema(p)) {
             return "\"\"";
         } else if (ModelUtils.isMapSchema(p)) {
-            String inner = getSchemaType((Schema) p.getAdditionalProperties());
+            String inner = getSchemaType(ModelUtils.getAdditionalProperties(p));
             return "std::map<std::string, " + inner + ">()";
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java
index bb06b36b1af..0d3d963f0f4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java
@@ -17,12 +17,15 @@
 
 package org.openapitools.codegen.languages;
 
-import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.ModelUtils;
-
-import io.swagger.v3.oas.models.media.*;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,6 +33,7 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -294,7 +298,7 @@ public class CppQt5ClientCodegen extends AbstractCppCodegen implements CodegenCo
             Schema inner = ap.getItems();
             return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">*";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "<QString, " + getTypeDeclaration(inner) + ">*";
         }
         if (foundationClasses.contains(openAPIType)) {
@@ -325,7 +329,7 @@ public class CppQt5ClientCodegen extends AbstractCppCodegen implements CodegenCo
             }
             return "0";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "new QMap<QString, " + getTypeDeclaration(inner) + ">()";
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
@@ -371,7 +375,7 @@ public class CppQt5ClientCodegen extends AbstractCppCodegen implements CodegenCo
 
         // if it's all uppper case, convert to lower case
         if (varName.matches("^[A-Z_]*$")) {
-            varName = varName.toLowerCase();
+            varName = varName.toLowerCase(Locale.ROOT);
         }
 
         // camelize (lower first character) the variable name
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java
index 9ca30263bf9..37f14e75c81 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java
@@ -17,12 +17,14 @@
 
 package org.openapitools.codegen.languages;
 
-import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.ModelUtils;
-
-import io.swagger.v3.oas.models.media.*;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,6 +32,7 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -323,7 +326,7 @@ public class CppQt5QHttpEngineServerCodegen extends AbstractCppCodegen implement
             Schema inner = ap.getItems();
             return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "<QString, " + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isBinarySchema(p)) {
             return getSchemaType(p) + "*";
@@ -359,7 +362,7 @@ public class CppQt5QHttpEngineServerCodegen extends AbstractCppCodegen implement
             }
             return "0";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "QMap<QString, " + getTypeDeclaration(inner) + ">()";
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
@@ -407,7 +410,7 @@ public class CppQt5QHttpEngineServerCodegen extends AbstractCppCodegen implement
 
         // if it's all uppper case, convert to lower case
         if (varName.matches("^[A-Z_]*$")) {
-            varName = varName.toLowerCase();
+            varName = varName.toLowerCase(Locale.ROOT);
         }
 
         // camelize (lower first character) the variable name
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
index df0e6722863..841e1c2dd09 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
@@ -17,17 +17,13 @@
 
 package org.openapitools.codegen.languages;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.responses.ApiResponse;
-
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenModel;
@@ -42,9 +38,12 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
+
 public class CppRestSdkClientCodegen extends AbstractCppCodegen {
 
     public static final String DECLSPEC = "declspec";
@@ -189,10 +188,10 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
 
         additionalProperties.put("modelNamespaceDeclarations", modelPackage.split("\\."));
         additionalProperties.put("modelNamespace", modelPackage.replaceAll("\\.", "::"));
-        additionalProperties.put("modelHeaderGuardPrefix", modelPackage.replaceAll("\\.", "_").toUpperCase());
+        additionalProperties.put("modelHeaderGuardPrefix", modelPackage.replaceAll("\\.", "_").toUpperCase(Locale.ROOT));
         additionalProperties.put("apiNamespaceDeclarations", apiPackage.split("\\."));
         additionalProperties.put("apiNamespace", apiPackage.replaceAll("\\.", "::"));
-        additionalProperties.put("apiHeaderGuardPrefix", apiPackage.replaceAll("\\.", "_").toUpperCase());
+        additionalProperties.put("apiHeaderGuardPrefix", apiPackage.replaceAll("\\.", "_").toUpperCase(Locale.ROOT));
         additionalProperties.put("declspec", declspec);
         additionalProperties.put("defaultInclude", defaultInclude);
     }
@@ -308,7 +307,7 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
             Schema inner = ap.getItems();
             return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "<utility::string_t, " + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isStringSchema(p)
                 || ModelUtils.isDateSchema(p) || ModelUtils.isDateTimeSchema(p)
@@ -339,7 +338,7 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
             }
             return "0";
         } else if (ModelUtils.isMapSchema(p)) {
-            String inner = getSchemaType((Schema) p.getAdditionalProperties());
+            String inner = getSchemaType(ModelUtils.getAdditionalProperties(p));
             return "std::map<utility::string_t, " + inner + ">()";
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
index 1dc73dca8b2..028eee1467f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
@@ -270,7 +270,7 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen {
             Schema inner = ap.getItems();
             return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "<std::string, " + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isByteArraySchema(p)) {
             return "std::string";
@@ -307,7 +307,7 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen {
         } else if (ModelUtils.isByteArraySchema(p)) {
             return "\"\"";
         } else if (ModelUtils.isMapSchema(p)) {
-            String inner = getSchemaType((Schema) p.getAdditionalProperties());
+            String inner = getSchemaType(ModelUtils.getAdditionalProperties(p));
             return "std::map<std::string, " + inner + ">()";
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java
index 6203fb04980..d2d83170d94 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java
@@ -307,7 +307,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {
             Schema inner = ap.getItems();
             return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
 
             return getSchemaType(p) + "<String, " + getTypeDeclaration(inner) + ">";
         }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java
index 6ae78c52a9b..8f7125ae3d4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java
@@ -17,13 +17,16 @@
 
 package org.openapitools.codegen.languages;
 
-import java.io.File;
-import java.util.UUID;
-
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.CodegenProperty;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.openapitools.codegen.*;
+import java.io.File;
+import java.util.Locale;
+import java.util.UUID;
 
 public class EiffelClientCodegen extends AbstractEiffelCodegen {
     private static final Logger LOGGER = LoggerFactory.getLogger(EiffelClientCodegen.class);
@@ -168,7 +171,7 @@ public class EiffelClientCodegen extends AbstractEiffelCodegen {
 
     @Override
     public String toEnumName(CodegenProperty property) {
-        return sanitizeName(property.name).toUpperCase() + "_ENUM";
+        return sanitizeName(property.name).toUpperCase(Locale.ROOT) + "_ENUM";
     }
 
     @Override
@@ -179,7 +182,7 @@ public class EiffelClientCodegen extends AbstractEiffelCodegen {
 
         // for symbol, e.g. $, #
         if (getSymbolName(value) != null) {
-            return getSymbolName(value).toUpperCase();
+            return getSymbolName(value).toUpperCase(Locale.ROOT);
         }
 
         // number
@@ -193,7 +196,7 @@ public class EiffelClientCodegen extends AbstractEiffelCodegen {
         }
 
         // string
-        String var = value.replaceAll("\\W+", "_").toLowerCase();
+        String var = value.replaceAll("\\W+", "_").toLowerCase(Locale.ROOT);
         if (var.matches("\\d.*")) {
             return "val_" + var;
         } else if (var.startsWith("_")) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java
index 2ee741de696..48da0380353 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java
@@ -447,7 +447,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig
             Schema inner = ap.getItems();
             return "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "%{optional(String.t) => " + getTypeDeclaration(inner) + "}";
         } else if (ModelUtils.isPasswordSchema(p)) {
             return "String.t";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
index 46f6e36edae..4f041c6843e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
@@ -17,15 +17,21 @@
 
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.*;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.NumberSchema;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.responses.ApiResponse;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenModel;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenParameter;
+import org.openapitools.codegen.CodegenProperty;
+import org.openapitools.codegen.CodegenResponse;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.DefaultCodegen;
+import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.utils.ModelUtils;
-import org.openapitools.codegen.languages.features.BeanValidationFeatures;
-import org.openapitools.codegen.languages.features.JbossFeature;
-import org.openapitools.codegen.languages.features.SwaggerFeatures;
-import io.swagger.v3.oas.models.*;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.parameters.*;
-import io.swagger.v3.oas.models.responses.*;
 
 import java.io.File;
 import java.text.Collator;
@@ -36,6 +42,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -259,7 +266,7 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig {
                 Collections.sort(parent.children, new Comparator<CodegenModel>() {
                     @Override
                     public int compare(CodegenModel cm1, CodegenModel cm2) {
-                        return Collator.getInstance().compare(cm1.classname, cm2.classname);
+                        return Collator.getInstance(Locale.ROOT).compare(cm1.classname, cm2.classname);
                     }
                 });
             }
@@ -486,7 +493,7 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig {
             Schema inner = ap.getItems();
             return getTypeDeclaration(inner);
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getTypeDeclaration(inner);
         }
         return super.getTypeDeclaration(p);
@@ -506,8 +513,8 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig {
     }
 
     @Override
-    public CodegenResponse fromResponse(String responseCode, ApiResponse resp) {
-        final CodegenResponse response = super.fromResponse(responseCode, resp);
+    public CodegenResponse fromResponse(OpenAPI openAPI, String responseCode, ApiResponse resp) {
+        final CodegenResponse response = super.fromResponse(openAPI, responseCode, resp);
         if (response.dataType != null) {
             addEncoderAndDecoder(response.vendorExtensions, response.dataType, response.isMapContainer, response.primitiveType);
         }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java
index 631c93e2b6e..ed5889a92fd 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java
@@ -21,6 +21,7 @@ import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
 
 import org.openapitools.codegen.*;
+import org.openapitools.codegen.mustache.JoinWithCommaLambda;
 import io.swagger.v3.oas.models.media.*;
 
 import java.io.File;
@@ -133,6 +134,8 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig
     public void processOpts() {
         super.processOpts();
 
+        additionalProperties.put("joinWithComma", new JoinWithCommaLambda());
+
         if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
             setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));
         } else {
@@ -287,7 +290,7 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig
         Pattern pattern = Pattern.compile("\\{([^\\}]+)\\}");
         for (CodegenOperation o : os) {
             // force http method to lower case
-            o.httpMethod = o.httpMethod.toLowerCase();
+            o.httpMethod = o.httpMethod.toLowerCase(Locale.ROOT);
 
             if (o.isListContainer) {
                 o.returnType = "[" + o.returnBaseType + "]";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java
index e4a849f1946..5830c194174 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java
@@ -239,7 +239,7 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
 
             return getSchemaType(p) + "[String, " + getTypeDeclaration(inner) + "]";
         }
@@ -341,7 +341,7 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig
     }
 
     private void generateScalaPath(CodegenOperation op) {
-        op.httpMethod = op.httpMethod.toLowerCase();
+        op.httpMethod = op.httpMethod.toLowerCase(Locale.ROOT);
 
         String path = op.path;
 
@@ -366,7 +366,7 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig
                 final CodegenParameter cp = op.pathParams.get(pathParamIndex);
 
                 // TODO: Handle non-primitives…
-                scalaPath = colConcat(scalaPath, cp.dataType.toLowerCase());
+                scalaPath = colConcat(scalaPath, cp.dataType.toLowerCase(Locale.ROOT));
 
                 pathParamIndex++;
             } else {
@@ -425,7 +425,7 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig
                     p.vendorExtensions.put("x-codegen-normalized-path-type", toPathParameter(p, "param", true));
                 } else {
                     // If parameter is primitive and required, we can rely on data types like "string" or "long"
-                    p.vendorExtensions.put("x-codegen-normalized-path-type", p.dataType.toLowerCase());
+                    p.vendorExtensions.put("x-codegen-normalized-path-type", p.dataType.toLowerCase(Locale.ROOT));
                 }
                 p.vendorExtensions.put("x-codegen-normalized-input-type", toInputParameter(p));
             } else {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java
index 1f75fce7eac..73ca27fa180 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java
@@ -17,25 +17,17 @@
 
 package org.openapitools.codegen.languages;
 
+import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.*;
 import org.openapitools.codegen.utils.ModelUtils;
-import org.openapitools.codegen.mustache.*;
-
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import io.swagger.v3.oas.models.*;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-import io.swagger.v3.oas.models.parameters.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
-
-import org.apache.commons.lang3.StringUtils;
+import java.util.Locale;
 
 public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(FlashClientCodegen.class);
@@ -267,7 +259,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
 
         // if it's all uppper case, convert to lower case
         if (name.matches("^[A-Z_]*$")) {
-            name = name.toLowerCase();
+            name = name.toLowerCase(Locale.ROOT);
         }
 
         // underscore the variable name
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
index a0bbfecc632..418ecd35769 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
@@ -465,7 +465,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
         } else {
             baseTitle = baseTitle.trim();
             // Drop any API suffix
-            if (baseTitle.toUpperCase().endsWith("API")) {
+            if (baseTitle.toUpperCase(Locale.ROOT).endsWith("API")) {
                 baseTitle = baseTitle.substring(0, baseTitle.length() - 3);
             }
         }
@@ -473,7 +473,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
         if (!additionalProperties.containsKey(PROP_CABAL_PACKAGE)) {
             List<String> words = new ArrayList<>();
             for (String word : baseTitle.split(" ")) {
-                words.add(word.toLowerCase());
+                words.add(word.toLowerCase(Locale.ROOT));
             }
             setCabalPackage(StringUtils.join(words, "-"));
         }
@@ -548,7 +548,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
             Schema inner = ap.getItems();
             return "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "(Map.Map String " + getTypeDeclaration(inner) + ")";
         }
         return super.getTypeDeclaration(p);
@@ -570,7 +570,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
     @Override
     public String toInstantiationType(Schema p) {
         if (ModelUtils.isMapSchema(p)) {
-            Schema additionalProperties2 = (Schema) p.getAdditionalProperties();
+            Schema additionalProperties2 = ModelUtils.getAdditionalProperties(p);
             String type = additionalProperties2.getType();
             if (null == type) {
                 LOGGER.error("No Type defined for Additional Schema " + additionalProperties2 + "\n" //
@@ -615,7 +615,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
             LOGGER.warn("generated unique operationId `" + uniqueName + "`");
         }
         op.operationId = uniqueName;
-        op.operationIdLowerCase = uniqueName.toLowerCase();
+        op.operationIdLowerCase = uniqueName.toLowerCase(Locale.ROOT);
         op.operationIdCamelCase = DefaultCodegen.camelize(uniqueName);
         op.operationIdSnakeCase = DefaultCodegen.underscore(uniqueName);
         opList.add(op);
@@ -628,7 +628,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
         op.vendorExtensions.put(X_OPERATION_TYPE, operationType);
         typeNames.add(operationType);
 
-        op.vendorExtensions.put(X_HADDOCK_PATH, String.format("%s %s", op.httpMethod, op.path.replace("/", "\\/")));
+        op.vendorExtensions.put(X_HADDOCK_PATH, String.format(Locale.ROOT, "%s %s", op.httpMethod, op.path.replace("/", "\\/")));
         op.vendorExtensions.put(X_HAS_BODY_OR_FORM_PARAM, op.getHasBodyParam() || op.getHasFormParams());
 
         for (CodegenParameter param : op.allParams) {
@@ -1003,9 +1003,9 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
         if (word.length() == 0) {
             return word;
         } else if (word.length() == 1) {
-            return word.substring(0, 1).toUpperCase();
+            return word.substring(0, 1).toUpperCase(Locale.ROOT);
         } else {
-            return word.substring(0, 1).toUpperCase() + word.substring(1);
+            return word.substring(0, 1).toUpperCase(Locale.ROOT) + word.substring(1);
         }
     }
 
@@ -1013,9 +1013,9 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
         if (word.length() == 0) {
             return word;
         } else if (word.length() == 1) {
-            return word.substring(0, 1).toLowerCase();
+            return word.substring(0, 1).toLowerCase(Locale.ROOT);
         } else {
-            return word.substring(0, 1).toLowerCase() + word.substring(1);
+            return word.substring(0, 1).toLowerCase(Locale.ROOT) + word.substring(1);
         }
     }
 
@@ -1303,7 +1303,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
         }
 
         // number
-        if (num.contains(datatype.toLowerCase())) {
+        if (num.contains(datatype.toLowerCase(Locale.ROOT))) {
             String varName = "Num" + value;
             varName = varName.replaceAll("-", "Minus_");
             varName = varName.replaceAll("\\+", "Plus_");
@@ -1317,7 +1317,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
     @Override
     public String toEnumValue(String value, String datatype) {
         List<String> num = new ArrayList<>(Arrays.asList("integer", "int", "double", "long", "float"));
-        if (num.contains(datatype.toLowerCase())) {
+        if (num.contains(datatype.toLowerCase(Locale.ROOT))) {
             return value;
         } else {
             return "\"" + escapeText(value) + "\"";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java
index 15dcf7c98b7..9408d6b8f51 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java
@@ -17,6 +17,10 @@
 
 package org.openapitools.codegen.languages;
 
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
@@ -29,15 +33,16 @@ import org.openapitools.codegen.CodegenType;
 import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.utils.ModelUtils;
-
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.parameters.Parameter;
-import io.swagger.v3.oas.models.media.*;
-
-import java.util.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 public class HaskellServantCodegen extends DefaultCodegen implements CodegenConfig {
@@ -204,9 +209,9 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
         if (word.length() == 0) {
             return word;
         } else if (word.length() == 1) {
-            return word.substring(0, 1).toUpperCase();
+            return word.substring(0, 1).toUpperCase(Locale.ROOT);
         } else {
-            return word.substring(0, 1).toUpperCase() + word.substring(1);
+            return word.substring(0, 1).toUpperCase(Locale.ROOT) + word.substring(1);
         }
     }
 
@@ -214,9 +219,9 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
         if (word.length() == 0) {
             return word;
         } else if (word.length() == 1) {
-            return word.substring(0, 1).toLowerCase();
+            return word.substring(0, 1).toLowerCase(Locale.ROOT);
         } else {
-            return word.substring(0, 1).toLowerCase() + word.substring(1);
+            return word.substring(0, 1).toLowerCase(Locale.ROOT) + word.substring(1);
         }
     }
 
@@ -230,7 +235,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
             title = "OpenAPI";
         } else {
             title = title.trim();
-            if (title.toUpperCase().endsWith("API")) {
+            if (title.toUpperCase(Locale.ROOT).endsWith("API")) {
                 title = title.substring(0, title.length() - 3);
             }
         }
@@ -240,7 +245,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
         // The package name is made by appending the lowercased words of the title interspersed with dashes
         List<String> wordsLower = new ArrayList<String>();
         for (String word : words) {
-            wordsLower.add(word.toLowerCase());
+            wordsLower.add(word.toLowerCase(Locale.ROOT));
         }
         String cabalName = joinStrings("-", wordsLower);
 
@@ -293,7 +298,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
             Schema inner = ap.getItems();
             return "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "Map.Map String " + getTypeDeclaration(inner);
         }
         return fixModelChars(super.getTypeDeclaration(p));
@@ -328,7 +333,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
     @Override
     public String toInstantiationType(Schema p) {
         if (ModelUtils.isMapSchema(p)) {
-            Schema additionalProperties2 = (Schema) p.getAdditionalProperties();
+            Schema additionalProperties2 = ModelUtils.getAdditionalProperties(p);
             String type = additionalProperties2.getType();
             if (null == type) {
                 LOGGER.error("No Type defined for Additional Property " + additionalProperties2 + "\n" //
@@ -484,7 +489,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
         if (returnType.indexOf(" ") >= 0) {
             returnType = "(" + returnType + ")";
         }
-        path.add("Verb '" + op.httpMethod.toUpperCase() + " 200 '[JSON] " + returnType);
+        path.add("Verb '" + op.httpMethod.toUpperCase(Locale.ROOT) + " 200 '[JSON] " + returnType);
         type.add("m " + returnType);
 
         op.vendorExtensions.put("x-routeType", joinStrings(" :> ", path));
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
index 830e5b06ade..912ad43a7e4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
@@ -174,7 +174,7 @@ public class JMeterClientCodegen extends DefaultCodegen implements CodegenConfig
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "[String, " + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java
index 380265a6470..6cd8ad9815a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java
@@ -18,7 +18,6 @@
 package org.openapitools.codegen.languages;
 
 import io.swagger.v3.oas.models.Operation;
-
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CodegenModel;
@@ -32,6 +31,7 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
@@ -198,7 +198,7 @@ public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
 
     @Override
     protected String getOrGenerateOperationId(Operation operation, String path, String httpMethod) {
-        return super.getOrGenerateOperationId(operation, path, httpMethod.toUpperCase());
+        return super.getOrGenerateOperationId(operation, path, httpMethod.toUpperCase(Locale.ROOT));
     }
 
     public String apiFilename(String templateName, String tag) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java
index 096992071bd..d0354468ae3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java
@@ -17,13 +17,12 @@
 
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.*;
-import io.swagger.v3.oas.models.*;
-
-import java.util.*;
-
+import io.swagger.v3.oas.models.Operation;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.*;
+
+import java.util.*;
 
 public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
 
@@ -159,7 +158,7 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
     @Override
     public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
         if (useTags) {
-            String basePath = tag.toLowerCase();
+            String basePath = tag.toLowerCase(Locale.ROOT);
             if (basePath.startsWith("/")) {
                 basePath = basePath.substring(1);
             }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java
index bcc5685777d..40932e20231 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java
@@ -21,7 +21,6 @@ import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.tags.Tag;
-
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenModel;
@@ -39,6 +38,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -541,7 +541,7 @@ public class JavaPKMSTServerCodegen extends AbstractJavaCodegen {
             // Drop any API suffix
             if (title != null) {
                 title = title.trim().replace(" ", "-");
-                if (title.toUpperCase().endsWith("API")) {
+                if (title.toUpperCase(Locale.ROOT).endsWith("API")) {
                     title = title.substring(0, title.length() - 3);
                 }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java
index 4866ca8bd49..64b14186654 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java
@@ -30,6 +30,7 @@ import org.openapitools.codegen.languages.features.BeanValidationFeatures;
 
 import java.io.File;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -191,7 +192,7 @@ public class JavaPlayFrameworkCodegen extends AbstractJavaCodegen implements Bea
         if (this.useSwaggerUI) {
             //App/Controllers
             supportingFiles.add(new SupportingFile("openapi.mustache", "public", "openapi.json"));
-            supportingFiles.add(new SupportingFile("apiDocController.mustache", String.format("app/%s", apiPackage.replace(".", File.separator)), "ApiDocController.java"));
+            supportingFiles.add(new SupportingFile("apiDocController.mustache", String.format(Locale.ROOT, "app/%s", apiPackage.replace(".", File.separator)), "ApiDocController.java"));
         }
 
         //We remove the default api.mustache that is used
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java
index 097917ddaf6..2940ec587c7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java
@@ -22,7 +22,6 @@ import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.PathItem.HttpMethod;
 import io.swagger.v3.oas.models.media.Schema;
-
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenOperation;
@@ -34,6 +33,7 @@ import org.openapitools.codegen.utils.URLPathUtils;
 import java.io.File;
 import java.net.URL;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.regex.Matcher;
@@ -175,7 +175,7 @@ public class JavaVertXServerCodegen extends AbstractJavaCodegen {
         if (operations != null) {
             List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
             for (CodegenOperation operation : ops) {
-                operation.httpMethod = operation.httpMethod.toLowerCase();
+                operation.httpMethod = operation.httpMethod.toLowerCase(Locale.ROOT);
 
                 if ("Void".equalsIgnoreCase(operation.returnType)) {
                     operation.returnType = null;
@@ -251,7 +251,7 @@ public class JavaVertXServerCodegen extends AbstractJavaCodegen {
                 serviceIdTemp = computeServiceId(pathname, entry);
                 entry.getValue().addExtension("x-serviceid", serviceIdTemp);
                 entry.getValue().addExtension("x-serviceid-varname",
-                        serviceIdTemp.toUpperCase() + "_SERVICE_ID");
+                        serviceIdTemp.toUpperCase(Locale.ROOT) + "_SERVICE_ID");
             }
         }
     }
@@ -284,7 +284,7 @@ public class JavaVertXServerCodegen extends AbstractJavaCodegen {
         pattern = Pattern.compile("(_)(.)");
         matcher = pattern.matcher(word);
         while (matcher.find()) {
-            word = matcher.replaceFirst(matcher.group(2).toUpperCase());
+            word = matcher.replaceFirst(matcher.group(2).toUpperCase(Locale.ROOT));
             matcher = pattern.matcher(word);
         }
         return word;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
index 0bbefee3bed..2991842b88d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
@@ -18,7 +18,12 @@
 package org.openapitools.codegen.languages;
 
 import com.google.common.base.Strings;
-
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConstants;
@@ -27,18 +32,9 @@ import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.CodegenParameter;
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.CodegenType;
-import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.DefaultCodegen;
+import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.utils.ModelUtils;
-
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.PathItem;
-import io.swagger.v3.oas.models.PathItem.HttpMethod;
-import io.swagger.v3.oas.models.*;
-import io.swagger.v3.oas.models.parameters.*;
-import io.swagger.v3.oas.models.info.*;
-
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,6 +44,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class JavascriptClientCodegen extends DefaultCodegen implements CodegenConfig {
@@ -601,7 +598,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
             Schema inner = ap.getItems();
             return "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "{String: " + getTypeDeclaration(inner) + "}";
         }
         return super.getTypeDeclaration(p);
@@ -863,9 +860,9 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
                 codegenModel.getVendorExtensions().put("x-itemType", getSchemaType(am.getItems()));
             }
         } else if (ModelUtils.isMapSchema(model)) {
-            if (model.getAdditionalProperties() != null) {
+            if (ModelUtils.getAdditionalProperties(model) != null) {
                 codegenModel.getVendorExtensions().put("x-isMap", true);
-                codegenModel.getVendorExtensions().put("x-itemType", getSchemaType((Schema) model.getAdditionalProperties()));
+                codegenModel.getVendorExtensions().put("x-itemType", getSchemaType(ModelUtils.getAdditionalProperties(model)));
             } else {
                 String type = model.getType();
                 if (isPrimitiveType(type)){
@@ -1132,7 +1129,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
 
         // for symbol, e.g. $, #
         if (getSymbolName(value) != null) {
-            return (getSymbolName(value)).toUpperCase();
+            return (getSymbolName(value)).toUpperCase(Locale.ROOT);
         }
 
         return value;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java
index 9fc66c4f053..c756bf8ac9b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java
@@ -236,7 +236,7 @@ public class JavascriptClosureAngularClientCodegen extends DefaultCodegen implem
             Schema inner = ap.getItems();
             return getSchemaType(p) + "<!" + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "Object<!string, "+ getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isFileSchema(p)) {
             return "Object";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java
index bb415e2bc41..cc0c78c387f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java
@@ -30,7 +30,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 public class JavascriptFlowtypedClientCodegen extends AbstractTypeScriptClientCodegen {
-    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm");
+    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm", Locale.ROOT);
 
     public static final String NPM_NAME = "npmName";
     public static final String NPM_VERSION = "npmVersion";
@@ -119,7 +119,7 @@ public class JavascriptFlowtypedClientCodegen extends AbstractTypeScriptClientCo
 
     @Override
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
-        codegenModel.additionalPropertiesType = getTypeDeclaration((Schema) schema.getAdditionalProperties());
+        codegenModel.additionalPropertiesType = getTypeDeclaration(ModelUtils.getAdditionalProperties(schema));
         addImport(codegenModel, codegenModel.additionalPropertiesType);
     }
 
@@ -141,7 +141,7 @@ public class JavascriptFlowtypedClientCodegen extends AbstractTypeScriptClientCo
             inner = ((ArraySchema) p).getItems();
             return this.getSchemaType(p) + "<" + this.getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            inner = (Schema) p.getAdditionalProperties();
+            inner = ModelUtils.getAdditionalProperties(p);
             return "{ [key: string]: " + this.getTypeDeclaration(inner) + "; }";
         } else if (ModelUtils.isFileSchema(p)) {
             return "any";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java
index bd4bc1c5be0..c41deb8be3d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java
@@ -17,21 +17,32 @@
 
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.ModelUtils;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-
-import java.io.File;
-import java.util.*;
-
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
-
+import org.openapitools.codegen.CliOption;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenParameter;
+import org.openapitools.codegen.CodegenProperty;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.DefaultCodegen;
+import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Locale;
+import java.util.Map;
+
 public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(LuaClientCodegen.class);
 
@@ -337,7 +348,7 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig {
             Schema inner = ap.getItems();
             return getTypeDeclaration(inner);
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getTypeDeclaration(inner);
         }
 
@@ -403,7 +414,7 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig {
                     // find the datatype of the parameter
                     //final CodegenParameter cp = op.pathParams.get(pathParamIndex);
                     // TODO: Handle non-primitives…
-                    //luaPath = luaPath + cp.dataType.toLowerCase();
+                    //luaPath = luaPath + cp.dataType.toLowerCase(Locale.ROOT);
                     luaPath = luaPath + "/%s";
                     pathParamIndex++;
                 } else if (items[i].length() != 0) {
@@ -514,11 +525,11 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig {
 
         // for symbol, e.g. $, #
         if (getSymbolName(name) != null) {
-            return getSymbolName(name).toUpperCase();
+            return getSymbolName(name).toUpperCase(Locale.ROOT);
         }
 
         // string
-        String enumName = sanitizeName(underscore(name).toUpperCase());
+        String enumName = sanitizeName(underscore(name).toUpperCase(Locale.ROOT));
         enumName = enumName.replaceFirst("^_", "");
         enumName = enumName.replaceFirst("_$", "");
 
@@ -531,7 +542,7 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toEnumName(CodegenProperty property) {
-        String enumName = underscore(toModelName(property.name)).toUpperCase();
+        String enumName = underscore(toModelName(property.name)).toUpperCase(Locale.ROOT);
 
         // remove [] for array or map of enum
         enumName = enumName.replace("[]", "");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java
index 662b13d3a92..d9260bce928 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java
@@ -20,25 +20,37 @@ package org.openapitools.codegen.languages;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
-
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.*;
-import io.swagger.v3.oas.models.*;
-import io.swagger.v3.oas.models.info.*;
-import io.swagger.v3.oas.models.PathItem.*;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.PathItem.HttpMethod;
 import io.swagger.v3.oas.models.Paths;
-
+import io.swagger.v3.oas.models.info.Info;
+import org.openapitools.codegen.CliOption;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenParameter;
+import org.openapitools.codegen.CodegenResponse;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.DefaultCodegen;
+import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.utils.URLPathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
-
 public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NodeJSServerCodegen.class);
@@ -232,7 +244,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
         @SuppressWarnings("unchecked")
         List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
         for (CodegenOperation operation : operations) {
-            operation.httpMethod = operation.httpMethod.toLowerCase();
+            operation.httpMethod = operation.httpMethod.toLowerCase(Locale.ROOT);
 
             List<CodegenParameter> params = operation.allParams;
             if (params != null && params.size() == 0) {
@@ -368,7 +380,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
                         .replaceAll("^[-]*", "")
                         .replaceAll("[-]*$", "")
                         .replaceAll("[-]{2,}", "-")
-                        .toLowerCase();
+                        .toLowerCase(Locale.ROOT);
                 this.additionalProperties.put("projectName", projectName);
             }
         }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java
index 11a7508dc63..6800e3af389 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java
@@ -17,6 +17,9 @@
 
 package org.openapitools.codegen.languages;
 
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConstants;
@@ -28,10 +31,6 @@ import org.openapitools.codegen.CodegenType;
 import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.utils.ModelUtils;
-
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.media.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,11 +39,10 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
-
 public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(ObjcClientCodegen.class);
 
@@ -341,8 +339,8 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         }
 
         // TODO avoid using toLowerCase as typeMapping should be case-sensitive
-        if (typeMapping.containsKey(openAPIType.toLowerCase())) {
-            type = typeMapping.get(openAPIType.toLowerCase());
+        if (typeMapping.containsKey(openAPIType.toLowerCase(Locale.ROOT))) {
+            type = typeMapping.get(openAPIType.toLowerCase(Locale.ROOT));
             if (languageSpecificPrimitives.contains(type) && !foundationClasses.contains(type)) {
                 return toModelNameWithoutReservedWordCheck(type);
             }
@@ -377,7 +375,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
                 return getSchemaType(p) + "<" + innerTypeDeclaration + ">*";
             }
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
 
             String innerTypeDeclaration = getTypeDeclaration(inner);
 
@@ -417,7 +415,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public boolean isDataTypeBinary(String dataType) {
-        return dataType.toLowerCase().startsWith("nsdata");
+        return dataType.toLowerCase(Locale.ROOT).startsWith("nsdata");
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java
index 08172a2cdce..21ccb6aad03 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java
@@ -220,7 +220,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "[string," + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
index ed9215d4010..85bd0497678 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
@@ -204,7 +204,7 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen {
         List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
 
         for (CodegenOperation op : operations) {
-            op.httpMethod = op.httpMethod.toLowerCase();
+            op.httpMethod = op.httpMethod.toLowerCase(Locale.ROOT);
             // check to see if the path contains ".", which is not supported by PHP laravel
             // ref: https://github.com/swagger-api/swagger-codegen/issues/6897
             if (op.path != null && op.path.contains(".")) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java
index 515e82d68ce..d81856c3134 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLumenServerCodegen.java
@@ -17,10 +17,12 @@
 
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.*;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
 
-import java.util.*;
 import java.io.File;
+import java.util.*;
 
 public class PhpLumenServerCodegen extends AbstractPhpCodegen {
     @SuppressWarnings("hiding")
@@ -115,7 +117,7 @@ public class PhpLumenServerCodegen extends AbstractPhpCodegen {
         List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
 
         for (CodegenOperation op : operations) {
-            op.httpMethod = op.httpMethod.toLowerCase();
+            op.httpMethod = op.httpMethod.toLowerCase(Locale.ROOT);
             // check to see if the path contains ".", which is not supported by Lumen
             if (op.path != null && op.path.contains(".")) {
                 throw new IllegalArgumentException("'.' (dot) is not supported by PHP Lumen.");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java
index 25142203cc9..84cf10331cc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java
@@ -116,6 +116,9 @@ public class PhpSilexServerCodegen extends DefaultCodegen implements CodegenConf
         supportingFiles.add(new SupportingFile("composer.json", "", "composer.json"));
         supportingFiles.add(new SupportingFile("index.mustache", "", "index.php"));
         supportingFiles.add(new SupportingFile(".htaccess", "", ".htaccess"));
+
+        // remove this line when this class extends AbstractPhpCodegen
+        supportingFiles.add(new SupportingFile(".gitignore", "", ".gitignore"));
     }
 
     @Override
@@ -160,7 +163,7 @@ public class PhpSilexServerCodegen extends DefaultCodegen implements CodegenConf
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "[string," + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java
index 15ef0a43e42..69c6bc6d677 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java
@@ -113,7 +113,6 @@ public class PhpSlimServerCodegen extends AbstractPhpCodegen {
         supportingFiles.add(new SupportingFile("composer.mustache", "", "composer.json"));
         supportingFiles.add(new SupportingFile("index.mustache", "", "index.php"));
         supportingFiles.add(new SupportingFile(".htaccess", "", ".htaccess"));
-        supportingFiles.add(new SupportingFile(".gitignore", "", ".gitignore"));
         supportingFiles.add(new SupportingFile("AbstractApiController.mustache", toSrcPath(invokerPackage, srcBasePath), "AbstractApiController.php"));
         supportingFiles.add(new SupportingFile("SlimRouter.mustache", toSrcPath(invokerPackage, srcBasePath), "SlimRouter.php"));
         supportingFiles.add(new SupportingFile("phpunit.xml.mustache", "", "phpunit.xml.dist"));
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java
index 897ae1716c3..5baf8b5d731 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java
@@ -17,17 +17,11 @@
 
 package org.openapitools.codegen.languages;
 
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.utils.ModelUtils;
-
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.PathItem;
-import io.swagger.v3.oas.models.PathItem.HttpMethod;
-import io.swagger.v3.oas.models.*;
-import io.swagger.v3.oas.models.parameters.*;
-import io.swagger.v3.core.util.Yaml;
-
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -194,7 +188,7 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg
         this.bundleName = bundleName;
         this.bundleClassName = bundleName + "Bundle";
         this.bundleExtensionName = bundleName + "Extension";
-        this.bundleAlias = snakeCase(bundleName).replaceAll("([A-Z]+)", "\\_$1").toLowerCase();
+        this.bundleAlias = snakeCase(bundleName).replaceAll("([A-Z]+)", "\\_$1").toLowerCase(Locale.ROOT);
     }
 
     public void setPhpLegacySupport(Boolean support) {
@@ -497,7 +491,7 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg
         }
 
         if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getTypeDeclaration(inner);
         }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java
index fee2490ff50..f8b5a5c4bce 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java
@@ -17,23 +17,18 @@
 
 package org.openapitools.codegen.languages;
 
-import io.swagger.v3.oas.models.PathItem;
-import org.openapitools.codegen.*;
-
-import io.swagger.v3.oas.models.PathItem.HttpMethod;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.PathItem.HttpMethod;
 import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.core.util.Yaml;
-import io.swagger.v3.oas.models.parameters.*;
+import io.swagger.v3.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.parameters.QueryParameter;
+import org.openapitools.codegen.*;
 import org.openapitools.codegen.utils.ModelUtils;
 
-
 import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class PhpZendExpressivePathHandlerServerCodegen extends AbstractPhpCodegen {
 
@@ -120,7 +115,7 @@ public class PhpZendExpressivePathHandlerServerCodegen extends AbstractPhpCodege
             }
         }
         if (counter == 0) {
-            co.operationIdLowerCase = co.operationId.toLowerCase();
+            co.operationIdLowerCase = co.operationId.toLowerCase(Locale.ROOT);
             opList.add(co);
             co.baseName = tag;
         }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
index 789cc14c9c0..f16a7528fa7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
@@ -17,14 +17,18 @@
 
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.*;
-
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.media.*;
-import org.openapitools.codegen.utils.ModelUtils;
-
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.CliOption;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenParameter;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.DefaultCodegen;
+import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +37,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import static java.util.UUID.randomUUID;
@@ -40,7 +45,7 @@ import static java.util.UUID.randomUUID;
 public class PowerShellClientCodegen extends DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(PowerShellClientCodegen.class);
 
-    private String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}";
+    private String packageGuid = "{" + randomUUID().toString().toUpperCase(Locale.ROOT) + "}";
 
     protected String sourceFolder = "src";
     protected String packageName = "Org.OpenAPITools";
@@ -383,7 +388,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
             Schema inner = ap.getItems();
             return getTypeDeclaration(inner) + "[]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             // TODO not sure if the following map/hash declaration is correct
             return "{String, " + getTypeDeclaration(inner) + "}";
         } else if (!languageSpecificPrimitives.contains(getSchemaType(p))) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
index eed683f061c..0b8455108e2 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
@@ -17,6 +17,9 @@
 
 package org.openapitools.codegen.languages;
 
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConstants;
@@ -27,11 +30,6 @@ import org.openapitools.codegen.CodegenType;
 import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.utils.ModelUtils;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-import io.swagger.v3.parser.util.SchemaTypeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,13 +38,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
-
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(PythonClientCodegen.class);
 
@@ -404,7 +399,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
 
             return getSchemaType(p) + "(str, " + getTypeDeclaration(inner) + ")";
         }
@@ -436,7 +431,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
 
         // if it's all uppper case, convert to lower case
         if (name.matches("^[A-Z_]*$")) {
-            name = name.toLowerCase();
+            name = name.toLowerCase(Locale.ROOT);
         }
 
         // underscore the variable name
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java
index 974135c545a..009dfeff8ba 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java
@@ -20,21 +20,21 @@ package org.openapitools.codegen.languages;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
-
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.ModelUtils;
-import io.swagger.v3.oas.models.media.*;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.PathItem.HttpMethod;
-import io.swagger.v3.oas.models.*;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.*;
+import org.openapitools.codegen.utils.ModelUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.*;
 
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class PythonFlaskConnexionServerCodegen extends DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(PythonFlaskConnexionServerCodegen.class);
 
@@ -289,7 +289,7 @@ public class PythonFlaskConnexionServerCodegen extends DefaultCodegen implements
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "[str, " + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
@@ -400,7 +400,7 @@ public class PythonFlaskConnexionServerCodegen extends DefaultCodegen implements
 
         // if it's all uppper case, convert to lower case
         if (name.matches("^[A-Z_]*$")) {
-            name = name.toLowerCase();
+            name = name.toLowerCase(Locale.ROOT);
         }
 
         // underscore the variable name
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
index dde0e9a2100..6be3b9814d2 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
@@ -286,7 +286,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
             Schema inner = ap.getItems();
             return getTypeDeclaration(inner);
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getTypeDeclaration(inner);
         }
 
@@ -428,11 +428,11 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
 
         // for symbol, e.g. $, #
         if (getSymbolName(name) != null) {
-            return getSymbolName(name).toUpperCase();
+            return getSymbolName(name).toUpperCase(Locale.ROOT);
         }
 
         // string
-        String enumName = sanitizeName(underscore(name).toUpperCase());
+        String enumName = sanitizeName(underscore(name).toUpperCase(Locale.ROOT));
         enumName = enumName.replaceFirst("^_", "");
         enumName = enumName.replaceFirst("_$", "");
 
@@ -445,7 +445,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toEnumName(CodegenProperty property) {
-        String enumName = underscore(toModelName(property.name)).toUpperCase();
+        String enumName = underscore(toModelName(property.name)).toUpperCase(Locale.ROOT);
 
         // remove [] for array or map of enum
         enumName = enumName.replace("[]", "");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
index b80b423311d..539dda6d2a6 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
@@ -17,23 +17,18 @@
 
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.CliOption;
-import org.openapitools.codegen.CodegenConstants;
-import org.openapitools.codegen.CodegenParameter;
-import org.openapitools.codegen.CodegenProperty;
-import org.openapitools.codegen.CodegenType;
-import org.openapitools.codegen.SupportingFile;
+import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.Map;
 
-import io.swagger.v3.oas.models.media.*;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class RubyClientCodegen extends AbstractRubyCodegen {
     private static final Logger LOGGER = LoggerFactory.getLogger(RubyClientCodegen.class);
     public static final String GEM_NAME = "gemName";
@@ -90,7 +85,7 @@ public class RubyClientCodegen extends AbstractRubyCodegen {
         for (String word : Arrays.asList(
                 "local_var_path", "query_params", "header_params", "_header_accept", "_header_accept_result",
                 "_header_content_type", "form_params", "post_body", "auth_names")) {
-            reservedWords.add(word.toLowerCase());
+            reservedWords.add(word.toLowerCase(Locale.ROOT));
         }
 
 
@@ -416,7 +411,7 @@ public class RubyClientCodegen extends AbstractRubyCodegen {
         }
 
         // string
-        String enumName = sanitizeName(underscore(name).toUpperCase());
+        String enumName = sanitizeName(underscore(name).toUpperCase(Locale.ROOT));
         enumName = enumName.replaceFirst("^_", "");
         enumName = enumName.replaceFirst("_$", "");
 
@@ -429,7 +424,7 @@ public class RubyClientCodegen extends AbstractRubyCodegen {
 
     @Override
     public String toEnumName(CodegenProperty property) {
-        String enumName = underscore(toModelName(property.name)).toUpperCase();
+        String enumName = underscore(toModelName(property.name)).toUpperCase(Locale.ROOT);
         enumName = enumName.replaceFirst("^_", "");
         enumName = enumName.replaceFirst("_$", "");
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyOnRailsServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyOnRailsServerCodegen.java
index 1c58af9123e..fe929e0270d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyOnRailsServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyOnRailsServerCodegen.java
@@ -28,6 +28,7 @@ import org.openapitools.codegen.SupportingFile;
 import io.swagger.v3.oas.models.media.*;
 
 import java.io.File;
+import java.util.Locale;
 import java.util.Map;
 
 import org.slf4j.Logger;
@@ -36,7 +37,7 @@ import org.slf4j.LoggerFactory;
 public class RubyOnRailsServerCodegen extends AbstractRubyCodegen {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RubyOnRailsServerCodegen.class);
-    private static final SimpleDateFormat MIGRATE_FILE_NAME_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
+    private static final SimpleDateFormat MIGRATE_FILE_NAME_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss", Locale.ROOT);
 
     protected String gemName;
     protected String moduleName;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
index 76411f0406c..2625c37d06c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
@@ -20,7 +20,14 @@ package org.openapitools.codegen.languages;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.*;
+import org.openapitools.codegen.CliOption;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenProperty;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.DefaultCodegen;
+import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,6 +36,7 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class RustClientCodegen extends DefaultCodegen implements CodegenConfig {
@@ -288,7 +296,7 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig {
             Schema inner = ap.getItems();
             return "Vec<" + getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "::std::collections::HashMap<String, " + getTypeDeclaration(inner) + ">";
         }
 
@@ -346,7 +354,7 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig {
         List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
         for (CodegenOperation operation : operations) {
             // http method verb conversion (e.g. PUT => Put)
-            operation.httpMethod = camelize(operation.httpMethod.toLowerCase());
+            operation.httpMethod = camelize(operation.httpMethod.toLowerCase(Locale.ROOT));
             // update return type to conform to rust standard
             /*
             if (operation.returnType != null) {
@@ -458,11 +466,11 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig {
 
         // for symbol, e.g. $, #
         if (getSymbolName(name) != null) {
-            return getSymbolName(name).toUpperCase();
+            return getSymbolName(name).toUpperCase(Locale.ROOT);
         }
 
         // string
-        String enumName = sanitizeName(underscore(name).toUpperCase());
+        String enumName = sanitizeName(underscore(name).toUpperCase(Locale.ROOT));
         enumName = enumName.replaceFirst("^_", "");
         enumName = enumName.replaceFirst("_$", "");
 
@@ -475,7 +483,7 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     @Override
     public String toEnumName(CodegenProperty property) {
-        String enumName = underscore(toModelName(property.name)).toUpperCase();
+        String enumName = underscore(toModelName(property.name)).toUpperCase(Locale.ROOT);
 
         // remove [] for array or map of enum
         enumName = enumName.replace("[]", "");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
index 63fd9d8091c..0486327f3e2 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
@@ -25,7 +25,6 @@ import io.swagger.v3.oas.models.media.FileSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.XML;
 import io.swagger.v3.oas.models.parameters.Parameter;
-
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
@@ -52,6 +51,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -415,7 +415,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
 
         // for symbol, e.g. $, #
         else if (getSymbolName(value) != null) {
-            var = getSymbolName(value).toUpperCase();
+            var = getSymbolName(value).toUpperCase(Locale.ROOT);
         }
 
         // number
@@ -429,7 +429,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
         }
 
         // string
-        var = value.replaceAll("\\W+", "_").toUpperCase();
+        var = value.replaceAll("\\W+", "_").toUpperCase(Locale.ROOT);
         if (var.matches("\\d.*")) {
             var = "_" + var;
         } else {
@@ -469,15 +469,15 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
     }
 
     boolean isMimetypeXml(String mimetype) {
-        return mimetype.toLowerCase().startsWith("application/xml");
+        return mimetype.toLowerCase(Locale.ROOT).startsWith("application/xml");
     }
 
     boolean isMimetypePlainText(String mimetype) {
-        return mimetype.toLowerCase().startsWith("text/plain");
+        return mimetype.toLowerCase(Locale.ROOT).startsWith("text/plain");
     }
 
     boolean isMimetypeWwwFormUrlEncoded(String mimetype) {
-        return mimetype.toLowerCase().startsWith("application/x-www-form-urlencoded");
+        return mimetype.toLowerCase(Locale.ROOT).startsWith("application/x-www-form-urlencoded");
     }
 
     @Override
@@ -490,7 +490,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
         //
         // Construct a Rust constant (uppercase) token name, and ensure it's
         // unique using a numeric tie-breaker if required.
-        String basePathId = sanitizeName(op.path.replace("/", "_").replace("{", "").replace("}", "").replaceAll("^_", "")).toUpperCase();
+        String basePathId = sanitizeName(op.path.replace("/", "_").replace("{", "").replace("}", "").replaceAll("^_", "")).toUpperCase(Locale.ROOT);
         String pathId = basePathId;
         int pathIdTiebreaker = 2;
         boolean found = false;
@@ -521,11 +521,11 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
         }
 
         op.vendorExtensions.put("operation_id", underscore(op.operationId));
-        op.vendorExtensions.put("uppercase_operation_id", underscore(op.operationId).toUpperCase());
+        op.vendorExtensions.put("uppercase_operation_id", underscore(op.operationId).toUpperCase(Locale.ROOT));
         op.vendorExtensions.put("path", op.path.replace("{", ":").replace("}", ""));
         op.vendorExtensions.put("PATH_ID", pathId);
         op.vendorExtensions.put("hasPathParams", !op.pathParams.isEmpty());
-        op.vendorExtensions.put("HttpMethod", Character.toUpperCase(op.httpMethod.charAt(0)) + op.httpMethod.substring(1).toLowerCase());
+        op.vendorExtensions.put("HttpMethod", Character.toUpperCase(op.httpMethod.charAt(0)) + op.httpMethod.substring(1).toLowerCase(Locale.ROOT));
         for (CodegenParameter param : op.allParams) {
             processParam(param, op);
         }
@@ -603,10 +603,10 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
                 responseId = "Status" + rsp.code;
             }
             rsp.vendorExtensions.put("x-responseId", responseId);
-            rsp.vendorExtensions.put("x-uppercaseResponseId", underscore(responseId).toUpperCase());
-            rsp.vendorExtensions.put("uppercase_operation_id", underscore(op.operationId).toUpperCase());
+            rsp.vendorExtensions.put("x-uppercaseResponseId", underscore(responseId).toUpperCase(Locale.ROOT));
+            rsp.vendorExtensions.put("uppercase_operation_id", underscore(op.operationId).toUpperCase(Locale.ROOT));
             if (rsp.dataType != null) {
-                rsp.vendorExtensions.put("uppercase_data_type", (rsp.dataType.replace("models::", "")).toUpperCase());
+                rsp.vendorExtensions.put("uppercase_data_type", (rsp.dataType.replace("models::", "")).toUpperCase(Locale.ROOT));
 
                 // Default to producing json if nothing else is specified
                 if (producesXml) {
@@ -675,7 +675,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
 
             if (op.bodyParam != null) {
                 // Default to consuming json
-                op.bodyParam.vendorExtensions.put("uppercase_operation_id", underscore(op.operationId).toUpperCase());
+                op.bodyParam.vendorExtensions.put("uppercase_operation_id", underscore(op.operationId).toUpperCase(Locale.ROOT));
                 if (consumesXml) {
                     op.bodyParam.vendorExtensions.put("consumesXml", true);
                 } else if (consumesPlainText) {
@@ -688,7 +688,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
             for (CodegenParameter param : op.bodyParams) {
                 processParam(param, op);
 
-                param.vendorExtensions.put("uppercase_operation_id", underscore(op.operationId).toUpperCase());
+                param.vendorExtensions.put("uppercase_operation_id", underscore(op.operationId).toUpperCase(Locale.ROOT));
 
                 // Default to producing json if nothing else is specified
                 if (consumesXml) {
@@ -730,7 +730,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
             typeDeclaration.append(innerType).append(">");
             return typeDeclaration.toString();
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             String innerType = getTypeDeclaration(inner);
             StringBuilder typeDeclaration = new StringBuilder(typeMapping.get("map")).append("<").append(typeMapping.get("string")).append(", ");
             typeDeclaration.append(innerType).append(">");
@@ -797,7 +797,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
             Schema inner = ap.getItems();
             return instantiationTypes.get("array") + "<" + getSchemaType(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return instantiationTypes.get("map") + "<" + typeMapping.get("string") + ", " + getSchemaType(inner) + ">";
         } else {
             return null;
@@ -807,7 +807,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
     @Override
     public CodegenModel fromModel(String name, Schema model, Map<String, Schema> allDefinitions) {
         CodegenModel mdl = super.fromModel(name, model, allDefinitions);
-        mdl.vendorExtensions.put("upperCaseName", name.toUpperCase());
+        mdl.vendorExtensions.put("upperCaseName", name.toUpperCase(Locale.ROOT));
         if (!StringUtils.isEmpty(model.get$ref())) {
             Schema schema = allDefinitions.get(ModelUtils.getSimpleRef(model.get$ref()));
             mdl.dataType = typeMapping.get(schema.getType());
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
index 2da46afb59f..d3a42542a8f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
@@ -276,7 +276,7 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
         } else if (ModelUtils.isIntegerSchema(p)) {
             return null;
         } else if (ModelUtils.isMapSchema(p)) {
-            String inner = getSchemaType((Schema) p.getAdditionalProperties());
+            String inner = getSchemaType(ModelUtils.getAdditionalProperties(p));
             return "Map[String, " + inner + "].empty ";
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java
index 178ed14cee2..df68da86049 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java
@@ -17,22 +17,31 @@
 
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.*;
-import org.openapitools.codegen.mustache.*;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import io.swagger.v3.oas.models.*;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-import io.swagger.v3.oas.models.parameters.*;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.parameters.Parameter;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.util.*;
 import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 
 public class ScalaGatlingCodegen extends AbstractScalaCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(ScalaGatlingCodegen.class);
@@ -324,10 +333,10 @@ public class ScalaGatlingCodegen extends AbstractScalaCodegen implements Codegen
                 vendorList.add(extensionMap);
                 parameterNames.add(parameter.getName());
             }
-            operation.addExtension("x-gatling-" + parameterType.toLowerCase() + "-params", vendorList);
-            operation.addExtension("x-gatling-" + parameterType.toLowerCase() + "-feeder", operation.getOperationId() + parameterType.toUpperCase() + "Feeder");
+            operation.addExtension("x-gatling-" + parameterType.toLowerCase(Locale.ROOT) + "-params", vendorList);
+            operation.addExtension("x-gatling-" + parameterType.toLowerCase(Locale.ROOT) + "-feeder", operation.getOperationId() + parameterType.toUpperCase(Locale.ROOT) + "Feeder");
             try {
-                FileUtils.writeStringToFile(new File(outputFolder + File.separator + dataFolder + File.separator + operation.getOperationId() + "-" + parameterType.toLowerCase() + "Params.csv"), StringUtils.join(parameterNames, ","));
+                FileUtils.writeStringToFile(new File(outputFolder + File.separator + dataFolder + File.separator + operation.getOperationId() + "-" + parameterType.toLowerCase(Locale.ROOT) + "Params.csv"), StringUtils.join(parameterNames, ","));
             } catch (IOException ioe) {
                 LOGGER.error("Could not create feeder file for operationId" + operation.getOperationId(), ioe);
             }
@@ -347,7 +356,7 @@ public class ScalaGatlingCodegen extends AbstractScalaCodegen implements Codegen
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "[String, " + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java
index 353152afe7d..a6818980fef 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java
@@ -17,19 +17,17 @@
 
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.*;
-import org.openapitools.codegen.mustache.*;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import io.swagger.v3.oas.models.*;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-import io.swagger.v3.oas.models.parameters.*;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class ScalatraServerCodegen extends AbstractScalaCodegen implements CodegenConfig {
@@ -146,7 +144,7 @@ public class ScalatraServerCodegen extends AbstractScalaCodegen implements Codeg
         List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
         for (CodegenOperation op : operationList) {
             // force http method to lower case
-            op.httpMethod = op.httpMethod.toLowerCase();
+            op.httpMethod = op.httpMethod.toLowerCase(Locale.ROOT);
 
             String[] items = op.path.split("/", -1);
             String scalaPath = "";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
index 4411e27b81b..5e6f269880e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
@@ -18,11 +18,9 @@
 package org.openapitools.codegen.languages;
 
 import com.samskivert.mustache.Mustache;
-
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
-
 import org.apache.commons.lang3.tuple.Pair;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
@@ -42,7 +40,12 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 
@@ -154,9 +157,9 @@ public class SpringCodegen extends AbstractJavaCodegen
         additionalProperties.put("configOptions", configOptions);
 
         // Process java8 option before common java ones to change the default dateLibrary to java8.
-        System.out.println("----------------------------------");
+        LOGGER.info("----------------------------------");
         if (additionalProperties.containsKey(JAVA_8)) {
-            System.out.println("has JAVA8");
+            LOGGER.info("has JAVA8");
             this.setJava8(Boolean.valueOf(additionalProperties.get(JAVA_8).toString()));
             additionalProperties.put(JAVA_8, java8);
         }
@@ -260,7 +263,7 @@ public class SpringCodegen extends AbstractJavaCodegen
                 additionalProperties.put("delegate-method", true);
             } else {
                 throw new IllegalArgumentException(
-                        String.format("Can not generate code with `%s` and `%s` true while `%s` is false.",
+                        String.format(Locale.ROOT, "Can not generate code with `%s` and `%s` true while `%s` is false.",
                                 DELEGATE_PATTERN, INTERFACE_ONLY, JAVA_8));
             }
         }
@@ -434,7 +437,7 @@ public class SpringCodegen extends AbstractJavaCodegen
             // Drop any API suffix
             if (title != null) {
                 title = title.trim().replace(" ", "-");
-                if (title.toUpperCase().endsWith("API")) {
+                if (title.toUpperCase(Locale.ROOT).endsWith("API")) {
                     title = title.substring(0, title.length() - 3);
                 }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java
index 32e198a1652..a975cf63bd7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java
@@ -17,14 +17,13 @@
 
 package org.openapitools.codegen.languages;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
-
-import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
@@ -43,6 +42,7 @@ import org.slf4j.LoggerFactory;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfig {
@@ -131,7 +131,7 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "[String, " + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
@@ -142,7 +142,7 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi
         Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
         List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
         for (CodegenOperation op : operationList) {
-            op.httpMethod = op.httpMethod.toLowerCase();
+            op.httpMethod = op.httpMethod.toLowerCase(Locale.ROOT);
             for (CodegenResponse response : op.responses) {
                 if ("0".equals(response.code)) {
                     response.code = "default";
@@ -204,7 +204,7 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi
 
         //path is an unescaped variable in the mustache template api.mustache line 82 '<&path>'
         op.path = sanitizePath(op.path);
-        op.vendorExtensions.put("x-codegen-httpMethodUpperCase", httpMethod.toUpperCase());
+        op.vendorExtensions.put("x-codegen-httpMethodUpperCase", httpMethod.toUpperCase(Locale.ROOT));
 
         return op;
     }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java
index feaac9dbc5d..8f34f49bbac 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java
@@ -19,12 +19,10 @@ package org.openapitools.codegen.languages;
 
 import com.samskivert.mustache.Escapers;
 import com.samskivert.mustache.Mustache.Compiler;
-
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
-
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConstants;
@@ -42,6 +40,7 @@ import org.openapitools.codegen.utils.ModelUtils;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig {
@@ -118,7 +117,7 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return getSchemaType(p) + "[String, " + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
@@ -129,7 +128,7 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig
         Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
         List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
         for (CodegenOperation op : operationList) {
-            op.httpMethod = op.httpMethod.toLowerCase();
+            op.httpMethod = op.httpMethod.toLowerCase(Locale.ROOT);
             for (CodegenResponse response : op.responses) {
                 if ("0".equals(response.code)) {
                     response.code = "default";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java
index 0e29b372804..a8b3f0d64e5 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java
@@ -230,7 +230,7 @@ public class Swift3Codegen extends DefaultCodegen implements CodegenConfig {
     @Override
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
 
-        final Schema additionalProperties = (Schema) schema.getAdditionalProperties();
+        final Schema additionalProperties = ModelUtils.getAdditionalProperties(schema);
 
         if (additionalProperties != null) {
             codegenModel.additionalPropertiesType = getSchemaType(additionalProperties);
@@ -333,7 +333,7 @@ public class Swift3Codegen extends DefaultCodegen implements CodegenConfig {
             Schema inner = ap.getItems();
             return "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "[String:" + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
@@ -422,7 +422,7 @@ public class Swift3Codegen extends DefaultCodegen implements CodegenConfig {
     @Override
     public String toInstantiationType(Schema p) {
         if (ModelUtils.isMapSchema(p)) {
-            return getSchemaType((Schema) p.getAdditionalProperties());
+            return getSchemaType(ModelUtils.getAdditionalProperties(p));
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
             String inner = getSchemaType(ap.getItems());
@@ -454,6 +454,12 @@ public class Swift3Codegen extends DefaultCodegen implements CodegenConfig {
             return newOperationId;
         }
 
+        // operationId starts with a number
+        if (operationId.matches("^\\d.*")) {
+            LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId), true));
+            operationId = camelize(sanitizeName("call_" + operationId), true);
+        }
+
         return operationId;
     }
 
@@ -578,7 +584,7 @@ public class Swift3Codegen extends DefaultCodegen implements CodegenConfig {
 
         // for symbol, e.g. $, #
         if (getSymbolName(name) != null) {
-            return camelize(WordUtils.capitalizeFully(getSymbolName(name).toUpperCase()), true);
+            return camelize(WordUtils.capitalizeFully(getSymbolName(name).toUpperCase(Locale.ROOT)), true);
         }
 
         // Camelize only when we have a structure defined below
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
index f765bf1bc36..76e2b0602bd 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
@@ -284,7 +284,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel,
                                                        Schema schema) {
 
-        final Schema additionalProperties = (Schema) schema.getAdditionalProperties();
+        final Schema additionalProperties = ModelUtils.getAdditionalProperties(schema);
 
         if (additionalProperties != null) {
             codegenModel.additionalPropertiesType = getSchemaType(additionalProperties);
@@ -420,7 +420,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
             Schema inner = ap.getItems();
             return "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "[String:" + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
@@ -524,7 +524,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
     @Override
     public String toInstantiationType(Schema p) {
         if (ModelUtils.isMapSchema(p)) {
-            return getSchemaType((Schema) p.getAdditionalProperties());
+            return getSchemaType(ModelUtils.getAdditionalProperties(p));
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
             String inner = getSchemaType(ap.getItems());
@@ -559,6 +559,13 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
             return newOperationId;
         }
 
+        // operationId starts with a number
+        if (operationId.matches("^\\d.*")) {
+            LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId), true));
+            operationId = camelize(sanitizeName("call_" + operationId), true);
+        }
+
+
         return operationId;
     }
 
@@ -690,7 +697,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
 
         // for symbol, e.g. $, #
         if (getSymbolName(name) != null) {
-            return camelize(WordUtils.capitalizeFully(getSymbolName(name).toUpperCase()), true);
+            return camelize(WordUtils.capitalizeFully(getSymbolName(name).toUpperCase(Locale.ROOT)), true);
         }
 
         // Camelize only when we have a structure defined below
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java
index 0a45cf78ddc..97aeb0479b2 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java
@@ -270,7 +270,7 @@ public class SwiftClientCodegen extends DefaultCodegen implements CodegenConfig
             Schema inner = ap.getItems();
             return "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = (Schema) p.getAdditionalProperties();
+            Schema inner = ModelUtils.getAdditionalProperties(p);
             return "[String:" + getTypeDeclaration(inner) + "]";
         }
         return super.getTypeDeclaration(p);
@@ -359,7 +359,7 @@ public class SwiftClientCodegen extends DefaultCodegen implements CodegenConfig
     @Override
     public String toInstantiationType(Schema p) {
         if (ModelUtils.isMapSchema(p)) {
-            String inner = getSchemaType((Schema) p.getAdditionalProperties());
+            String inner = getSchemaType(ModelUtils.getAdditionalProperties(p));
             return "[String:" + inner + "]";
         } else if (ModelUtils.isArraySchema(p)) {
             ArraySchema ap = (ArraySchema) p;
@@ -450,6 +450,12 @@ public class SwiftClientCodegen extends DefaultCodegen implements CodegenConfig
             return newOperationId;
         }
 
+        // operationId starts with a number
+        if (operationId.matches("^\\d.*")) {
+            LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId), true));
+            operationId = camelize(sanitizeName("call_" + operationId), true);
+        }
+
         return operationId;
     }
 
@@ -577,7 +583,7 @@ public class SwiftClientCodegen extends DefaultCodegen implements CodegenConfig
         }
 
         // string
-        String enumName = sanitizeName(underscore(name).toUpperCase());
+        String enumName = sanitizeName(underscore(name).toUpperCase(Locale.ROOT));
         enumName = enumName.replaceFirst("^_", "");
         enumName = enumName.replaceFirst("_$", "");
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
index ecfd9b5b1ca..c08a980a339 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
@@ -32,7 +32,7 @@ import java.util.*;
 public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCodegen {
     private static final Logger LOGGER = LoggerFactory.getLogger(TypeScriptAngularClientCodegen.class);
 
-    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm");
+    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm", Locale.ROOT);
     private static final String X_DISCRIMINATOR_TYPE = "x-discriminator-value";
     private static String CLASS_NAME_SUFFIX_PATTERN = "^[a-zA-Z0-9]*$";
     private static String FILE_NAME_SUFFIX_PATTERN = "^[a-zA-Z0-9.-]*$";
@@ -98,7 +98,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
 
     @Override
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
-        codegenModel.additionalPropertiesType = getTypeDeclaration((Schema) schema.getAdditionalProperties());
+        codegenModel.additionalPropertiesType = getTypeDeclaration(ModelUtils.getAdditionalProperties(schema));
         addImport(codegenModel, codegenModel.additionalPropertiesType);
     }
 
@@ -539,7 +539,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
     private void validateFileSuffixArgument(String argument, String value) {
         if (!value.matches(FILE_NAME_SUFFIX_PATTERN)) {
             throw new IllegalArgumentException(
-                    String.format("%s file suffix only allows '.', '-' and alphanumeric characters.", argument)
+                    String.format(Locale.ROOT, "%s file suffix only allows '.', '-' and alphanumeric characters.", argument)
             );
         }
     }
@@ -553,7 +553,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
     private void validateClassSuffixArgument(String argument, String value) {
         if (!value.matches(CLASS_NAME_SUFFIX_PATTERN)) {
             throw new IllegalArgumentException(
-                    String.format("%s class suffix only allows alphanumeric characters.", argument)
+                    String.format(Locale.ROOT, "%s class suffix only allows alphanumeric characters.", argument)
             );
         }
     }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java
index fe1a44b06b9..90aa18de863 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java
@@ -17,10 +17,16 @@
 
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.*;
+import org.openapitools.codegen.CliOption;
+import org.openapitools.codegen.CodegenModel;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenParameter;
+import org.openapitools.codegen.CodegenProperty;
+import org.openapitools.codegen.SupportingFile;
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.TreeSet;
 
@@ -107,7 +113,7 @@ public class TypeScriptAureliaClientCodegen extends AbstractTypeScriptClientCode
         List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
         for (CodegenOperation op : operationList) {
             // Aurelia uses "asGet", "asPost", ... methods; change the method format
-            op.httpMethod = initialCaps(op.httpMethod.toLowerCase());
+            op.httpMethod = initialCaps(op.httpMethod.toLowerCase(Locale.ROOT));
 
             // Collect models to be imported
             for (CodegenParameter param : op.allParams) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
index bb1161d21e0..58289942173 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
@@ -27,9 +27,10 @@ import org.openapitools.codegen.utils.ModelUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodegen {
-    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm");
+    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm", Locale.ROOT);
 
     public static final String NPM_NAME = "npmName";
     public static final String NPM_VERSION = "npmVersion";
@@ -114,7 +115,7 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
             inner = ((ArraySchema) p).getItems();
             return this.getSchemaType(p) + "<" + this.getTypeDeclaration(inner) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
-            inner = (Schema) p.getAdditionalProperties();
+            inner = ModelUtils.getAdditionalProperties(p);
             return "{ [key: string]: " + this.getTypeDeclaration(inner) + "; }";
         } else if (ModelUtils.isFileSchema(p)) {
             return "any";
@@ -127,7 +128,7 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
 
     @Override
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
-        codegenModel.additionalPropertiesType = getTypeDeclaration((Schema) schema.getAdditionalProperties());
+        codegenModel.additionalPropertiesType = getTypeDeclaration(ModelUtils.getAdditionalProperties(schema));
         addImport(codegenModel, codegenModel.additionalPropertiesType);
     }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java
index 82c9008891d..28259a7dcdb 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java
@@ -22,6 +22,7 @@ import io.swagger.v3.oas.models.media.FileSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 import org.openapitools.codegen.*;
+import org.openapitools.codegen.utils.ModelUtils;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -29,7 +30,7 @@ import java.util.*;
 
 
 public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCodegen {
-    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm");
+    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm", Locale.ROOT);
     private static final String X_DISCRIMINATOR_TYPE = "x-discriminator-value";
 
     public static final String NPM_NAME = "npmName";
@@ -77,7 +78,7 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo
 
     @Override
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
-        codegenModel.additionalPropertiesType = getTypeDeclaration((Schema) schema.getAdditionalProperties());
+        codegenModel.additionalPropertiesType = getTypeDeclaration(ModelUtils.getAdditionalProperties(schema));
         addImport(codegenModel, codegenModel.additionalPropertiesType);
     }
 
@@ -220,7 +221,7 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo
             StringBuilder parameterName = new StringBuilder();
             int insideCurly = 0;
 
-            op.httpMethod = op.httpMethod.toLowerCase();
+            op.httpMethod = op.httpMethod.toLowerCase(Locale.ROOT);
 
             // Iterate through existing string, one character at a time.
             for (int i = 0; i < op.path.length(); i++) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java
index 247bee5b63e..53689ae1b32 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java
@@ -30,10 +30,11 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 public class TypeScriptJqueryClientCodegen extends AbstractTypeScriptClientCodegen {
     private static final Logger LOGGER = LoggerFactory.getLogger(TypeScriptJqueryClientCodegen.class);
-    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm");
+    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm", Locale.ROOT);
 
     public static final String NPM_NAME = "npmName";
     public static final String NPM_VERSION = "npmVersion";
@@ -134,18 +135,9 @@ public class TypeScriptJqueryClientCodegen extends AbstractTypeScriptClientCodeg
         return addModelPrefix(name);
     }
 
-    @Override
-    public void postProcessParameter(CodegenParameter parameter) {
-        super.postProcessParameter(parameter);
-
-        if (!parameter.isEnum) {
-            parameter.dataType = addModelPrefix(parameter.dataType);
-        }
-    }
-
     @Override
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
-        codegenModel.additionalPropertiesType = getSchemaType((Schema) schema.getAdditionalProperties());
+        codegenModel.additionalPropertiesType = getSchemaType(ModelUtils.getAdditionalProperties(schema));
         addImport(codegenModel, codegenModel.additionalPropertiesType);
     }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java
index 45f00f626be..3e6b1848f01 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java
@@ -31,7 +31,7 @@ import java.util.*;
 
 public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen {
     private static final Logger LOGGER = LoggerFactory.getLogger(TypeScriptNodeClientCodegen.class);
-    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm");
+    private static final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm", Locale.ROOT);
 
     public static final String NPM_NAME = "npmName";
     public static final String NPM_VERSION = "npmVersion";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/JoinWithCommaLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/JoinWithCommaLambda.java
new file mode 100644
index 00000000000..80944554940
--- /dev/null
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/JoinWithCommaLambda.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ * Copyright 2018 SmartBear Software
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openapitools.codegen.mustache;
+
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.DefaultCodegen;
+
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * Split text by 2 spaces and then join the strings with ", "
+ *
+ * Register:
+ * <pre>
+ * additionalProperties.put("joinWithComma", new JoinWithCommaLambda());
+ * </pre>
+ *
+ * Use:
+ * <pre>
+ * {{#joinWithComma}}{{name}}{{/joinWithComma}}
+ * </pre>
+ */
+public class JoinWithCommaLambda implements Mustache.Lambda {
+    private CodegenConfig generator = null;
+
+    public JoinWithCommaLambda() {
+
+    }
+
+    public JoinWithCommaLambda generator(final CodegenConfig generator) {
+        this.generator = generator;
+        return this;
+    }
+
+    @Override
+    public void execute(Template.Fragment fragment, Writer writer) throws IOException {
+        String[] substr = fragment.execute().trim().split("  ");
+
+        writer.write(String.join(", ", substr));
+    }
+}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/LowercaseLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/LowercaseLambda.java
index 7db62729150..ba466fd0073 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/LowercaseLambda.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/LowercaseLambda.java
@@ -23,6 +23,7 @@ import org.openapitools.codegen.CodegenConfig;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.util.Locale;
 
 /**
  * Converts text in a fragment to lowercase.
@@ -51,7 +52,7 @@ public class LowercaseLambda implements Mustache.Lambda {
 
     @Override
     public void execute(Template.Fragment fragment, Writer writer) throws IOException {
-        String text = fragment.execute().toLowerCase();
+        String text = fragment.execute().toLowerCase(Locale.ROOT);
         if (generator != null && generator.reservedWords().contains(text)) {
             text = generator.escapeReservedWord(text);
         }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/TitlecaseLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/TitlecaseLambda.java
index e3d1eb7a986..e9ec42991b6 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/TitlecaseLambda.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/TitlecaseLambda.java
@@ -22,6 +22,7 @@ import com.samskivert.mustache.Template;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.util.Locale;
 
 /**
  * Converts text in a fragment to title case.
@@ -60,7 +61,7 @@ public class TitlecaseLambda implements Mustache.Lambda  {
     }
 
     private String titleCase(final String input) {
-        return input.substring(0, 1).toUpperCase() + input.substring(1);
+        return input.substring(0, 1).toUpperCase(Locale.ROOT) + input.substring(1);
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/UppercaseLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/UppercaseLambda.java
index 745eb10b27a..98b835b55bc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/UppercaseLambda.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/mustache/UppercaseLambda.java
@@ -22,6 +22,7 @@ import com.samskivert.mustache.Template;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.util.Locale;
 
 /**
  * Converts text in a fragment to uppercase.
@@ -40,6 +41,6 @@ public class UppercaseLambda implements Mustache.Lambda {
     @Override
     public void execute(Template.Fragment fragment, Writer writer) throws IOException {
         String text = fragment.execute();
-        writer.write(text.toUpperCase());
+        writer.write(text.toUpperCase(Locale.ROOT));
     }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
index c5afa2dd8b1..7d2eeb40c43 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
@@ -20,6 +20,7 @@ package org.openapitools.codegen.utils;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.headers.Header;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.BinarySchema;
 import io.swagger.v3.oas.models.media.BooleanSchema;
@@ -307,6 +308,9 @@ public class ModelUtils {
         if (schema.getAdditionalProperties() instanceof Schema) {
             return true;
         }
+        if (schema.getAdditionalProperties() instanceof Boolean && (Boolean)schema.getAdditionalProperties()) {
+            return true;
+        }
         return false;
     }
 
@@ -657,4 +661,35 @@ public class ModelUtils {
         return schema;
     }
 
+    public static Schema getAdditionalProperties(Schema schema) {
+        if(schema.getAdditionalProperties() instanceof Schema) {
+            return (Schema) schema.getAdditionalProperties();
+        }
+        if(schema.getAdditionalProperties() instanceof Boolean && (Boolean)schema.getAdditionalProperties()) {
+            return new ObjectSchema();
+        }
+        return null;
+    }
+
+    public static Header getReferencedHeader(OpenAPI openAPI, Header header) {
+        if (header != null && StringUtils.isNotEmpty(header.get$ref())) {
+            String name = getSimpleRef(header.get$ref());
+            Header referencedheader = getHeader(openAPI, name);
+            if (referencedheader != null) {
+                return referencedheader;
+            }
+        }
+        return header;
+    }
+
+    public static Header getHeader(OpenAPI openAPI, String name) {
+        if (name == null) {
+            return null;
+        }
+
+        if (openAPI != null && openAPI.getComponents() != null && openAPI.getComponents().getHeaders() != null) {
+            return openAPI.getComponents().getHeaders().get(name);
+        }
+        return null;
+    }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java
index 91aba80d82c..fdfa6fdfd6b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java
@@ -50,7 +50,7 @@ public class URLPathUtils {
         return getServerURL(servers.get(0));
     }
 
-    static URL getServerURL(final Server server) {
+    public static URL getServerURL(final Server server) {
         String url = server.getUrl();
         ServerVariables variables = server.getVariables();
         if(variables == null) {
diff --git a/modules/openapi-generator/src/main/resources/Java/JSON.mustache b/modules/openapi-generator/src/main/resources/Java/JSON.mustache
index 92fa0f9d0fa..ae8de32fafc 100644
--- a/modules/openapi-generator/src/main/resources/Java/JSON.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/JSON.mustache
@@ -40,6 +40,7 @@ import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 {{/java8}}
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -65,9 +66,9 @@ public class JSON {
             public Class getClassForElement(JsonElement readElement) {
                 Map classByDiscriminatorValue = new HashMap();
                 {{#mappedModels}}
-                classByDiscriminatorValue.put("{{mappingName}}".toUpperCase(), {{modelName}}.class);
+                classByDiscriminatorValue.put("{{mappingName}}".toUpperCase(Locale.ROOT), {{modelName}}.class);
                 {{/mappedModels}}
-                classByDiscriminatorValue.put("{{classname}}".toUpperCase(), {{classname}}.class);
+                classByDiscriminatorValue.put("{{classname}}".toUpperCase(Locale.ROOT), {{classname}}.class);
                 return getClassByDiscriminator(
                                            classByDiscriminatorValue,
                                            getDiscriminatorValue(readElement, "{{{propertyName}}}"));
@@ -91,7 +92,7 @@ public class JSON {
     }
 
     private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
-        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
+        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase(Locale.ROOT));
         if(null == clazz) {
             throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
         }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache
index cf8d5c45ba2..42bdf68613b 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache
@@ -13,7 +13,7 @@ import java.util.function.Supplier;
 
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
-import static org.openapitools.client.GsonObjectMapper.gson;
+import static {{invokerPackage}}.GsonObjectMapper.gson;
 {{/fullJavaUtil}}
 
 public class ApiClient {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache
index 1f400d0efa1..75c3a373ae3 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache
@@ -28,6 +28,7 @@ import {{invokerPackage}}.JSON;
 
 import static io.restassured.http.Method.*;
 
+@Api(value = "{{{baseName}}}")
 public class {{classname}} {
 
     private RequestSpecBuilder reqSpec;
@@ -43,15 +44,12 @@ public class {{classname}} {
 {{#operations}}
 {{#operation}}
 
-    @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}"{{#hasAuthMethods}}, authorizations = {
-        {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
-            {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
-            {{/hasMore}}{{/scopes}}
-            }{{/isOAuth}}){{#hasMore}},
-        {{/hasMore}}{{/authMethods}}
-    }{{/hasAuthMethods}}, tags={ {{#tags}}{{#name}}"{{{name}}}"{{/name}}{{^-last}}, {{/-last}}{{/tags}} })
+    @ApiOperation(value = "{{{summary}}}",
+            notes = "{{{notes}}}",
+            nickname = "{{{operationId}}}",
+            tags = { {{#tags}}{{#name}}"{{{name}}}"{{/name}}{{^-last}}, {{/-last}}{{/tags}} })
     @ApiResponses(value = { {{#responses}}
-        @ApiResponse(code = {{{code}}}, message = "{{{message}}}") {{#hasMore}},{{/hasMore}}{{/responses}} })
+            @ApiResponse(code = {{{code}}}, message = "{{{message}}}") {{#hasMore}},{{/hasMore}}{{/responses}} })
     {{#isDeprecated}}
     @Deprecated
     {{/isDeprecated}}
@@ -139,7 +137,7 @@ public class {{classname}} {
         {{#bodyParams}}
 
          /**
-         * @param {{paramName}} ({{{dataType}}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
+         * @param {{paramName}} ({{dataType}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
          * @return operation
          */
         public {{operationIdCamelCase}}Oper body({{{dataType}}} {{paramName}}) {
@@ -152,7 +150,7 @@ public class {{classname}} {
         public static final String {{#convert}}{{paramName}}{{/convert}}_HEADER = "{{baseName}}";
 
         /**
-         * @param {{paramName}} ({{{dataType}}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
+         * @param {{paramName}} ({{dataType}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
          * @return operation
          */
         public {{operationIdCamelCase}}Oper {{paramName}}Header(String {{paramName}}) {
@@ -165,7 +163,7 @@ public class {{classname}} {
         public static final String {{#convert}}{{paramName}}{{/convert}}_PATH = "{{baseName}}";
 
         /**
-         * @param {{paramName}} ({{{dataType}}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
+         * @param {{paramName}} ({{dataType}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
          * @return operation
          */
         public {{operationIdCamelCase}}Oper {{paramName}}Path(Object {{paramName}}) {
@@ -178,7 +176,7 @@ public class {{classname}} {
         public static final String {{#convert}}{{paramName}}{{/convert}}_QUERY = "{{baseName}}";
 
         /**
-         * @param {{paramName}} ({{{dataType}}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
+         * @param {{paramName}} ({{dataType}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
          * @return operation
          */
         public {{operationIdCamelCase}}Oper {{paramName}}Query(Object... {{paramName}}) {
@@ -192,7 +190,7 @@ public class {{classname}} {
          public static final String {{#convert}}{{paramName}}{{/convert}}_FORM = "{{baseName}}";
 
          /**
-         * @param {{paramName}} ({{{dataType}}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
+         * @param {{paramName}} ({{dataType}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
          * @return operation
          */
          public {{operationIdCamelCase}}Oper {{paramName}}Form(Object... {{paramName}}) {
@@ -207,7 +205,7 @@ public class {{classname}} {
          /**
          * It will assume that the control name is file and the &lt;content-type&gt; is &lt;application/octet-stream&gt;
          * @see #reqSpec for customise
-         * @param {{paramName}} ({{{dataType}}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
+         * @param {{paramName}} ({{dataType}}) {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
          * @return operation
          */
          public {{operationIdCamelCase}}Oper {{paramName}}MultiPart({{{dataType}}} {{paramName}}) {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache
index ad1fcc649dd..96ff0f77653 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache
@@ -16,6 +16,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TimeZone;
@@ -64,7 +65,7 @@ public class ApiClient {
     json = new JSON();
     httpClient = buildHttpClient(debugging);
 
-    this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+    this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.ROOT);
 
     // Use UTC as the default time zone.
     this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
@@ -477,7 +478,7 @@ public class ApiClient {
   public Entity<?> serialize(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
     Entity<?> entity = null;
     if (contentType.startsWith("multipart/form-data")) {
-      MultipartFormDataOutput multipart = new MultipartFormDataOutput();  
+      MultipartFormDataOutput multipart = new MultipartFormDataOutput();
       //MultiPart multiPart = new MultiPart();
       for (Entry<String, Object> param: formParams.entrySet()) {
         if (param.getValue() instanceof File) {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
index f48180f4381..beede4b55b1 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
@@ -8,6 +8,7 @@ import {{invokerPackage}}.ApiClient;
 {{^fullJavaUtil}}import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;{{/fullJavaUtil}}
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,7 +78,7 @@ public class {{classname}} {
         final HttpHeaders {{localVariablePrefix}}headerParams = new HttpHeaders();
         final MultiValueMap<String, Object> {{localVariablePrefix}}formParams = new LinkedMultiValueMap<String, Object>();{{#hasQueryParams}}
         
-        {{#queryParams}}{{localVariablePrefix}}queryParams.putAll({{localVariablePrefix}}apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase()){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}));{{#hasMore}}
+        {{#queryParams}}{{localVariablePrefix}}queryParams.putAll({{localVariablePrefix}}apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}));{{#hasMore}}
         {{/hasMore}}{{/queryParams}}{{/hasQueryParams}}{{#hasHeaderParams}}
         
         {{#headerParams}}if ({{paramName}} != null)
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/JSON.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/JSON.mustache
index ac8958824cb..7dbb56a3da1 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/JSON.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/JSON.mustache
@@ -39,6 +39,7 @@ import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 {{/java8}}
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -62,9 +63,9 @@ public class JSON {
             public Class getClassForElement(JsonElement readElement) {
                 Map classByDiscriminatorValue = new HashMap();
                 {{#mappedModels}}
-                classByDiscriminatorValue.put("{{mappingName}}".toUpperCase(), {{modelName}}.class);
+                classByDiscriminatorValue.put("{{mappingName}}".toUpperCase(Locale.ROOT), {{modelName}}.class);
                 {{/mappedModels}}
-                classByDiscriminatorValue.put("{{classname}}".toUpperCase(), {{classname}}.class);
+                classByDiscriminatorValue.put("{{classname}}".toUpperCase(Locale.ROOT), {{classname}}.class);
                 return getClassByDiscriminator(
                             classByDiscriminatorValue,
                             getDiscriminatorValue(readElement, "{{{propertyName}}}"));
@@ -84,7 +85,7 @@ public class JSON {
     }
 
     private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
-        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
+        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase(Locale.ROOT));
         if(null == clazz) {
             throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
         }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache
index fb80f0d2dba..3bcf3ede667 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache
@@ -18,6 +18,7 @@ import io.vertx.core.file.FileSystem;
 import io.vertx.core.file.OpenOptions;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
+import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.Json;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.client.HttpRequest;
@@ -553,7 +554,11 @@ public class ApiClient {
                             handleFileDownload(httpResponse, handler);
                             return;
                         } else {
-                            resultContent = Json.decodeValue(httpResponse.body(), returnType);
+                            try {
+                                resultContent = Json.mapper.readValue(httpResponse.bodyAsString(), returnType);
+                            } catch (Exception e) {
+                                throw new DecodeException("Failed to decode:" + e.getMessage(), e);
+                            }
                         }
                         result = Future.succeededFuture(resultContent);
                     }
@@ -597,4 +602,4 @@ public class ApiClient {
             auth.applyToParams(queryParams, headerParams);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
index 6d6a38e25c0..9c3f9fb140c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
@@ -8,6 +8,7 @@ import {{invokerPackage}}.ApiClient;
 {{^fullJavaUtil}}import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;{{/fullJavaUtil}}
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,7 +78,7 @@ public class {{classname}} {
         final HttpHeaders {{localVariablePrefix}}headerParams = new HttpHeaders();
         final MultiValueMap<String, Object> {{localVariablePrefix}}formParams = new LinkedMultiValueMap<String, Object>();{{#hasQueryParams}}
         
-        {{#queryParams}}{{localVariablePrefix}}queryParams.putAll({{localVariablePrefix}}apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase()){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}));{{#hasMore}}
+        {{#queryParams}}{{localVariablePrefix}}queryParams.putAll({{localVariablePrefix}}apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}));{{#hasMore}}
         {{/hasMore}}{{/queryParams}}{{/hasQueryParams}}{{#hasHeaderParams}}
         
         {{#headerParams}}if ({{paramName}} != null)
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache
index d3d8b238d72..a7673c8f138 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache
@@ -3,7 +3,7 @@ package {{invokerPackage}};
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("{{{contextPath}}}")
 public class RestApplication extends Application {
   // Add implementation-specific details here
 }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/queryParams.mustache
index c1c9e8b45cb..48660b59a8e 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{#defaultValue}}@DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}) {{#defaultValue}}@DefaultValue({{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/queryParams.mustache
index 6a98efdac02..60ec7b9af89 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}}@DefaultValue("{{{defaultValue}}}") {{/defaultValue}}{{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}}@DefaultValue({{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}) {{/defaultValue}}{{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/queryParams.mustache
index 9055e6f16dc..a8e45cd5f78 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}){{#defaultValue}} @DefaultValue({{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache
index df9a31434b6..99f572b54ff 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RestApplication.mustache
@@ -3,7 +3,7 @@ package {{invokerPackage}};
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("{{{contextPath}}}")
 public class RestApplication extends Application {
 
 }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache
index cdab3c0830b..0f9c4b28e86 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/RestApplication.mustache
@@ -15,7 +15,7 @@ import {{package}}.impl.{{classname}}ServiceImpl;
 {{/apis}}
 {{/apiInfo}}   
 
-@ApplicationPath("/")
+@ApplicationPath("{{{contextPath}}}")
 public class RestApplication extends Application {
 
 {{#useSwaggerFeature}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/queryParams.mustache
index 292fbb4600f..0fb3c78c63f 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue({{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache
index 82b8d9533e0..3dd570e9c35 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache
@@ -3,7 +3,7 @@ package {{invokerPackage}};
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("{{{contextPath}}}")
 public class RestApplication extends Application {
 
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache
index 4434783a461..279efb3cfa3 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}}  {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue({{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{description}}"){{/description}}{{/useSwaggerAnnotations}}  {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/openapiUtils.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/openapiUtils.mustache
index 24091812020..e85eb571fe3 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/openapiUtils.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/openapiUtils.mustache
@@ -104,6 +104,6 @@ public class OpenAPIUtils {
     }
 
     public static String formatDatetime(Date date) {
-    	return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX").format(date);
+        return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.ROOT).format(date);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache
index 182152c6e5a..97e90bafefe 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{>optionalDataType}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}) {{>optionalDataType}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache
index ad95c328257..66d7f51f8c5 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache
@@ -68,7 +68,7 @@ public class {{classname}}Verticle extends AbstractVerticle {
                 {{{dataType}}} {{paramName}} = {{paramName}}Param;
                 {{/required}}
                 {{^required}}
-                {{{dataType}}} {{paramName}} = ({{paramName}}Param == null) ? {{#defaultValue}}{{defaultValue}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}} : {{paramName}}Param;
+                {{{dataType}}} {{paramName}} = ({{paramName}}Param == null) ? {{#defaultValue}}{{#isEnum}}"{{/isEnum}}{{{defaultValue}}}{{#isEnum}}"{{/isEnum}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}} : {{paramName}}Param;
                 {{/required}}
                                 {{/isString}}
                                 {{^isString}}
diff --git a/modules/openapi-generator/src/main/resources/MSF4J/queryParams.mustache b/modules/openapi-generator/src/main/resources/MSF4J/queryParams.mustache
index 9055e6f16dc..a8e45cd5f78 100644
--- a/modules/openapi-generator/src/main/resources/MSF4J/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/MSF4J/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}){{#defaultValue}} @DefaultValue({{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache
index 81df5d1ff56..d00fcdeb6e3 100644
--- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache
@@ -36,55 +36,55 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
     }
 {{/isContainer}}{{/isPrimitiveType}}{{/required}}{{/allParams}}
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("{{{path}}}");
-    {{#pathParams}}boost::replace_all(path, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("{{baseName}}") + utility::conversions::to_string_t("}"), ApiClient::parameterToString({{{paramName}}}));
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("{{{path}}}");
+    {{#pathParams}}boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("{{baseName}}") + utility::conversions::to_string_t("}"), ApiClient::parameterToString({{{paramName}}}));
     {{/pathParams}}
 
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
     {{#produces}}
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("{{{mediaType}}}") );
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("{{{mediaType}}}") );
     {{/produces}}
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
         {{#vendorExtensions.x-codegen-response.isString}}
-        responseHttpContentType = utility::conversions::to_string_t("text/plain");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("text/plain");
         {{/vendorExtensions.x-codegen-response.isString}}
         {{^vendorExtensions.x-codegen-response.isString}}
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
         {{/vendorExtensions.x-codegen-response.isString}}
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     {{#vendorExtensions.x-codegen-response.isString}}
     // plain text
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("text/plain")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("text/plain")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("text/plain");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("text/plain");
     }
     {{/vendorExtensions.x-codegen-response.isString}}
     {{#vendorExtensions.x-codegen-response-ishttpcontent}}
     else
     {
         //It's going to be binary, so just use the first one.
-        responseHttpContentType = *responseHttpContentTypes.begin();
+        localVarResponseHttpContentType = *localVarResponseHttpContentTypes.begin();
     }
     {{/vendorExtensions.x-codegen-response-ishttpcontent}}
     {{^vendorExtensions.x-codegen-response-ishttpcontent}}
@@ -94,11 +94,11 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
     }
     {{/vendorExtensions.x-codegen-response-ishttpcontent}}
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
     {{#consumes}}
-    consumeHttpContentTypes.insert( utility::conversions::to_string_t("{{{mediaType}}}") );
+    localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("{{{mediaType}}}") );
     {{/consumes}}
 
     {{#allParams}}
@@ -131,17 +131,17 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
     {{/required}}
     {
         {{#isQueryParam}}
-        queryParams[utility::conversions::to_string_t("{{baseName}}")] = ApiClient::parameterToString({{^required}}*{{/required}}{{paramName}});
+        localVarQueryParams[utility::conversions::to_string_t("{{baseName}}")] = ApiClient::parameterToString({{^required}}*{{/required}}{{paramName}});
         {{/isQueryParam}}
         {{#isHeaderParam}}
-        headerParams[utility::conversions::to_string_t("{{baseName}}")] = ApiClient::parameterToString({{^required}}*{{/required}}{{paramName}});
+        localVarHeaderParams[utility::conversions::to_string_t("{{baseName}}")] = ApiClient::parameterToString({{^required}}*{{/required}}{{paramName}});
         {{/isHeaderParam}}
         {{#isFormParam}}
         {{#isFile}}
-        fileParams[ utility::conversions::to_string_t("{{baseName}}") ] = {{^required}}*{{/required}}{{paramName}};
+        localVarFileParams[ utility::conversions::to_string_t("{{baseName}}") ] = {{^required}}*{{/required}}{{paramName}};
         {{/isFile}}
         {{^isFile}}
-        formParams[ utility::conversions::to_string_t("{{baseName}}") ] = ApiClient::parameterToString({{^required}}*{{/required}}{{paramName}});
+        localVarFormParams[ utility::conversions::to_string_t("{{baseName}}") ] = ApiClient::parameterToString({{^required}}*{{/required}}{{paramName}});
         {{/isFile}}
         {{/isFormParam}}
     }
@@ -149,77 +149,77 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
     {{/isBodyParam}}
     {{/allParams}}
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
         {{#bodyParam}}
-        web::json::value json;
+        web::json::value localVarJson;
 
         {{#isPrimitiveType}}
-        json = ModelBase::toJson({{paramName}});
+        localVarJson = ModelBase::toJson({{paramName}});
         {{/isPrimitiveType}}
         {{^isPrimitiveType}}
         {{#isListContainer}}
         {
-            std::vector<web::json::value> jsonArray;
-            for( auto& item : {{paramName}} )
+            std::vector<web::json::value> localVarJsonArray;
+            for( auto& localVarItem : {{paramName}} )
             {
-                {{#items.isPrimitiveType}}jsonArray.push_back(ModelBase::toJson(item));
-                {{/items.isPrimitiveType}}{{^items.isPrimitiveType}}{{#items.isString}}jsonArray.push_back(ModelBase::toJson(item));
-                {{/items.isString}}{{^items.isString}}{{#items.isDateTime}}jsonArray.push_back(ModelBase::toJson(item));
-                {{/items.isDateTime}}{{^items.isDateTime}}jsonArray.push_back( item.get() ? item->toJson() : web::json::value::null() );
+                {{#items.isPrimitiveType}}localVarJsonArray.push_back(ModelBase::toJson(localVarItem));
+                {{/items.isPrimitiveType}}{{^items.isPrimitiveType}}{{#items.isString}}localVarJsonArray.push_back(ModelBase::toJson(localVarItem));
+                {{/items.isString}}{{^items.isString}}{{#items.isDateTime}}localVarJsonArray.push_back(ModelBase::toJson(localVarItem));
+                {{/items.isDateTime}}{{^items.isDateTime}}localVarJsonArray.push_back( localVarItem.get() ? localVarItem->toJson() : web::json::value::null() );
                 {{/items.isDateTime}}{{/items.isString}}{{/items.isPrimitiveType}}
             }
-            json = web::json::value::array(jsonArray);
+            localVarJson = web::json::value::array(localVarJsonArray);
         }
         {{/isListContainer}}
-        {{^isListContainer}}{{#required}}json = ModelBase::toJson({{paramName}});
+        {{^isListContainer}}{{#required}}localVarJson = ModelBase::toJson({{paramName}});
         {{/required}}{{^required}}if ({{paramName}})
-            json = ModelBase::toJson(*{{paramName}});{{/required}}
+            localVarJson = ModelBase::toJson(*{{paramName}});{{/required}}
         {{/isListContainer}}
         {{/isPrimitiveType}}
 
-        httpBody = std::shared_ptr<IHttpBody>( new JsonBody( json ) );
+        localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
         {{/bodyParam}}
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
         {{#bodyParam}}
-        std::shared_ptr<MultipartFormData> multipart(new MultipartFormData);
+        std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
         {{#isPrimitiveType}}
-        multipart->add(ModelBase::toHttpContent("{{paramName}}", {{paramName}}));
+        localVarMultipart->add(ModelBase::toHttpContent("{{paramName}}", {{paramName}}));
         {{/isPrimitiveType}}
         {{^isPrimitiveType}}
         {{#isListContainer}}
         {
-            std::vector<web::json::value> jsonArray;
-            for( auto& item : {{paramName}} )
+            std::vector<web::json::value> localVarJsonArray;
+            for( auto& localVarItem : {{paramName}} )
             {
-                {{#items.isPrimitiveType}}jsonArray.push_back(ModelBase::toJson(item));
-                {{/items.isPrimitiveType}}{{^items.isPrimitiveType}}{{#items.isString}}jsonArray.push_back(ModelBase::toJson(item));
-                {{/items.isString}}{{^items.isString}}{{#items.isDateTime}}jsonArray.push_back(ModelBase::toJson(item));
-                {{/items.isDateTime}}{{^items.isDateTime}}jsonArray.push_back( item.get() ? item->toJson() : web::json::value::null() );
+                {{#items.isPrimitiveType}}localVarJsonArray.push_back(ModelBase::toJson(localVarItem));
+                {{/items.isPrimitiveType}}{{^items.isPrimitiveType}}{{#items.isString}}localVarJsonArray.push_back(ModelBase::toJson(localVarItem));
+                {{/items.isString}}{{^items.isString}}{{#items.isDateTime}}localVarJsonArray.push_back(ModelBase::toJson(localVarItem));
+                {{/items.isDateTime}}{{^items.isDateTime}}localVarJsonArray.push_back( localVarItem.get() ? localVarItem->toJson() : web::json::value::null() );
                 {{/items.isDateTime}}{{/items.isString}}{{/items.isPrimitiveType}}
             }
-            multipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), web::json::value::array(jsonArray), utility::conversions::to_string_t("application/json")));
+            localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), web::json::value::array(localVarJsonArray), utility::conversions::to_string_t("application/json")));
         }{{/isListContainer}}
-        {{^isListContainer}}{{#isString}}multipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), {{paramName}}));
+        {{^isListContainer}}{{#isString}}localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), {{paramName}}));
         {{/isString}}{{^isString}}if({{^required}}{{paramName}} && (*{{paramName}}){{/required}}{{#required}}{{paramName}}{{/required}}.get())
         {
-            {{^required}}(*{{/required}}{{paramName}}{{^required}}){{/required}}->toMultipart(multipart, utility::conversions::to_string_t("{{paramName}}"));
+            {{^required}}(*{{/required}}{{paramName}}{{^required}}){{/required}}->toMultipart(localVarMultipart, utility::conversions::to_string_t("{{paramName}}"));
         }
         {{/isString}}
         {{/isListContainer}}
         {{/isPrimitiveType}}
 
-        httpBody = multipart;
-        requestHttpContentType += utility::conversions::to_string_t("; boundary=") + multipart->getBoundary();
+        localVarHttpBody = localVarMultipart;
+        localVarRequestHttpContentType += utility::conversions::to_string_t("; boundary=") + localVarMultipart->getBoundary();
         {{/bodyParam}}
     }
     else
@@ -232,19 +232,19 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
     {{#isApiKey}}
     {{#isKeyInHeader}}
     {
-        utility::string_t apiKey = apiConfiguration->getApiKey(utility::conversions::to_string_t("{{keyParamName}}"));
-        if ( apiKey.size() > 0 )
+        utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("{{keyParamName}}"));
+        if ( localVarApiKey.size() > 0 )
         {
-            headerParams[utility::conversions::to_string_t("{{keyParamName}}")] = apiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("{{keyParamName}}")] = localVarApiKey;
         }
     }
     {{/isKeyInHeader}}
     {{#isKeyInQuery}}
     {
-        utility::string_t apiKey = apiConfiguration->getApiKey(utility::conversions::to_string_t("{{keyParamName}}"));
-        if ( apiKey.size() > 0 )
+        utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("{{keyParamName}}"));
+        if ( localVarApiKey.size() > 0 )
         {
-            queryParams[utility::conversions::to_string_t("{{keyParamName}}")] = apiKey;
+            localVarQueryParams[utility::conversions::to_string_t("{{keyParamName}}")] = localVarApiKey;
         }
     }
     {{/isKeyInQuery}}
@@ -257,91 +257,91 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
     {{/isOAuth}}
     {{/authMethods}}
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("{{httpMethod}}"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("{{httpMethod}}"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling {{operationId}}: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling {{operationId}}: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling {{operationId}}: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling {{operationId}}: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
         {{#vendorExtensions.x-codegen-response-ishttpcontent}}
-        return response.extract_vector();
+        return localVarResponse.extract_vector();
     })
-    .then([=](std::vector<unsigned char> response)
+    .then([=](std::vector<unsigned char> localVarResponse)
     {
-        HttpContent result;
-        std::shared_ptr<std::stringstream> stream = std::make_shared<std::stringstream>(std::string(response.begin(), response.end()));
-        result.setData(stream);
-        return result;
+        HttpContent localVarResult;
+        std::shared_ptr<std::stringstream> stream = std::make_shared<std::stringstream>(std::string(localVarResponse.begin(), localVarResponse.end()));
+        localVarResult.setData(stream);
+        return localVarResult;
         {{/vendorExtensions.x-codegen-response-ishttpcontent}}
         {{^vendorExtensions.x-codegen-response-ishttpcontent}}
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         {{^returnType}}
         return void();
         {{/returnType}}
         {{#returnType}}
         {{#returnContainer}}
-        {{{returnType}}} result;
+        {{{returnType}}} localVarResult;
         {{/returnContainer}}
         {{^returnContainer}}
-        {{{returnType}}} result({{{defaultResponse}}});
+        {{{returnType}}} localVarResult({{{defaultResponse}}});
         {{/returnContainer}}
 
-        if(responseHttpContentType == utility::conversions::to_string_t("application/json"))
+        if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json"))
         {
-            web::json::value json = web::json::value::parse(response);
+            web::json::value localVarJson = web::json::value::parse(localVarResponse);
 
-            {{#isListContainer}}for( auto& item : json.as_array() )
+            {{#isListContainer}}for( auto& localVarItem : localVarJson.as_array() )
             {
-                {{#vendorExtensions.x-codegen-response.items.isPrimitiveType}}result.push_back(ModelBase::{{vendorExtensions.x-codegen-response.items.datatype}}FromJson(item));
-                {{/vendorExtensions.x-codegen-response.items.isPrimitiveType}}{{^vendorExtensions.x-codegen-response.items.isPrimitiveType}}{{#vendorExtensions.x-codegen-response.items.isString}}result.push_back(ModelBase::stringFromJson(item));
-                {{/vendorExtensions.x-codegen-response.items.isString}}{{^vendorExtensions.x-codegen-response.items.isString}}{{{vendorExtensions.x-codegen-response.items.datatype}}} itemObj({{{vendorExtensions.x-codegen-response.items.defaultValue}}});
-                itemObj->fromJson(item);
-                result.push_back(itemObj);
+                {{#vendorExtensions.x-codegen-response.items.isPrimitiveType}}localVarResult.push_back(ModelBase::{{vendorExtensions.x-codegen-response.items.datatype}}FromJson(localVarItem));
+                {{/vendorExtensions.x-codegen-response.items.isPrimitiveType}}{{^vendorExtensions.x-codegen-response.items.isPrimitiveType}}{{#vendorExtensions.x-codegen-response.items.isString}}localVarResult.push_back(ModelBase::stringFromJson(localVarItem));
+                {{/vendorExtensions.x-codegen-response.items.isString}}{{^vendorExtensions.x-codegen-response.items.isString}}{{{vendorExtensions.x-codegen-response.items.datatype}}} localVarItemObj({{{vendorExtensions.x-codegen-response.items.defaultValue}}});
+                localVarItemObj->fromJson(localVarItem);
+                localVarResult.push_back(localVarItemObj);
                 {{/vendorExtensions.x-codegen-response.items.isString}}{{/vendorExtensions.x-codegen-response.items.isPrimitiveType}}
             }
-            {{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}for( auto& item : json.as_object() )
+            {{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}for( auto& localVarItem : localVarJson.as_object() )
             {
-                {{#vendorExtensions.x-codegen-response.items.isPrimitiveType}}result[item.first] = ModelBase::{{vendorExtensions.x-codegen-response.items.datatype}}FromJson(item.second);
-                {{/vendorExtensions.x-codegen-response.items.isPrimitiveType}}{{^vendorExtensions.x-codegen-response.items.isPrimitiveType}}{{#vendorExtensions.x-codegen-response.items.isString}}result[item.first] = ModelBase::stringFromJson(item.second);
-                {{/vendorExtensions.x-codegen-response.items.isString}}{{^vendorExtensions.x-codegen-response.items.isString}}{{{vendorExtensions.x-codegen-response.items.datatype}}} itemObj({{{vendorExtensions.x-codegen-response.items.defaultValue}}});
-                itemObj->fromJson(item.second);
-                result[item.first] = itemObj;
+                {{#vendorExtensions.x-codegen-response.items.isPrimitiveType}}localVarResult[localVarItem.first] = ModelBase::{{vendorExtensions.x-codegen-response.items.datatype}}FromJson(localVarItem.second);
+                {{/vendorExtensions.x-codegen-response.items.isPrimitiveType}}{{^vendorExtensions.x-codegen-response.items.isPrimitiveType}}{{#vendorExtensions.x-codegen-response.items.isString}}localVarResult[localVarItem.first] = ModelBase::stringFromJson(localVarItem.second);
+                {{/vendorExtensions.x-codegen-response.items.isString}}{{^vendorExtensions.x-codegen-response.items.isString}}{{{vendorExtensions.x-codegen-response.items.datatype}}} localVarItemObj({{{vendorExtensions.x-codegen-response.items.defaultValue}}});
+                localVarItemObj->fromJson(localVarItem.second);
+                localVarResult[localVarItem.first] = localVarItemObj;
                 {{/vendorExtensions.x-codegen-response.items.isString}}{{/vendorExtensions.x-codegen-response.items.isPrimitiveType}}
             }
-            {{/isMapContainer}}{{^isMapContainer}}{{#vendorExtensions.x-codegen-response.isPrimitiveType}}{{#vendorExtensions.x-codegen-response.items.datatype}}result = ModelBase::{{vendorExtensions.x-codegen-response.items.datatype}}FromJson(json);
-            {{/vendorExtensions.x-codegen-response.items.datatype}}{{^vendorExtensions.x-codegen-response.items.datatype}}result = ModelBase::{{vendorExtensions.x-codegen-response.datatype}}FromJson(json);
-            {{/vendorExtensions.x-codegen-response.items.datatype}}{{/vendorExtensions.x-codegen-response.isPrimitiveType}}{{^vendorExtensions.x-codegen-response.isPrimitiveType}}{{#vendorExtensions.x-codegen-response.isString}}result = ModelBase::stringFromJson(json);
-            {{/vendorExtensions.x-codegen-response.isString}}{{^vendorExtensions.x-codegen-response.isString}}result->fromJson(json);{{/vendorExtensions.x-codegen-response.isString}}{{/vendorExtensions.x-codegen-response.isPrimitiveType}}{{/isMapContainer}}{{/isListContainer}}
+            {{/isMapContainer}}{{^isMapContainer}}{{#vendorExtensions.x-codegen-response.isPrimitiveType}}{{#vendorExtensions.x-codegen-response.items.datatype}}localVarResult = ModelBase::{{vendorExtensions.x-codegen-response.items.datatype}}FromJson(localVarJson);
+            {{/vendorExtensions.x-codegen-response.items.datatype}}{{^vendorExtensions.x-codegen-response.items.datatype}}localVarResult = ModelBase::{{vendorExtensions.x-codegen-response.datatype}}FromJson(localVarJson);
+            {{/vendorExtensions.x-codegen-response.items.datatype}}{{/vendorExtensions.x-codegen-response.isPrimitiveType}}{{^vendorExtensions.x-codegen-response.isPrimitiveType}}{{#vendorExtensions.x-codegen-response.isString}}localVarResult = ModelBase::stringFromJson(localVarJson);
+            {{/vendorExtensions.x-codegen-response.isString}}{{^vendorExtensions.x-codegen-response.isString}}localVarResult->fromJson(localVarJson);{{/vendorExtensions.x-codegen-response.isString}}{{/vendorExtensions.x-codegen-response.isPrimitiveType}}{{/isMapContainer}}{{/isListContainer}}
         }{{#vendorExtensions.x-codegen-response.isString}}
-        else if(responseHttpContentType == utility::conversions::to_string_t("text/plain"))
+        else if(localVarResponseHttpContentType == utility::conversions::to_string_t("text/plain"))
         {
-            result = response;
+            localVarResult = localVarResponse;
         }{{/vendorExtensions.x-codegen-response.isString}}
-        // else if(responseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
+        // else if(localVarResponseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
         // {
         // TODO multipart response parsing
         // }
@@ -351,7 +351,7 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
                 , utility::conversions::to_string_t("error calling {{operationId}}: unsupported response type"));
         }
 
-        return result;
+        return localVarResult;
         {{/returnType}}
         {{/vendorExtensions.x-codegen-response-ishttpcontent}}
     });
diff --git a/modules/openapi-generator/src/main/resources/erlang-client/api.mustache b/modules/openapi-generator/src/main/resources/erlang-client/api.mustache
index c292cf28aa3..a2335745bbb 100644
--- a/modules/openapi-generator/src/main/resources/erlang-client/api.mustache
+++ b/modules/openapi-generator/src/main/resources/erlang-client/api.mustache
@@ -22,9 +22,9 @@
 
     Method = {{httpMethod}},
     Path = ["{{{replacedPathName}}}"],
-    QS = {{#queryParams.isEmpty}}[]{{/queryParams.isEmpty}}{{^queryParams.isEmpty}}lists:flatten([{{#queryParams}}{{#required}}{{^-first}}, {{/-first}}{{#qsEncode}}{{this}}{{/qsEncode}}{{/required}}{{/queryParams}}])++{{packageName}}_utils:optional_params([{{#queryParams}}{{^required}}{{^-first}}, {{/-first}}'{{baseName}}'{{/required}}{{/queryParams}}], _OptionalParams){{/queryParams.isEmpty}},
-    Headers = {{#headerParams.isEmpty}}[]{{/headerParams.isEmpty}}{{^headerParams.isEmpty}}[{{#headerParams}}{{#required}}{{^-first}}, {{/-first}}{<<"{{baseName}}">>, {{paramName}}}{{/required}}{{/headerParams}}]++{{packageName}}_utils:optional_params([{{#headerParams}}{{^required}}{{^-first}}, {{/-first}}'{{baseName}}'{{/required}}{{/headerParams}}], _OptionalParams){{/headerParams.isEmpty}},
-    Body1 = {{^formParams.isEmpty}}{form, [{{#formParams}}{{#required}}{{^-first}}, {{/-first}}{<<"{{baseName}}">>, {{paramName}}}{{/required}}{{/formParams}}]++{{packageName}}_utils:optional_params([{{#formParams}}{{^required}}{{^-first}}, {{/-first}}'{{baseName}}'{{/required}}{{/formParams}}], _OptionalParams)}{{/formParams.isEmpty}}{{#formParams.isEmpty}}{{#bodyParams.isEmpty}}[]{{/bodyParams.isEmpty}}{{^bodyParams.isEmpty}}{{#bodyParams}}{{paramName}}{{/bodyParams}}{{/bodyParams.isEmpty}}{{/formParams.isEmpty}},
+    QS = {{#queryParams.isEmpty}}[]{{/queryParams.isEmpty}}{{^queryParams.isEmpty}}lists:flatten([{{#joinWithComma}}{{#queryParams}}{{#required}}{{#qsEncode}}{{this}}{{/qsEncode}}  {{/required}}{{/queryParams}}{{/joinWithComma}}])++{{packageName}}_utils:optional_params([{{#joinWithComma}}{{#queryParams}}{{^required}}  '{{baseName}}'{{/required}}{{/queryParams}}{{/joinWithComma}}], _OptionalParams){{/queryParams.isEmpty}},
+    Headers = {{#headerParams.isEmpty}}[]{{/headerParams.isEmpty}}{{^headerParams.isEmpty}}[{{#headerParams}}{{#required}}  {<<"{{baseName}}">>, {{paramName}}}{{/required}}{{/headerParams}}]++{{packageName}}_utils:optional_params([{{#joinWithComma}}{{#headerParams}}{{^required}}  '{{baseName}}'{{/required}}{{/headerParams}}{{/joinWithComma}}], _OptionalParams){{/headerParams.isEmpty}},
+    Body1 = {{^formParams.isEmpty}}{form, [{{#joinWithComma}}{{#formParams}}{{#required}}  {<<"{{baseName}}">>, {{paramName}}}{{/required}}{{/formParams}}{{/joinWithComma}}]++{{packageName}}_utils:optional_params([{{#joinWithComma}}{{#formParams}}{{^required}}  '{{baseName}}'{{/required}}{{/formParams}}{{/joinWithComma}}], _OptionalParams)}{{/formParams.isEmpty}}{{#formParams.isEmpty}}{{#bodyParams.isEmpty}}[]{{/bodyParams.isEmpty}}{{^bodyParams.isEmpty}}{{#bodyParams}}{{paramName}}{{/bodyParams}}{{/bodyParams.isEmpty}}{{/formParams.isEmpty}},
     ContentTypeHeader = {{packageName}}_utils:select_header_content_type([{{#consumes}}{{^-first}}, {{/-first}}<<"{{mediaType}}">>{{/consumes}}]),
     Opts = maps:get(hackney_opts, Optional, []),
 
diff --git a/modules/openapi-generator/src/main/resources/go/model.mustache b/modules/openapi-generator/src/main/resources/go/model.mustache
index f669ec2c2bb..4243daa4e2d 100644
--- a/modules/openapi-generator/src/main/resources/go/model.mustache
+++ b/modules/openapi-generator/src/main/resources/go/model.mustache
@@ -35,7 +35,7 @@ type {{classname}} struct {
 {{#description}}
 	// {{{description}}}
 {{/description}}
-	{{name}} {{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}"{{/withXml}}`
+	{{name}} {{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}`
 {{/vars}}
 }
 {{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/queryParams.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/queryParams.mustache
index 182152c6e5a..97e90bafefe 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{>optionalDataType}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}) {{>optionalDataType}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/lumen/.gitignore b/modules/openapi-generator/src/main/resources/lumen/.gitignore
new file mode 100644
index 00000000000..390a8878ede
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/lumen/.gitignore
@@ -0,0 +1,8 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-laravel/.gitignore b/modules/openapi-generator/src/main/resources/php-laravel/.gitignore
new file mode 100644
index 00000000000..286a6119198
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-laravel/.gitignore
@@ -0,0 +1,19 @@
+# ref: https://github.com/github/gitignore/blob/master/Laravel.gitignore
+
+vendor/
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# Laravel 4 specific
+bootstrap/compiled.php
+app/storage/
+
+# Laravel 5 & Lumen specific
+public/storage
+public/hot
+storage/*.key
+.env
+Homestead.yaml
+Homestead.json
+/.vagrant
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-silex/.gitignore b/modules/openapi-generator/src/main/resources/php-silex/.gitignore
new file mode 100644
index 00000000000..390a8878ede
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-silex/.gitignore
@@ -0,0 +1,8 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/.gitignore b/modules/openapi-generator/src/main/resources/php-slim-server/.gitignore
index 23a42ca8d8a..390a8878ede 100644
--- a/modules/openapi-generator/src/main/resources/php-slim-server/.gitignore
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/.gitignore
@@ -1,3 +1,5 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
 composer.phar
 /vendor/
 
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/.htaccess b/modules/openapi-generator/src/main/resources/php-slim-server/.htaccess
index e47b5fb8a0c..f6a2ceb3952 100644
--- a/modules/openapi-generator/src/main/resources/php-slim-server/.htaccess
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/.htaccess
@@ -1,5 +1,6 @@
 <IfModule mod_rewrite.c>
     RewriteEngine On
     RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^(.*)$ index.php?_url=/$1 [QSA,L]
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule ^ index.php [QSA,L]
 </IfModule>
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-slim-server/README.mustache b/modules/openapi-generator/src/main/resources/php-slim-server/README.mustache
index e7b73f219bf..c8375231584 100644
--- a/modules/openapi-generator/src/main/resources/php-slim-server/README.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim-server/README.mustache
@@ -1,22 +1,77 @@
-# OpenAPI generated server
+# {{packageName}} - PHP Slim Server library for {{appName}}
 
-## Overview
-This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the
-[OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub.  This
-is an example of building a PHP Slim server.
+[Slim Framework Documentation](https://www.slimframework.com/docs/)
 
-This example uses the [Slim Framework](http://www.slimframework.com/).  To see how to make this your own, please take a look at the template here:
+## Requirements
 
-[TEMPLATES](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/resources/php-slim-server/)
+* Web server with URL rewriting
+* PHP 5.5 or newer
+
+This package contains `.htaccess` for Apache configuration.
+If you use another server(Nginx, HHVM, IIS, lighttpd) check out [Web Servers](https://www.slimframework.com/docs/v3/start/web-servers.html) doc.
+
+## Installation via [Composer](https://getcomposer.org/)
+
+Navigate into your project's root directory and execute the bash command shown below.
+This command downloads the Slim Framework and its third-party dependencies into your project's `vendor/` directory.
+```bash
+$ composer install
+```
+
+## Start devserver
+
+Run the following command in terminal to start localhost web server, assuming `./php-slim-server/` is public-accessible directory with `index.php` file:
+```bash
+$ php -S localhost:8888 -t php-slim-server
+```
+> **Warning** This web server was designed to aid application development.
+> It may also be useful for testing purposes or for application demonstrations that are run in controlled environments.
+> It is not intended to be a full-featured web server. It should not be used on a public network.
+
+## Run tests
+
+This package uses PHPUnit 4.8 for unit testing.
+[Test folder]({{testBasePath}}) contains templates which you can fill with real test assertions.
+How to write tests read at [PHPUnit Manual - Chapter 2. Writing Tests for PHPUnit](https://phpunit.de/manual/4.8/en/writing-tests-for-phpunit.html).
+
+Command | Tool | Target
+---- | ---- | ----
+`$ composer test` | PHPUnit | All tests
+`$ composer run test-apis` | PHPUnit | Apis tests
+`$ composer run test-models` | PHPUnit | Models tests
+
+{{#generateApiDocs}}
+## API Endpoints
+
+All URIs are relative to *{{{basePath}}}*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | **{{operationId}}** | **{{httpMethod}}** {{path}} | {{#summary}}{{{summary}}}{{/summary}}
+{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+{{/generateApiDocs}}
+
+{{#generateModelDocs}}
+## Models
+
+{{#modelPackage}}
+{{#models}}{{#model}}* {{{modelPackage}}}\{{{classname}}}
+{{/model}}{{/models}}
+{{/modelPackage}}
+{{^modelPackage}}
+No model defined in this package
+{{/modelPackage}}
+{{/generateModelDocs}}
 
 {{#authMethods}}
 {{^hasMore}}
 ## Authentication
+
 {{/hasMore}}
 {{/authMethods}}
 {{#authMethods}}
 {{#isBasic}}
-> Important! To make Basic Authentication work you need to implement `authenticator` function in [SlimRouter]({{srcBasePath}}/SlimRouter.php) class.  
-> Documentation [tuupola/slim-basic-auth](https://github.com/tuupola/slim-basic-auth)
+> Important! To make Basic Authentication work you need to implement `authenticator` function in [SlimRouter]({{srcBasePath}}/SlimRouter.php) class.
+> Documentation [tuupola/slim-basic-auth](https://github.com/tuupola/slim-basic-auth#readme)
 {{/isBasic}}
 {{/authMethods}}
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/.gitignore b/modules/openapi-generator/src/main/resources/php-symfony/.gitignore
new file mode 100644
index 00000000000..20b7b989760
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-symfony/.gitignore
@@ -0,0 +1,54 @@
+# ref: https://github.com/github/gitignore/blob/master/Symfony.gitignore
+
+# Cache and logs (Symfony2)
+/app/cache/*
+/app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
+
+# Email spool folder
+/app/spool/*
+
+# Cache, session files and logs (Symfony3)
+/var/cache/*
+/var/logs/*
+/var/sessions/*
+!var/cache/.gitkeep
+!var/logs/.gitkeep
+!var/sessions/.gitkeep
+
+# Parameters
+/app/config/parameters.yml
+/app/config/parameters.ini
+
+# Managed by Composer
+/app/bootstrap.php.cache
+/var/bootstrap.php.cache
+/bin/*
+!bin/console
+!bin/symfony_requirements
+/vendor/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
+
+# Build data
+/build/
+
+# Composer PHAR
+/composer.phar
+
+# Backup entities generated with doctrine:generate:entities command
+**/Entity/*~
+
+# Embedded web-server pid file
+/.web-server-pid
+
+# From root gitignore
+/Tests/cache/
+/Tests/logs/
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache
index 69ac276f6c1..3c623d307b5 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache
@@ -25,7 +25,7 @@
         "ext-mbstring": "*",
         "symfony/validator": "*",
         "jms/serializer-bundle": "*",
-        "symfony/framework-bundle": "^2.3|^3.0"
+        "symfony/framework-bundle": "^2.3|^3.0|^4.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8",
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/services.mustache b/modules/openapi-generator/src/main/resources/php-symfony/services.mustache
index 6d61563c32d..f28cde4d73f 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/services.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/services.mustache
@@ -14,10 +14,10 @@ services:
         class: {{modelPackage}}\ModelSerializer
 
     {{bundleAlias}}.service.serializer:
-        class: %{{bundleAlias}}.serializer%
+        class: '%{{bundleAlias}}.serializer%'
 
     {{bundleAlias}}.service.validator:
-        class: %{{bundleAlias}}.validator%
+        class: '%{{bundleAlias}}.validator%'
 
 {{#apiInfo}}
 {{#apis}}
diff --git a/modules/openapi-generator/src/main/resources/php/.gitignore b/modules/openapi-generator/src/main/resources/php/.gitignore
new file mode 100644
index 00000000000..edcf63f6aee
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php/.gitignore
@@ -0,0 +1,8 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+composer.lock
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/swift4/AlamofireImplementations.mustache b/modules/openapi-generator/src/main/resources/swift4/AlamofireImplementations.mustache
index 280b4e53389..2ade78f5a61 100644
--- a/modules/openapi-generator/src/main/resources/swift4/AlamofireImplementations.mustache
+++ b/modules/openapi-generator/src/main/resources/swift4/AlamofireImplementations.mustache
@@ -17,8 +17,37 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
     }
 }
 
+private struct SynchronizedDictionary<K: Hashable, V> {
+
+     private var dictionary = [K: V]()
+     private let queue = DispatchQueue(
+         label: "SynchronizedDictionary",
+         qos: DispatchQoS.userInitiated,
+         attributes: [DispatchQueue.Attributes.concurrent],
+         autoreleaseFrequency: DispatchQueue.AutoreleaseFrequency.inherit,
+         target: nil
+     )
+
+     public subscript(key: K) -> V? {
+         get {
+             var value: V?
+
+             queue.sync {
+                 value = self.dictionary[key]
+             }
+
+             return value
+         }
+         set {
+             queue.sync(flags: DispatchWorkItemFlags.barrier) {
+                 self.dictionary[key] = newValue
+             }
+         }
+     }
+ }
+
 // Store manager to retain its reference
-private var managerStore: [String: Alamofire.SessionManager] = [:]
+private var managerStore = SynchronizedDictionary<String, Alamofire.SessionManager>()
 
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
     required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
@@ -112,7 +141,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         }
 
         let cleanupRequest = {
-            _ = managerStore.removeValue(forKey: managerId)
+            managerStore[managerId] = nil
         }
 
         let validatedRequest = request.validate()
@@ -314,7 +343,7 @@ open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilde
         }
 
         let cleanupRequest = {
-            _ = managerStore.removeValue(forKey: managerId)
+            managerStore[managerId] = nil
         }
 
         let validatedRequest = request.validate()
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache
index c701faf6be6..ad56f190c41 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache
@@ -11,10 +11,10 @@ npm run build
 ### publishing
 
 {{#useNgPackagr}}
-First build the package than run ```npm publish dist``` (don't forget to specify the `dist` folder!)
+First build the package then run ```npm publish dist``` (don't forget to specify the `dist` folder!)
 {{/useNgPackagr}}
 {{^useNgPackagr}}
-First build the package than run ```npm publish```
+First build the package then run ```npm publish```
 {{/useNgPackagr}}
 
 ### consuming
@@ -190,4 +190,4 @@ import { environment } from '../environments/environment';
   bootstrap: [ AppComponent ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```  
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/api.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/api.mustache
index d791ace1d7a..f6da696178d 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/api.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/api.mustache
@@ -102,7 +102,11 @@ export const {{classname}}FetchParamCreator = function (configuration?: Configur
             const localVarPath = `{{{path}}}`{{#pathParams}}
                 .replace(`{${"{{baseName}}"}}`, encodeURIComponent(String({{paramName}}))){{/pathParams}};
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: '{{httpMethod}}' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: '{{httpMethod}}' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
     {{#hasFormParams}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/configuration.mustache
index 5614b839645..777f4fa1a2b 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/configuration.mustache
@@ -7,6 +7,7 @@ export interface ConfigurationParameters {
     password?: string;
     accessToken?: string | ((name: string, scopes?: string[]) => string);
     basePath?: string;
+    baseOptions?: any;
 }
 
 export class Configuration {
@@ -44,6 +45,13 @@ export class Configuration {
      * @memberof Configuration
      */
     basePath?: string;
+    /**
+     * base options for fetch calls
+     *
+     * @type {any}
+     * @memberof Configuration
+     */
+    baseOptions?: any;
 
     constructor(param: ConfigurationParameters = {}) {
         this.apiKey = param.apiKey;
diff --git a/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache b/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache
index 71678eada2b..182f2f09b37 100644
--- a/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache
@@ -238,7 +238,7 @@ export class {{classname}} {
         >();
         $.ajax(requestOptions).then(
             (data: {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}any{{/returnType}}, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/.gitignore b/modules/openapi-generator/src/main/resources/ze-ph/.gitignore
new file mode 100644
index 00000000000..be88ab49679
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/ze-ph/.gitignore
@@ -0,0 +1,26 @@
+# ref: https://github.com/github/gitignore/blob/master/ZendFramework.gitignore
+
+# Composer files
+composer.phar
+vendor/
+
+# Local configs
+config/autoload/*.local.php
+
+# Binary gettext files
+*.mo
+
+# Data
+data/logs/
+data/cache/
+data/sessions/
+data/tmp/
+temp/
+
+#Doctrine 2
+data/DoctrineORMModule/Proxy/
+data/DoctrineORMModule/cache/
+
+# Legacy ZF1
+demos/
+extras/documentation
\ No newline at end of file
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/AbstractOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/AbstractOptionsTest.java
index c9a98d66f58..ee7b4f9b38d 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/AbstractOptionsTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/AbstractOptionsTest.java
@@ -30,6 +30,7 @@ import org.testng.annotations.Test;
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 public abstract class AbstractOptionsTest {
@@ -58,12 +59,12 @@ public abstract class AbstractOptionsTest {
         final Set<String> skipped = new HashSet<String>(cliOptions);
         skipped.removeAll(testOptions);
         if (!skipped.isEmpty()) {
-            Assert.fail(String.format("These options weren't checked: %s.", StringUtils.join(skipped, ", ")));
+            Assert.fail(String.format(Locale.ROOT, "These options weren't checked: %s.", StringUtils.join(skipped, ", ")));
         }
         final Set<String> undocumented = new HashSet<String>(testOptions);
         undocumented.removeAll(cliOptions);
         if (!undocumented.isEmpty()) {
-            Assert.fail(String.format("These options weren't documented: %s. Are you expecting base options and calling cliOptions.clear()?", StringUtils.join(undocumented, ", ")));
+            Assert.fail(String.format(Locale.ROOT,"These options weren't documented: %s. Are you expecting base options and calling cliOptions.clear()?", StringUtils.join(undocumented, ", ")));
         }
     }
 
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
index 7a6fc2e0ae4..2666cc2c6dd 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
@@ -208,9 +208,7 @@ public class DefaultCodegenTest {
 
         };
 
-        Method method = DefaultCodegen.class.getDeclaredMethod("getAllAliases", Map.class);
-        method.setAccessible(true);
-        Map<String, String> aliases = (Map<String, String>)method.invoke(null, schemas);
+        Map<String, String> aliases = DefaultCodegen.getAllAliases(schemas);
 
         Assert.assertEquals(aliases.size(), 0);
     }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
index 94f4aa7c05c..ac37ef22731 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
@@ -31,20 +31,12 @@ import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.parameters.RequestBody;
+import io.swagger.v3.oas.models.responses.ApiResponse;
 import io.swagger.v3.parser.core.models.ParseOptions;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 
-import org.openapitools.codegen.ClientOptInput;
-import org.openapitools.codegen.CodegenConstants;
-import org.openapitools.codegen.CodegenModel;
-import org.openapitools.codegen.CodegenModelFactory;
-import org.openapitools.codegen.CodegenModelType;
-import org.openapitools.codegen.CodegenOperation;
-import org.openapitools.codegen.CodegenParameter;
-import org.openapitools.codegen.CodegenProperty;
-import org.openapitools.codegen.MockDefaultGenerator;
+import org.openapitools.codegen.*;
 import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile;
-import org.openapitools.codegen.TestUtils;
 import org.openapitools.codegen.config.CodegenConfigurator;
 import org.openapitools.codegen.languages.JavaClientCodegen;
 import org.openapitools.codegen.utils.ModelUtils;
@@ -307,6 +299,49 @@ public class JavaClientCodegenTest {
         output.deleteOnExit();
     }
 
+    @Test
+    public void testReferencedHeader() {
+        final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/issue855.yaml", null, new ParseOptions()).getOpenAPI();
+        JavaClientCodegen codegen = new JavaClientCodegen();
+
+        ApiResponse ok_200 = openAPI.getComponents().getResponses().get("OK_200");
+        CodegenResponse response = codegen.fromResponse(openAPI, "200", ok_200);
+
+        Assert.assertEquals(1, response.headers.size());
+        CodegenProperty header = response.headers.get(0);
+        Assert.assertEquals("UUID", header.dataType);
+        Assert.assertEquals("Request", header.baseName);
+    }
+
+    @Test
+    public void testFreeFormObjects() {
+        final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/issue796.yaml", null, new ParseOptions()).getOpenAPI();
+        JavaClientCodegen codegen = new JavaClientCodegen();
+
+        Schema test1 = openAPI.getComponents().getSchemas().get("MapTest1");
+        CodegenModel cm1 = codegen.fromModel("MapTest1", test1, openAPI.getComponents().getSchemas());
+        Assert.assertEquals(cm1.getDataType(), "Map");
+        Assert.assertEquals(cm1.getParent(), "HashMap<String, Object>");
+        Assert.assertEquals(cm1.getClassname(), "MapTest1");
+
+        Schema test2 = openAPI.getComponents().getSchemas().get("MapTest2");
+        CodegenModel cm2 = codegen.fromModel("MapTest2", test2, openAPI.getComponents().getSchemas());
+        Assert.assertEquals(cm2.getDataType(), "Map");
+        Assert.assertEquals(cm2.getParent(), "HashMap<String, Object>");
+        Assert.assertEquals(cm2.getClassname(), "MapTest2");
+
+        Schema test3 = openAPI.getComponents().getSchemas().get("MapTest3");
+        CodegenModel cm3 = codegen.fromModel("MapTest3", test3, openAPI.getComponents().getSchemas());
+        Assert.assertEquals(cm3.getDataType(), "Map");
+        Assert.assertEquals(cm3.getParent(), "HashMap<String, Object>");
+        Assert.assertEquals(cm3.getClassname(), "MapTest3");
+
+        Schema other = openAPI.getComponents().getSchemas().get("OtherObj");
+        CodegenModel cm = codegen.fromModel("OtherObj", other, openAPI.getComponents().getSchemas());
+        Assert.assertEquals(cm.getDataType(), "Object");
+        Assert.assertEquals(cm.getClassname(), "OtherObj");
+    }
+
     private void ensureContainsFile(Map<String, String> generatedFiles, File root, String filename) {
         File file = new File(root, filename);
         String absoluteFilename = file.getAbsolutePath().replace("\\", "/");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java
index 6f7bb58ff43..a0c5a326ead 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java
@@ -23,6 +23,7 @@ import org.openapitools.codegen.languages.RubyClientCodegen;
 
 import io.swagger.parser.OpenAPIParser;
 import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.parser.core.models.ParseOptions;
 
 import org.apache.commons.io.FileUtils;
@@ -169,4 +170,61 @@ public class RubyClientCodegenTest {
         Assert.assertEquals(bp.example, "OnlinePetstore::Pet.new");
     }
 
+
+    @Test(description = "test nullable for properties")
+    public void nullableTest() {
+        final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/petstore_oas3_test.yaml", null, new ParseOptions()).getOpenAPI();
+        final RubyClientCodegen codegen = new RubyClientCodegen();
+        codegen.setModuleName("OnlinePetstore");
+        final String path = "/pet";
+
+        final Schema schema = openAPI.getComponents().getSchemas().get("NullablePet");
+        CodegenModel nullablePet = codegen.fromModel("NullablePet", schema, openAPI.getComponents().getSchemas());
+        CodegenProperty cp0 = nullablePet.getVars().get(0);
+        Assert.assertTrue(cp0.isNullable);
+
+        CodegenProperty cp1 = nullablePet.getVars().get(1);
+        Assert.assertFalse(cp1.isNullable);
+
+        CodegenProperty cp2 = nullablePet.getVars().get(2);
+        Assert.assertTrue(cp2.isNullable);
+
+        CodegenProperty cp3 = nullablePet.getVars().get(3);
+        Assert.assertTrue(cp3.isNullable);
+
+        CodegenProperty cp4 = nullablePet.getVars().get(4);
+        Assert.assertFalse(cp4.isNullable);
+
+        CodegenProperty cp5 = nullablePet.getVars().get(5);
+        Assert.assertTrue(cp5.isNullable);
+    }
+
+    @Test(description = "test properties without nullable")
+    public void propertiesWithoutNullableTest() {
+        final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/petstore_oas3_test.yaml", null, new ParseOptions()).getOpenAPI();
+        final RubyClientCodegen codegen = new RubyClientCodegen();
+        codegen.setModuleName("OnlinePetstore");
+        final String path = "/pet";
+
+        final Schema schema = openAPI.getComponents().getSchemas().get("Pet");
+        CodegenModel nullablePet = codegen.fromModel("Pet", schema, openAPI.getComponents().getSchemas());
+        CodegenProperty cp0 = nullablePet.getVars().get(0);
+        Assert.assertFalse(cp0.isNullable);
+
+        CodegenProperty cp1 = nullablePet.getVars().get(1);
+        Assert.assertFalse(cp1.isNullable);
+
+        CodegenProperty cp2 = nullablePet.getVars().get(2);
+        Assert.assertFalse(cp2.isNullable);
+
+        CodegenProperty cp3 = nullablePet.getVars().get(3);
+        Assert.assertFalse(cp3.isNullable);
+
+        CodegenProperty cp4 = nullablePet.getVars().get(4);
+        Assert.assertFalse(cp4.isNullable);
+
+        CodegenProperty cp5 = nullablePet.getVars().get(5);
+        Assert.assertFalse(cp5.isNullable);
+    }
+
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/AssertFile.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/AssertFile.java
index a34f056497f..68f1b2a2bde 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/AssertFile.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/testutils/AssertFile.java
@@ -28,6 +28,7 @@ import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 
 import difflib.Delta;
 import difflib.DiffUtils;
@@ -71,7 +72,7 @@ public class AssertFile {
                     Path actualDir = absoluteActual.resolve(relativeExpectedDir);
 
                     if (!Files.exists(actualDir)) {
-                        fail(String.format("Directory '%s' is missing.", actualDir));
+                        fail(String.format(Locale.ROOT,"Directory '%s' is missing.", actualDir));
                     }
 
                     String[] expected = expectedDir.toFile().list();
@@ -86,7 +87,7 @@ public class AssertFile {
 
                     assertEquals(expected,
                             actual,
-                            String.format("Directory content of '%s' and '%s' differ.", expectedDir, actualDir));
+                            String.format(Locale.ROOT, "Directory content of '%s' and '%s' differ.", expectedDir, actualDir));
 
                     return FileVisitResult.CONTINUE;
                 }
@@ -97,7 +98,7 @@ public class AssertFile {
                     Path actualFile = absoluteActual.resolve(relativeExpectedFile);
 
                     if (!Files.exists(actualFile)) {
-                        fail(String.format("File '%s' is missing.", actualFile));
+                        fail(String.format(Locale.ROOT, "File '%s' is missing.", actualFile));
                     }
 
                     assertFilesAreEqual(expectedFile, actualFile);
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue796.yaml b/modules/openapi-generator/src/test/resources/3_0/issue796.yaml
new file mode 100644
index 00000000000..4b3103ec08a
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/issue796.yaml
@@ -0,0 +1,37 @@
+openapi: 3.0.1
+info:
+  title: Issue 796
+  license:
+    name: Apache-2.0
+    url: http://www.apache.org/licenses/LICENSE-2.0.html
+  version: 1.0.0
+servers:
+- url: http://localhost:123/api
+paths:
+  /test:
+    get:
+      tags:
+      - test
+      responses:
+        201:
+          description: Successful response
+components:
+  schemas:
+    MapTest1:
+      type: object
+      description: This type example 1
+      additionalProperties: {}
+    MapTest2:
+      type: object
+      description: This type example 2
+      additionalProperties: true
+    MapTest3:
+      type: object
+      description: This type example 3
+      additionalProperties:
+        type: object
+    OtherObj:
+      type: object
+      description: This type example 4
+      additionalProperties: false
+
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue855.yaml b/modules/openapi-generator/src/test/resources/3_0/issue855.yaml
new file mode 100644
index 00000000000..7ef2d00348f
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/issue855.yaml
@@ -0,0 +1,29 @@
+openapi: 3.0.1
+info:
+  title: Issue 855 example
+  version: 1.0.0
+components:
+  headers:
+    Request:
+      description: ID of the request, unique to the call, as determined by the initiating party.
+      required: true
+      example: "99391c7e-ad88-49ec-a2ad-99ddcb1f7721"
+      schema:
+        type: string
+        format: uuid
+
+  responses:
+    OK_200:
+      description: OK
+      headers:
+        Request:
+          $ref: "#/components/headers/Request"
+
+paths:
+  /ping:
+    get:
+      summary: Get Payment Information
+      description: Returns the content of a payment object
+      responses:
+        '200':
+          $ref: "#/components/responses/OK_200"
\ No newline at end of file
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml
new file mode 100644
index 00000000000..c9c83e09a6b
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore_oas3_test.yaml
@@ -0,0 +1,741 @@
+openapi: 3.0.0
+servers:
+  - url: 'http://petstore.swagger.io/v2'
+info:
+  description: >-
+    A test spec based on the Petstore spec with OAS3 related test cases such as nullable
+  version: 1.0.0
+  title: OpenAPI Petstore
+  license:
+    name: Apache-2.0
+    url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
+tags:
+  - name: pet
+    description: Everything about your Pets
+  - name: store
+    description: Access to Petstore orders
+  - name: user
+    description: Operations about user
+paths:
+  /pet:
+    post:
+      tags:
+        - pet
+      summary: Add a new pet to the store
+      description: ''
+      operationId: addPet
+      responses:
+        '405':
+          description: Invalid input
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      requestBody:
+        $ref: '#/components/requestBodies/Pet'
+    put:
+      tags:
+        - pet
+      summary: Update an existing pet
+      description: ''
+      operationId: updatePet
+      responses:
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Pet not found
+        '405':
+          description: Validation exception
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      requestBody:
+        $ref: '#/components/requestBodies/Pet'
+  /pet/findByStatus:
+    get:
+      tags:
+        - pet
+      summary: Finds Pets by status
+      description: Multiple status values can be provided with comma separated strings
+      operationId: findPetsByStatus
+      parameters:
+        - name: status
+          in: query
+          description: Status values that need to be considered for filter
+          required: true
+          style: form
+          explode: false
+          schema:
+            type: array
+            items:
+              type: string
+              enum:
+                - available
+                - pending
+                - sold
+              default: available
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Pet'
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Pet'
+        '400':
+          description: Invalid status value
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  /pet/findByTags:
+    get:
+      tags:
+        - pet
+      summary: Finds Pets by tags
+      description: >-
+        Multiple tags can be provided with comma separated strings. Use tag1,
+        tag2, tag3 for testing.
+      operationId: findPetsByTags
+      parameters:
+        - name: tags
+          in: query
+          description: Tags to filter by
+          required: true
+          style: form
+          explode: false
+          schema:
+            type: array
+            items:
+              type: string
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Pet'
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Pet'
+        '400':
+          description: Invalid tag value
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      deprecated: true
+  '/pet/{petId}':
+    get:
+      tags:
+        - pet
+      summary: Find pet by ID
+      description: Returns a single pet
+      operationId: getPetById
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to return
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Pet'
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Pet not found
+      security:
+        - api_key: []
+    post:
+      tags:
+        - pet
+      summary: Updates a pet in the store with form data
+      description: ''
+      operationId: updatePetWithForm
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet that needs to be updated
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '405':
+          description: Invalid input
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      requestBody:
+        content:
+          application/x-www-form-urlencoded:
+            schema:
+              type: object
+              properties:
+                name:
+                  description: Updated name of the pet
+                  type: string
+                status:
+                  description: Updated status of the pet
+                  type: string
+    delete:
+      tags:
+        - pet
+      summary: Deletes a pet
+      description: ''
+      operationId: deletePet
+      parameters:
+        - name: api_key
+          in: header
+          required: false
+          schema:
+            type: string
+        - name: petId
+          in: path
+          description: Pet id to delete
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '400':
+          description: Invalid pet value
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  '/pet/{petId}/uploadImage':
+    post:
+      tags:
+        - pet
+      summary: uploads an image
+      description: ''
+      operationId: uploadFile
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to update
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ApiResponse'
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                additionalMetadata:
+                  description: Additional data to pass to server
+                  type: string
+                file:
+                  description: file to upload
+                  type: string
+                  format: binary
+  /store/inventory:
+    get:
+      tags:
+        - store
+      summary: Returns pet inventories by status
+      description: Returns a map of status codes to quantities
+      operationId: getInventory
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                type: object
+                additionalProperties:
+                  type: integer
+                  format: int32
+      security:
+        - api_key: []
+  /store/order:
+    post:
+      tags:
+        - store
+      summary: Place an order for a pet
+      description: ''
+      operationId: placeOrder
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Order'
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+        '400':
+          description: Invalid Order
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+        description: order placed for purchasing the pet
+        required: true
+  '/store/order/{orderId}':
+    get:
+      tags:
+        - store
+      summary: Find purchase order by ID
+      description: >-
+        For valid response try integer IDs with value <= 5 or > 10. Other values
+        will generated exceptions
+      operationId: getOrderById
+      parameters:
+        - name: orderId
+          in: path
+          description: ID of pet that needs to be fetched
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 1
+            maximum: 5
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Order'
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Order not found
+    delete:
+      tags:
+        - store
+      summary: Delete purchase order by ID
+      description: >-
+        For valid response try integer IDs with value < 1000. Anything above
+        1000 or nonintegers will generate API errors
+      operationId: deleteOrder
+      parameters:
+        - name: orderId
+          in: path
+          description: ID of the order that needs to be deleted
+          required: true
+          schema:
+            type: string
+      responses:
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Order not found
+  /user:
+    post:
+      tags:
+        - user
+      summary: Create user
+      description: This can only be done by the logged in user.
+      operationId: createUser
+      responses:
+        default:
+          description: successful operation
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/User'
+        description: Created user object
+        required: true
+  /user/createWithArray:
+    post:
+      tags:
+        - user
+      summary: Creates list of users with given input array
+      description: ''
+      operationId: createUsersWithArrayInput
+      responses:
+        default:
+          description: successful operation
+      requestBody:
+        $ref: '#/components/requestBodies/UserArray'
+  /user/createWithList:
+    post:
+      tags:
+        - user
+      summary: Creates list of users with given input array
+      description: ''
+      operationId: createUsersWithListInput
+      responses:
+        default:
+          description: successful operation
+      requestBody:
+        $ref: '#/components/requestBodies/UserArray'
+  /user/login:
+    get:
+      tags:
+        - user
+      summary: Logs user into the system
+      description: ''
+      operationId: loginUser
+      parameters:
+        - name: username
+          in: query
+          description: The user name for login
+          required: true
+          schema:
+            type: string
+        - name: password
+          in: query
+          description: The password for login in clear text
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: successful operation
+          headers:
+            X-Rate-Limit:
+              description: calls per hour allowed by the user
+              schema:
+                type: integer
+                format: int32
+            X-Expires-After:
+              description: date in UTC when toekn expires
+              schema:
+                type: string
+                format: date-time
+          content:
+            application/xml:
+              schema:
+                type: string
+            application/json:
+              schema:
+                type: string
+        '400':
+          description: Invalid username/password supplied
+  /user/logout:
+    get:
+      tags:
+        - user
+      summary: Logs out current logged in user session
+      description: ''
+      operationId: logoutUser
+      responses:
+        default:
+          description: successful operation
+  '/user/{username}':
+    get:
+      tags:
+        - user
+      summary: Get user by user name
+      description: ''
+      operationId: getUserByName
+      parameters:
+        - name: username
+          in: path
+          description: The name that needs to be fetched. Use user1 for testing.
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/User'
+            application/json:
+              schema:
+                $ref: '#/components/schemas/User'
+        '400':
+          description: Invalid username supplied
+        '404':
+          description: User not found
+    put:
+      tags:
+        - user
+      summary: Updated user
+      description: This can only be done by the logged in user.
+      operationId: updateUser
+      parameters:
+        - name: username
+          in: path
+          description: name that need to be deleted
+          required: true
+          schema:
+            type: string
+      responses:
+        '400':
+          description: Invalid user supplied
+        '404':
+          description: User not found
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/User'
+        description: Updated user object
+        required: true
+    delete:
+      tags:
+        - user
+      summary: Delete user
+      description: This can only be done by the logged in user.
+      operationId: deleteUser
+      parameters:
+        - name: username
+          in: path
+          description: The name that needs to be deleted
+          required: true
+          schema:
+            type: string
+      responses:
+        '400':
+          description: Invalid username supplied
+        '404':
+          description: User not found
+externalDocs:
+  description: Find out more about Swagger
+  url: 'http://swagger.io'
+components:
+  requestBodies:
+    UserArray:
+      content:
+        application/json:
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/User'
+      description: List of user object
+      required: true
+    Pet:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Pet'
+        application/xml:
+          schema:
+            $ref: '#/components/schemas/Pet'
+      description: Pet object that needs to be added to the store
+      required: true
+  securitySchemes:
+    petstore_auth:
+      type: oauth2
+      flows:
+        implicit:
+          authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog'
+          scopes:
+            'write:pets': modify pets in your account
+            'read:pets': read your pets
+    api_key:
+      type: apiKey
+      name: api_key
+      in: header
+  schemas:
+    Order:
+      title: Pet Order
+      description: An order for a pets from the pet store
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        petId:
+          type: integer
+          format: int64
+        quantity:
+          type: integer
+          format: int32
+        shipDate:
+          type: string
+          format: date-time
+        status:
+          type: string
+          description: Order Status
+          enum:
+            - placed
+            - approved
+            - delivered
+        complete:
+          type: boolean
+          default: false
+      xml:
+        name: Order
+    Category:
+      title: Pet category
+      description: A category for a pet
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+      xml:
+        name: Category
+    User:
+      title: a User
+      description: A User who is purchasing from the pet store
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        username:
+          type: string
+        firstName:
+          type: string
+        lastName:
+          type: string
+        email:
+          type: string
+        password:
+          type: string
+        phone:
+          type: string
+        userStatus:
+          type: integer
+          format: int32
+          description: User Status
+      xml:
+        name: User
+    Tag:
+      title: Pet Tag
+      description: A tag for a pet
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+      xml:
+        name: Tag
+    Pet:
+      title: a Pet
+      description: A pet for sale in the pet store
+      type: object
+      required:
+        - name
+        - photoUrls
+      properties:
+        id:
+          type: integer
+          format: int64
+        category:
+          $ref: '#/components/schemas/Category'
+        name:
+          type: string
+          example: doggie
+        photoUrls:
+          type: array
+          xml:
+            name: photoUrl
+            wrapped: true
+          items:
+            type: string
+        tags:
+          type: array
+          xml:
+            name: tag
+            wrapped: true
+          items:
+            $ref: '#/components/schemas/Tag'
+        status:
+          type: string
+          description: pet status in the store
+          enum:
+            - available
+            - pending
+            - sold
+      xml:
+        name: Pet
+    NullablePet:
+      title: a Pet
+      description: A pet for sale in the pet store
+      type: object
+      required:
+        - name
+        - photoUrls
+      properties:
+        id:
+          nullable: true
+          type: integer
+          format: int64
+        category:
+          $ref: '#/components/schemas/Category'
+        name:
+          nullable: true
+          type: string
+          example: doggie
+        photoUrls:
+          nullable: true
+          type: array
+          xml:
+            name: photoUrl
+            wrapped: true
+          items:
+            type: string
+        tags:
+          type: array
+          xml:
+            name: tag
+            wrapped: true
+          items:
+            $ref: '#/components/schemas/Tag'
+        status:
+          nullable: true
+          type: string
+          description: pet status in the store
+          enum:
+            - available
+            - pending
+            - sold
+      xml:
+        name: Pet
+    ApiResponse:
+      title: An uploaded response
+      description: Describes the result of uploading an image resource
+      type: object
+      properties:
+        code:
+          type: integer
+          format: int32
+        type:
+          type: string
+        message:
+          type: string
diff --git a/pom.xml b/pom.xml
index 7458544e86d..7dbe747ac63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,6 +277,33 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>de.thetaphi</groupId>
+                <artifactId>forbiddenapis</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <bundledSignatures>
+                        <!--
+                          This will automatically choose the right
+                          signatures based on 'maven.compiler.target':
+                        -->
+                        <bundledSignature>jdk-unsafe</bundledSignature>
+                        <bundledSignature>jdk-deprecated</bundledSignature>
+                        <bundledSignature>jdk-internal</bundledSignature>
+                        <!-- disallow undocumented classes like sun.misc.Unsafe: -->
+                        <bundledSignature>jdk-non-portable</bundledSignature>
+                        <bundledSignature>jdk-reflection</bundledSignature>
+                    </bundledSignatures>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                            <goal>testCheck</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -1104,6 +1131,8 @@
         </repository>
     </repositories>
     <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <swagger-parser-version>2.0.2-OpenAPITools.org-1</swagger-parser-version>
         <swagger-core-version>2.0.1</swagger-core-version>
         <scala-version>2.11.1</scala-version>
diff --git a/samples/client/petstore-security-test/php/.gitignore b/samples/client/petstore-security-test/php/.gitignore
new file mode 100644
index 00000000000..edcf63f6aee
--- /dev/null
+++ b/samples/client/petstore-security-test/php/.gitignore
@@ -0,0 +1,8 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+composer.lock
\ No newline at end of file
diff --git a/samples/client/petstore-security-test/typescript-fetch/.openapi-generator/VERSION b/samples/client/petstore-security-test/typescript-fetch/.openapi-generator/VERSION
index 855ff9501eb..0f58aa04141 100644
--- a/samples/client/petstore-security-test/typescript-fetch/.openapi-generator/VERSION
+++ b/samples/client/petstore-security-test/typescript-fetch/.openapi-generator/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
\ No newline at end of file
+3.1.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore-security-test/typescript-fetch/api.ts b/samples/client/petstore-security-test/typescript-fetch/api.ts
index d69e2ae751d..f5b4defe68b 100644
--- a/samples/client/petstore-security-test/typescript-fetch/api.ts
+++ b/samples/client/petstore-security-test/typescript-fetch/api.ts
@@ -1,14 +1,14 @@
 /// <reference path="./custom.d.ts" />
 // tslint:disable
 /**
- * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r
+ * OpenAPI Petstore *_/ ' \" =end -- \\r\\n \\n \\r
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end --       
  *
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
- * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
+ * Contact: something@something.abc *_/ ' \" =end -- \\r\\n \\n \\r
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
@@ -17,7 +17,7 @@ import * as url from "url";
 import * as portableFetch from "portable-fetch";
 import { Configuration } from "./configuration";
 
-const BASE_PATH = "https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r".replace(/\/+$/, "");
+const BASE_PATH = "http://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r".replace(/\/+$/, "");
 
 /**
  *
@@ -55,7 +55,7 @@ export interface FetchArgs {
  * @class BaseAPI
  */
 export class BaseAPI {
-    protected configuration: Configuration;
+    protected configuration: Configuration | undefined;
 
     constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected fetch: FetchAPI = portableFetch) {
         if (configuration) {
@@ -72,7 +72,7 @@ export class BaseAPI {
  * @extends {Error}
  */
 export class RequiredError extends Error {
-    name: "RequiredError"
+    name: "RequiredError" = "RequiredError";
     constructor(public field: string, msg?: string) {
         super(msg);
     }
@@ -81,13 +81,13 @@ export class RequiredError extends Error {
 /**
  * Model for testing reserved words  *_/ ' \" =end -- \\r\\n \\n \\r
  * @export
- * @interface ModelReturn
+ * @interface Return
  */
-export interface ModelReturn {
+export interface Return {
     /**
      * property description  *_/ ' \" =end -- \\r\\n \\n \\r
      * @type {number}
-     * @memberof ModelReturn
+     * @memberof Return
      */
     _return?: number;
 }
@@ -102,29 +102,29 @@ export const FakeApiFetchParamCreator = function (configuration?: Configuration)
         /**
          * 
          * @summary To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
-         * @param {string} [testCodeInjectEndRnNR] To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+         * @param {UNKNOWN_BASE_TYPE} [UNKNOWN_BASE_TYPE] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        testCodeInjectEndRnNR(testCodeInjectEndRnNR?: string, options: any = {}): FetchArgs {
+        testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE?: UNKNOWN_BASE_TYPE, options: any = {}): FetchArgs {
             const localVarPath = `/fake`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'PUT' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'PUT' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
-            const localVarFormParams = new url.URLSearchParams();
 
-            if (testCodeInjectEndRnNR !== undefined) {
-                localVarFormParams.set('test code inject */ &#39; &quot; &#x3D;end -- \r\n \n \r', testCodeInjectEndRnNR as any);
-            }
-
-            localVarHeaderParameter['Content-Type'] = 'application/x-www-form-urlencoded';
+            localVarHeaderParameter['Content-Type'] = 'application/json';
 
             localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
             // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
             delete localVarUrlObj.search;
             localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            localVarRequestOptions.body = localVarFormParams.toString();
+            const needsSerialization = (<any>"UNKNOWN_BASE_TYPE" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.body =  needsSerialization ? JSON.stringify(UNKNOWN_BASE_TYPE || {}) : (UNKNOWN_BASE_TYPE || "");
 
             return {
                 url: url.format(localVarUrlObj),
@@ -143,12 +143,12 @@ export const FakeApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
-         * @param {string} [testCodeInjectEndRnNR] To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+         * @param {UNKNOWN_BASE_TYPE} [UNKNOWN_BASE_TYPE] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        testCodeInjectEndRnNR(testCodeInjectEndRnNR?: string, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = FakeApiFetchParamCreator(configuration).testCodeInjectEndRnNR(testCodeInjectEndRnNR, options);
+        testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE?: UNKNOWN_BASE_TYPE, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
+            const localVarFetchArgs = FakeApiFetchParamCreator(configuration).testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE, options);
             return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
                 return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
                     if (response.status >= 200 && response.status < 300) {
@@ -171,12 +171,12 @@ export const FakeApiFactory = function (configuration?: Configuration, fetch?: F
         /**
          * 
          * @summary To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
-         * @param {string} [testCodeInjectEndRnNR] To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+         * @param {UNKNOWN_BASE_TYPE} [UNKNOWN_BASE_TYPE] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        testCodeInjectEndRnNR(testCodeInjectEndRnNR?: string, options?: any) {
-            return FakeApiFp(configuration).testCodeInjectEndRnNR(testCodeInjectEndRnNR, options)(fetch, basePath);
+        testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE?: UNKNOWN_BASE_TYPE, options?: any) {
+            return FakeApiFp(configuration).testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE, options)(fetch, basePath);
         },
     };
 };
@@ -191,13 +191,13 @@ export class FakeApi extends BaseAPI {
     /**
      * 
      * @summary To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
-     * @param {string} [testCodeInjectEndRnNR] To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     * @param {UNKNOWN_BASE_TYPE} [UNKNOWN_BASE_TYPE] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof FakeApi
      */
-    public testCodeInjectEndRnNR(testCodeInjectEndRnNR?: string, options?: any) {
-        return FakeApiFp(this.configuration).testCodeInjectEndRnNR(testCodeInjectEndRnNR, options)(this.fetch, this.basePath);
+    public testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE?: UNKNOWN_BASE_TYPE, options?: any) {
+        return FakeApiFp(this.configuration).testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE, options)(this.fetch, this.basePath);
     }
 
 }
diff --git a/samples/client/petstore-security-test/typescript-fetch/configuration.ts b/samples/client/petstore-security-test/typescript-fetch/configuration.ts
index 06288872871..73d80a44392 100644
--- a/samples/client/petstore-security-test/typescript-fetch/configuration.ts
+++ b/samples/client/petstore-security-test/typescript-fetch/configuration.ts
@@ -1,13 +1,13 @@
 // tslint:disable
 /**
- * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r
+ * OpenAPI Petstore *_/ ' \" =end -- \\r\\n \\n \\r
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end --       
  *
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
- * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
+ * Contact: something@something.abc *_/ ' \" =end -- \\r\\n \\n \\r
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
@@ -18,6 +18,7 @@ export interface ConfigurationParameters {
     password?: string;
     accessToken?: string | ((name: string, scopes?: string[]) => string);
     basePath?: string;
+    baseOptions?: any;
 }
 
 export class Configuration {
@@ -55,6 +56,13 @@ export class Configuration {
      * @memberof Configuration
      */
     basePath?: string;
+    /**
+     * base options for fetch calls
+     *
+     * @type {any}
+     * @memberof Configuration
+     */
+    baseOptions?: any;
 
     constructor(param: ConfigurationParameters = {}) {
         this.apiKey = param.apiKey;
diff --git a/samples/client/petstore-security-test/typescript-fetch/git_push.sh b/samples/client/petstore-security-test/typescript-fetch/git_push.sh
index a1ff4c9bcba..188eeaea7bc 100644
--- a/samples/client/petstore-security-test/typescript-fetch/git_push.sh
+++ b/samples/client/petstore-security-test/typescript-fetch/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore-security-test/typescript-fetch/index.ts b/samples/client/petstore-security-test/typescript-fetch/index.ts
index 2670610eb94..06529df41e4 100644
--- a/samples/client/petstore-security-test/typescript-fetch/index.ts
+++ b/samples/client/petstore-security-test/typescript-fetch/index.ts
@@ -1,13 +1,13 @@
 // tslint:disable
 /**
- * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r
+ * OpenAPI Petstore *_/ ' \" =end -- \\r\\n \\n \\r
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end --       
  *
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
- * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
+ * Contact: something@something.abc *_/ ' \" =end -- \\r\\n \\n \\r
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp
index c2f9a7f99f7..8d99e86ca8a 100644
--- a/samples/client/petstore/cpp-restsdk/api/PetApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp
@@ -45,72 +45,72 @@ pplx::task<void> PetApi::addPet(std::shared_ptr<Pet> pet)
     }
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/pet");
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/pet");
     
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("PetApi->addPet does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
-    consumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
-    consumeHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
+    localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
+    localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
-        web::json::value json;
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
+        web::json::value localVarJson;
 
-        json = ModelBase::toJson(pet);
+        localVarJson = ModelBase::toJson(pet);
         
 
-        httpBody = std::shared_ptr<IHttpBody>( new JsonBody( json ) );
+        localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
-        std::shared_ptr<MultipartFormData> multipart(new MultipartFormData);
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
         if(pet.get())
         {
-            pet->toMultipart(multipart, utility::conversions::to_string_t("pet"));
+            pet->toMultipart(localVarMultipart, utility::conversions::to_string_t("pet"));
         }
 
-        httpBody = multipart;
-        requestHttpContentType += utility::conversions::to_string_t("; boundary=") + multipart->getBoundary();
+        localVarHttpBody = localVarMultipart;
+        localVarRequestHttpContentType += utility::conversions::to_string_t("; boundary=") + localVarMultipart->getBoundary();
     }
     else
     {
@@ -120,36 +120,36 @@ pplx::task<void> PetApi::addPet(std::shared_ptr<Pet> pet)
     // authentication (petstore_auth) required
     // oauth2 authentication is added automatically as part of the http_client_config
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("POST"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling addPet: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling addPet: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling addPet: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling addPet: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         return void();
     });
@@ -158,60 +158,60 @@ pplx::task<void> PetApi::deletePet(int64_t petId, boost::optional<utility::strin
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/pet/{petId}");
-    boost::replace_all(path, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("petId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(petId));
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/pet/{petId}");
+    boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("petId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(petId));
 
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("PetApi->deletePet does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
     if (apiKey)
     {
-        headerParams[utility::conversions::to_string_t("api_key")] = ApiClient::parameterToString(*apiKey);
+        localVarHeaderParams[utility::conversions::to_string_t("api_key")] = ApiClient::parameterToString(*apiKey);
     }
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -221,36 +221,36 @@ pplx::task<void> PetApi::deletePet(int64_t petId, boost::optional<utility::strin
     // authentication (petstore_auth) required
     // oauth2 authentication is added automatically as part of the http_client_config
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("DELETE"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("DELETE"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling deletePet: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling deletePet: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling deletePet: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling deletePet: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         return void();
     });
@@ -259,60 +259,60 @@ pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByStatus(std::vect
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/pet/findByStatus");
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/pet/findByStatus");
     
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("PetApi->findPetsByStatus does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
     {
-        queryParams[utility::conversions::to_string_t("status")] = ApiClient::parameterToString(status);
+        localVarQueryParams[utility::conversions::to_string_t("status")] = ApiClient::parameterToString(status);
     }
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -322,53 +322,53 @@ pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByStatus(std::vect
     // authentication (petstore_auth) required
     // oauth2 authentication is added automatically as part of the http_client_config
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("GET"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling findPetsByStatus: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling findPetsByStatus: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling findPetsByStatus: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling findPetsByStatus: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
-        std::vector<std::shared_ptr<Pet>> result;
+        std::vector<std::shared_ptr<Pet>> localVarResult;
 
-        if(responseHttpContentType == utility::conversions::to_string_t("application/json"))
+        if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json"))
         {
-            web::json::value json = web::json::value::parse(response);
+            web::json::value localVarJson = web::json::value::parse(localVarResponse);
 
-            for( auto& item : json.as_array() )
+            for( auto& localVarItem : localVarJson.as_array() )
             {
-                std::shared_ptr<Pet> itemObj(new Pet());
-                itemObj->fromJson(item);
-                result.push_back(itemObj);
+                std::shared_ptr<Pet> localVarItemObj(new Pet());
+                localVarItemObj->fromJson(localVarItem);
+                localVarResult.push_back(localVarItemObj);
                 
             }
             
         }
-        // else if(responseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
+        // else if(localVarResponseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
         // {
         // TODO multipart response parsing
         // }
@@ -378,67 +378,67 @@ pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByStatus(std::vect
                 , utility::conversions::to_string_t("error calling findPetsByStatus: unsupported response type"));
         }
 
-        return result;
+        return localVarResult;
     });
 }
 pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByTags(std::vector<utility::string_t> tags)
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/pet/findByTags");
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/pet/findByTags");
     
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("PetApi->findPetsByTags does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
     {
-        queryParams[utility::conversions::to_string_t("tags")] = ApiClient::parameterToString(tags);
+        localVarQueryParams[utility::conversions::to_string_t("tags")] = ApiClient::parameterToString(tags);
     }
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -448,53 +448,53 @@ pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByTags(std::vector
     // authentication (petstore_auth) required
     // oauth2 authentication is added automatically as part of the http_client_config
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("GET"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling findPetsByTags: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling findPetsByTags: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling findPetsByTags: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling findPetsByTags: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
-        std::vector<std::shared_ptr<Pet>> result;
+        std::vector<std::shared_ptr<Pet>> localVarResult;
 
-        if(responseHttpContentType == utility::conversions::to_string_t("application/json"))
+        if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json"))
         {
-            web::json::value json = web::json::value::parse(response);
+            web::json::value localVarJson = web::json::value::parse(localVarResponse);
 
-            for( auto& item : json.as_array() )
+            for( auto& localVarItem : localVarJson.as_array() )
             {
-                std::shared_ptr<Pet> itemObj(new Pet());
-                itemObj->fromJson(item);
-                result.push_back(itemObj);
+                std::shared_ptr<Pet> localVarItemObj(new Pet());
+                localVarItemObj->fromJson(localVarItem);
+                localVarResult.push_back(localVarItemObj);
                 
             }
             
         }
-        // else if(responseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
+        // else if(localVarResponseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
         // {
         // TODO multipart response parsing
         // }
@@ -504,65 +504,65 @@ pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByTags(std::vector
                 , utility::conversions::to_string_t("error calling findPetsByTags: unsupported response type"));
         }
 
-        return result;
+        return localVarResult;
     });
 }
 pplx::task<std::shared_ptr<Pet>> PetApi::getPetById(int64_t petId)
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/pet/{petId}");
-    boost::replace_all(path, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("petId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(petId));
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/pet/{petId}");
+    boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("petId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(petId));
 
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("PetApi->getPetById does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -571,53 +571,53 @@ pplx::task<std::shared_ptr<Pet>> PetApi::getPetById(int64_t petId)
 
     // authentication (api_key) required
     {
-        utility::string_t apiKey = apiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
-        if ( apiKey.size() > 0 )
+        utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
+        if ( localVarApiKey.size() > 0 )
         {
-            headerParams[utility::conversions::to_string_t("api_key")] = apiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("api_key")] = localVarApiKey;
         }
     }
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("GET"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling getPetById: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling getPetById: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling getPetById: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling getPetById: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
-        std::shared_ptr<Pet> result(new Pet());
+        std::shared_ptr<Pet> localVarResult(new Pet());
 
-        if(responseHttpContentType == utility::conversions::to_string_t("application/json"))
+        if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json"))
         {
-            web::json::value json = web::json::value::parse(response);
+            web::json::value localVarJson = web::json::value::parse(localVarResponse);
 
-            result->fromJson(json);
+            localVarResult->fromJson(localVarJson);
         }
-        // else if(responseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
+        // else if(localVarResponseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
         // {
         // TODO multipart response parsing
         // }
@@ -627,7 +627,7 @@ pplx::task<std::shared_ptr<Pet>> PetApi::getPetById(int64_t petId)
                 , utility::conversions::to_string_t("error calling getPetById: unsupported response type"));
         }
 
-        return result;
+        return localVarResult;
     });
 }
 pplx::task<void> PetApi::updatePet(std::shared_ptr<Pet> pet)
@@ -640,72 +640,72 @@ pplx::task<void> PetApi::updatePet(std::shared_ptr<Pet> pet)
     }
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/pet");
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/pet");
     
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("PetApi->updatePet does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
-    consumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
-    consumeHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
+    localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
+    localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
-        web::json::value json;
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
+        web::json::value localVarJson;
 
-        json = ModelBase::toJson(pet);
+        localVarJson = ModelBase::toJson(pet);
         
 
-        httpBody = std::shared_ptr<IHttpBody>( new JsonBody( json ) );
+        localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
-        std::shared_ptr<MultipartFormData> multipart(new MultipartFormData);
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
         if(pet.get())
         {
-            pet->toMultipart(multipart, utility::conversions::to_string_t("pet"));
+            pet->toMultipart(localVarMultipart, utility::conversions::to_string_t("pet"));
         }
 
-        httpBody = multipart;
-        requestHttpContentType += utility::conversions::to_string_t("; boundary=") + multipart->getBoundary();
+        localVarHttpBody = localVarMultipart;
+        localVarRequestHttpContentType += utility::conversions::to_string_t("; boundary=") + localVarMultipart->getBoundary();
     }
     else
     {
@@ -715,36 +715,36 @@ pplx::task<void> PetApi::updatePet(std::shared_ptr<Pet> pet)
     // authentication (petstore_auth) required
     // oauth2 authentication is added automatically as part of the http_client_config
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("PUT"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("PUT"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling updatePet: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling updatePet: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling updatePet: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling updatePet: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         return void();
     });
@@ -753,65 +753,65 @@ pplx::task<void> PetApi::updatePetWithForm(int64_t petId, boost::optional<utilit
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/pet/{petId}");
-    boost::replace_all(path, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("petId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(petId));
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/pet/{petId}");
+    boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("petId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(petId));
 
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("PetApi->updatePetWithForm does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
-    consumeHttpContentTypes.insert( utility::conversions::to_string_t("application/x-www-form-urlencoded") );
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
+    localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/x-www-form-urlencoded") );
 
     if (name)
     {
-        formParams[ utility::conversions::to_string_t("name") ] = ApiClient::parameterToString(*name);
+        localVarFormParams[ utility::conversions::to_string_t("name") ] = ApiClient::parameterToString(*name);
     }
     if (status)
     {
-        formParams[ utility::conversions::to_string_t("status") ] = ApiClient::parameterToString(*status);
+        localVarFormParams[ utility::conversions::to_string_t("status") ] = ApiClient::parameterToString(*status);
     }
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -821,36 +821,36 @@ pplx::task<void> PetApi::updatePetWithForm(int64_t petId, boost::optional<utilit
     // authentication (petstore_auth) required
     // oauth2 authentication is added automatically as part of the http_client_config
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("POST"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling updatePetWithForm: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling updatePetWithForm: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling updatePetWithForm: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling updatePetWithForm: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         return void();
     });
@@ -859,66 +859,66 @@ pplx::task<std::shared_ptr<ApiResponse>> PetApi::uploadFile(int64_t petId, boost
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/pet/{petId}/uploadImage");
-    boost::replace_all(path, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("petId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(petId));
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/pet/{petId}/uploadImage");
+    boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("petId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(petId));
 
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("PetApi->uploadFile does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
-    consumeHttpContentTypes.insert( utility::conversions::to_string_t("multipart/form-data") );
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
+    localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("multipart/form-data") );
 
     if (additionalMetadata)
     {
-        formParams[ utility::conversions::to_string_t("additionalMetadata") ] = ApiClient::parameterToString(*additionalMetadata);
+        localVarFormParams[ utility::conversions::to_string_t("additionalMetadata") ] = ApiClient::parameterToString(*additionalMetadata);
     }
     if (file && *file != nullptr)
     {
-        fileParams[ utility::conversions::to_string_t("file") ] = *file;
+        localVarFileParams[ utility::conversions::to_string_t("file") ] = *file;
     }
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -928,46 +928,46 @@ pplx::task<std::shared_ptr<ApiResponse>> PetApi::uploadFile(int64_t petId, boost
     // authentication (petstore_auth) required
     // oauth2 authentication is added automatically as part of the http_client_config
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("POST"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling uploadFile: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling uploadFile: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling uploadFile: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling uploadFile: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
-        std::shared_ptr<ApiResponse> result(new ApiResponse());
+        std::shared_ptr<ApiResponse> localVarResult(new ApiResponse());
 
-        if(responseHttpContentType == utility::conversions::to_string_t("application/json"))
+        if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json"))
         {
-            web::json::value json = web::json::value::parse(response);
+            web::json::value localVarJson = web::json::value::parse(localVarResponse);
 
-            result->fromJson(json);
+            localVarResult->fromJson(localVarJson);
         }
-        // else if(responseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
+        // else if(localVarResponseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
         // {
         // TODO multipart response parsing
         // }
@@ -977,7 +977,7 @@ pplx::task<std::shared_ptr<ApiResponse>> PetApi::uploadFile(int64_t petId, boost
                 , utility::conversions::to_string_t("error calling uploadFile: unsupported response type"));
         }
 
-        return result;
+        return localVarResult;
     });
 }
 
diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
index ca188d17328..c690f2be511 100644
--- a/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
@@ -39,56 +39,56 @@ pplx::task<void> StoreApi::deleteOrder(utility::string_t orderId)
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/store/order/{orderId}");
-    boost::replace_all(path, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("orderId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(orderId));
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/store/order/{orderId}");
+    boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("orderId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(orderId));
 
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("StoreApi->deleteOrder does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -96,36 +96,36 @@ pplx::task<void> StoreApi::deleteOrder(utility::string_t orderId)
     }
 
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("DELETE"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("DELETE"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling deleteOrder: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling deleteOrder: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling deleteOrder: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling deleteOrder: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         return void();
     });
@@ -134,56 +134,56 @@ pplx::task<std::map<utility::string_t, int32_t>> StoreApi::getInventory()
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/store/inventory");
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/store/inventory");
     
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("StoreApi->getInventory does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -192,58 +192,58 @@ pplx::task<std::map<utility::string_t, int32_t>> StoreApi::getInventory()
 
     // authentication (api_key) required
     {
-        utility::string_t apiKey = apiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
-        if ( apiKey.size() > 0 )
+        utility::string_t localVarApiKey = localVarApiConfiguration->getApiKey(utility::conversions::to_string_t("api_key"));
+        if ( localVarApiKey.size() > 0 )
         {
-            headerParams[utility::conversions::to_string_t("api_key")] = apiKey;
+            localVarHeaderParams[utility::conversions::to_string_t("api_key")] = localVarApiKey;
         }
     }
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("GET"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling getInventory: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling getInventory: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling getInventory: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling getInventory: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
-        std::map<utility::string_t, int32_t> result;
+        std::map<utility::string_t, int32_t> localVarResult;
 
-        if(responseHttpContentType == utility::conversions::to_string_t("application/json"))
+        if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json"))
         {
-            web::json::value json = web::json::value::parse(response);
+            web::json::value localVarJson = web::json::value::parse(localVarResponse);
 
-            for( auto& item : json.as_object() )
+            for( auto& localVarItem : localVarJson.as_object() )
             {
-                result[item.first] = ModelBase::int32_tFromJson(item.second);
+                localVarResult[localVarItem.first] = ModelBase::int32_tFromJson(localVarItem.second);
                 
             }
             
         }
-        // else if(responseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
+        // else if(localVarResponseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
         // {
         // TODO multipart response parsing
         // }
@@ -253,65 +253,65 @@ pplx::task<std::map<utility::string_t, int32_t>> StoreApi::getInventory()
                 , utility::conversions::to_string_t("error calling getInventory: unsupported response type"));
         }
 
-        return result;
+        return localVarResult;
     });
 }
 pplx::task<std::shared_ptr<Order>> StoreApi::getOrderById(int64_t orderId)
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/store/order/{orderId}");
-    boost::replace_all(path, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("orderId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(orderId));
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/store/order/{orderId}");
+    boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("orderId") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(orderId));
 
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("StoreApi->getOrderById does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -319,46 +319,46 @@ pplx::task<std::shared_ptr<Order>> StoreApi::getOrderById(int64_t orderId)
     }
 
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("GET"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling getOrderById: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling getOrderById: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling getOrderById: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling getOrderById: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
-        std::shared_ptr<Order> result(new Order());
+        std::shared_ptr<Order> localVarResult(new Order());
 
-        if(responseHttpContentType == utility::conversions::to_string_t("application/json"))
+        if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json"))
         {
-            web::json::value json = web::json::value::parse(response);
+            web::json::value localVarJson = web::json::value::parse(localVarResponse);
 
-            result->fromJson(json);
+            localVarResult->fromJson(localVarJson);
         }
-        // else if(responseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
+        // else if(localVarResponseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
         // {
         // TODO multipart response parsing
         // }
@@ -368,7 +368,7 @@ pplx::task<std::shared_ptr<Order>> StoreApi::getOrderById(int64_t orderId)
                 , utility::conversions::to_string_t("error calling getOrderById: unsupported response type"));
         }
 
-        return result;
+        return localVarResult;
     });
 }
 pplx::task<std::shared_ptr<Order>> StoreApi::placeOrder(std::shared_ptr<Order> order)
@@ -381,72 +381,72 @@ pplx::task<std::shared_ptr<Order>> StoreApi::placeOrder(std::shared_ptr<Order> o
     }
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/store/order");
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/store/order");
     
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("StoreApi->placeOrder does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
-        web::json::value json;
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
+        web::json::value localVarJson;
 
-        json = ModelBase::toJson(order);
+        localVarJson = ModelBase::toJson(order);
         
 
-        httpBody = std::shared_ptr<IHttpBody>( new JsonBody( json ) );
+        localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
-        std::shared_ptr<MultipartFormData> multipart(new MultipartFormData);
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
         if(order.get())
         {
-            order->toMultipart(multipart, utility::conversions::to_string_t("order"));
+            order->toMultipart(localVarMultipart, utility::conversions::to_string_t("order"));
         }
 
-        httpBody = multipart;
-        requestHttpContentType += utility::conversions::to_string_t("; boundary=") + multipart->getBoundary();
+        localVarHttpBody = localVarMultipart;
+        localVarRequestHttpContentType += utility::conversions::to_string_t("; boundary=") + localVarMultipart->getBoundary();
     }
     else
     {
@@ -454,46 +454,46 @@ pplx::task<std::shared_ptr<Order>> StoreApi::placeOrder(std::shared_ptr<Order> o
     }
 
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("POST"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling placeOrder: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling placeOrder: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling placeOrder: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling placeOrder: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
-        std::shared_ptr<Order> result(new Order());
+        std::shared_ptr<Order> localVarResult(new Order());
 
-        if(responseHttpContentType == utility::conversions::to_string_t("application/json"))
+        if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json"))
         {
-            web::json::value json = web::json::value::parse(response);
+            web::json::value localVarJson = web::json::value::parse(localVarResponse);
 
-            result->fromJson(json);
+            localVarResult->fromJson(localVarJson);
         }
-        // else if(responseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
+        // else if(localVarResponseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
         // {
         // TODO multipart response parsing
         // }
@@ -503,7 +503,7 @@ pplx::task<std::shared_ptr<Order>> StoreApi::placeOrder(std::shared_ptr<Order> o
                 , utility::conversions::to_string_t("error calling placeOrder: unsupported response type"));
         }
 
-        return result;
+        return localVarResult;
     });
 }
 
diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp
index 9a466b26c15..af3fb210b68 100644
--- a/samples/client/petstore/cpp-restsdk/api/UserApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp
@@ -45,70 +45,70 @@ pplx::task<void> UserApi::createUser(std::shared_ptr<User> user)
     }
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/user");
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/user");
     
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("UserApi->createUser does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
-        web::json::value json;
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
+        web::json::value localVarJson;
 
-        json = ModelBase::toJson(user);
+        localVarJson = ModelBase::toJson(user);
         
 
-        httpBody = std::shared_ptr<IHttpBody>( new JsonBody( json ) );
+        localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
-        std::shared_ptr<MultipartFormData> multipart(new MultipartFormData);
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
         if(user.get())
         {
-            user->toMultipart(multipart, utility::conversions::to_string_t("user"));
+            user->toMultipart(localVarMultipart, utility::conversions::to_string_t("user"));
         }
 
-        httpBody = multipart;
-        requestHttpContentType += utility::conversions::to_string_t("; boundary=") + multipart->getBoundary();
+        localVarHttpBody = localVarMultipart;
+        localVarRequestHttpContentType += utility::conversions::to_string_t("; boundary=") + localVarMultipart->getBoundary();
     }
     else
     {
@@ -116,36 +116,36 @@ pplx::task<void> UserApi::createUser(std::shared_ptr<User> user)
     }
 
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("POST"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling createUser: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling createUser: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling createUser: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling createUser: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         return void();
     });
@@ -154,81 +154,81 @@ pplx::task<void> UserApi::createUsersWithArrayInput(std::vector<std::shared_ptr<
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/user/createWithArray");
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/user/createWithArray");
     
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("UserApi->createUsersWithArrayInput does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
-        web::json::value json;
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
+        web::json::value localVarJson;
 
         {
-            std::vector<web::json::value> jsonArray;
-            for( auto& item : user )
+            std::vector<web::json::value> localVarJsonArray;
+            for( auto& localVarItem : user )
             {
-                jsonArray.push_back( item.get() ? item->toJson() : web::json::value::null() );
+                localVarJsonArray.push_back( localVarItem.get() ? localVarItem->toJson() : web::json::value::null() );
                 
             }
-            json = web::json::value::array(jsonArray);
+            localVarJson = web::json::value::array(localVarJsonArray);
         }
         
-        httpBody = std::shared_ptr<IHttpBody>( new JsonBody( json ) );
+        localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
-        std::shared_ptr<MultipartFormData> multipart(new MultipartFormData);
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
         {
-            std::vector<web::json::value> jsonArray;
-            for( auto& item : user )
+            std::vector<web::json::value> localVarJsonArray;
+            for( auto& localVarItem : user )
             {
-                jsonArray.push_back( item.get() ? item->toJson() : web::json::value::null() );
+                localVarJsonArray.push_back( localVarItem.get() ? localVarItem->toJson() : web::json::value::null() );
                 
             }
-            multipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("user"), web::json::value::array(jsonArray), utility::conversions::to_string_t("application/json")));
+            localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("user"), web::json::value::array(localVarJsonArray), utility::conversions::to_string_t("application/json")));
         }
         
-        httpBody = multipart;
-        requestHttpContentType += utility::conversions::to_string_t("; boundary=") + multipart->getBoundary();
+        localVarHttpBody = localVarMultipart;
+        localVarRequestHttpContentType += utility::conversions::to_string_t("; boundary=") + localVarMultipart->getBoundary();
     }
     else
     {
@@ -236,36 +236,36 @@ pplx::task<void> UserApi::createUsersWithArrayInput(std::vector<std::shared_ptr<
     }
 
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("POST"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling createUsersWithArrayInput: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling createUsersWithArrayInput: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling createUsersWithArrayInput: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling createUsersWithArrayInput: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         return void();
     });
@@ -274,81 +274,81 @@ pplx::task<void> UserApi::createUsersWithListInput(std::vector<std::shared_ptr<U
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/user/createWithList");
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/user/createWithList");
     
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("UserApi->createUsersWithListInput does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
-        web::json::value json;
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
+        web::json::value localVarJson;
 
         {
-            std::vector<web::json::value> jsonArray;
-            for( auto& item : user )
+            std::vector<web::json::value> localVarJsonArray;
+            for( auto& localVarItem : user )
             {
-                jsonArray.push_back( item.get() ? item->toJson() : web::json::value::null() );
+                localVarJsonArray.push_back( localVarItem.get() ? localVarItem->toJson() : web::json::value::null() );
                 
             }
-            json = web::json::value::array(jsonArray);
+            localVarJson = web::json::value::array(localVarJsonArray);
         }
         
-        httpBody = std::shared_ptr<IHttpBody>( new JsonBody( json ) );
+        localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
-        std::shared_ptr<MultipartFormData> multipart(new MultipartFormData);
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
         {
-            std::vector<web::json::value> jsonArray;
-            for( auto& item : user )
+            std::vector<web::json::value> localVarJsonArray;
+            for( auto& localVarItem : user )
             {
-                jsonArray.push_back( item.get() ? item->toJson() : web::json::value::null() );
+                localVarJsonArray.push_back( localVarItem.get() ? localVarItem->toJson() : web::json::value::null() );
                 
             }
-            multipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("user"), web::json::value::array(jsonArray), utility::conversions::to_string_t("application/json")));
+            localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("user"), web::json::value::array(localVarJsonArray), utility::conversions::to_string_t("application/json")));
         }
         
-        httpBody = multipart;
-        requestHttpContentType += utility::conversions::to_string_t("; boundary=") + multipart->getBoundary();
+        localVarHttpBody = localVarMultipart;
+        localVarRequestHttpContentType += utility::conversions::to_string_t("; boundary=") + localVarMultipart->getBoundary();
     }
     else
     {
@@ -356,36 +356,36 @@ pplx::task<void> UserApi::createUsersWithListInput(std::vector<std::shared_ptr<U
     }
 
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("POST"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("POST"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling createUsersWithListInput: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling createUsersWithListInput: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling createUsersWithListInput: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling createUsersWithListInput: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         return void();
     });
@@ -394,56 +394,56 @@ pplx::task<void> UserApi::deleteUser(utility::string_t username)
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/user/{username}");
-    boost::replace_all(path, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("username") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(username));
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/user/{username}");
+    boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("username") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(username));
 
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("UserApi->deleteUser does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -451,36 +451,36 @@ pplx::task<void> UserApi::deleteUser(utility::string_t username)
     }
 
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("DELETE"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("DELETE"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling deleteUser: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling deleteUser: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling deleteUser: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling deleteUser: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         return void();
     });
@@ -489,58 +489,58 @@ pplx::task<std::shared_ptr<User>> UserApi::getUserByName(utility::string_t usern
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/user/{username}");
-    boost::replace_all(path, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("username") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(username));
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/user/{username}");
+    boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("username") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(username));
 
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("UserApi->getUserByName does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -548,46 +548,46 @@ pplx::task<std::shared_ptr<User>> UserApi::getUserByName(utility::string_t usern
     }
 
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("GET"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling getUserByName: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling getUserByName: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling getUserByName: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling getUserByName: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
-        std::shared_ptr<User> result(new User());
+        std::shared_ptr<User> localVarResult(new User());
 
-        if(responseHttpContentType == utility::conversions::to_string_t("application/json"))
+        if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json"))
         {
-            web::json::value json = web::json::value::parse(response);
+            web::json::value localVarJson = web::json::value::parse(localVarResponse);
 
-            result->fromJson(json);
+            localVarResult->fromJson(localVarJson);
         }
-        // else if(responseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
+        // else if(localVarResponseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
         // {
         // TODO multipart response parsing
         // }
@@ -597,75 +597,75 @@ pplx::task<std::shared_ptr<User>> UserApi::getUserByName(utility::string_t usern
                 , utility::conversions::to_string_t("error calling getUserByName: unsupported response type"));
         }
 
-        return result;
+        return localVarResult;
     });
 }
 pplx::task<utility::string_t> UserApi::loginUser(utility::string_t username, utility::string_t password)
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/user/login");
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/user/login");
     
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/xml") );
+    localVarResponseHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("text/plain");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("text/plain");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     // plain text
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("text/plain")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("text/plain")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("text/plain");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("text/plain");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("UserApi->loginUser does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
     {
-        queryParams[utility::conversions::to_string_t("username")] = ApiClient::parameterToString(username);
+        localVarQueryParams[utility::conversions::to_string_t("username")] = ApiClient::parameterToString(username);
     }
     {
-        queryParams[utility::conversions::to_string_t("password")] = ApiClient::parameterToString(password);
+        localVarQueryParams[utility::conversions::to_string_t("password")] = ApiClient::parameterToString(password);
     }
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -673,51 +673,51 @@ pplx::task<utility::string_t> UserApi::loginUser(utility::string_t username, uti
     }
 
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("GET"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling loginUser: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling loginUser: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling loginUser: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling loginUser: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
-        utility::string_t result(utility::conversions::to_string_t(""));
+        utility::string_t localVarResult(utility::conversions::to_string_t(""));
 
-        if(responseHttpContentType == utility::conversions::to_string_t("application/json"))
+        if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json"))
         {
-            web::json::value json = web::json::value::parse(response);
+            web::json::value localVarJson = web::json::value::parse(localVarResponse);
 
-            result = ModelBase::stringFromJson(json);
+            localVarResult = ModelBase::stringFromJson(localVarJson);
             
         }
-        else if(responseHttpContentType == utility::conversions::to_string_t("text/plain"))
+        else if(localVarResponseHttpContentType == utility::conversions::to_string_t("text/plain"))
         {
-            result = response;
+            localVarResult = localVarResponse;
         }
-        // else if(responseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
+        // else if(localVarResponseHttpContentType == utility::conversions::to_string_t("multipart/form-data"))
         // {
         // TODO multipart response parsing
         // }
@@ -727,62 +727,62 @@ pplx::task<utility::string_t> UserApi::loginUser(utility::string_t username, uti
                 , utility::conversions::to_string_t("error calling loginUser: unsupported response type"));
         }
 
-        return result;
+        return localVarResult;
     });
 }
 pplx::task<void> UserApi::logoutUser()
 {
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/user/logout");
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/user/logout");
     
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("UserApi->logoutUser does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
@@ -790,36 +790,36 @@ pplx::task<void> UserApi::logoutUser()
     }
 
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("GET"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("GET"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling logoutUser: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling logoutUser: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling logoutUser: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling logoutUser: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         return void();
     });
@@ -834,71 +834,71 @@ pplx::task<void> UserApi::updateUser(utility::string_t username, std::shared_ptr
     }
 
 
-    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t path = utility::conversions::to_string_t("/user/{username}");
-    boost::replace_all(path, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("username") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(username));
+    std::shared_ptr<ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
+    utility::string_t localVarPath = utility::conversions::to_string_t("/user/{username}");
+    boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("username") + utility::conversions::to_string_t("}"), ApiClient::parameterToString(username));
 
-    std::map<utility::string_t, utility::string_t> queryParams;
-    std::map<utility::string_t, utility::string_t> headerParams( apiConfiguration->getDefaultHeaders() );
-    std::map<utility::string_t, utility::string_t> formParams;
-    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;
+    std::map<utility::string_t, utility::string_t> localVarQueryParams;
+    std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
+    std::map<utility::string_t, utility::string_t> localVarFormParams;
+    std::map<utility::string_t, std::shared_ptr<HttpContent>> localVarFileParams;
 
-    std::unordered_set<utility::string_t> responseHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarResponseHttpContentTypes;
 
-    utility::string_t responseHttpContentType;
+    utility::string_t localVarResponseHttpContentType;
 
     // use JSON if possible
-    if ( responseHttpContentTypes.size() == 0 )
+    if ( localVarResponseHttpContentTypes.size() == 0 )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // JSON
-    else if ( responseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != responseHttpContentTypes.end() )
+    else if ( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("application/json");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("application/json");
     }
     // multipart formdata
-    else if( responseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != responseHttpContentTypes.end() )
+    else if( localVarResponseHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarResponseHttpContentTypes.end() )
     {
-        responseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        localVarResponseHttpContentType = utility::conversions::to_string_t("multipart/form-data");
     }
     else
     {
         throw ApiException(400, utility::conversions::to_string_t("UserApi->updateUser does not produce any supported media type"));
     }
 
-    headerParams[utility::conversions::to_string_t("Accept")] = responseHttpContentType;
+    localVarHeaderParams[utility::conversions::to_string_t("Accept")] = localVarResponseHttpContentType;
 
-    std::unordered_set<utility::string_t> consumeHttpContentTypes;
+    std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
 
-    std::shared_ptr<IHttpBody> httpBody;
-    utility::string_t requestHttpContentType;
+    std::shared_ptr<IHttpBody> localVarHttpBody;
+    utility::string_t localVarRequestHttpContentType;
 
     // use JSON if possible
-    if ( consumeHttpContentTypes.size() == 0 || consumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != consumeHttpContentTypes.end() )
+    if ( localVarConsumeHttpContentTypes.size() == 0 || localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("application/json")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("application/json");
-        web::json::value json;
+        localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
+        web::json::value localVarJson;
 
-        json = ModelBase::toJson(user);
+        localVarJson = ModelBase::toJson(user);
         
 
-        httpBody = std::shared_ptr<IHttpBody>( new JsonBody( json ) );
+        localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
     // multipart formdata
-    else if( consumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != consumeHttpContentTypes.end() )
+    else if( localVarConsumeHttpContentTypes.find(utility::conversions::to_string_t("multipart/form-data")) != localVarConsumeHttpContentTypes.end() )
     {
-        requestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
-        std::shared_ptr<MultipartFormData> multipart(new MultipartFormData);
+        localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
+        std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
         if(user.get())
         {
-            user->toMultipart(multipart, utility::conversions::to_string_t("user"));
+            user->toMultipart(localVarMultipart, utility::conversions::to_string_t("user"));
         }
 
-        httpBody = multipart;
-        requestHttpContentType += utility::conversions::to_string_t("; boundary=") + multipart->getBoundary();
+        localVarHttpBody = localVarMultipart;
+        localVarRequestHttpContentType += utility::conversions::to_string_t("; boundary=") + localVarMultipart->getBoundary();
     }
     else
     {
@@ -906,36 +906,36 @@ pplx::task<void> UserApi::updateUser(utility::string_t username, std::shared_ptr
     }
 
 
-    return m_ApiClient->callApi(path, utility::conversions::to_string_t("PUT"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
-    .then([=](web::http::http_response response)
+    return m_ApiClient->callApi(localVarPath, utility::conversions::to_string_t("PUT"), localVarQueryParams, localVarHttpBody, localVarHeaderParams, localVarFormParams, localVarFileParams, localVarRequestHttpContentType)
+    .then([=](web::http::http_response localVarResponse)
     {
         // 1xx - informational : OK
         // 2xx - successful       : OK
         // 3xx - redirection   : OK
         // 4xx - client error  : not OK
         // 5xx - client error  : not OK
-        if (response.status_code() >= 400)
+        if (localVarResponse.status_code() >= 400)
         {
-            throw ApiException(response.status_code()
-                , utility::conversions::to_string_t("error calling updateUser: ") + response.reason_phrase()
-                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+            throw ApiException(localVarResponse.status_code()
+                , utility::conversions::to_string_t("error calling updateUser: ") + localVarResponse.reason_phrase()
+                , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
         }
 
         // check response content type
-        if(response.headers().has(utility::conversions::to_string_t("Content-Type")))
+        if(localVarResponse.headers().has(utility::conversions::to_string_t("Content-Type")))
         {
-            utility::string_t contentType = response.headers()[utility::conversions::to_string_t("Content-Type")];
-            if( contentType.find(responseHttpContentType) == std::string::npos )
+            utility::string_t localVarContentType = localVarResponse.headers()[utility::conversions::to_string_t("Content-Type")];
+            if( localVarContentType.find(localVarResponseHttpContentType) == std::string::npos )
             {
                 throw ApiException(500
-                    , utility::conversions::to_string_t("error calling updateUser: unexpected response type: ") + contentType
-                    , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+                    , utility::conversions::to_string_t("error calling updateUser: unexpected response type: ") + localVarContentType
+                    , std::make_shared<std::stringstream>(localVarResponse.extract_utf8string(true).get()));
             }
         }
 
-        return response.extract_string();
+        return localVarResponse.extract_string();
     })
-    .then([=](utility::string_t response)
+    .then([=](utility::string_t localVarResponse)
     {
         return void();
     });
diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
+++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/erlang-client/.openapi-generator/VERSION b/samples/client/petstore/erlang-client/.openapi-generator/VERSION
index 096bf47efe3..105bb87d77b 100644
--- a/samples/client/petstore/erlang-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/erlang-client/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/API/Fake.hs b/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/API/Fake.hs
index 98881805310..51f5f5e51c7 100644
--- a/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/API/Fake.hs
+++ b/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/API/Fake.hs
@@ -73,7 +73,7 @@ fakeOuterBooleanSerialize  _ =
 data FakeOuterBooleanSerialize 
 
 -- | /Body Param/ "body" - Input boolean as post body
-instance HasBodyParam FakeOuterBooleanSerialize BodyBool 
+instance HasBodyParam FakeOuterBooleanSerialize Body8 
 
 -- | @application/json@
 instance Consumes FakeOuterBooleanSerialize MimeJSON
@@ -123,7 +123,7 @@ fakeOuterNumberSerialize  _ =
 data FakeOuterNumberSerialize 
 
 -- | /Body Param/ "body" - Input number as post body
-instance HasBodyParam FakeOuterNumberSerialize Body 
+instance HasBodyParam FakeOuterNumberSerialize Body6 
 
 -- | @application/json@
 instance Consumes FakeOuterNumberSerialize MimeJSON
@@ -148,7 +148,7 @@ fakeOuterStringSerialize  _ =
 data FakeOuterStringSerialize 
 
 -- | /Body Param/ "body" - Input string as post body
-instance HasBodyParam FakeOuterStringSerialize BodyText 
+instance HasBodyParam FakeOuterStringSerialize Body7 
 
 -- | @application/json@
 instance Consumes FakeOuterStringSerialize MimeJSON
diff --git a/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/Model.hs b/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/Model.hs
index cb46c7b8b2c..f4a0f43dbad 100644
--- a/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/Model.hs
+++ b/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/Model.hs
@@ -72,14 +72,14 @@ newtype AdditionalMetadata = AdditionalMetadata { unAdditionalMetadata :: Text }
 -- ** ApiKey
 newtype ApiKey = ApiKey { unApiKey :: Text } deriving (P.Eq, P.Show)
 
--- ** Body
-newtype Body = Body { unBody :: Double } deriving (P.Eq, P.Show, A.ToJSON)
+-- ** Body6
+newtype Body6 = Body6 { unBody6 :: Double } deriving (P.Eq, P.Show, A.ToJSON)
 
--- ** BodyBool
-newtype BodyBool = BodyBool { unBodyBool :: Bool } deriving (P.Eq, P.Show, A.ToJSON)
+-- ** Body7
+newtype Body7 = Body7 { unBody7 :: Text } deriving (P.Eq, P.Show, A.ToJSON)
 
--- ** BodyText
-newtype BodyText = BodyText { unBodyText :: Text } deriving (P.Eq, P.Show, A.ToJSON)
+-- ** Body8
+newtype Body8 = Body8 { unBody8 :: Bool } deriving (P.Eq, P.Show, A.ToJSON)
 
 -- ** Byte
 newtype Byte = Byte { unByte :: ByteArray } deriving (P.Eq, P.Show)
@@ -416,6 +416,253 @@ mkArrayTest =
   , arrayTestArrayArrayOfModel = Nothing
   }
 
+-- ** Body
+-- | Body
+data Body = Body
+  { bodyName :: !(Maybe Text) -- ^ "name" - Updated name of the pet
+  , bodyStatus :: !(Maybe Text) -- ^ "status" - Updated status of the pet
+  } deriving (P.Show, P.Eq, P.Typeable)
+
+-- | FromJSON Body
+instance A.FromJSON Body where
+  parseJSON = A.withObject "Body" $ \o ->
+    Body
+      <$> (o .:? "name")
+      <*> (o .:? "status")
+
+-- | ToJSON Body
+instance A.ToJSON Body where
+  toJSON Body {..} =
+   _omitNulls
+      [ "name" .= bodyName
+      , "status" .= bodyStatus
+      ]
+
+
+-- | Construct a value of type 'Body' (by applying it's required fields, if any)
+mkBody
+  :: Body
+mkBody =
+  Body
+  { bodyName = Nothing
+  , bodyStatus = Nothing
+  }
+
+-- ** Body1
+-- | Body1
+data Body1 = Body1
+  { body1AdditionalMetadata :: !(Maybe Text) -- ^ "additionalMetadata" - Additional data to pass to server
+  , body1File :: !(Maybe FilePath) -- ^ "file" - file to upload
+  } deriving (P.Show, P.Eq, P.Typeable)
+
+-- | FromJSON Body1
+instance A.FromJSON Body1 where
+  parseJSON = A.withObject "Body1" $ \o ->
+    Body1
+      <$> (o .:? "additionalMetadata")
+      <*> (o .:? "file")
+
+-- | ToJSON Body1
+instance A.ToJSON Body1 where
+  toJSON Body1 {..} =
+   _omitNulls
+      [ "additionalMetadata" .= body1AdditionalMetadata
+      , "file" .= body1File
+      ]
+
+
+-- | Construct a value of type 'Body1' (by applying it's required fields, if any)
+mkBody1
+  :: Body1
+mkBody1 =
+  Body1
+  { body1AdditionalMetadata = Nothing
+  , body1File = Nothing
+  }
+
+-- ** Body2
+-- | Body2
+data Body2 = Body2
+  { body2EnumFormStringArray :: !(Maybe [E'EnumFormStringArray]) -- ^ "enum_form_string_array" - Form parameter enum test (string array)
+  , body2EnumFormString :: !(Maybe E'EnumFormString) -- ^ "enum_form_string" - Form parameter enum test (string)
+  } deriving (P.Show, P.Eq, P.Typeable)
+
+-- | FromJSON Body2
+instance A.FromJSON Body2 where
+  parseJSON = A.withObject "Body2" $ \o ->
+    Body2
+      <$> (o .:? "enum_form_string_array")
+      <*> (o .:? "enum_form_string")
+
+-- | ToJSON Body2
+instance A.ToJSON Body2 where
+  toJSON Body2 {..} =
+   _omitNulls
+      [ "enum_form_string_array" .= body2EnumFormStringArray
+      , "enum_form_string" .= body2EnumFormString
+      ]
+
+
+-- | Construct a value of type 'Body2' (by applying it's required fields, if any)
+mkBody2
+  :: Body2
+mkBody2 =
+  Body2
+  { body2EnumFormStringArray = Nothing
+  , body2EnumFormString = Nothing
+  }
+
+-- ** Body3
+-- | Body3
+data Body3 = Body3
+  { body3Integer :: !(Maybe Int) -- ^ "integer" - None
+  , body3Int32 :: !(Maybe Int) -- ^ "int32" - None
+  , body3Int64 :: !(Maybe Integer) -- ^ "int64" - None
+  , body3Number :: !(Double) -- ^ /Required/ "number" - None
+  , body3Float :: !(Maybe Float) -- ^ "float" - None
+  , body3Double :: !(Double) -- ^ /Required/ "double" - None
+  , body3String :: !(Maybe Text) -- ^ "string" - None
+  , body3PatternWithoutDelimiter :: !(Text) -- ^ /Required/ "pattern_without_delimiter" - None
+  , body3Byte :: !(ByteArray) -- ^ /Required/ "byte" - None
+  , body3Binary :: !(Maybe FilePath) -- ^ "binary" - None
+  , body3Date :: !(Maybe Date) -- ^ "date" - None
+  , body3DateTime :: !(Maybe DateTime) -- ^ "dateTime" - None
+  , body3Password :: !(Maybe Text) -- ^ "password" - None
+  , body3Callback :: !(Maybe Text) -- ^ "callback" - None
+  } deriving (P.Show, P.Eq, P.Typeable)
+
+-- | FromJSON Body3
+instance A.FromJSON Body3 where
+  parseJSON = A.withObject "Body3" $ \o ->
+    Body3
+      <$> (o .:? "integer")
+      <*> (o .:? "int32")
+      <*> (o .:? "int64")
+      <*> (o .:  "number")
+      <*> (o .:? "float")
+      <*> (o .:  "double")
+      <*> (o .:? "string")
+      <*> (o .:  "pattern_without_delimiter")
+      <*> (o .:  "byte")
+      <*> (o .:? "binary")
+      <*> (o .:? "date")
+      <*> (o .:? "dateTime")
+      <*> (o .:? "password")
+      <*> (o .:? "callback")
+
+-- | ToJSON Body3
+instance A.ToJSON Body3 where
+  toJSON Body3 {..} =
+   _omitNulls
+      [ "integer" .= body3Integer
+      , "int32" .= body3Int32
+      , "int64" .= body3Int64
+      , "number" .= body3Number
+      , "float" .= body3Float
+      , "double" .= body3Double
+      , "string" .= body3String
+      , "pattern_without_delimiter" .= body3PatternWithoutDelimiter
+      , "byte" .= body3Byte
+      , "binary" .= body3Binary
+      , "date" .= body3Date
+      , "dateTime" .= body3DateTime
+      , "password" .= body3Password
+      , "callback" .= body3Callback
+      ]
+
+
+-- | Construct a value of type 'Body3' (by applying it's required fields, if any)
+mkBody3
+  :: Double -- ^ 'body3Number': None
+  -> Double -- ^ 'body3Double': None
+  -> Text -- ^ 'body3PatternWithoutDelimiter': None
+  -> ByteArray -- ^ 'body3Byte': None
+  -> Body3
+mkBody3 body3Number body3Double body3PatternWithoutDelimiter body3Byte =
+  Body3
+  { body3Integer = Nothing
+  , body3Int32 = Nothing
+  , body3Int64 = Nothing
+  , body3Number
+  , body3Float = Nothing
+  , body3Double
+  , body3String = Nothing
+  , body3PatternWithoutDelimiter
+  , body3Byte
+  , body3Binary = Nothing
+  , body3Date = Nothing
+  , body3DateTime = Nothing
+  , body3Password = Nothing
+  , body3Callback = Nothing
+  }
+
+-- ** Body4
+-- | Body4
+data Body4 = Body4
+  { body4Param :: !(Text) -- ^ /Required/ "param" - field1
+  , body4Param2 :: !(Text) -- ^ /Required/ "param2" - field2
+  } deriving (P.Show, P.Eq, P.Typeable)
+
+-- | FromJSON Body4
+instance A.FromJSON Body4 where
+  parseJSON = A.withObject "Body4" $ \o ->
+    Body4
+      <$> (o .:  "param")
+      <*> (o .:  "param2")
+
+-- | ToJSON Body4
+instance A.ToJSON Body4 where
+  toJSON Body4 {..} =
+   _omitNulls
+      [ "param" .= body4Param
+      , "param2" .= body4Param2
+      ]
+
+
+-- | Construct a value of type 'Body4' (by applying it's required fields, if any)
+mkBody4
+  :: Text -- ^ 'body4Param': field1
+  -> Text -- ^ 'body4Param2': field2
+  -> Body4
+mkBody4 body4Param body4Param2 =
+  Body4
+  { body4Param
+  , body4Param2
+  }
+
+-- ** Body5
+-- | Body5
+data Body5 = Body5
+  { body5AdditionalMetadata :: !(Maybe Text) -- ^ "additionalMetadata" - Additional data to pass to server
+  , body5RequiredFile :: !(FilePath) -- ^ /Required/ "requiredFile" - file to upload
+  } deriving (P.Show, P.Eq, P.Typeable)
+
+-- | FromJSON Body5
+instance A.FromJSON Body5 where
+  parseJSON = A.withObject "Body5" $ \o ->
+    Body5
+      <$> (o .:? "additionalMetadata")
+      <*> (o .:  "requiredFile")
+
+-- | ToJSON Body5
+instance A.ToJSON Body5 where
+  toJSON Body5 {..} =
+   _omitNulls
+      [ "additionalMetadata" .= body5AdditionalMetadata
+      , "requiredFile" .= body5RequiredFile
+      ]
+
+
+-- | Construct a value of type 'Body5' (by applying it's required fields, if any)
+mkBody5
+  :: FilePath -- ^ 'body5RequiredFile': file to upload
+  -> Body5
+mkBody5 body5RequiredFile =
+  Body5
+  { body5AdditionalMetadata = Nothing
+  , body5RequiredFile
+  }
+
 -- ** Capitalization
 -- | Capitalization
 data Capitalization = Capitalization
diff --git a/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/ModelLens.hs b/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/ModelLens.hs
index f30ff167e37..317dbe109c8 100644
--- a/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/ModelLens.hs
+++ b/samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/ModelLens.hs
@@ -124,6 +124,150 @@ arrayTestArrayArrayOfModelL f ArrayTest{..} = (\arrayTestArrayArrayOfModel -> Ar
 
 
 
+-- * Body
+
+-- | 'bodyName' Lens
+bodyNameL :: Lens_' Body (Maybe Text)
+bodyNameL f Body{..} = (\bodyName -> Body { bodyName, ..} ) <$> f bodyName
+{-# INLINE bodyNameL #-}
+
+-- | 'bodyStatus' Lens
+bodyStatusL :: Lens_' Body (Maybe Text)
+bodyStatusL f Body{..} = (\bodyStatus -> Body { bodyStatus, ..} ) <$> f bodyStatus
+{-# INLINE bodyStatusL #-}
+
+
+
+-- * Body1
+
+-- | 'body1AdditionalMetadata' Lens
+body1AdditionalMetadataL :: Lens_' Body1 (Maybe Text)
+body1AdditionalMetadataL f Body1{..} = (\body1AdditionalMetadata -> Body1 { body1AdditionalMetadata, ..} ) <$> f body1AdditionalMetadata
+{-# INLINE body1AdditionalMetadataL #-}
+
+-- | 'body1File' Lens
+body1FileL :: Lens_' Body1 (Maybe FilePath)
+body1FileL f Body1{..} = (\body1File -> Body1 { body1File, ..} ) <$> f body1File
+{-# INLINE body1FileL #-}
+
+
+
+-- * Body2
+
+-- | 'body2EnumFormStringArray' Lens
+body2EnumFormStringArrayL :: Lens_' Body2 (Maybe [E'EnumFormStringArray])
+body2EnumFormStringArrayL f Body2{..} = (\body2EnumFormStringArray -> Body2 { body2EnumFormStringArray, ..} ) <$> f body2EnumFormStringArray
+{-# INLINE body2EnumFormStringArrayL #-}
+
+-- | 'body2EnumFormString' Lens
+body2EnumFormStringL :: Lens_' Body2 (Maybe E'EnumFormString)
+body2EnumFormStringL f Body2{..} = (\body2EnumFormString -> Body2 { body2EnumFormString, ..} ) <$> f body2EnumFormString
+{-# INLINE body2EnumFormStringL #-}
+
+
+
+-- * Body3
+
+-- | 'body3Integer' Lens
+body3IntegerL :: Lens_' Body3 (Maybe Int)
+body3IntegerL f Body3{..} = (\body3Integer -> Body3 { body3Integer, ..} ) <$> f body3Integer
+{-# INLINE body3IntegerL #-}
+
+-- | 'body3Int32' Lens
+body3Int32L :: Lens_' Body3 (Maybe Int)
+body3Int32L f Body3{..} = (\body3Int32 -> Body3 { body3Int32, ..} ) <$> f body3Int32
+{-# INLINE body3Int32L #-}
+
+-- | 'body3Int64' Lens
+body3Int64L :: Lens_' Body3 (Maybe Integer)
+body3Int64L f Body3{..} = (\body3Int64 -> Body3 { body3Int64, ..} ) <$> f body3Int64
+{-# INLINE body3Int64L #-}
+
+-- | 'body3Number' Lens
+body3NumberL :: Lens_' Body3 (Double)
+body3NumberL f Body3{..} = (\body3Number -> Body3 { body3Number, ..} ) <$> f body3Number
+{-# INLINE body3NumberL #-}
+
+-- | 'body3Float' Lens
+body3FloatL :: Lens_' Body3 (Maybe Float)
+body3FloatL f Body3{..} = (\body3Float -> Body3 { body3Float, ..} ) <$> f body3Float
+{-# INLINE body3FloatL #-}
+
+-- | 'body3Double' Lens
+body3DoubleL :: Lens_' Body3 (Double)
+body3DoubleL f Body3{..} = (\body3Double -> Body3 { body3Double, ..} ) <$> f body3Double
+{-# INLINE body3DoubleL #-}
+
+-- | 'body3String' Lens
+body3StringL :: Lens_' Body3 (Maybe Text)
+body3StringL f Body3{..} = (\body3String -> Body3 { body3String, ..} ) <$> f body3String
+{-# INLINE body3StringL #-}
+
+-- | 'body3PatternWithoutDelimiter' Lens
+body3PatternWithoutDelimiterL :: Lens_' Body3 (Text)
+body3PatternWithoutDelimiterL f Body3{..} = (\body3PatternWithoutDelimiter -> Body3 { body3PatternWithoutDelimiter, ..} ) <$> f body3PatternWithoutDelimiter
+{-# INLINE body3PatternWithoutDelimiterL #-}
+
+-- | 'body3Byte' Lens
+body3ByteL :: Lens_' Body3 (ByteArray)
+body3ByteL f Body3{..} = (\body3Byte -> Body3 { body3Byte, ..} ) <$> f body3Byte
+{-# INLINE body3ByteL #-}
+
+-- | 'body3Binary' Lens
+body3BinaryL :: Lens_' Body3 (Maybe FilePath)
+body3BinaryL f Body3{..} = (\body3Binary -> Body3 { body3Binary, ..} ) <$> f body3Binary
+{-# INLINE body3BinaryL #-}
+
+-- | 'body3Date' Lens
+body3DateL :: Lens_' Body3 (Maybe Date)
+body3DateL f Body3{..} = (\body3Date -> Body3 { body3Date, ..} ) <$> f body3Date
+{-# INLINE body3DateL #-}
+
+-- | 'body3DateTime' Lens
+body3DateTimeL :: Lens_' Body3 (Maybe DateTime)
+body3DateTimeL f Body3{..} = (\body3DateTime -> Body3 { body3DateTime, ..} ) <$> f body3DateTime
+{-# INLINE body3DateTimeL #-}
+
+-- | 'body3Password' Lens
+body3PasswordL :: Lens_' Body3 (Maybe Text)
+body3PasswordL f Body3{..} = (\body3Password -> Body3 { body3Password, ..} ) <$> f body3Password
+{-# INLINE body3PasswordL #-}
+
+-- | 'body3Callback' Lens
+body3CallbackL :: Lens_' Body3 (Maybe Text)
+body3CallbackL f Body3{..} = (\body3Callback -> Body3 { body3Callback, ..} ) <$> f body3Callback
+{-# INLINE body3CallbackL #-}
+
+
+
+-- * Body4
+
+-- | 'body4Param' Lens
+body4ParamL :: Lens_' Body4 (Text)
+body4ParamL f Body4{..} = (\body4Param -> Body4 { body4Param, ..} ) <$> f body4Param
+{-# INLINE body4ParamL #-}
+
+-- | 'body4Param2' Lens
+body4Param2L :: Lens_' Body4 (Text)
+body4Param2L f Body4{..} = (\body4Param2 -> Body4 { body4Param2, ..} ) <$> f body4Param2
+{-# INLINE body4Param2L #-}
+
+
+
+-- * Body5
+
+-- | 'body5AdditionalMetadata' Lens
+body5AdditionalMetadataL :: Lens_' Body5 (Maybe Text)
+body5AdditionalMetadataL f Body5{..} = (\body5AdditionalMetadata -> Body5 { body5AdditionalMetadata, ..} ) <$> f body5AdditionalMetadata
+{-# INLINE body5AdditionalMetadataL #-}
+
+-- | 'body5RequiredFile' Lens
+body5RequiredFileL :: Lens_' Body5 (FilePath)
+body5RequiredFileL f Body5{..} = (\body5RequiredFile -> Body5 { body5RequiredFile, ..} ) <$> f body5RequiredFile
+{-# INLINE body5RequiredFileL #-}
+
+
+
 -- * Capitalization
 
 -- | 'capitalizationSmallCamel' Lens
diff --git a/samples/client/petstore/haskell-http-client/tests/Instances.hs b/samples/client/petstore/haskell-http-client/tests/Instances.hs
index 14cef8e188c..6e54830ccfa 100644
--- a/samples/client/petstore/haskell-http-client/tests/Instances.hs
+++ b/samples/client/petstore/haskell-http-client/tests/Instances.hs
@@ -130,6 +130,54 @@ instance Arbitrary ArrayTest where
       <*> arbitrary -- arrayTestArrayArrayOfInteger :: Maybe [[Integer]]
       <*> arbitrary -- arrayTestArrayArrayOfModel :: Maybe [[ReadOnlyFirst]]
     
+instance Arbitrary Body where
+  arbitrary =
+    Body
+      <$> arbitrary -- bodyName :: Maybe Text
+      <*> arbitrary -- bodyStatus :: Maybe Text
+    
+instance Arbitrary Body1 where
+  arbitrary =
+    Body1
+      <$> arbitrary -- body1AdditionalMetadata :: Maybe Text
+      <*> arbitrary -- body1File :: Maybe FilePath
+    
+instance Arbitrary Body2 where
+  arbitrary =
+    Body2
+      <$> arbitrary -- body2EnumFormStringArray :: Maybe [Text]
+      <*> arbitrary -- body2EnumFormString :: Maybe Text
+    
+instance Arbitrary Body3 where
+  arbitrary =
+    Body3
+      <$> arbitrary -- body3Integer :: Maybe Int
+      <*> arbitrary -- body3Int32 :: Maybe Int
+      <*> arbitrary -- body3Int64 :: Maybe Integer
+      <*> arbitrary -- body3Number :: Double
+      <*> arbitrary -- body3Float :: Maybe Float
+      <*> arbitrary -- body3Double :: Double
+      <*> arbitrary -- body3String :: Maybe Text
+      <*> arbitrary -- body3PatternWithoutDelimiter :: Text
+      <*> arbitrary -- body3Byte :: ByteArray
+      <*> arbitrary -- body3Binary :: Maybe FilePath
+      <*> arbitrary -- body3Date :: Maybe Date
+      <*> arbitrary -- body3DateTime :: Maybe DateTime
+      <*> arbitrary -- body3Password :: Maybe Text
+      <*> arbitrary -- body3Callback :: Maybe Text
+    
+instance Arbitrary Body4 where
+  arbitrary =
+    Body4
+      <$> arbitrary -- body4Param :: Text
+      <*> arbitrary -- body4Param2 :: Text
+    
+instance Arbitrary Body5 where
+  arbitrary =
+    Body5
+      <$> arbitrary -- body5AdditionalMetadata :: Maybe Text
+      <*> arbitrary -- body5RequiredFile :: FilePath
+    
 instance Arbitrary Capitalization where
   arbitrary =
     Capitalization
diff --git a/samples/client/petstore/haskell-http-client/tests/Test.hs b/samples/client/petstore/haskell-http-client/tests/Test.hs
index ea6fff251e3..ee6483020f4 100644
--- a/samples/client/petstore/haskell-http-client/tests/Test.hs
+++ b/samples/client/petstore/haskell-http-client/tests/Test.hs
@@ -27,6 +27,12 @@ main =
       propMimeEq MimeJSON (Proxy :: Proxy ArrayOfArrayOfNumberOnly)
       propMimeEq MimeJSON (Proxy :: Proxy ArrayOfNumberOnly)
       propMimeEq MimeJSON (Proxy :: Proxy ArrayTest)
+      propMimeEq MimeJSON (Proxy :: Proxy Body)
+      propMimeEq MimeJSON (Proxy :: Proxy Body1)
+      propMimeEq MimeJSON (Proxy :: Proxy Body2)
+      propMimeEq MimeJSON (Proxy :: Proxy Body3)
+      propMimeEq MimeJSON (Proxy :: Proxy Body4)
+      propMimeEq MimeJSON (Proxy :: Proxy Body5)
       propMimeEq MimeJSON (Proxy :: Proxy Capitalization)
       propMimeEq MimeJSON (Proxy :: Proxy Cat)
       propMimeEq MimeJSON (Proxy :: Proxy Category)
diff --git a/samples/client/petstore/java/feign/.openapi-generator/VERSION b/samples/client/petstore/java/feign/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/feign/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/feign/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/ApiClientTest.java b/samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/ApiClientTest.java
index a890ead935f..405267d4131 100644
--- a/samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/ApiClientTest.java
+++ b/samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/ApiClientTest.java
@@ -28,7 +28,7 @@ public class ApiClientTest {
         assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
 
         // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
         dateStr = "2015-11-07T13:49:09+10:00";
diff --git a/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/ApiClientTest.java b/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/ApiClientTest.java
index 6fb1e54b679..09659fb4700 100644
--- a/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/ApiClientTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/ApiClientTest.java
@@ -28,7 +28,7 @@ public class ApiClientTest {
         assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
 
         // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
         dateStr = "2015-11-07T13:49:09+10:00";
diff --git a/samples/client/petstore/java/jersey2/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/ApiClientTest.java b/samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/ApiClientTest.java
index 6fb1e54b679..09659fb4700 100644
--- a/samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/ApiClientTest.java
+++ b/samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/ApiClientTest.java
@@ -28,7 +28,7 @@ public class ApiClientTest {
         assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
 
         // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
         dateStr = "2015-11-07T13:49:09+10:00";
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java
index 8b4f1f34d02..64ff528f11c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java
@@ -37,6 +37,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -55,9 +56,9 @@ public class JSON {
             @Override
             public Class getClassForElement(JsonElement readElement) {
                 Map classByDiscriminatorValue = new HashMap();
-                classByDiscriminatorValue.put("Dog".toUpperCase(), Dog.class);
-                classByDiscriminatorValue.put("Cat".toUpperCase(), Cat.class);
-                classByDiscriminatorValue.put("Animal".toUpperCase(), Animal.class);
+                classByDiscriminatorValue.put("Dog".toUpperCase(Locale.ROOT), Dog.class);
+                classByDiscriminatorValue.put("Cat".toUpperCase(Locale.ROOT), Cat.class);
+                classByDiscriminatorValue.put("Animal".toUpperCase(Locale.ROOT), Animal.class);
                 return getClassByDiscriminator(
                                            classByDiscriminatorValue,
                                            getDiscriminatorValue(readElement, "className"));
@@ -78,7 +79,7 @@ public class JSON {
     }
 
     private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
-        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
+        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase(Locale.ROOT));
         if(null == clazz) {
             throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
         }
diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
index 8b4f1f34d02..64ff528f11c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
@@ -37,6 +37,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -55,9 +56,9 @@ public class JSON {
             @Override
             public Class getClassForElement(JsonElement readElement) {
                 Map classByDiscriminatorValue = new HashMap();
-                classByDiscriminatorValue.put("Dog".toUpperCase(), Dog.class);
-                classByDiscriminatorValue.put("Cat".toUpperCase(), Cat.class);
-                classByDiscriminatorValue.put("Animal".toUpperCase(), Animal.class);
+                classByDiscriminatorValue.put("Dog".toUpperCase(Locale.ROOT), Dog.class);
+                classByDiscriminatorValue.put("Cat".toUpperCase(Locale.ROOT), Cat.class);
+                classByDiscriminatorValue.put("Animal".toUpperCase(Locale.ROOT), Animal.class);
                 return getClassByDiscriminator(
                                            classByDiscriminatorValue,
                                            getDiscriminatorValue(readElement, "className"));
@@ -78,7 +79,7 @@ public class JSON {
     }
 
     private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
-        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
+        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase(Locale.ROOT));
         if(null == clazz) {
             throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
         }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java
index e7687d0b33b..1c825e39256 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java
@@ -12,6 +12,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Locale;
 import java.util.TimeZone;
 
 import okio.ByteString;
@@ -46,7 +47,7 @@ public class JSONTest {
         assertEquals(json.deserialize("\"2015-11-07T03:49:09.356" + getCurrentTimezoneOffset() + "\"", java.sql.Date.class).toString(), date.toString());
 
         // custom date format: without day
-        DateFormat format = new SimpleDateFormat("yyyy-MM");
+        DateFormat format = new SimpleDateFormat("yyyy-MM", Locale.ROOT);
         apiClient.setSqlDateFormat(format);
         String dateStr = "\"2015-11\"";
         assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11-07T03:49:09Z\"", java.sql.Date.class)));
@@ -79,7 +80,7 @@ public class JSONTest {
         assertEquals(utcDate, json.serialize(date));
 
         // custom datetime format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
 
@@ -190,10 +191,10 @@ public class JSONTest {
     public static String getCurrentTimezoneOffset() {
 
         TimeZone tz = TimeZone.getDefault();
-        Calendar cal = GregorianCalendar.getInstance(tz);
+        Calendar cal = GregorianCalendar.getInstance(tz, Locale.ROOT);
         int offsetInMillis = tz.getOffset(cal.getTimeInMillis());
 
-        String offset = String.format("%02d:%02d", Math.abs(offsetInMillis / 3600000), Math.abs((offsetInMillis / 60000) % 60));
+        String offset = String.format(Locale.ROOT,"%02d:%02d", Math.abs(offsetInMillis / 3600000), Math.abs((offsetInMillis / 60000) % 60));
         offset = (offsetInMillis >= 0 ? "+" : "-") + offset;
 
         return offset;
diff --git a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java
index 8b4f1f34d02..64ff528f11c 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java
@@ -37,6 +37,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -55,9 +56,9 @@ public class JSON {
             @Override
             public Class getClassForElement(JsonElement readElement) {
                 Map classByDiscriminatorValue = new HashMap();
-                classByDiscriminatorValue.put("Dog".toUpperCase(), Dog.class);
-                classByDiscriminatorValue.put("Cat".toUpperCase(), Cat.class);
-                classByDiscriminatorValue.put("Animal".toUpperCase(), Animal.class);
+                classByDiscriminatorValue.put("Dog".toUpperCase(Locale.ROOT), Dog.class);
+                classByDiscriminatorValue.put("Cat".toUpperCase(Locale.ROOT), Cat.class);
+                classByDiscriminatorValue.put("Animal".toUpperCase(Locale.ROOT), Animal.class);
                 return getClassByDiscriminator(
                                            classByDiscriminatorValue,
                                            getDiscriminatorValue(readElement, "className"));
@@ -78,7 +79,7 @@ public class JSON {
     }
 
     private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
-        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
+        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase(Locale.ROOT));
         if(null == clazz) {
             throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
         }
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 58ab8015d06..0128eed22b5 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -36,6 +36,7 @@ import org.openapitools.client.JSON;
 
 import static io.restassured.http.Method.*;
 
+@Api(value = "AnotherFake")
 public class AnotherFakeApi {
 
     private RequestSpecBuilder reqSpec;
@@ -49,9 +50,12 @@ public class AnotherFakeApi {
     }
 
 
-    @ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", tags={ "$another-fake?" })
+    @ApiOperation(value = "To test special tags",
+            notes = "To test special tags and operation ID starting with number",
+            nickname = "call123testSpecialTags",
+            tags = { "$another-fake?" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation")  })
+            @ApiResponse(code = 200, message = "successful operation")  })
     public Call123testSpecialTagsOper call123testSpecialTags() {
         return new Call123testSpecialTagsOper(reqSpec);
     }
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
index e39e207f36e..250ef18113a 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -43,6 +43,7 @@ import org.openapitools.client.JSON;
 
 import static io.restassured.http.Method.*;
 
+@Api(value = "Fake")
 public class FakeApi {
 
     private RequestSpecBuilder reqSpec;
@@ -56,83 +57,114 @@ public class FakeApi {
     }
 
 
-    @ApiOperation(value = "", notes = "Test serialization of outer boolean types", tags={ "fake" })
+    @ApiOperation(value = "",
+            notes = "Test serialization of outer boolean types",
+            nickname = "fakeOuterBooleanSerialize",
+            tags = { "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "Output boolean")  })
+            @ApiResponse(code = 200, message = "Output boolean")  })
     public FakeOuterBooleanSerializeOper fakeOuterBooleanSerialize() {
         return new FakeOuterBooleanSerializeOper(reqSpec);
     }
 
-    @ApiOperation(value = "", notes = "Test serialization of object with outer number type", tags={ "fake" })
+    @ApiOperation(value = "",
+            notes = "Test serialization of object with outer number type",
+            nickname = "fakeOuterCompositeSerialize",
+            tags = { "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "Output composite")  })
+            @ApiResponse(code = 200, message = "Output composite")  })
     public FakeOuterCompositeSerializeOper fakeOuterCompositeSerialize() {
         return new FakeOuterCompositeSerializeOper(reqSpec);
     }
 
-    @ApiOperation(value = "", notes = "Test serialization of outer number types", tags={ "fake" })
+    @ApiOperation(value = "",
+            notes = "Test serialization of outer number types",
+            nickname = "fakeOuterNumberSerialize",
+            tags = { "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "Output number")  })
+            @ApiResponse(code = 200, message = "Output number")  })
     public FakeOuterNumberSerializeOper fakeOuterNumberSerialize() {
         return new FakeOuterNumberSerializeOper(reqSpec);
     }
 
-    @ApiOperation(value = "", notes = "Test serialization of outer string types", tags={ "fake" })
+    @ApiOperation(value = "",
+            notes = "Test serialization of outer string types",
+            nickname = "fakeOuterStringSerialize",
+            tags = { "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "Output string")  })
+            @ApiResponse(code = 200, message = "Output string")  })
     public FakeOuterStringSerializeOper fakeOuterStringSerialize() {
         return new FakeOuterStringSerializeOper(reqSpec);
     }
 
-    @ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake" })
+    @ApiOperation(value = "",
+            notes = "For this test, the body for this request much reference a schema named `File`.",
+            nickname = "testBodyWithFileSchema",
+            tags = { "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "Success")  })
+            @ApiResponse(code = 200, message = "Success")  })
     public TestBodyWithFileSchemaOper testBodyWithFileSchema() {
         return new TestBodyWithFileSchemaOper(reqSpec);
     }
 
-    @ApiOperation(value = "", notes = "", tags={ "fake" })
+    @ApiOperation(value = "",
+            notes = "",
+            nickname = "testBodyWithQueryParams",
+            tags = { "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "Success")  })
+            @ApiResponse(code = 200, message = "Success")  })
     public TestBodyWithQueryParamsOper testBodyWithQueryParams() {
         return new TestBodyWithQueryParamsOper(reqSpec);
     }
 
-    @ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", tags={ "fake" })
+    @ApiOperation(value = "To test \"client\" model",
+            notes = "To test \"client\" model",
+            nickname = "testClientModel",
+            tags = { "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation")  })
+            @ApiResponse(code = 200, message = "successful operation")  })
     public TestClientModelOper testClientModel() {
         return new TestClientModelOper(reqSpec);
     }
 
-    @ApiOperation(value = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ", notes = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ", authorizations = {
-        @Authorization(value = "http_basic_test")
-    }, tags={ "fake" })
+    @ApiOperation(value = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ",
+            notes = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ",
+            nickname = "testEndpointParameters",
+            tags = { "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid username supplied") ,
-        @ApiResponse(code = 404, message = "User not found")  })
+            @ApiResponse(code = 400, message = "Invalid username supplied") ,
+            @ApiResponse(code = 404, message = "User not found")  })
     public TestEndpointParametersOper testEndpointParameters() {
         return new TestEndpointParametersOper(reqSpec);
     }
 
-    @ApiOperation(value = "To test enum parameters", notes = "To test enum parameters", tags={ "fake" })
+    @ApiOperation(value = "To test enum parameters",
+            notes = "To test enum parameters",
+            nickname = "testEnumParameters",
+            tags = { "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid request") ,
-        @ApiResponse(code = 404, message = "Not found")  })
+            @ApiResponse(code = 400, message = "Invalid request") ,
+            @ApiResponse(code = 404, message = "Not found")  })
     public TestEnumParametersOper testEnumParameters() {
         return new TestEnumParametersOper(reqSpec);
     }
 
-    @ApiOperation(value = "test inline additionalProperties", notes = "", tags={ "fake" })
+    @ApiOperation(value = "test inline additionalProperties",
+            notes = "",
+            nickname = "testInlineAdditionalProperties",
+            tags = { "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation")  })
+            @ApiResponse(code = 200, message = "successful operation")  })
     public TestInlineAdditionalPropertiesOper testInlineAdditionalProperties() {
         return new TestInlineAdditionalPropertiesOper(reqSpec);
     }
 
-    @ApiOperation(value = "test json serialization of form data", notes = "", tags={ "fake" })
+    @ApiOperation(value = "test json serialization of form data",
+            notes = "",
+            nickname = "testJsonFormData",
+            tags = { "fake" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation")  })
+            @ApiResponse(code = 200, message = "successful operation")  })
     public TestJsonFormDataOper testJsonFormData() {
         return new TestJsonFormDataOper(reqSpec);
     }
@@ -893,7 +925,7 @@ public class FakeApi {
         public static final String ENUM_HEADER_STRING_ARRAY_HEADER = "enum_header_string_array";
 
         /**
-         * @param enumHeaderStringArray (List<String>) Header parameter enum test (string array) (optional)
+         * @param enumHeaderStringArray (List&lt;String&gt;) Header parameter enum test (string array) (optional)
          * @return operation
          */
         public TestEnumParametersOper enumHeaderStringArrayHeader(String enumHeaderStringArray) {
@@ -915,7 +947,7 @@ public class FakeApi {
         public static final String ENUM_QUERY_STRING_ARRAY_QUERY = "enum_query_string_array";
 
         /**
-         * @param enumQueryStringArray (List<String>) Query parameter enum test (string array) (optional)
+         * @param enumQueryStringArray (List&lt;String&gt;) Query parameter enum test (string array) (optional)
          * @return operation
          */
         public TestEnumParametersOper enumQueryStringArrayQuery(Object... enumQueryStringArray) {
@@ -959,7 +991,7 @@ public class FakeApi {
          public static final String ENUM_FORM_STRING_ARRAY_FORM = "enum_form_string_array";
 
          /**
-         * @param enumFormStringArray (List<String>) Form parameter enum test (string array) (optional, default to $)
+         * @param enumFormStringArray (List&lt;String&gt;) Form parameter enum test (string array) (optional, default to $)
          * @return operation
          */
          public TestEnumParametersOper enumFormStringArrayForm(Object... enumFormStringArray) {
@@ -1030,7 +1062,7 @@ public class FakeApi {
         }
 
          /**
-         * @param requestBody (Map<String, String>) request body (required)
+         * @param requestBody (Map&lt;String, String&gt;) request body (required)
          * @return operation
          */
         public TestInlineAdditionalPropertiesOper body(Map<String, String> requestBody) {
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index a68d2045748..beb30b39339 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -36,6 +36,7 @@ import org.openapitools.client.JSON;
 
 import static io.restassured.http.Method.*;
 
+@Api(value = "FakeClassnameTags123")
 public class FakeClassnameTags123Api {
 
     private RequestSpecBuilder reqSpec;
@@ -49,11 +50,12 @@ public class FakeClassnameTags123Api {
     }
 
 
-    @ApiOperation(value = "To test class name in snake case", notes = "To test class name in snake case", authorizations = {
-        @Authorization(value = "api_key_query")
-    }, tags={ "fake_classname_tags 123#$%^" })
+    @ApiOperation(value = "To test class name in snake case",
+            notes = "To test class name in snake case",
+            nickname = "testClassname",
+            tags = { "fake_classname_tags 123#$%^" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation")  })
+            @ApiResponse(code = 200, message = "successful operation")  })
     public TestClassnameOper testClassname() {
         return new TestClassnameOper(reqSpec);
     }
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java
index d99a9dbc1d3..43e9f070484 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java
@@ -38,6 +38,7 @@ import org.openapitools.client.JSON;
 
 import static io.restassured.http.Method.*;
 
+@Api(value = "Pet")
 public class PetApi {
 
     private RequestSpecBuilder reqSpec;
@@ -51,114 +52,99 @@ public class PetApi {
     }
 
 
-    @ApiOperation(value = "Add a new pet to the store", notes = "", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-            })
-    }, tags={ "pet" })
+    @ApiOperation(value = "Add a new pet to the store",
+            notes = "",
+            nickname = "addPet",
+            tags = { "pet" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 405, message = "Invalid input")  })
+            @ApiResponse(code = 405, message = "Invalid input")  })
     public AddPetOper addPet() {
         return new AddPetOper(reqSpec);
     }
 
-    @ApiOperation(value = "Deletes a pet", notes = "", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-            })
-    }, tags={ "pet" })
+    @ApiOperation(value = "Deletes a pet",
+            notes = "",
+            nickname = "deletePet",
+            tags = { "pet" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid pet value")  })
+            @ApiResponse(code = 400, message = "Invalid pet value")  })
     public DeletePetOper deletePet() {
         return new DeletePetOper(reqSpec);
     }
 
-    @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-            })
-    }, tags={ "pet" })
+    @ApiOperation(value = "Finds Pets by status",
+            notes = "Multiple status values can be provided with comma separated strings",
+            nickname = "findPetsByStatus",
+            tags = { "pet" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation") ,
-        @ApiResponse(code = 400, message = "Invalid status value")  })
+            @ApiResponse(code = 200, message = "successful operation") ,
+            @ApiResponse(code = 400, message = "Invalid status value")  })
     public FindPetsByStatusOper findPetsByStatus() {
         return new FindPetsByStatusOper(reqSpec);
     }
 
-    @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-            })
-    }, tags={ "pet" })
+    @ApiOperation(value = "Finds Pets by tags",
+            notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.",
+            nickname = "findPetsByTags",
+            tags = { "pet" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation") ,
-        @ApiResponse(code = 400, message = "Invalid tag value")  })
+            @ApiResponse(code = 200, message = "successful operation") ,
+            @ApiResponse(code = 400, message = "Invalid tag value")  })
     @Deprecated
     public FindPetsByTagsOper findPetsByTags() {
         return new FindPetsByTagsOper(reqSpec);
     }
 
-    @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", authorizations = {
-        @Authorization(value = "api_key")
-    }, tags={ "pet" })
+    @ApiOperation(value = "Find pet by ID",
+            notes = "Returns a single pet",
+            nickname = "getPetById",
+            tags = { "pet" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation") ,
-        @ApiResponse(code = 400, message = "Invalid ID supplied") ,
-        @ApiResponse(code = 404, message = "Pet not found")  })
+            @ApiResponse(code = 200, message = "successful operation") ,
+            @ApiResponse(code = 400, message = "Invalid ID supplied") ,
+            @ApiResponse(code = 404, message = "Pet not found")  })
     public GetPetByIdOper getPetById() {
         return new GetPetByIdOper(reqSpec);
     }
 
-    @ApiOperation(value = "Update an existing pet", notes = "", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-            })
-    }, tags={ "pet" })
+    @ApiOperation(value = "Update an existing pet",
+            notes = "",
+            nickname = "updatePet",
+            tags = { "pet" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid ID supplied") ,
-        @ApiResponse(code = 404, message = "Pet not found") ,
-        @ApiResponse(code = 405, message = "Validation exception")  })
+            @ApiResponse(code = 400, message = "Invalid ID supplied") ,
+            @ApiResponse(code = 404, message = "Pet not found") ,
+            @ApiResponse(code = 405, message = "Validation exception")  })
     public UpdatePetOper updatePet() {
         return new UpdatePetOper(reqSpec);
     }
 
-    @ApiOperation(value = "Updates a pet in the store with form data", notes = "", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-            })
-    }, tags={ "pet" })
+    @ApiOperation(value = "Updates a pet in the store with form data",
+            notes = "",
+            nickname = "updatePetWithForm",
+            tags = { "pet" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 405, message = "Invalid input")  })
+            @ApiResponse(code = 405, message = "Invalid input")  })
     public UpdatePetWithFormOper updatePetWithForm() {
         return new UpdatePetWithFormOper(reqSpec);
     }
 
-    @ApiOperation(value = "uploads an image", notes = "", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-            })
-    }, tags={ "pet" })
+    @ApiOperation(value = "uploads an image",
+            notes = "",
+            nickname = "uploadFile",
+            tags = { "pet" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation")  })
+            @ApiResponse(code = 200, message = "successful operation")  })
     public UploadFileOper uploadFile() {
         return new UploadFileOper(reqSpec);
     }
 
-    @ApiOperation(value = "uploads an image (required)", notes = "", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-            })
-    }, tags={ "pet" })
+    @ApiOperation(value = "uploads an image (required)",
+            notes = "",
+            nickname = "uploadFileWithRequiredFile",
+            tags = { "pet" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation")  })
+            @ApiResponse(code = 200, message = "successful operation")  })
     public UploadFileWithRequiredFileOper uploadFileWithRequiredFile() {
         return new UploadFileWithRequiredFileOper(reqSpec);
     }
@@ -350,7 +336,7 @@ public class PetApi {
         public static final String STATUS_QUERY = "status";
 
         /**
-         * @param status (List<String>) Status values that need to be considered for filter (required)
+         * @param status (List&lt;String&gt;) Status values that need to be considered for filter (required)
          * @return operation
          */
         public FindPetsByStatusOper statusQuery(Object... status) {
@@ -424,7 +410,7 @@ public class PetApi {
         public static final String TAGS_QUERY = "tags";
 
         /**
-         * @param tags (List<String>) Tags to filter by (required)
+         * @param tags (List&lt;String&gt;) Tags to filter by (required)
          * @return operation
          */
         public FindPetsByTagsOper tagsQuery(Object... tags) {
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
index a796a6776dc..3db2be24e47 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -36,6 +36,7 @@ import org.openapitools.client.JSON;
 
 import static io.restassured.http.Method.*;
 
+@Api(value = "Store")
 public class StoreApi {
 
     private RequestSpecBuilder reqSpec;
@@ -49,36 +50,46 @@ public class StoreApi {
     }
 
 
-    @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", tags={ "store" })
+    @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",
+            nickname = "deleteOrder",
+            tags = { "store" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid ID supplied") ,
-        @ApiResponse(code = 404, message = "Order not found")  })
+            @ApiResponse(code = 400, message = "Invalid ID supplied") ,
+            @ApiResponse(code = 404, message = "Order not found")  })
     public DeleteOrderOper deleteOrder() {
         return new DeleteOrderOper(reqSpec);
     }
 
-    @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", authorizations = {
-        @Authorization(value = "api_key")
-    }, tags={ "store" })
+    @ApiOperation(value = "Returns pet inventories by status",
+            notes = "Returns a map of status codes to quantities",
+            nickname = "getInventory",
+            tags = { "store" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation")  })
+            @ApiResponse(code = 200, message = "successful operation")  })
     public GetInventoryOper getInventory() {
         return new GetInventoryOper(reqSpec);
     }
 
-    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", tags={ "store" })
+    @ApiOperation(value = "Find purchase order by ID",
+            notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+            nickname = "getOrderById",
+            tags = { "store" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation") ,
-        @ApiResponse(code = 400, message = "Invalid ID supplied") ,
-        @ApiResponse(code = 404, message = "Order not found")  })
+            @ApiResponse(code = 200, message = "successful operation") ,
+            @ApiResponse(code = 400, message = "Invalid ID supplied") ,
+            @ApiResponse(code = 404, message = "Order not found")  })
     public GetOrderByIdOper getOrderById() {
         return new GetOrderByIdOper(reqSpec);
     }
 
-    @ApiOperation(value = "Place an order for a pet", notes = "", tags={ "store" })
+    @ApiOperation(value = "Place an order for a pet",
+            notes = "",
+            nickname = "placeOrder",
+            tags = { "store" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation") ,
-        @ApiResponse(code = 400, message = "Invalid Order")  })
+            @ApiResponse(code = 200, message = "successful operation") ,
+            @ApiResponse(code = 400, message = "Invalid Order")  })
     public PlaceOrderOper placeOrder() {
         return new PlaceOrderOper(reqSpec);
     }
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java
index 37c4bc747ea..ccbc21769a4 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java
@@ -36,6 +36,7 @@ import org.openapitools.client.JSON;
 
 import static io.restassured.http.Method.*;
 
+@Api(value = "User")
 public class UserApi {
 
     private RequestSpecBuilder reqSpec;
@@ -49,63 +50,87 @@ public class UserApi {
     }
 
 
-    @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", tags={ "user" })
+    @ApiOperation(value = "Create user",
+            notes = "This can only be done by the logged in user.",
+            nickname = "createUser",
+            tags = { "user" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 0, message = "successful operation")  })
+            @ApiResponse(code = 0, message = "successful operation")  })
     public CreateUserOper createUser() {
         return new CreateUserOper(reqSpec);
     }
 
-    @ApiOperation(value = "Creates list of users with given input array", notes = "", tags={ "user" })
+    @ApiOperation(value = "Creates list of users with given input array",
+            notes = "",
+            nickname = "createUsersWithArrayInput",
+            tags = { "user" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 0, message = "successful operation")  })
+            @ApiResponse(code = 0, message = "successful operation")  })
     public CreateUsersWithArrayInputOper createUsersWithArrayInput() {
         return new CreateUsersWithArrayInputOper(reqSpec);
     }
 
-    @ApiOperation(value = "Creates list of users with given input array", notes = "", tags={ "user" })
+    @ApiOperation(value = "Creates list of users with given input array",
+            notes = "",
+            nickname = "createUsersWithListInput",
+            tags = { "user" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 0, message = "successful operation")  })
+            @ApiResponse(code = 0, message = "successful operation")  })
     public CreateUsersWithListInputOper createUsersWithListInput() {
         return new CreateUsersWithListInputOper(reqSpec);
     }
 
-    @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", tags={ "user" })
+    @ApiOperation(value = "Delete user",
+            notes = "This can only be done by the logged in user.",
+            nickname = "deleteUser",
+            tags = { "user" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid username supplied") ,
-        @ApiResponse(code = 404, message = "User not found")  })
+            @ApiResponse(code = 400, message = "Invalid username supplied") ,
+            @ApiResponse(code = 404, message = "User not found")  })
     public DeleteUserOper deleteUser() {
         return new DeleteUserOper(reqSpec);
     }
 
-    @ApiOperation(value = "Get user by user name", notes = "", tags={ "user" })
+    @ApiOperation(value = "Get user by user name",
+            notes = "",
+            nickname = "getUserByName",
+            tags = { "user" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation") ,
-        @ApiResponse(code = 400, message = "Invalid username supplied") ,
-        @ApiResponse(code = 404, message = "User not found")  })
+            @ApiResponse(code = 200, message = "successful operation") ,
+            @ApiResponse(code = 400, message = "Invalid username supplied") ,
+            @ApiResponse(code = 404, message = "User not found")  })
     public GetUserByNameOper getUserByName() {
         return new GetUserByNameOper(reqSpec);
     }
 
-    @ApiOperation(value = "Logs user into the system", notes = "", tags={ "user" })
+    @ApiOperation(value = "Logs user into the system",
+            notes = "",
+            nickname = "loginUser",
+            tags = { "user" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation") ,
-        @ApiResponse(code = 400, message = "Invalid username/password supplied")  })
+            @ApiResponse(code = 200, message = "successful operation") ,
+            @ApiResponse(code = 400, message = "Invalid username/password supplied")  })
     public LoginUserOper loginUser() {
         return new LoginUserOper(reqSpec);
     }
 
-    @ApiOperation(value = "Logs out current logged in user session", notes = "", tags={ "user" })
+    @ApiOperation(value = "Logs out current logged in user session",
+            notes = "",
+            nickname = "logoutUser",
+            tags = { "user" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 0, message = "successful operation")  })
+            @ApiResponse(code = 0, message = "successful operation")  })
     public LogoutUserOper logoutUser() {
         return new LogoutUserOper(reqSpec);
     }
 
-    @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", tags={ "user" })
+    @ApiOperation(value = "Updated user",
+            notes = "This can only be done by the logged in user.",
+            nickname = "updateUser",
+            tags = { "user" })
     @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid user supplied") ,
-        @ApiResponse(code = 404, message = "User not found")  })
+            @ApiResponse(code = 400, message = "Invalid user supplied") ,
+            @ApiResponse(code = 404, message = "User not found")  })
     public UpdateUserOper updateUser() {
         return new UpdateUserOper(reqSpec);
     }
@@ -212,7 +237,7 @@ public class UserApi {
         }
 
          /**
-         * @param user (List<User>) List of user object (required)
+         * @param user (List&lt;User&gt;) List of user object (required)
          * @return operation
          */
         public CreateUsersWithArrayInputOper body(List<User> user) {
@@ -272,7 +297,7 @@ public class UserApi {
         }
 
          /**
-         * @param user (List<User>) List of user object (required)
+         * @param user (List&lt;User&gt;) List of user object (required)
          * @return operation
          */
         public CreateUsersWithListInputOper body(List<User> user) {
diff --git a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java
index b8cbc485421..933582c7e04 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java
@@ -16,6 +16,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TimeZone;
@@ -64,7 +65,7 @@ public class ApiClient {
     json = new JSON();
     httpClient = buildHttpClient(debugging);
 
-    this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+    this.dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.ROOT);
 
     // Use UTC as the default time zone.
     this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
@@ -478,7 +479,7 @@ public class ApiClient {
   public Entity<?> serialize(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
     Entity<?> entity = null;
     if (contentType.startsWith("multipart/form-data")) {
-      MultipartFormDataOutput multipart = new MultipartFormDataOutput();  
+      MultipartFormDataOutput multipart = new MultipartFormDataOutput();
       //MultiPart multiPart = new MultiPart();
       for (Entry<String, Object> param: formParams.entrySet()) {
         if (param.getValue() instanceof File) {
diff --git a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 08bbc033fbe..d14b1a53a83 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.Client;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
index 1a765af7da7..b1e3e174e21 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -14,6 +14,7 @@ import org.openapitools.client.model.User;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -393,7 +394,7 @@ public class FakeApi {
         final HttpHeaders headerParams = new HttpHeaders();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
         
-        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase()), "enum_query_string_array", enumQueryStringArray));
+        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray));
         queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString));
         queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger));
         queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble));
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 212cf2bfef2..6f9c1ebb5d5 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.Client;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java
index 7a3897f689c..6dc75c0845b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java
@@ -9,6 +9,7 @@ import org.openapitools.client.model.Pet;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -141,7 +142,7 @@ public class PetApi {
         final HttpHeaders headerParams = new HttpHeaders();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
         
-        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase()), "status", status));
+        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status));
 
         final String[] accepts = { 
             "application/xml", "application/json"
@@ -178,7 +179,7 @@ public class PetApi {
         final HttpHeaders headerParams = new HttpHeaders();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
         
-        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase()), "tags", tags));
+        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags));
 
         final String[] accepts = { 
             "application/xml", "application/json"
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java
index e417838bba4..abce9547b3d 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.Order;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java
index 2949e2f57a0..a3a67216f24 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.User;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 08bbc033fbe..d14b1a53a83 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.Client;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
index 1a765af7da7..b1e3e174e21 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -14,6 +14,7 @@ import org.openapitools.client.model.User;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -393,7 +394,7 @@ public class FakeApi {
         final HttpHeaders headerParams = new HttpHeaders();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
         
-        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase()), "enum_query_string_array", enumQueryStringArray));
+        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray));
         queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString));
         queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger));
         queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble));
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 212cf2bfef2..6f9c1ebb5d5 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.Client;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java
index 7a3897f689c..6dc75c0845b 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java
@@ -9,6 +9,7 @@ import org.openapitools.client.model.Pet;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -141,7 +142,7 @@ public class PetApi {
         final HttpHeaders headerParams = new HttpHeaders();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
         
-        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase()), "status", status));
+        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status));
 
         final String[] accepts = { 
             "application/xml", "application/json"
@@ -178,7 +179,7 @@ public class PetApi {
         final HttpHeaders headerParams = new HttpHeaders();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
         
-        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase()), "tags", tags));
+        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags));
 
         final String[] accepts = { 
             "application/xml", "application/json"
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java
index e417838bba4..abce9547b3d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.Order;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java
index 2949e2f57a0..a3a67216f24 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.User;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/ApiClientTest.java b/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/ApiClientTest.java
index 2113f5d2453..a6bedae3e95 100644
--- a/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/ApiClientTest.java
+++ b/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/ApiClientTest.java
@@ -34,7 +34,7 @@ public class ApiClientTest {
         assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
 
         // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
         apiClient.setDateFormat(format);
         dateStr = "2015-11-07T13:49:09+10:00";
diff --git a/samples/client/petstore/java/retrofit/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/JSON.java
index cd8031a6b96..1325f4fce63 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/JSON.java
@@ -36,6 +36,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -52,9 +53,9 @@ public class JSON {
             @Override
             public Class getClassForElement(JsonElement readElement) {
                 Map classByDiscriminatorValue = new HashMap();
-                classByDiscriminatorValue.put("Dog".toUpperCase(), Dog.class);
-                classByDiscriminatorValue.put("Cat".toUpperCase(), Cat.class);
-                classByDiscriminatorValue.put("Animal".toUpperCase(), Animal.class);
+                classByDiscriminatorValue.put("Dog".toUpperCase(Locale.ROOT), Dog.class);
+                classByDiscriminatorValue.put("Cat".toUpperCase(Locale.ROOT), Cat.class);
+                classByDiscriminatorValue.put("Animal".toUpperCase(Locale.ROOT), Animal.class);
                 return getClassByDiscriminator(
                             classByDiscriminatorValue,
                             getDiscriminatorValue(readElement, "className"));
@@ -74,7 +75,7 @@ public class JSON {
     }
 
     private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
-        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
+        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase(Locale.ROOT));
         if(null == clazz) {
             throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
         }
diff --git a/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/JSON.java
index cd8031a6b96..1325f4fce63 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/JSON.java
@@ -36,6 +36,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -52,9 +53,9 @@ public class JSON {
             @Override
             public Class getClassForElement(JsonElement readElement) {
                 Map classByDiscriminatorValue = new HashMap();
-                classByDiscriminatorValue.put("Dog".toUpperCase(), Dog.class);
-                classByDiscriminatorValue.put("Cat".toUpperCase(), Cat.class);
-                classByDiscriminatorValue.put("Animal".toUpperCase(), Animal.class);
+                classByDiscriminatorValue.put("Dog".toUpperCase(Locale.ROOT), Dog.class);
+                classByDiscriminatorValue.put("Cat".toUpperCase(Locale.ROOT), Cat.class);
+                classByDiscriminatorValue.put("Animal".toUpperCase(Locale.ROOT), Animal.class);
                 return getClassByDiscriminator(
                             classByDiscriminatorValue,
                             getDiscriminatorValue(readElement, "className"));
@@ -74,7 +75,7 @@ public class JSON {
     }
 
     private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
-        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
+        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase(Locale.ROOT));
         if(null == clazz) {
             throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
         }
diff --git a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/JSON.java
index cd8031a6b96..1325f4fce63 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/JSON.java
@@ -36,6 +36,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -52,9 +53,9 @@ public class JSON {
             @Override
             public Class getClassForElement(JsonElement readElement) {
                 Map classByDiscriminatorValue = new HashMap();
-                classByDiscriminatorValue.put("Dog".toUpperCase(), Dog.class);
-                classByDiscriminatorValue.put("Cat".toUpperCase(), Cat.class);
-                classByDiscriminatorValue.put("Animal".toUpperCase(), Animal.class);
+                classByDiscriminatorValue.put("Dog".toUpperCase(Locale.ROOT), Dog.class);
+                classByDiscriminatorValue.put("Cat".toUpperCase(Locale.ROOT), Cat.class);
+                classByDiscriminatorValue.put("Animal".toUpperCase(Locale.ROOT), Animal.class);
                 return getClassByDiscriminator(
                             classByDiscriminatorValue,
                             getDiscriminatorValue(readElement, "className"));
@@ -74,7 +75,7 @@ public class JSON {
     }
 
     private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
-        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
+        Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase(Locale.ROOT));
         if(null == clazz) {
             throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
         }
diff --git a/samples/client/petstore/java/vertx/.openapi-generator/VERSION b/samples/client/petstore/java/vertx/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/vertx/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/vertx/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiClient.java
index 49e53810020..b77033426da 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/ApiClient.java
@@ -18,6 +18,7 @@ import io.vertx.core.file.FileSystem;
 import io.vertx.core.file.OpenOptions;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
+import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.Json;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.client.HttpRequest;
@@ -554,7 +555,11 @@ public class ApiClient {
                             handleFileDownload(httpResponse, handler);
                             return;
                         } else {
-                            resultContent = Json.decodeValue(httpResponse.body(), returnType);
+                            try {
+                                resultContent = Json.mapper.readValue(httpResponse.bodyAsString(), returnType);
+                            } catch (Exception e) {
+                                throw new DecodeException("Failed to decode:" + e.getMessage(), e);
+                            }
                         }
                         result = Future.succeededFuture(resultContent);
                     }
@@ -598,4 +603,4 @@ public class ApiClient {
             auth.applyToParams(queryParams, headerParams);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/webclient/.openapi-generator/VERSION b/samples/client/petstore/java/webclient/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/java/webclient/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/webclient/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 2020fac4b53..845a1e5cde9 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.Client;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
index 6cde4a7f633..a6edb74655d 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -14,6 +14,7 @@ import org.openapitools.client.model.User;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -393,7 +394,7 @@ public class FakeApi {
         final HttpHeaders headerParams = new HttpHeaders();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
         
-        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase()), "enum_query_string_array", enumQueryStringArray));
+        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray));
         queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString));
         queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger));
         queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble));
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 4d3111415b2..15f1d2e6791 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.Client;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java
index 92bfbd46d54..febe863feda 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java
@@ -9,6 +9,7 @@ import org.openapitools.client.model.Pet;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -141,7 +142,7 @@ public class PetApi {
         final HttpHeaders headerParams = new HttpHeaders();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
         
-        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase()), "status", status));
+        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status));
 
         final String[] accepts = { 
             "application/xml", "application/json"
@@ -178,7 +179,7 @@ public class PetApi {
         final HttpHeaders headerParams = new HttpHeaders();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
         
-        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase()), "tags", tags));
+        queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags));
 
         final String[] accepts = { 
             "application/xml", "application/json"
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java
index e3acf8ec0d2..383bc7ace0f 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.Order;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java
index b1d42b682e3..4b38490e704 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java
@@ -7,6 +7,7 @@ import org.openapitools.client.model.User;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION b/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION
index 096bf47efe3..411b9556532 100644
--- a/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java
index 3aa2ec3d55c..b2725e076bc 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java
@@ -31,7 +31,6 @@ public class Order  {
   @ApiModelProperty(value = "")
   private Date shipDate = null;
 
-
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
 public enum StatusEnum {
@@ -60,7 +59,7 @@ public enum StatusEnum {
                 return b;
             }
         }
-        return null;
+        throw new IllegalArgumentException("Unexpected value '" + v + "'");
     }
 }
 
@@ -170,7 +169,7 @@ public enum StatusEnum {
    * @return complete
   **/
   @JsonProperty("complete")
-  public Boolean isComplete() {
+  public Boolean getComplete() {
     return complete;
   }
 
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java
index c7e7cda691e..f6faecaf750 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java
@@ -37,7 +37,6 @@ public class Pet  {
   @ApiModelProperty(value = "")
   private List<Tag> tags = null;
 
-
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
 public enum StatusEnum {
@@ -66,7 +65,7 @@ public enum StatusEnum {
                 return b;
             }
         }
-        return null;
+        throw new IllegalArgumentException("Unexpected value '" + v + "'");
     }
 }
 
diff --git a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin/.openapi-generator/VERSION b/samples/client/petstore/kotlin/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/kotlin/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/php/OpenAPIClient-php/.gitignore b/samples/client/petstore/php/OpenAPIClient-php/.gitignore
new file mode 100644
index 00000000000..edcf63f6aee
--- /dev/null
+++ b/samples/client/petstore/php/OpenAPIClient-php/.gitignore
@@ -0,0 +1,8 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+composer.lock
\ No newline at end of file
diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
+++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
index 5823c0c0ee0..99f505c8848 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
index b9965a942a3..66fd80cebec 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
index 33427981bda..01514377032 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
index cc8aa218449..8795c879f0f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
index 26c0eb7a088..57f9b4090fc 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
index c6194229127..18adbf9935e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
index 0152162f71e..da631f51d79 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
index f6b5a845aaa..06150749a24 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
index c63bed58b4e..9f785db442d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
index e0580382283..0e9116158ae 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
index de132087d2d..fbb1d2f23ed 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
index f3b820922b3..9122cd1cb18 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
index a90a9af8243..ba9cb5ce79b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
index c1fde194525..f6047651834 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
index 30f62c06667..5d5c92f9546 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
index 8625f31f1d1..39bdc1ad056 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
index 22739a7c632..24f83aef548 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
index 6ca8d0d3ba1..1eeb4be5d37 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
index cf236825c47..1da9729f5b4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
index fc33d211666..df7d62205cf 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
index db1f712f0c0..106184d21a4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
index f8924d7fb86..098dd5d56eb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
index 029fcdc3e2d..6a8dd35aa41 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
index eb66f0ab957..4099f2dc6ad 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
index c8c091cabce..56bda31a5c4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
index aa04c170043..0fe2d61e2ef 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
index 45fe3b5a53d..54decec82d8 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
index 284f9bc3acd..98ed15a1fbd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
index 85059a73774..21b845841c3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
index 34295f3473e..33d6f8c6cc4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index 4107964b5ef..e522a954b6d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
index 95966b3b40a..d93f7ae5a8b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
index baa7267b757..f474cff3dae 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
index ba27a1ea33a..182627efc21 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
index 5c2038ff584..00df339f7e3 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
index 053e1adafb3..cfc7ab5cd42 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
index fa525b1e5ce..3d6e3a119bb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
index baa76be7d96..dff244bd604 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
index fe5f8434527..fe7b1ae607c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
index ec7262c9d44..c28577aebe0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
index 3ab9f16e3e0..71a7f65bd7b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
index 4ca0ed8ca30..c8235528f02 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
index fd33e32e0b4..f40f190125c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
index d3665902cae..d7837757f8f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
index 26b27adfe3c..c0306a00864 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
index 80def29e5aa..13202ead6a1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
index 024969dcd6a..95830e8b257 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
index b79a751b98d..7df4931b53b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
index 60e051fd066..126ac5cfbee 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
index 71cdaf6cf2b..4cd1d46fb7e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
index 83fd23fb10f..245d1a616b9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
index 5ea98485e93..dae232e528e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
index 6a4ced913c7..3a5f9ff1943 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
index 4eaabc82ce4..629ee0f5657 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
index 5e984bac6be..559d559c627 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
index 7579695f18a..525eb6d7738 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
index cb64b823911..c8a38c1bcc0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index d21fde8b686..d61a5a33184 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
index fb80798ecd2..964c72fd86b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
index 1cb5018cdb3..c32c301b7cc 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
index 98617bd6d05..6a5a64b35fe 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
index 9e455fcd171..ac6d86256e5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
index f5a53a69cf2..90d1d7ecec2 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
index 42610c61c4b..2e99417165f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
index 02c5d3edb10..dc6e21a9164 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
index eaa42fdefd4..606d1d893fa 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
index 9d07ad0c9c6..4dd023d49fd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
index 86c236f8745..f63230dd96d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
index e3805b23319..4745ed774a2 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
index ab0ebb13744..199abb9d64f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
index 55a77ce6cbb..222dcbf7476 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
index b74fab7c8a1..59d86e07c52 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
index 081cda4e456..14b62d06498 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
index b17f229c293..e1d6d387eb0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index f25f42275d8..549d7c2b22a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
index 6ce3b5fa858..4ed9337429d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
index c6973b2fb20..57f40a4eebf 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
index f255740833d..06bd2e0b0ed 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
index 1e2d76868ec..6f74d72309a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
index 5ea57e93e22..8b2438ecd9e 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
index 46bb91b7148..4429560cdd1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
index b93d84f6886..110dd3b7ba4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
index 02b0ab97d77..19d711a05e7 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
index cfaeb328cc4..0bad57c383a 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
index 91aada21a12..f1174c4cbab 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
index 6c20dccad2c..a4af9363e4f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
index 2ab7476aa7d..575efea2387 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
index cfa1e08113f..a1943d337ef 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
index 354a5b512f8..a92d738c4eb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/client/petstore/ruby/.openapi-generator/VERSION b/samples/client/petstore/ruby/.openapi-generator/VERSION
index 14900cee60e..c791c986fbb 100644
--- a/samples/client/petstore/ruby/.openapi-generator/VERSION
+++ b/samples/client/petstore/ruby/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
index fb9522a24ca..1d122199188 100644
--- a/samples/client/petstore/ruby/lib/petstore.rb
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
index 631a32a42dc..02b83cd07d9 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
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 73202e75325..adb73a8b606 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
index 673879cf076..479bb3221d8 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
index ba02b06905d..72d7d449db9 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
index 40e2658140f..e3dfef5ecf4 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
index 9a51c874d24..fa3a2ba336f 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb
index 06f714c0e77..7a2e4e30859 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_client.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb
index 78edb8feb73..29dca1c1fdd 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_error.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb
index 6f8132d700c..ae3542f3899 100644
--- a/samples/client/petstore/ruby/lib/petstore/configuration.rb
+++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
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
index bea7565c37f..3972cab8c91 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
index f2dcfb278aa..f99d757b970 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =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 92776bda94f..6771f8744b9 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =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 47613736d9e..9668ba07eb4 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
index 200b1003f33..90a1e9e0b56 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
index b50fbb4bd61..74bf4cdded5 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb
index af3061da626..af11ea04985 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb
index fdabd812601..a68d999491e 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb
index 129be2ccbdf..6a0e047d696 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb
index baccd2ecd07..500554d861b 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/category.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb
index d5b7d848a9a..9db0d1a8b9d 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/client.rb b/samples/client/petstore/ruby/lib/petstore/models/client.rb
index 61a4bc93f0c..12a321bab8b 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/client.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/client.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
index 5628376f957..41b5bb03089 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
index bed06c5194c..549da2d328a 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =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 46059c24614..5b9a860503c 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =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 40416289d45..d1d8826162c 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/file.rb b/samples/client/petstore/ruby/lib/petstore/models/file.rb
index e141d680f8f..e870d9bd2a1 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/file.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/file.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
index 4dd48acfa93..31f27fc16b9 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =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 9f04147e823..dda7ab40ba3 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
index 6b33d9e5504..f05ac87745b 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/list.rb b/samples/client/petstore/ruby/lib/petstore/models/list.rb
index a6d375a09b5..b3b9b7081b6 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/list.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/list.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb
index 40d6ce9a90d..b34ba915878 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =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
index 9666d11d158..e4c039dced3 100644
--- 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
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb
index 3bb679ae3c2..052ed975980 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =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 8de1e511d6e..21878f5f4d9 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb
index 990d4c67751..88978402494 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/name.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb
index 60a525f0b5e..32010cb8411 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb
index 2f2ec5e9145..57cc8903d47 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb
index eaeeed40882..fac1d6f54ce 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb
index d815de0d8f4..b52e279e60d 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
index ceb3d9d327f..dd3b013cf9f 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =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
index 992bea8712e..0e608f9cb6e 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =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 13ab4f67fc9..9f42f62c9f3 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
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb b/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb
index 2318f7e8fb0..c8fc919993c 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
index 220c9848b73..18cb4ce5731 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb
index ce1f13ae839..c5d18550ba9 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/user.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb
index 1f94471ed8c..ac90f18baf5 100644
--- a/samples/client/petstore/ruby/lib/petstore/version.rb
+++ b/samples/client/petstore/ruby/lib/petstore/version.rb
@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec
index a7beed1589c..0fb50655895 100644
--- a/samples/client/petstore/ruby/petstore.gemspec
+++ b/samples/client/petstore/ruby/petstore.gemspec
@@ -8,7 +8,7 @@
 OpenAPI spec version: 1.0.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.2.1-SNAPSHOT
+OpenAPI Generator version: 3.2.3-SNAPSHOT
 
 =end
 
diff --git a/samples/client/petstore/ruby/pom.xml b/samples/client/petstore/ruby/pom.xml
index f4c621fca53..7da992f4e86 100644
--- a/samples/client/petstore/ruby/pom.xml
+++ b/samples/client/petstore/ruby/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>RubyPetstoreClientTests</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
-    <name>Ruby Swagger Petstore Client</name>
+    <name>Ruby OpenAPI Petstore Client</name>
     <build>
         <plugins>
             <plugin>
diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
+++ b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
index 40378c6ee25..6a5e4fcc4f1 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
index 946daffc524..c8ba8ff43e2 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
index c6bdcdd6f7f..cdecda471c0 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
+++ b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
index 4d583fcd2e8..5c2e3b6a7f8 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
index 589f2d41da3..fa11ef10583 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
index d737a5ee262..3288f68ef28 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/swift3/default/.openapi-generator/VERSION b/samples/client/petstore/swift3/default/.openapi-generator/VERSION
index ad121e8340e..4395ff59232 100644
--- a/samples/client/petstore/swift3/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift3/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.1-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index 3ed9e7cfddf..e44709f2459 100644
--- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -239,8 +239,8 @@ open class FakeAPI: APIBase {
      * enum for parameter enumHeaderStringArray
      */
     public enum EnumHeaderStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
+        case greaterThan = "">""
+        case dollar = ""$""
     }
 
     /**
@@ -256,8 +256,8 @@ open class FakeAPI: APIBase {
      * enum for parameter enumQueryStringArray
      */
     public enum EnumQueryStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
+        case greaterThan = "">""
+        case dollar = ""$""
     }
 
     /**
diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index a54e0ff03f4..20514a3b6e6 100644
--- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -25,6 +25,7 @@ open class FakeClassnameTags123API: APIBase {
     /**
      To test class name in snake case
      - PATCH /fake_classname_test
+     - To test class name in snake case
      - API Key:
        - type: apiKey api_key_query (QUERY)
        - name: api_key_query
diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 1460cbe2955..8648214c730 100644
--- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -89,9 +89,9 @@ open class PetAPI: APIBase {
      * enum for parameter status
      */
     public enum Status_findPetsByStatus: String { 
-        case available = "available"
-        case pending = "pending"
-        case sold = "sold"
+        case available = ""available""
+        case pending = ""pending""
+        case sold = ""sold""
     }
 
     /**
diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 928449dfcbc..c2414d1023e 100644
--- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -15,8 +15,8 @@ open class EnumArrays: JSONEncodable {
         case dollar = "$"
     }
     public enum ArrayEnum: String { 
-        case fish = "fish"
-        case crab = "crab"
+        case fish = ""fish""
+        case crab = ""crab""
     }
     public var justSymbol: JustSymbol?
     public var arrayEnum: [ArrayEnum]?
diff --git a/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 58548bee74d..7b6af62b057 100644
--- a/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift3/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -11,8 +11,8 @@ import Foundation
 open class MapTest: JSONEncodable {
 
     public enum MapOfEnumString: String { 
-        case upper = "UPPER"
-        case lower = "lower"
+        case upper = ""UPPER""
+        case lower = ""lower""
     }
     public var mapMapOfString: [String:[String:String]]?
     public var mapOfEnumString: [String:String]?
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Podfile.lock b/samples/client/petstore/swift3/default/SwaggerClientTests/Podfile.lock
index 187218299fb..cd2b8ac82ec 100644
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Podfile.lock
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Podfile.lock
@@ -6,14 +6,18 @@ PODS:
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: bbb95cd0adc059bbdbe541b384f8294f4e241226
+  PetstoreClient: a9f241d378687facad5c691a1747b21f64b405fa
 
 PODFILE CHECKSUM: 417049e9ed0e4680602b34d838294778389bd418
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
index ba5d67322e3..22dee1089b3 100644
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
@@ -2,16 +2,17 @@
   "name": "PetstoreClient",
   "platforms": {
     "ios": "9.0",
-    "osx": "10.11"
+    "osx": "10.11",
+    "tvos": "9.0"
   },
   "version": "0.0.1",
   "source": {
-    "git": "git@github.com:swagger-api/swagger-mustache.git",
+    "git": "git@github.com:openapitools/openapi-generator.git",
     "tag": "v1.0.0"
   },
   "authors": "",
   "license": "Proprietary",
-  "homepage": "https://github.com/swagger-api/swagger-codegen",
+  "homepage": "https://github.com/openapitools/openapi-generator",
   "summary": "PetstoreClient",
   "source_files": "PetstoreClient/Classes/**/*.swift",
   "dependencies": {
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Manifest.lock b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Manifest.lock
index 187218299fb..cd2b8ac82ec 100644
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Manifest.lock
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Manifest.lock
@@ -6,14 +6,18 @@ PODS:
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: bbb95cd0adc059bbdbe541b384f8294f4e241226
+  PetstoreClient: a9f241d378687facad5c691a1747b21f64b405fa
 
 PODFILE CHECKSUM: 417049e9ed0e4680602b34d838294778389bd418
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
index 346e9509029..10406add241 100644
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
@@ -7,84 +7,81 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		00433565417D8EB2877B80870AA37FC5 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85F20E4DF6D1F32E36AE3823008F92BE /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
-		057D51272B35EEE9D412EE4A012F273B /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEEEB561582A92AB799221584DDDAD6 /* Capitalization.swift */; };
-		05AA1D0A4880C8B2E820E8AB9DB0CA0C /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00925AB5384C3976E53F0437FE1311C5 /* AlamofireImplementations.swift */; };
-		09CF911587060356512E13F57A1746E9 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59945A57D8EEE7EBE8146D516EA7257D /* Name.swift */; };
+		022118A06E4266B7CF103F2D3E594F1B /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57299EE6209AFEBA56C717433863E136 /* Model200Response.swift */; };
+		0B4682928CDA581AE825A894AA4EE97F /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14FE73E27209DA05667C0D3E1B601734 /* Pet.swift */; };
 		10EB23E9ECC4B33E16933BB1EA560B6A /* Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87882A1F5A92C8138D54545E51D51E6F /* Timeline.swift */; };
-		1B9EDEDC964E6B08F78920B4F4B9DB84 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = B44A27EFBB0DA84D738057B77F3413B1 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1C48756766427E6BB17C6F5C7672F0EF /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BA02A166AA3B7EC3B8DF4103088DE8A /* Pet.swift */; };
-		245C4B7A64DD93E776A57C420002ED8B /* OuterString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 547A70BA5BF7A5A411F65BEFD9BF0B07 /* OuterString.swift */; };
-		2E4FA060FD9624B60A1B8A4AF3FB70EF /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7645FEA4F23C54852D28771CC2FF3B80 /* User.swift */; };
-		31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		327DFA0268018413C4C6D9EAEE45FFF4 /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C7F83F8F72A49EA9D543B4B32260F64 /* Return.swift */; };
-		33854474ACF02E42AD42AC08C523B54F /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B3E802F6708C08B257C5E6F550D3FDB /* APIHelper.swift */; };
+		12F046ACC7A765A58AE3EC78B5C37654 /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DD46253330346E885D5966DBB25FE8B /* ArrayOfArrayOfNumberOnly.swift */; };
+		17D7DD6070AC0827798B808A3B3F33CC /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD481458DC0F63AEFBD495121305D6D8 /* AdditionalPropertiesClass.swift */; };
+		1B9EDEDC964E6B08F78920B4F4B9DB84 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 03DECE84DC850B04690604AB7C521277 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2692488ECFB2DC44A1484F4E237F1A7F /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ED78F1E81F4EF6FE5B0E77CA5BFB40C /* Cat.swift */; };
+		2D99D98D8B0A65646A128075993EE8E7 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2CEC365CFACB91EC9E750D659D5ED10 /* Client.swift */; };
+		358744AD7511300B7BA57E75C523CE4E /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BAEE07194E1BFA72B1110849C7B348A /* Return.swift */; };
 		3626B94094672CB1C9DEA32B9F9502E1 /* TaskDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A01C037B4034EDA3D7955BC5E4E9D9D6 /* TaskDelegate.swift */; };
+		3B3759CDE620B518B4E187D6607AD40E /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F3B836F14594A6EF1923CC07B61E893 /* ClassModel.swift */; };
 		3F3B788CC8A53F01CE6A1B33D4052D80 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
-		4164BE89CE07197B165DE11BE00C81B6 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270C457C18A9B3C93FE2C196EC065A1A /* SpecialModelName.swift */; };
-		41A4833A4104452384C8200FECA468F7 /* OuterNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3AE9FA5F3483AB2497E1D3B488F0562 /* OuterNumber.swift */; };
-		424F25F3C040D2362DD353C82A86740B /* Pods-SwaggerClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		43ECF64E02DB84925FBE5EC2F6569B22 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68E391F21156718CBAB2638D6A02FAA3 /* UserAPI.swift */; };
-		44990E3C6099A47299E6E39B9BD01214 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB0115D0EE604B8618320E1C6B52390 /* Client.swift */; };
-		45B9E69F6558F40D6C4AA9C1BCFA9FEA /* FakeclassnametagsAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = F25F7F29B763AB9B70C3140B53E8F5A1 /* FakeclassnametagsAPI.swift */; };
-		473587DCDFAD50A5A2D7FEB93F3D28E1 /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7092AD06F0EF38CC9D8C3FE8B772E65 /* Dog.swift */; };
-		4C172288F3ACD041084677D2C05DEF02 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9769FD713F522BC6BA9A6C8B6C3BA7 /* EnumClass.swift */; };
-		4CF609068BF29F02DFDBF05320064219 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 706C7AFFE37BA158C3553250F4B5FAED /* Alamofire.framework */; };
+		41C410B0290C38CDA9F27285983864D2 /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59022FD592AB91A0B2EDA3A2EA5EC8D9 /* OuterComposite.swift */; };
+		424F25F3C040D2362DD353C82A86740B /* Pods-SwaggerClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4B608BE9558F9880F286073E764222BA /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2274608F6E89920A7FBADABEF6A20A1F /* Animal.swift */; };
+		4D659A79C5FD26710C0EE4DDD46B5197 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A15B50BA886EAD6427ADC7E68BBD4FE /* StoreAPI.swift */; };
+		4EE591215BF57E9C655E1FFDF4244E20 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E982F66B9CB4E2C2083F9B02EF41011 /* APIHelper.swift */; };
+		535108E2BD555B4E3935DB583B03BC03 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00FC3821A8BFCD6F05D00696BF175619 /* MapTest.swift */; };
 		5387216E723A3C68E851CA15573CDD71 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E230A0448B394DE26E688DAC8E6201E /* Request.swift */; };
-		58501155D7B20CF99109A4DC953CC266 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7017BC38FCA103F2518FE2C4942EB8A3 /* AnimalFarm.swift */; };
-		5887440665FFCF423171C4E5C3EFB9D1 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 541CB75E23648A3EE2925E81E345B0FB /* MapTest.swift */; };
-		5B01F54B86EA75E6E4A4C2A2EB2E8B07 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 580886F727A89668FA28D3BA11678585 /* Order.swift */; };
-		609113D6244720A747DD150234AB431C /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA45912AE978F0840F94A8D308944E6B /* OuterComposite.swift */; };
-		60A9299604ADCB164294555D66DD507F /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 052400F31168326FF2A3E229D65D1B39 /* EnumTest.swift */; };
+		5C8D71030D0D58B316181FF9BB0FA757 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC890DE67452A9F63BD12B30135E3BD6 /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		5DD7FE53110AD4EAACC894FC465DA8F2 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A1AE5E1B215E1D53DCB6AB501CB0DAE /* Configuration.swift */; };
+		5EF2450B3FE235021270DDE480AB9DFF /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8261F606FFC7AA4F9C45CA8016E8B1C7 /* FormatTest.swift */; };
 		61200D01A1855D7920CEF835C8BE00B0 /* DispatchQueue+Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FCBF1EED873F61C6D46CE37FA5C39D3 /* DispatchQueue+Alamofire.swift */; };
+		6244553C8EB8413BDE84442BDB32B158 /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE05BA43EDFECD3CB825712216F42CE9 /* APIs.swift */; };
 		62F65AD8DC4F0F9610F4B8B4738EC094 /* ServerTrustPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B030D27CAC730C5EB0F22390645310 /* ServerTrustPolicy.swift */; };
-		65C5109AD09965C1BD747668037F7895 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 06F576B1286B5129A7A77654A92AAFCF /* PetstoreClient-dummy.m */; };
-		6872374F425855C8CADA536A71CD5DBE /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C4834C40334FCBD463B4BC38A966C9 /* Model200Response.swift */; };
-		69F05AAB871A087A719B6B4383CBEA0F /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DAD68F75B538EE67EB80CC354DCE787 /* Extensions.swift */; };
-		71F5C69A53E4AAB624587E0966CDFD0B /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B30C52CDC21F3188E5A50C469937008F /* NumberOnly.swift */; };
+		6337B0A36831DF8FAA0BC62F2E5ED525 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA5F47130C28C4C5652E69E59A0902BD /* User.swift */; };
+		63E53FB5E0AFF41C1AEE670D4D2EA55B /* AnotherFakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45ED3A5E50AA60588D6ADA19ACBF0C66 /* AnotherFakeAPI.swift */; };
+		73880BFBD593B84BDC52BDA73CD905D3 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C103637D74EC198CF949454436D3616 /* Category.swift */; };
 		73B9C996AED49ED7CF8EC2A6F1738059 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
+		7877D0A755EDD3241453857443FED9BE /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08583885463D1EDB2F8023584348659C /* Dog.swift */; };
 		7B5FE28C7EA4122B0598738E54DBEBD8 /* SessionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195D73DD9EF275A3C56569E2B1CA8026 /* SessionDelegate.swift */; };
 		7D8CC01E8C9EFFF9F4D65406CDE0AB66 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D60BC9955B4F7FFA62D7440CB385C11 /* Result.swift */; };
-		7FF14684D2EDBA8FF4B8785919108F4A /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BAC2B27DBB94AEC209B05FC0541894E /* StoreAPI.swift */; };
-		81C4DD7F2D22A02649BF8D76955BDCB6 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB010C5D4A7300AD69E8389F8E09BDF /* ArrayTest.swift */; };
-		863FA751BBFDA85195E1B17CA2392236 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = F381FC45001ED67FBA800D5DEACBE414 /* HasOnlyReadOnly.swift */; };
-		897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */; };
-		953F99387D4F96C3CDA56DBF619716FD /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0CC1C18E268F223DDA59BAA121FE88E /* List.swift */; };
-		9CD67121D1D4F1093AF9F7ADBFAF9BD6 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09CECC4989EF7F2028490D9A4CC6C9B7 /* OuterEnum.swift */; };
-		9E4253E1905B0A36CAE0C590902BC030 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FDCB2CCAC42FDF414F93594CF7F2D6D /* Category.swift */; };
+		80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */; };
+		819A936646985D3BD0ED55EE5A11E874 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3911B66DC4AC99DD29F10D115CF4555A /* PetAPI.swift */; };
+		83BB300F436739562A879819271788A8 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4C9F81DD3B2DAC61C014790FAFD205E /* Name.swift */; };
+		8448CBC208B027E8EADEA39AE687B3D8 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CAA626D85FBD1FF53F144A14B3A3230 /* Extensions.swift */; };
+		8505A8B33E6DB2468C52997E8B328FA0 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64104A4C68341D80F2DB4CF5DE7779F /* Models.swift */; };
+		85216A45BF4ABCF5654715167D7A8A44 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A0B504F5FC1B5E5369C2AD8ABA9482A /* AnimalFarm.swift */; };
+		856E217482D183D133297CB6BF12D8FD /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2AAC6F82FCBCF2CE32522143CBF59D6 /* List.swift */; };
+		86031F845943F3F00049B90CA06F1C4E /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B11E91D22910944308DE39CB8CBF3AE /* OuterEnum.swift */; };
+		8F51DB58A86B9665D7B785BB25DE9FEF /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0644BE2FFAA5C8FE7F15E3BF2557AFC /* Order.swift */; };
+		8F68634B12F668D1B117CC89F899CF13 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E3D0C745CE3A020C8BC5C96CAFB616F /* PetstoreClient-dummy.m */; };
+		93AB309BD6FE9AEE0CFD4E7075F26619 /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EB881F0C1B1D1F90FAB084334D6C13D /* EnumTest.swift */; };
+		961E53797F3F7FA8DB12A00560426AC8 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BFA1723A93AA1DB0952B2F750421B32 /* UserAPI.swift */; };
+		984C5C69C0582AD61CD1A3AA7D1D4B4C /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 706C7AFFE37BA158C3553250F4B5FAED /* Alamofire.framework */; };
 		9ED2BB2981896E0A39EFA365503F58CE /* AFError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AF006B0AD5765D1BFA8253C2DCBB126 /* AFError.swift */; };
+		A08574719EF212B105954F58DD8AFBE1 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCD2D0F8C81B81BFB4306011CAC48A20 /* AlamofireImplementations.swift */; };
+		A1BDAFE44135347E816DDA243519910B /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = C049305B9A26A2FD2A88D0394DD37678 /* HasOnlyReadOnly.swift */; };
 		A2A6F71B727312BD45CC7A4AAD7B0AB7 /* NetworkReachabilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5A8AA5F9EDED0A0BDDE7E830BF4AEE0 /* NetworkReachabilityManager.swift */; };
-		A7FDA0F12CCF0FE7407C4EE1D88D63D1 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B693DDC1E69F657EACB36EFF2276AB9 /* ArrayOfNumberOnly.swift */; };
-		A9E7F7A86DB2E1A97F472E8184EB8D62 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE862CC5FFB80999FD1500D5801F2A21 /* ReadOnlyFirst.swift */; };
-		A9EEEA7477981DEEBC72432DE9990A4B /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 22C1C119BCE81C53F76CAC2BE27C38E0 /* Alamofire-dummy.m */; };
-		AAB6E3FF4C203D1B4418B604C704EC5E /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91DFFBF289A62730BCCBAC4851A1AC8B /* AdditionalPropertiesClass.swift */; };
+		A9EEEA7477981DEEBC72432DE9990A4B /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D1F50F37DFB6DC0B7B9D8C373E5A3EAE /* Alamofire-dummy.m */; };
 		AE1EF48399533730D0066E04B22CA2D6 /* SessionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46CDAC6C1187C5467E576980E1062C8B /* SessionManager.swift */; };
-		B3E582D71CDFDDC17D542DBB2CC569D5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
+		AE21939A626D9B867413404C953FB83B /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDE4AF9A5A88886D7B60AF0F0996D9FA /* EnumArrays.swift */; };
+		B29744F262A1B7D3F1344833CA64349A /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93D9DA1CB883DC1FCCF639FECF14930D /* FakeClassnameTags123API.swift */; };
+		B6387F6650EDB2C988BBD6EE93263AFA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
 		B65FCF589DA398C3EFE0128064E510EC /* MultipartFormData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 155538D91ACEEEDF82069ACF6C1A02E7 /* MultipartFormData.swift */; };
-		BB44263B22784220295C8DE96281AC0D /* Fake_classname_tags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80F9261093894D0B652D42D5A3D1D1F9 /* Fake_classname_tags123API.swift */; };
 		BBEFE2F9CEB73DC7BD97FFA66A0D9D4F /* Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B029DBC43E49A740F12B5E4D2E6DD452 /* Validation.swift */; };
+		BBFF38577AA65B4E0C3E6B7A32BC7E27 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4FB407CB8C792BFB02EADD91D6A4DFA /* ReadOnlyFirst.swift */; };
 		BE5C67A07E289FE1F9BE27335B159997 /* ParameterEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6639346628280A0D0FAD35196BF56108 /* ParameterEncoding.swift */; };
-		C1C8EAD6D96212CEE77AE32B4C5B4689 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB7377A43FADE63746BBC7D1CCAD93D /* ClassModel.swift */; };
-		C454A045AA0C3821D4143B435AADB863 /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5351A4A344C05ACDF996E3630E69366C /* ArrayOfArrayOfNumberOnly.swift */; };
-		C4FE1444409BDBD0C1850A7D0C24E0E2 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E2C57703EA0D61575D878820DE56A5E4 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		CB57E535A1515E3590E3ECFF8DD3040C /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2B00793CB30A6A5C0C3497B890D7A1 /* Animal.swift */; };
+		CB2AE7CE6253392499D81064945D704B /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0E62A4CE2C6F59AE92D9D02B41649D5 /* ApiResponse.swift */; };
 		CB6D60925223897FFA2662667DF83E8A /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F47F5C9CDB035C5AFADEBA5BF44F1C /* Response.swift */; };
-		CCE24F24BF3EB1A2C514AB41B9BBF722 /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 888EE37DF287C4063756B72B2D0DBB04 /* FakeAPI.swift */; };
-		CFDC2507829B1FEF8C1319EFB91B9B2E /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8480516CD063566F07F5D08643F3BA9F /* Cat.swift */; };
-		D329D405FF7D2A9DEE1F03F00587E132 /* OuterBoolean.swift in Sources */ = {isa = PBXBuildFile; fileRef = 863C495665994A46B8848CBC998B332A /* OuterBoolean.swift */; };
-		D5F1BBD60108412FD5C8B320D20B2993 /* Pods-SwaggerClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */; };
-		D7214BDCBD49ABCB18F79A04C8225B07 /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95821A5031076AE0FDCDE22E0954A02D /* EnumArrays.swift */; };
-		E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
-		EA63D6A5D6D3063FEDC68902C60F7C44 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7896C2D88FC42331AEA0607792B4510A /* Tag.swift */; };
-		EAFE09F156DA9CE33520DE9A83A0063A /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 428C78B74D8A4ECEA1E6470057D3562B /* PetAPI.swift */; };
+		CB9D5B33D2A072BBEAFC7A941C986A85 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5921D679A4009B3F216FEF671EB69158 /* NumberOnly.swift */; };
+		D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
+		D41E4EEA685E8151A95393E9E1EF95CC /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = D931C41179C1EA52307316C7F51D1245 /* ArrayOfNumberOnly.swift */; };
+		D5F1BBD60108412FD5C8B320D20B2993 /* Pods-SwaggerClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */; };
+		DD79A040B4D1DEE849091CF1E91AF42A /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FCF0B9190C58BD7493583E8133B3E56 /* EnumClass.swift */; };
+		E479ACE0A5835A89134A8C7663FA2E1D /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2A82E1B6CEC50F002C59C255C26B381 /* Capitalization.swift */; };
+		E6A94FA31172DD3438D5A3EC51A05638 /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD8EF004C7534401577C1694D823F3 /* FakeAPI.swift */; };
+		E888314B46198CB029A33B8F4C66C947 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9623461D845F7EE6E2BBDBC44B8FE867 /* SpecialModelName.swift */; };
+		ECF333C34A4147267C5AD9AF8436DFF7 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB9FB7676C53BD9BE06337BB539478B1 /* Tag.swift */; };
 		EFD264FC408EBF3BA2528E70B08DDD94 /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66A46F517F0AF7E85A16D723F6406896 /* Notifications.swift */; };
+		F31DA9A56D4B939D511C9CC5CCE95843 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BCC6F35A8BC2A442A13DE66D59CAC87 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F6BECD98B97CBFEBE2C96F0E9E72A6C0 /* ResponseSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F9510473F6FFD7AA66524DB16C2263 /* ResponseSerialization.swift */; };
-		F8284F679BA0722A2847F6DF984D3CC9 /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF2F015C5D4E807D437D0EE9528B3CE /* APIs.swift */; };
 		F8B3D3092ED0417E8CDF32033F6122F5 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFCB8C44DE758E906C0BCDA455937B85 /* Alamofire.swift */; };
-		FC41F2E7439517DE7A562E935DA992F7 /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B6FF05C8B29C32FB1710F116C21BB4 /* FormatTest.swift */; };
-		FE01173D208EA67C931846F08230E37F /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 311A10F75B7649E2E301E8EC58A6A5EA /* Configuration.swift */; };
-		FEA39C941A98DB246BE23697A4C556F1 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 885795F7A7783B007F026944B55862FF /* Models.swift */; };
-		FEDEAFA3F155ACC48A61243BE97DC0FD /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A557F23780CA069BA61AE2BE3C0C935 /* ApiResponse.swift */; };
+		FCAD0021405A0CAE1B59CE70430EBE11 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 749EFF1B930D930529640C8004714C51 /* ArrayTest.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -92,10 +89,17 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = F10822488A6B105743E3D9107AEE518C;
+			remoteGlobalIDString = 7A44E3414AC7209D8D353C337F268DBC;
 			remoteInfo = PetstoreClient;
 		};
-		4348BAD86139841DA7571E09FA8BE2E7 /* PBXContainerItemProxy */ = {
+		39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 41903051A113E887E262FB29130EB187;
+			remoteInfo = "Pods-SwaggerClient";
+		};
+		65C4A1A84C1B3A3EA573D203ABE57C80 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
@@ -112,127 +116,125 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		00925AB5384C3976E53F0437FE1311C5 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift; sourceTree = "<group>"; };
-		00ACB4396DD1B4E4539E4E81C1D7A14E /* Pods-SwaggerClientTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-SwaggerClientTests.modulemap"; sourceTree = "<group>"; };
-		02F28E719AA874BE9213D6CF8CE7E36B /* Pods-SwaggerClientTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClientTests-acknowledgements.plist"; sourceTree = "<group>"; };
+		00FC3821A8BFCD6F05D00696BF175619 /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
+		03DECE84DC850B04690604AB7C521277 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
 		04F47F5C9CDB035C5AFADEBA5BF44F1C /* Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Response.swift; path = Source/Response.swift; sourceTree = "<group>"; };
-		052400F31168326FF2A3E229D65D1B39 /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
-		06F576B1286B5129A7A77654A92AAFCF /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
-		09CECC4989EF7F2028490D9A4CC6C9B7 /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
-		0B3E802F6708C08B257C5E6F550D3FDB /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/Swaggers/APIHelper.swift; sourceTree = "<group>"; };
+		08583885463D1EDB2F8023584348659C /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		08BDFE9C9E9365771FF2D47928E3E79A /* Pods-SwaggerClient-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClient-acknowledgements.plist"; sourceTree = "<group>"; };
+		0AD61F8554C909A3AFA66AD9ECCB5F23 /* Pods-SwaggerClient-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-frameworks.sh"; sourceTree = "<group>"; };
+		0BCC6F35A8BC2A442A13DE66D59CAC87 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
 		0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		0FCBF1EED873F61C6D46CE37FA5C39D3 /* DispatchQueue+Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Alamofire.swift"; path = "Source/DispatchQueue+Alamofire.swift"; sourceTree = "<group>"; };
-		13A0A663B36A229C69D5274A83E93F88 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		117EFB31D9AD9673BAF51B48596F19E2 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		14FE73E27209DA05667C0D3E1B601734 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
 		155538D91ACEEEDF82069ACF6C1A02E7 /* MultipartFormData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MultipartFormData.swift; path = Source/MultipartFormData.swift; sourceTree = "<group>"; };
-		16C4834C40334FCBD463B4BC38A966C9 /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		15EC3D8D715BC3F25A366C403ED02060 /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
 		195D73DD9EF275A3C56569E2B1CA8026 /* SessionDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionDelegate.swift; path = Source/SessionDelegate.swift; sourceTree = "<group>"; };
-		1B693DDC1E69F657EACB36EFF2276AB9 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
-		1BA02A166AA3B7EC3B8DF4103088DE8A /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
-		1BAC2B27DBB94AEC209B05FC0541894E /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.debug.xcconfig"; sourceTree = "<group>"; };
+		1BAEE07194E1BFA72B1110849C7B348A /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		1C103637D74EC198CF949454436D3616 /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
 		1E230A0448B394DE26E688DAC8E6201E /* Request.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Request.swift; path = Source/Request.swift; sourceTree = "<group>"; };
-		22C1C119BCE81C53F76CAC2BE27C38E0 /* Alamofire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Alamofire-dummy.m"; sourceTree = "<group>"; };
-		270C457C18A9B3C93FE2C196EC065A1A /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
-		291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClient-dummy.m"; sourceTree = "<group>"; };
-		2FF17440CCD2E1A69791A4AA23325AD5 /* Pods-SwaggerClient-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClient-acknowledgements.markdown"; sourceTree = "<group>"; };
-		311A10F75B7649E2E301E8EC58A6A5EA /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/Swaggers/Configuration.swift; sourceTree = "<group>"; };
+		1E982F66B9CB4E2C2083F9B02EF41011 /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/OpenAPIs/APIHelper.swift; sourceTree = "<group>"; };
+		1FCF0B9190C58BD7493583E8133B3E56 /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		210971763CB2FC0DC4E378271A37BE32 /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Alamofire.modulemap; sourceTree = "<group>"; };
+		2274608F6E89920A7FBADABEF6A20A1F /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
+		2EB881F0C1B1D1F90FAB084334D6C13D /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
+		2F3B836F14594A6EF1923CC07B61E893 /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
+		32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClient-umbrella.h"; sourceTree = "<group>"; };
 		32B030D27CAC730C5EB0F22390645310 /* ServerTrustPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ServerTrustPolicy.swift; path = Source/ServerTrustPolicy.swift; sourceTree = "<group>"; };
-		3C7F83F8F72A49EA9D543B4B32260F64 /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		33A04B5D27E86AF4B84D95E21CF3F452 /* Alamofire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Alamofire.xcconfig; sourceTree = "<group>"; };
+		3911B66DC4AC99DD29F10D115CF4555A /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		3BFA1723A93AA1DB0952B2F750421B32 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
 		3D60BC9955B4F7FFA62D7440CB385C11 /* Result.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Result.swift; path = Source/Result.swift; sourceTree = "<group>"; };
-		3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClient-umbrella.h"; sourceTree = "<group>"; };
-		3F16B43ABD2C8CD4A311AA1AB3B6C02F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		428C78B74D8A4ECEA1E6470057D3562B /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
-		43FC49AA70D3E2A84CAED9C37BE9C4B5 /* Pods-SwaggerClientTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-frameworks.sh"; sourceTree = "<group>"; };
+		3ED78F1E81F4EF6FE5B0E77CA5BFB40C /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
+		4050C78B3A61270CDB69C80EFEB9BF4B /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
+		419496CDDD7E7536CBEA02BAEE2C7C21 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		45ED3A5E50AA60588D6ADA19ACBF0C66 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = "<group>"; };
 		46CDAC6C1187C5467E576980E1062C8B /* SessionManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionManager.swift; path = Source/SessionManager.swift; sourceTree = "<group>"; };
 		49A9B3BBFEA1CFFC48229E438EA64F9E /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Alamofire.framework; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4AF006B0AD5765D1BFA8253C2DCBB126 /* AFError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AFError.swift; path = Source/AFError.swift; sourceTree = "<group>"; };
-		4BB010C5D4A7300AD69E8389F8E09BDF /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
-		4FF2F015C5D4E807D437D0EE9528B3CE /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/Swaggers/APIs.swift; sourceTree = "<group>"; };
-		5351A4A344C05ACDF996E3630E69366C /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
-		541CB75E23648A3EE2925E81E345B0FB /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
-		547A70BA5BF7A5A411F65BEFD9BF0B07 /* OuterString.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterString.swift; sourceTree = "<group>"; };
-		549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.debug.xcconfig"; sourceTree = "<group>"; };
-		580886F727A89668FA28D3BA11678585 /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
-		59945A57D8EEE7EBE8146D516EA7257D /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
-		5DB0115D0EE604B8618320E1C6B52390 /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
-		5E79C2313007533BFFA709832BE18FDC /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		4DD46253330346E885D5966DBB25FE8B /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		536A8BDFB104F4132169F2B758A6AA0C /* PetstoreClient.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = PetstoreClient.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		57299EE6209AFEBA56C717433863E136 /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		59022FD592AB91A0B2EDA3A2EA5EC8D9 /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
+		5921D679A4009B3F216FEF671EB69158 /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
+		61D920D6E48023BCBF18CD83450D05F5 /* Alamofire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-prefix.pch"; sourceTree = "<group>"; };
 		6639346628280A0D0FAD35196BF56108 /* ParameterEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ParameterEncoding.swift; path = Source/ParameterEncoding.swift; sourceTree = "<group>"; };
 		66A46F517F0AF7E85A16D723F6406896 /* Notifications.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Notifications.swift; path = Source/Notifications.swift; sourceTree = "<group>"; };
-		687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClientTests-dummy.m"; sourceTree = "<group>"; };
-		68E391F21156718CBAB2638D6A02FAA3 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
-		694EDDB57CDB8FB6CB5088BF3F66CE8A /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
+		6A0B504F5FC1B5E5369C2AD8ABA9482A /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
 		6C0ACB269F0C836F1865A56C4AF7A07E /* Pods_SwaggerClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClient.framework; path = "Pods-SwaggerClient.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
-		6DB7377A43FADE63746BBC7D1CCAD93D /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
-		7017BC38FCA103F2518FE2C4942EB8A3 /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
+		6CAA626D85FBD1FF53F144A14B3A3230 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/OpenAPIs/Extensions.swift; sourceTree = "<group>"; };
 		706C7AFFE37BA158C3553250F4B5FAED /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		7645FEA4F23C54852D28771CC2FF3B80 /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
-		7896C2D88FC42331AEA0607792B4510A /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
-		78B6FF05C8B29C32FB1710F116C21BB4 /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
-		7C8E63660D346FD8ED2A97242E74EA09 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		7CEEEB561582A92AB799221584DDDAD6 /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
-		7D141D1953E5C6E67E362CE73090E48A /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = Alamofire.modulemap; sourceTree = "<group>"; };
-		80F9261093894D0B652D42D5A3D1D1F9 /* Fake_classname_tags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Fake_classname_tags123API.swift; sourceTree = "<group>"; };
-		8480516CD063566F07F5D08643F3BA9F /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
-		849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.release.xcconfig"; sourceTree = "<group>"; };
-		855FBD05ABAD1AE4A03E58EEBA975DAA /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
-		85F20E4DF6D1F32E36AE3823008F92BE /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
-		863C495665994A46B8848CBC998B332A /* OuterBoolean.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterBoolean.swift; sourceTree = "<group>"; };
-		86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.release.xcconfig"; sourceTree = "<group>"; };
+		721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClientTests-dummy.m"; sourceTree = "<group>"; };
+		749EFF1B930D930529640C8004714C51 /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
+		76645699475D3AB6EB5242AC4D0CEFAE /* Pods-SwaggerClient-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClient-acknowledgements.markdown"; sourceTree = "<group>"; };
+		79DD8EF004C7534401577C1694D823F3 /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
+		7A15B50BA886EAD6427ADC7E68BBD4FE /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		7A1AE5E1B215E1D53DCB6AB501CB0DAE /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/OpenAPIs/Configuration.swift; sourceTree = "<group>"; };
+		7B11E91D22910944308DE39CB8CBF3AE /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
+		7E3D0C745CE3A020C8BC5C96CAFB616F /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
+		814471C0F27B39D751143F0CD53670BD /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		8261F606FFC7AA4F9C45CA8016E8B1C7 /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
 		87882A1F5A92C8138D54545E51D51E6F /* Timeline.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeline.swift; path = Source/Timeline.swift; sourceTree = "<group>"; };
-		885795F7A7783B007F026944B55862FF /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/Swaggers/Models.swift; sourceTree = "<group>"; };
-		888EE37DF287C4063756B72B2D0DBB04 /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
 		897F0C201C5E0C66A1F1E359AECF4C9C /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = PetstoreClient.framework; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		8FDCB2CCAC42FDF414F93594CF7F2D6D /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
-		91DFFBF289A62730BCCBAC4851A1AC8B /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
 		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
-		95821A5031076AE0FDCDE22E0954A02D /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
-		969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.debug.xcconfig"; sourceTree = "<group>"; };
-		9A557F23780CA069BA61AE2BE3C0C935 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
-		9DAD68F75B538EE67EB80CC354DCE787 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/Swaggers/Extensions.swift; sourceTree = "<group>"; };
+		93D9DA1CB883DC1FCCF639FECF14930D /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
+		9623461D845F7EE6E2BBDBC44B8FE867 /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
+		9D08EC9B39FEBA43A5B55DAF97AAEBE9 /* Pods-SwaggerClientTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClientTests.modulemap"; sourceTree = "<group>"; };
+		9D780FDAD16A03CC25F4D6F3317B9423 /* Pods-SwaggerClientTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClientTests-acknowledgements.plist"; sourceTree = "<group>"; };
 		A01C037B4034EDA3D7955BC5E4E9D9D6 /* TaskDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TaskDelegate.swift; path = Source/TaskDelegate.swift; sourceTree = "<group>"; };
-		A0CC1C18E268F223DDA59BAA121FE88E /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		AB9FB7676C53BD9BE06337BB539478B1 /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
+		AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.debug.xcconfig"; sourceTree = "<group>"; };
+		AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
 		B029DBC43E49A740F12B5E4D2E6DD452 /* Validation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Validation.swift; path = Source/Validation.swift; sourceTree = "<group>"; };
-		B30C52CDC21F3188E5A50C469937008F /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
-		B44A27EFBB0DA84D738057B77F3413B1 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
-		BCCA9CA7D9C1A2047BB93336C5708DFD /* Alamofire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-prefix.pch"; sourceTree = "<group>"; };
-		BCF2D4DFF08D2A18E8C8FE4C4B4633FB /* Pods-SwaggerClient-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-frameworks.sh"; sourceTree = "<group>"; };
-		CA9769FD713F522BC6BA9A6C8B6C3BA7 /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
-		D2841E5E2183846280B97F6E660DA26C /* Pods-SwaggerClient-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-resources.sh"; sourceTree = "<group>"; };
-		D3AE9FA5F3483AB2497E1D3B488F0562 /* OuterNumber.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterNumber.swift; sourceTree = "<group>"; };
-		D7092AD06F0EF38CC9D8C3FE8B772E65 /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
-		DA2B00793CB30A6A5C0C3497B890D7A1 /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
-		DE164497A94DD3215ED4D1AE0D4703B1 /* Pods-SwaggerClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-SwaggerClient.modulemap"; sourceTree = "<group>"; };
-		DE862CC5FFB80999FD1500D5801F2A21 /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
+		B2AAC6F82FCBCF2CE32522143CBF59D6 /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		B2CEC365CFACB91EC9E750D659D5ED10 /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
+		B4FB407CB8C792BFB02EADD91D6A4DFA /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
+		B64104A4C68341D80F2DB4CF5DE7779F /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/OpenAPIs/Models.swift; sourceTree = "<group>"; };
+		BCD2D0F8C81B81BFB4306011CAC48A20 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift; sourceTree = "<group>"; };
+		BDE4AF9A5A88886D7B60AF0F0996D9FA /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
+		C049305B9A26A2FD2A88D0394DD37678 /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
+		CAF6F32F117197F6F08B477687F09728 /* Pods-SwaggerClientTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-frameworks.sh"; sourceTree = "<group>"; };
+		CC890DE67452A9F63BD12B30135E3BD6 /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClientTests-umbrella.h"; sourceTree = "<group>"; };
+		CFA4F581E074596AB5C3DAF3D9C39F17 /* Pods-SwaggerClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClient.modulemap"; sourceTree = "<group>"; };
+		D1F50F37DFB6DC0B7B9D8C373E5A3EAE /* Alamofire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Alamofire-dummy.m"; sourceTree = "<group>"; };
+		D47B812D78D0AE64D85D16A96840F8C4 /* Pods-SwaggerClientTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClientTests-acknowledgements.markdown"; sourceTree = "<group>"; };
+		D4C9F81DD3B2DAC61C014790FAFD205E /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
+		D931C41179C1EA52307316C7F51D1245 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		DA5F47130C28C4C5652E69E59A0902BD /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		DE05BA43EDFECD3CB825712216F42CE9 /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/OpenAPIs/APIs.swift; sourceTree = "<group>"; };
 		DFCB8C44DE758E906C0BCDA455937B85 /* Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Alamofire.swift; path = Source/Alamofire.swift; sourceTree = "<group>"; };
-		E1E4BCB344D3C100253B24B79421F00A /* Pods-SwaggerClient-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClient-acknowledgements.plist"; sourceTree = "<group>"; };
-		E2C57703EA0D61575D878820DE56A5E4 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
+		E0644BE2FFAA5C8FE7F15E3BF2557AFC /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		E19AF5866D261DB5B6AEC5D575086EA2 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E2F9510473F6FFD7AA66524DB16C2263 /* ResponseSerialization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResponseSerialization.swift; path = Source/ResponseSerialization.swift; sourceTree = "<group>"; };
-		E4B3DD8A15BBF3791DE2AE67DF7DD23C /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
-		E4E6F4A58FE7868CA2177D3AC79AD2FA /* Pods-SwaggerClientTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-resources.sh"; sourceTree = "<group>"; };
 		E5A8AA5F9EDED0A0BDDE7E830BF4AEE0 /* NetworkReachabilityManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NetworkReachabilityManager.swift; path = Source/NetworkReachabilityManager.swift; sourceTree = "<group>"; };
-		E6F34CCF86067ED508C12C676E298C69 /* Alamofire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Alamofire.xcconfig; sourceTree = "<group>"; };
 		EA3FFA48FB4D08FC02C47F71C0089CD9 /* Pods_SwaggerClientTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClientTests.framework; path = "Pods-SwaggerClientTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
-		F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClientTests-umbrella.h"; sourceTree = "<group>"; };
-		F25F7F29B763AB9B70C3140B53E8F5A1 /* FakeclassnametagsAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeclassnametagsAPI.swift; sourceTree = "<group>"; };
-		F381FC45001ED67FBA800D5DEACBE414 /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
-		FA45912AE978F0840F94A8D308944E6B /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
-		FB170EFD14935F121CDE3211DB4C5CA3 /* Pods-SwaggerClientTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClientTests-acknowledgements.markdown"; sourceTree = "<group>"; };
+		F0E62A4CE2C6F59AE92D9D02B41649D5 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
+		F2A82E1B6CEC50F002C59C255C26B381 /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.release.xcconfig"; sourceTree = "<group>"; };
+		F3E1116FA9F9F3AFD9332B7236F6E711 /* Pods-SwaggerClientTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-resources.sh"; sourceTree = "<group>"; };
+		F4BB3B2146310CA18C30F145BFF15BD9 /* Pods-SwaggerClient-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-resources.sh"; sourceTree = "<group>"; };
+		F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClient-dummy.m"; sourceTree = "<group>"; };
+		FD481458DC0F63AEFBD495121305D6D8 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		77F528E4BD190E29EBDB108102752C9A /* Frameworks */ = {
+		331077404C87016AAE282CC06A8E8F83 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4CF609068BF29F02DFDBF05320064219 /* Alamofire.framework in Frameworks */,
-				B3E582D71CDFDDC17D542DBB2CC569D5 /* Foundation.framework in Frameworks */,
+				984C5C69C0582AD61CD1A3AA7D1D4B4C /* Alamofire.framework in Frameworks */,
+				B6387F6650EDB2C988BBD6EE93263AFA /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */ = {
+		7139BF778844E2A9E420524D8146ECD8 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */,
+				D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -255,23 +257,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		0BDA8E0BE198EED1AD88B926509C3382 /* PetstoreClient */ = {
-			isa = PBXGroup;
-			children = (
-				00925AB5384C3976E53F0437FE1311C5 /* AlamofireImplementations.swift */,
-				0B3E802F6708C08B257C5E6F550D3FDB /* APIHelper.swift */,
-				4FF2F015C5D4E807D437D0EE9528B3CE /* APIs.swift */,
-				311A10F75B7649E2E301E8EC58A6A5EA /* Configuration.swift */,
-				9DAD68F75B538EE67EB80CC354DCE787 /* Extensions.swift */,
-				885795F7A7783B007F026944B55862FF /* Models.swift */,
-				45EE0834297896279B488DCD3D66C373 /* APIs */,
-				28BE76357A2CB1D1115C90F572A15193 /* Models */,
-				E44C17565AC7C2BF978747A8E3FBDEAA /* Support Files */,
-			);
-			name = PetstoreClient;
-			path = ../..;
-			sourceTree = "<group>";
-		};
 		200D10EB20F0397D47F022B50CF0433F /* Alamofire */ = {
 			isa = PBXGroup;
 			children = (
@@ -292,54 +277,24 @@
 				A01C037B4034EDA3D7955BC5E4E9D9D6 /* TaskDelegate.swift */,
 				87882A1F5A92C8138D54545E51D51E6F /* Timeline.swift */,
 				B029DBC43E49A740F12B5E4D2E6DD452 /* Validation.swift */,
-				55F14F994FE7AB51F028BFE66CEF3106 /* Support Files */,
+				2E5925946A4DE3B8F7E4137BACAD9618 /* Support Files */,
 			);
 			name = Alamofire;
 			path = Alamofire;
 			sourceTree = "<group>";
 		};
-		28BE76357A2CB1D1115C90F572A15193 /* Models */ = {
+		2E5925946A4DE3B8F7E4137BACAD9618 /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				91DFFBF289A62730BCCBAC4851A1AC8B /* AdditionalPropertiesClass.swift */,
-				DA2B00793CB30A6A5C0C3497B890D7A1 /* Animal.swift */,
-				7017BC38FCA103F2518FE2C4942EB8A3 /* AnimalFarm.swift */,
-				9A557F23780CA069BA61AE2BE3C0C935 /* ApiResponse.swift */,
-				5351A4A344C05ACDF996E3630E69366C /* ArrayOfArrayOfNumberOnly.swift */,
-				1B693DDC1E69F657EACB36EFF2276AB9 /* ArrayOfNumberOnly.swift */,
-				4BB010C5D4A7300AD69E8389F8E09BDF /* ArrayTest.swift */,
-				7CEEEB561582A92AB799221584DDDAD6 /* Capitalization.swift */,
-				8480516CD063566F07F5D08643F3BA9F /* Cat.swift */,
-				8FDCB2CCAC42FDF414F93594CF7F2D6D /* Category.swift */,
-				6DB7377A43FADE63746BBC7D1CCAD93D /* ClassModel.swift */,
-				5DB0115D0EE604B8618320E1C6B52390 /* Client.swift */,
-				D7092AD06F0EF38CC9D8C3FE8B772E65 /* Dog.swift */,
-				95821A5031076AE0FDCDE22E0954A02D /* EnumArrays.swift */,
-				CA9769FD713F522BC6BA9A6C8B6C3BA7 /* EnumClass.swift */,
-				052400F31168326FF2A3E229D65D1B39 /* EnumTest.swift */,
-				78B6FF05C8B29C32FB1710F116C21BB4 /* FormatTest.swift */,
-				F381FC45001ED67FBA800D5DEACBE414 /* HasOnlyReadOnly.swift */,
-				A0CC1C18E268F223DDA59BAA121FE88E /* List.swift */,
-				541CB75E23648A3EE2925E81E345B0FB /* MapTest.swift */,
-				85F20E4DF6D1F32E36AE3823008F92BE /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
-				16C4834C40334FCBD463B4BC38A966C9 /* Model200Response.swift */,
-				59945A57D8EEE7EBE8146D516EA7257D /* Name.swift */,
-				B30C52CDC21F3188E5A50C469937008F /* NumberOnly.swift */,
-				580886F727A89668FA28D3BA11678585 /* Order.swift */,
-				863C495665994A46B8848CBC998B332A /* OuterBoolean.swift */,
-				FA45912AE978F0840F94A8D308944E6B /* OuterComposite.swift */,
-				09CECC4989EF7F2028490D9A4CC6C9B7 /* OuterEnum.swift */,
-				D3AE9FA5F3483AB2497E1D3B488F0562 /* OuterNumber.swift */,
-				547A70BA5BF7A5A411F65BEFD9BF0B07 /* OuterString.swift */,
-				1BA02A166AA3B7EC3B8DF4103088DE8A /* Pet.swift */,
-				DE862CC5FFB80999FD1500D5801F2A21 /* ReadOnlyFirst.swift */,
-				3C7F83F8F72A49EA9D543B4B32260F64 /* Return.swift */,
-				270C457C18A9B3C93FE2C196EC065A1A /* SpecialModelName.swift */,
-				7896C2D88FC42331AEA0607792B4510A /* Tag.swift */,
-				7645FEA4F23C54852D28771CC2FF3B80 /* User.swift */,
+				210971763CB2FC0DC4E378271A37BE32 /* Alamofire.modulemap */,
+				33A04B5D27E86AF4B84D95E21CF3F452 /* Alamofire.xcconfig */,
+				D1F50F37DFB6DC0B7B9D8C373E5A3EAE /* Alamofire-dummy.m */,
+				61D920D6E48023BCBF18CD83450D05F5 /* Alamofire-prefix.pch */,
+				03DECE84DC850B04690604AB7C521277 /* Alamofire-umbrella.h */,
+				117EFB31D9AD9673BAF51B48596F19E2 /* Info.plist */,
 			);
-			name = Models;
-			path = PetstoreClient/Classes/Swaggers/Models;
+			name = "Support Files";
+			path = "../Target Support Files/Alamofire";
 			sourceTree = "<group>";
 		};
 		35F128EB69B6F7FB7DA93BBF6C130FAE /* Pods */ = {
@@ -350,26 +305,22 @@
 			name = Pods;
 			sourceTree = "<group>";
 		};
-		45EE0834297896279B488DCD3D66C373 /* APIs */ = {
+		38BCEE2B62E7F17FC1A6B47F74A915B1 /* PetstoreClient */ = {
 			isa = PBXGroup;
 			children = (
-				80F9261093894D0B652D42D5A3D1D1F9 /* Fake_classname_tags123API.swift */,
-				888EE37DF287C4063756B72B2D0DBB04 /* FakeAPI.swift */,
-				F25F7F29B763AB9B70C3140B53E8F5A1 /* FakeclassnametagsAPI.swift */,
-				428C78B74D8A4ECEA1E6470057D3562B /* PetAPI.swift */,
-				1BAC2B27DBB94AEC209B05FC0541894E /* StoreAPI.swift */,
-				68E391F21156718CBAB2638D6A02FAA3 /* UserAPI.swift */,
+				BCD2D0F8C81B81BFB4306011CAC48A20 /* AlamofireImplementations.swift */,
+				1E982F66B9CB4E2C2083F9B02EF41011 /* APIHelper.swift */,
+				DE05BA43EDFECD3CB825712216F42CE9 /* APIs.swift */,
+				7A1AE5E1B215E1D53DCB6AB501CB0DAE /* Configuration.swift */,
+				6CAA626D85FBD1FF53F144A14B3A3230 /* Extensions.swift */,
+				B64104A4C68341D80F2DB4CF5DE7779F /* Models.swift */,
+				71EF1D86BA306C7F68FA92ABA15B0633 /* APIs */,
+				5540224464BBA954BAFB3FC559814D13 /* Models */,
+				758ACCF640B62D96565B035F4A4931A6 /* Pod */,
+				FC9FD763F0BBF138A397EE0401BEA7BE /* Support Files */,
 			);
-			name = APIs;
-			path = PetstoreClient/Classes/Swaggers/APIs;
-			sourceTree = "<group>";
-		};
-		4DEB624A2186E265CF56EBC3503FD8C9 /* Development Pods */ = {
-			isa = PBXGroup;
-			children = (
-				0BDA8E0BE198EED1AD88B926509C3382 /* PetstoreClient */,
-			);
-			name = "Development Pods";
+			name = PetstoreClient;
+			path = ../..;
 			sourceTree = "<group>";
 		};
 		51A9B78D6A7E7FB5A465754528750815 /* iOS */ = {
@@ -380,18 +331,45 @@
 			name = iOS;
 			sourceTree = "<group>";
 		};
-		55F14F994FE7AB51F028BFE66CEF3106 /* Support Files */ = {
+		5540224464BBA954BAFB3FC559814D13 /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				7D141D1953E5C6E67E362CE73090E48A /* Alamofire.modulemap */,
-				E6F34CCF86067ED508C12C676E298C69 /* Alamofire.xcconfig */,
-				22C1C119BCE81C53F76CAC2BE27C38E0 /* Alamofire-dummy.m */,
-				BCCA9CA7D9C1A2047BB93336C5708DFD /* Alamofire-prefix.pch */,
-				B44A27EFBB0DA84D738057B77F3413B1 /* Alamofire-umbrella.h */,
-				13A0A663B36A229C69D5274A83E93F88 /* Info.plist */,
+				FD481458DC0F63AEFBD495121305D6D8 /* AdditionalPropertiesClass.swift */,
+				2274608F6E89920A7FBADABEF6A20A1F /* Animal.swift */,
+				6A0B504F5FC1B5E5369C2AD8ABA9482A /* AnimalFarm.swift */,
+				F0E62A4CE2C6F59AE92D9D02B41649D5 /* ApiResponse.swift */,
+				4DD46253330346E885D5966DBB25FE8B /* ArrayOfArrayOfNumberOnly.swift */,
+				D931C41179C1EA52307316C7F51D1245 /* ArrayOfNumberOnly.swift */,
+				749EFF1B930D930529640C8004714C51 /* ArrayTest.swift */,
+				F2A82E1B6CEC50F002C59C255C26B381 /* Capitalization.swift */,
+				3ED78F1E81F4EF6FE5B0E77CA5BFB40C /* Cat.swift */,
+				1C103637D74EC198CF949454436D3616 /* Category.swift */,
+				2F3B836F14594A6EF1923CC07B61E893 /* ClassModel.swift */,
+				B2CEC365CFACB91EC9E750D659D5ED10 /* Client.swift */,
+				08583885463D1EDB2F8023584348659C /* Dog.swift */,
+				BDE4AF9A5A88886D7B60AF0F0996D9FA /* EnumArrays.swift */,
+				1FCF0B9190C58BD7493583E8133B3E56 /* EnumClass.swift */,
+				2EB881F0C1B1D1F90FAB084334D6C13D /* EnumTest.swift */,
+				8261F606FFC7AA4F9C45CA8016E8B1C7 /* FormatTest.swift */,
+				C049305B9A26A2FD2A88D0394DD37678 /* HasOnlyReadOnly.swift */,
+				B2AAC6F82FCBCF2CE32522143CBF59D6 /* List.swift */,
+				00FC3821A8BFCD6F05D00696BF175619 /* MapTest.swift */,
+				CC890DE67452A9F63BD12B30135E3BD6 /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
+				57299EE6209AFEBA56C717433863E136 /* Model200Response.swift */,
+				D4C9F81DD3B2DAC61C014790FAFD205E /* Name.swift */,
+				5921D679A4009B3F216FEF671EB69158 /* NumberOnly.swift */,
+				E0644BE2FFAA5C8FE7F15E3BF2557AFC /* Order.swift */,
+				59022FD592AB91A0B2EDA3A2EA5EC8D9 /* OuterComposite.swift */,
+				7B11E91D22910944308DE39CB8CBF3AE /* OuterEnum.swift */,
+				14FE73E27209DA05667C0D3E1B601734 /* Pet.swift */,
+				B4FB407CB8C792BFB02EADD91D6A4DFA /* ReadOnlyFirst.swift */,
+				1BAEE07194E1BFA72B1110849C7B348A /* Return.swift */,
+				9623461D845F7EE6E2BBDBC44B8FE867 /* SpecialModelName.swift */,
+				AB9FB7676C53BD9BE06337BB539478B1 /* Tag.swift */,
+				DA5F47130C28C4C5652E69E59A0902BD /* User.swift */,
 			);
-			name = "Support Files";
-			path = "../Target Support Files/Alamofire";
+			name = Models;
+			path = PetstoreClient/Classes/OpenAPIs/Models;
 			sourceTree = "<group>";
 		};
 		59B91F212518421F271EBA85D5530651 /* Frameworks */ = {
@@ -403,11 +381,33 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		71EF1D86BA306C7F68FA92ABA15B0633 /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				45ED3A5E50AA60588D6ADA19ACBF0C66 /* AnotherFakeAPI.swift */,
+				79DD8EF004C7534401577C1694D823F3 /* FakeAPI.swift */,
+				93D9DA1CB883DC1FCCF639FECF14930D /* FakeClassnameTags123API.swift */,
+				3911B66DC4AC99DD29F10D115CF4555A /* PetAPI.swift */,
+				7A15B50BA886EAD6427ADC7E68BBD4FE /* StoreAPI.swift */,
+				3BFA1723A93AA1DB0952B2F750421B32 /* UserAPI.swift */,
+			);
+			name = APIs;
+			path = PetstoreClient/Classes/OpenAPIs/APIs;
+			sourceTree = "<group>";
+		};
+		758ACCF640B62D96565B035F4A4931A6 /* Pod */ = {
+			isa = PBXGroup;
+			children = (
+				536A8BDFB104F4132169F2B758A6AA0C /* PetstoreClient.podspec */,
+			);
+			name = Pod;
+			sourceTree = "<group>";
+		};
 		7DB346D0F39D3F0E887471402A8071AB = {
 			isa = PBXGroup;
 			children = (
 				93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */,
-				4DEB624A2186E265CF56EBC3503FD8C9 /* Development Pods */,
+				8F0C005305764051BE9B8E1DEE8C7E64 /* Development Pods */,
 				59B91F212518421F271EBA85D5530651 /* Frameworks */,
 				35F128EB69B6F7FB7DA93BBF6C130FAE /* Pods */,
 				9BBD96A0F02B8F92DD3659B2DCDF1A8C /* Products */,
@@ -415,22 +415,12 @@
 			);
 			sourceTree = "<group>";
 		};
-		88CE2B3F08C34DDB098AD8A5DCC1DF1E /* Pods-SwaggerClient */ = {
+		8F0C005305764051BE9B8E1DEE8C7E64 /* Development Pods */ = {
 			isa = PBXGroup;
 			children = (
-				7C8E63660D346FD8ED2A97242E74EA09 /* Info.plist */,
-				DE164497A94DD3215ED4D1AE0D4703B1 /* Pods-SwaggerClient.modulemap */,
-				2FF17440CCD2E1A69791A4AA23325AD5 /* Pods-SwaggerClient-acknowledgements.markdown */,
-				E1E4BCB344D3C100253B24B79421F00A /* Pods-SwaggerClient-acknowledgements.plist */,
-				291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */,
-				BCF2D4DFF08D2A18E8C8FE4C4B4633FB /* Pods-SwaggerClient-frameworks.sh */,
-				D2841E5E2183846280B97F6E660DA26C /* Pods-SwaggerClient-resources.sh */,
-				3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */,
-				549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */,
-				86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */,
+				38BCEE2B62E7F17FC1A6B47F74A915B1 /* PetstoreClient */,
 			);
-			name = "Pods-SwaggerClient";
-			path = "Target Support Files/Pods-SwaggerClient";
+			name = "Development Pods";
 			sourceTree = "<group>";
 		};
 		9BBD96A0F02B8F92DD3659B2DCDF1A8C /* Products */ = {
@@ -447,39 +437,57 @@
 		C1A60D10CED0E61146591438999C7502 /* Targets Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				88CE2B3F08C34DDB098AD8A5DCC1DF1E /* Pods-SwaggerClient */,
-				D6D0CD30E3EAF2ED10AE0CBC07506C5A /* Pods-SwaggerClientTests */,
+				DE503BFFEBBF78BDC743C8A6A50DFF47 /* Pods-SwaggerClient */,
+				E9EDF70990CC7A4463ED5FC2E3719BD0 /* Pods-SwaggerClientTests */,
 			);
 			name = "Targets Support Files";
 			sourceTree = "<group>";
 		};
-		D6D0CD30E3EAF2ED10AE0CBC07506C5A /* Pods-SwaggerClientTests */ = {
+		DE503BFFEBBF78BDC743C8A6A50DFF47 /* Pods-SwaggerClient */ = {
 			isa = PBXGroup;
 			children = (
-				3F16B43ABD2C8CD4A311AA1AB3B6C02F /* Info.plist */,
-				00ACB4396DD1B4E4539E4E81C1D7A14E /* Pods-SwaggerClientTests.modulemap */,
-				FB170EFD14935F121CDE3211DB4C5CA3 /* Pods-SwaggerClientTests-acknowledgements.markdown */,
-				02F28E719AA874BE9213D6CF8CE7E36B /* Pods-SwaggerClientTests-acknowledgements.plist */,
-				687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */,
-				43FC49AA70D3E2A84CAED9C37BE9C4B5 /* Pods-SwaggerClientTests-frameworks.sh */,
-				E4E6F4A58FE7868CA2177D3AC79AD2FA /* Pods-SwaggerClientTests-resources.sh */,
-				F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */,
-				969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */,
-				849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */,
+				814471C0F27B39D751143F0CD53670BD /* Info.plist */,
+				CFA4F581E074596AB5C3DAF3D9C39F17 /* Pods-SwaggerClient.modulemap */,
+				76645699475D3AB6EB5242AC4D0CEFAE /* Pods-SwaggerClient-acknowledgements.markdown */,
+				08BDFE9C9E9365771FF2D47928E3E79A /* Pods-SwaggerClient-acknowledgements.plist */,
+				F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */,
+				0AD61F8554C909A3AFA66AD9ECCB5F23 /* Pods-SwaggerClient-frameworks.sh */,
+				F4BB3B2146310CA18C30F145BFF15BD9 /* Pods-SwaggerClient-resources.sh */,
+				32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */,
+				AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */,
+				F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */,
+			);
+			name = "Pods-SwaggerClient";
+			path = "Target Support Files/Pods-SwaggerClient";
+			sourceTree = "<group>";
+		};
+		E9EDF70990CC7A4463ED5FC2E3719BD0 /* Pods-SwaggerClientTests */ = {
+			isa = PBXGroup;
+			children = (
+				419496CDDD7E7536CBEA02BAEE2C7C21 /* Info.plist */,
+				9D08EC9B39FEBA43A5B55DAF97AAEBE9 /* Pods-SwaggerClientTests.modulemap */,
+				D47B812D78D0AE64D85D16A96840F8C4 /* Pods-SwaggerClientTests-acknowledgements.markdown */,
+				9D780FDAD16A03CC25F4D6F3317B9423 /* Pods-SwaggerClientTests-acknowledgements.plist */,
+				721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */,
+				CAF6F32F117197F6F08B477687F09728 /* Pods-SwaggerClientTests-frameworks.sh */,
+				F3E1116FA9F9F3AFD9332B7236F6E711 /* Pods-SwaggerClientTests-resources.sh */,
+				CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */,
+				1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */,
+				FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */,
 			);
 			name = "Pods-SwaggerClientTests";
 			path = "Target Support Files/Pods-SwaggerClientTests";
 			sourceTree = "<group>";
 		};
-		E44C17565AC7C2BF978747A8E3FBDEAA /* Support Files */ = {
+		FC9FD763F0BBF138A397EE0401BEA7BE /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				5E79C2313007533BFFA709832BE18FDC /* Info.plist */,
-				855FBD05ABAD1AE4A03E58EEBA975DAA /* PetstoreClient.modulemap */,
-				E4B3DD8A15BBF3791DE2AE67DF7DD23C /* PetstoreClient.xcconfig */,
-				06F576B1286B5129A7A77654A92AAFCF /* PetstoreClient-dummy.m */,
-				694EDDB57CDB8FB6CB5088BF3F66CE8A /* PetstoreClient-prefix.pch */,
-				E2C57703EA0D61575D878820DE56A5E4 /* PetstoreClient-umbrella.h */,
+				E19AF5866D261DB5B6AEC5D575086EA2 /* Info.plist */,
+				15EC3D8D715BC3F25A366C403ED02060 /* PetstoreClient.modulemap */,
+				AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */,
+				7E3D0C745CE3A020C8BC5C96CAFB616F /* PetstoreClient-dummy.m */,
+				4050C78B3A61270CDB69C80EFEB9BF4B /* PetstoreClient-prefix.pch */,
+				0BCC6F35A8BC2A442A13DE66D59CAC87 /* PetstoreClient-umbrella.h */,
 			);
 			name = "Support Files";
 			path = "SwaggerClientTests/Pods/Target Support Files/PetstoreClient";
@@ -488,11 +496,11 @@
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		1353AC7A6419F876B294A55E5550D1E4 /* Headers */ = {
+		58BF069F515DC42D6AA02C635E7A151D /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */,
+				F31DA9A56D4B939D511C9CC5CCE95843 /* PetstoreClient-umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -504,6 +512,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C19E54C800095CFA2457EC19C7C2E974 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		DC071B9D59E4680147F481F53FBCE180 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -512,14 +528,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		F94F31E62A698E5D7EB3976F18400028 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				C4FE1444409BDBD0C1850A7D0C24E0E2 /* PetstoreClient-umbrella.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
@@ -542,6 +550,24 @@
 			productReference = 6C0ACB269F0C836F1865A56C4AF7A07E /* Pods_SwaggerClient.framework */;
 			productType = "com.apple.product-type.framework";
 		};
+		7A44E3414AC7209D8D353C337F268DBC /* PetstoreClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2E8D4ECE8C49444F29C531059B32A46E /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildPhases = (
+				9F6567235C6E1627F81B601F2645CABC /* Sources */,
+				331077404C87016AAE282CC06A8E8F83 /* Frameworks */,
+				58BF069F515DC42D6AA02C635E7A151D /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				64EE23A908FF7DD89D49F047F2EA62C5 /* PBXTargetDependency */,
+			);
+			name = PetstoreClient;
+			productName = PetstoreClient;
+			productReference = 897F0C201C5E0C66A1F1E359AECF4C9C /* PetstoreClient.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 		88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 419E5D95491847CD79841B971A8A3277 /* Build configuration list for PBXNativeTarget "Alamofire" */;
@@ -559,35 +585,18 @@
 			productReference = 49A9B3BBFEA1CFFC48229E438EA64F9E /* Alamofire.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		F10822488A6B105743E3D9107AEE518C /* PetstoreClient */ = {
+		BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = F3A56D5CC2C98220366FF2A73BD8D5DD /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildConfigurationList = 6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
 			buildPhases = (
-				4C5A005C2839A42D2561421760901B18 /* Sources */,
-				77F528E4BD190E29EBDB108102752C9A /* Frameworks */,
-				F94F31E62A698E5D7EB3976F18400028 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				DA7D9F8E92242F97E46013C81BD79150 /* PBXTargetDependency */,
-			);
-			name = PetstoreClient;
-			productName = PetstoreClient;
-			productReference = 897F0C201C5E0C66A1F1E359AECF4C9C /* PetstoreClient.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-		F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
-			buildPhases = (
-				BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */,
-				87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */,
-				1353AC7A6419F876B294A55E5550D1E4 /* Headers */,
+				61868F2FE74A9422171483DBABE7C61F /* Sources */,
+				7139BF778844E2A9E420524D8146ECD8 /* Frameworks */,
+				C19E54C800095CFA2457EC19C7C2E974 /* Headers */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */,
 			);
 			name = "Pods-SwaggerClientTests";
 			productName = "Pods-SwaggerClientTests";
@@ -600,8 +609,8 @@
 		D41D8CD98F00B204E9800998ECF8427E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0700;
+				LastSwiftUpdateCheck = 0930;
+				LastUpgradeCheck = 0930;
 			};
 			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -616,9 +625,9 @@
 			projectRoot = "";
 			targets = (
 				88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */,
-				F10822488A6B105743E3D9107AEE518C /* PetstoreClient */,
+				7A44E3414AC7209D8D353C337F268DBC /* PetstoreClient */,
 				41903051A113E887E262FB29130EB187 /* Pods-SwaggerClient */,
-				F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */,
+				BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */,
 			);
 		};
 /* End PBXProject section */
@@ -649,59 +658,11 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		4C5A005C2839A42D2561421760901B18 /* Sources */ = {
+		61868F2FE74A9422171483DBABE7C61F /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AAB6E3FF4C203D1B4418B604C704EC5E /* AdditionalPropertiesClass.swift in Sources */,
-				05AA1D0A4880C8B2E820E8AB9DB0CA0C /* AlamofireImplementations.swift in Sources */,
-				CB57E535A1515E3590E3ECFF8DD3040C /* Animal.swift in Sources */,
-				58501155D7B20CF99109A4DC953CC266 /* AnimalFarm.swift in Sources */,
-				33854474ACF02E42AD42AC08C523B54F /* APIHelper.swift in Sources */,
-				FEDEAFA3F155ACC48A61243BE97DC0FD /* ApiResponse.swift in Sources */,
-				F8284F679BA0722A2847F6DF984D3CC9 /* APIs.swift in Sources */,
-				C454A045AA0C3821D4143B435AADB863 /* ArrayOfArrayOfNumberOnly.swift in Sources */,
-				A7FDA0F12CCF0FE7407C4EE1D88D63D1 /* ArrayOfNumberOnly.swift in Sources */,
-				81C4DD7F2D22A02649BF8D76955BDCB6 /* ArrayTest.swift in Sources */,
-				057D51272B35EEE9D412EE4A012F273B /* Capitalization.swift in Sources */,
-				CFDC2507829B1FEF8C1319EFB91B9B2E /* Cat.swift in Sources */,
-				9E4253E1905B0A36CAE0C590902BC030 /* Category.swift in Sources */,
-				C1C8EAD6D96212CEE77AE32B4C5B4689 /* ClassModel.swift in Sources */,
-				44990E3C6099A47299E6E39B9BD01214 /* Client.swift in Sources */,
-				FE01173D208EA67C931846F08230E37F /* Configuration.swift in Sources */,
-				473587DCDFAD50A5A2D7FEB93F3D28E1 /* Dog.swift in Sources */,
-				D7214BDCBD49ABCB18F79A04C8225B07 /* EnumArrays.swift in Sources */,
-				4C172288F3ACD041084677D2C05DEF02 /* EnumClass.swift in Sources */,
-				60A9299604ADCB164294555D66DD507F /* EnumTest.swift in Sources */,
-				69F05AAB871A087A719B6B4383CBEA0F /* Extensions.swift in Sources */,
-				BB44263B22784220295C8DE96281AC0D /* Fake_classname_tags123API.swift in Sources */,
-				CCE24F24BF3EB1A2C514AB41B9BBF722 /* FakeAPI.swift in Sources */,
-				45B9E69F6558F40D6C4AA9C1BCFA9FEA /* FakeclassnametagsAPI.swift in Sources */,
-				FC41F2E7439517DE7A562E935DA992F7 /* FormatTest.swift in Sources */,
-				863FA751BBFDA85195E1B17CA2392236 /* HasOnlyReadOnly.swift in Sources */,
-				953F99387D4F96C3CDA56DBF619716FD /* List.swift in Sources */,
-				5887440665FFCF423171C4E5C3EFB9D1 /* MapTest.swift in Sources */,
-				00433565417D8EB2877B80870AA37FC5 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
-				6872374F425855C8CADA536A71CD5DBE /* Model200Response.swift in Sources */,
-				FEA39C941A98DB246BE23697A4C556F1 /* Models.swift in Sources */,
-				09CF911587060356512E13F57A1746E9 /* Name.swift in Sources */,
-				71F5C69A53E4AAB624587E0966CDFD0B /* NumberOnly.swift in Sources */,
-				5B01F54B86EA75E6E4A4C2A2EB2E8B07 /* Order.swift in Sources */,
-				D329D405FF7D2A9DEE1F03F00587E132 /* OuterBoolean.swift in Sources */,
-				609113D6244720A747DD150234AB431C /* OuterComposite.swift in Sources */,
-				9CD67121D1D4F1093AF9F7ADBFAF9BD6 /* OuterEnum.swift in Sources */,
-				41A4833A4104452384C8200FECA468F7 /* OuterNumber.swift in Sources */,
-				245C4B7A64DD93E776A57C420002ED8B /* OuterString.swift in Sources */,
-				1C48756766427E6BB17C6F5C7672F0EF /* Pet.swift in Sources */,
-				EAFE09F156DA9CE33520DE9A83A0063A /* PetAPI.swift in Sources */,
-				65C5109AD09965C1BD747668037F7895 /* PetstoreClient-dummy.m in Sources */,
-				A9E7F7A86DB2E1A97F472E8184EB8D62 /* ReadOnlyFirst.swift in Sources */,
-				327DFA0268018413C4C6D9EAEE45FFF4 /* Return.swift in Sources */,
-				4164BE89CE07197B165DE11BE00C81B6 /* SpecialModelName.swift in Sources */,
-				7FF14684D2EDBA8FF4B8785919108F4A /* StoreAPI.swift in Sources */,
-				EA63D6A5D6D3063FEDC68902C60F7C44 /* Tag.swift in Sources */,
-				2E4FA060FD9624B60A1B8A4AF3FB70EF /* User.swift in Sources */,
-				43ECF64E02DB84925FBE5EC2F6569B22 /* UserAPI.swift in Sources */,
+				80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -713,11 +674,56 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */ = {
+		9F6567235C6E1627F81B601F2645CABC /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */,
+				17D7DD6070AC0827798B808A3B3F33CC /* AdditionalPropertiesClass.swift in Sources */,
+				A08574719EF212B105954F58DD8AFBE1 /* AlamofireImplementations.swift in Sources */,
+				4B608BE9558F9880F286073E764222BA /* Animal.swift in Sources */,
+				85216A45BF4ABCF5654715167D7A8A44 /* AnimalFarm.swift in Sources */,
+				63E53FB5E0AFF41C1AEE670D4D2EA55B /* AnotherFakeAPI.swift in Sources */,
+				4EE591215BF57E9C655E1FFDF4244E20 /* APIHelper.swift in Sources */,
+				CB2AE7CE6253392499D81064945D704B /* ApiResponse.swift in Sources */,
+				6244553C8EB8413BDE84442BDB32B158 /* APIs.swift in Sources */,
+				12F046ACC7A765A58AE3EC78B5C37654 /* ArrayOfArrayOfNumberOnly.swift in Sources */,
+				D41E4EEA685E8151A95393E9E1EF95CC /* ArrayOfNumberOnly.swift in Sources */,
+				FCAD0021405A0CAE1B59CE70430EBE11 /* ArrayTest.swift in Sources */,
+				E479ACE0A5835A89134A8C7663FA2E1D /* Capitalization.swift in Sources */,
+				2692488ECFB2DC44A1484F4E237F1A7F /* Cat.swift in Sources */,
+				73880BFBD593B84BDC52BDA73CD905D3 /* Category.swift in Sources */,
+				3B3759CDE620B518B4E187D6607AD40E /* ClassModel.swift in Sources */,
+				2D99D98D8B0A65646A128075993EE8E7 /* Client.swift in Sources */,
+				5DD7FE53110AD4EAACC894FC465DA8F2 /* Configuration.swift in Sources */,
+				7877D0A755EDD3241453857443FED9BE /* Dog.swift in Sources */,
+				AE21939A626D9B867413404C953FB83B /* EnumArrays.swift in Sources */,
+				DD79A040B4D1DEE849091CF1E91AF42A /* EnumClass.swift in Sources */,
+				93AB309BD6FE9AEE0CFD4E7075F26619 /* EnumTest.swift in Sources */,
+				8448CBC208B027E8EADEA39AE687B3D8 /* Extensions.swift in Sources */,
+				E6A94FA31172DD3438D5A3EC51A05638 /* FakeAPI.swift in Sources */,
+				B29744F262A1B7D3F1344833CA64349A /* FakeClassnameTags123API.swift in Sources */,
+				5EF2450B3FE235021270DDE480AB9DFF /* FormatTest.swift in Sources */,
+				A1BDAFE44135347E816DDA243519910B /* HasOnlyReadOnly.swift in Sources */,
+				856E217482D183D133297CB6BF12D8FD /* List.swift in Sources */,
+				535108E2BD555B4E3935DB583B03BC03 /* MapTest.swift in Sources */,
+				5C8D71030D0D58B316181FF9BB0FA757 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
+				022118A06E4266B7CF103F2D3E594F1B /* Model200Response.swift in Sources */,
+				8505A8B33E6DB2468C52997E8B328FA0 /* Models.swift in Sources */,
+				83BB300F436739562A879819271788A8 /* Name.swift in Sources */,
+				CB9D5B33D2A072BBEAFC7A941C986A85 /* NumberOnly.swift in Sources */,
+				8F51DB58A86B9665D7B785BB25DE9FEF /* Order.swift in Sources */,
+				41C410B0290C38CDA9F27285983864D2 /* OuterComposite.swift in Sources */,
+				86031F845943F3F00049B90CA06F1C4E /* OuterEnum.swift in Sources */,
+				0B4682928CDA581AE825A894AA4EE97F /* Pet.swift in Sources */,
+				819A936646985D3BD0ED55EE5A11E874 /* PetAPI.swift in Sources */,
+				8F68634B12F668D1B117CC89F899CF13 /* PetstoreClient-dummy.m in Sources */,
+				BBFF38577AA65B4E0C3E6B7A32BC7E27 /* ReadOnlyFirst.swift in Sources */,
+				358744AD7511300B7BA57E75C523CE4E /* Return.swift in Sources */,
+				E888314B46198CB029A33B8F4C66C947 /* SpecialModelName.swift in Sources */,
+				4D659A79C5FD26710C0EE4DDD46B5197 /* StoreAPI.swift in Sources */,
+				ECF333C34A4147267C5AD9AF8436DFF7 /* Tag.swift in Sources */,
+				6337B0A36831DF8FAA0BC62F2E5ED525 /* User.swift in Sources */,
+				961E53797F3F7FA8DB12A00560426AC8 /* UserAPI.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -727,359 +733,216 @@
 		374AD22F26F7E9801AB27C2FCBBF4EC9 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PetstoreClient;
-			target = F10822488A6B105743E3D9107AEE518C /* PetstoreClient */;
+			target = 7A44E3414AC7209D8D353C337F268DBC /* PetstoreClient */;
 			targetProxy = 398B30E9B8AE28E1BDA1C6D292107659 /* PBXContainerItemProxy */;
 		};
+		64EE23A908FF7DD89D49F047F2EA62C5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Alamofire;
+			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
+			targetProxy = 65C4A1A84C1B3A3EA573D203ABE57C80 /* PBXContainerItemProxy */;
+		};
 		AC31F7EF81A7A1C4862B1BA6879CEC1C /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = Alamofire;
 			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
 			targetProxy = F9E1549CFEDAD61BECA92DB5B12B4019 /* PBXContainerItemProxy */;
 		};
-		DA7D9F8E92242F97E46013C81BD79150 /* PBXTargetDependency */ = {
+		CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			name = Alamofire;
-			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
-			targetProxy = 4348BAD86139841DA7571E09FA8BE2E7 /* PBXContainerItemProxy */;
+			name = "Pods-SwaggerClient";
+			target = 41903051A113E887E262FB29130EB187 /* Pods-SwaggerClient */;
+			targetProxy = 39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		077C4BB7DBEAA715DED46C057DC8051C /* Release */ = {
+		1061787EE37EF1635F9DDF717212E04E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E6F34CCF86067ED508C12C676E298C69 /* Alamofire.xcconfig */;
+			baseConfigurationReference = F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_NAME = Alamofire;
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
 			name = Release;
 		};
-		3F44D50290D52EC3C557274BDDAB4C7A /* Debug */ = {
+		1FE3B4CE8C074CE87C18B26C91020E15 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
 				CODE_SIGNING_REQUIRED = NO;
 				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"POD_CONFIGURATION_DEBUG=1",
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SYMROOT = "${SRCROOT}/../build";
 			};
 			name = Debug;
 		};
-		5FD3C308E1FF2B6C127426676CBBBEF9 /* Release */ = {
+		5E110A36DB7BF1BF01973770C95C3047 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGNING_REQUIRED = NO;
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"POD_CONFIGURATION_RELEASE=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
-				STRIP_INSTALLED_PRODUCT = NO;
-				SYMROOT = "${SRCROOT}/../build";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		6B59346B3AB8E509089589F4EDBEE69C /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = E4B3DD8A15BBF3791DE2AE67DF7DD23C /* PetstoreClient.xcconfig */;
-			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_NAME = PetstoreClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		86E66B7CE6321797D5D4EB3E7593B23B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		8ABD810FE320ED013B51DFEA7CBA6A0D /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		9C5DAD5759A0A21C275605C95B748A4D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = E4B3DD8A15BBF3791DE2AE67DF7DD23C /* PetstoreClient.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_NAME = PetstoreClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		C66477B6E5656B1F4785FD5D9546905A /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
 				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
 			name = Release;
 		};
-		D60F8C4DE6B0D221A33959774DA3DAFF /* Debug */ = {
+		6B119F7AC2DCC7121A30BFF775C46557 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E6F34CCF86067ED508C12C676E298C69 /* Alamofire.xcconfig */;
+			baseConfigurationReference = AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				PRODUCT_MODULE_NAME = PetstoreClient;
+				PRODUCT_NAME = PetstoreClient;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		7B0415700290D1DEBAB6B173951CC0C7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 33A04B5D27E86AF4B84D95E21CF3F452 /* Alamofire.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
 				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_MODULE_NAME = Alamofire;
 				PRODUCT_NAME = Alamofire;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -1092,34 +955,155 @@
 			};
 			name = Debug;
 		};
-		F89C2DC5B4DBA79FB9C8BA8F24E52DF4 /* Debug */ = {
+		89C68177307D3F04B055FD0AA2FC173A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
+				CODE_SIGNING_REQUIRED = NO;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"POD_CONFIGURATION_RELEASE=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+			};
+			name = Release;
+		};
+		95DBEF0AB0B74932A7CEF4BB6099470D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 33A04B5D27E86AF4B84D95E21CF3F452 /* Alamofire.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				PRODUCT_MODULE_NAME = Alamofire;
+				PRODUCT_NAME = Alamofire;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		9715671A3B214B77299431783A3C79AF /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				PRODUCT_MODULE_NAME = PetstoreClient;
+				PRODUCT_NAME = PetstoreClient;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		AA44C748B579D9822A4F1DA83E57D74C /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
 				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 3.0;
@@ -1129,14 +1113,59 @@
 			};
 			name = Debug;
 		};
+		E944E2E9660E4E16301165EDE14498C3 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
 		2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				3F44D50290D52EC3C557274BDDAB4C7A /* Debug */,
-				5FD3C308E1FF2B6C127426676CBBBEF9 /* Release */,
+				1FE3B4CE8C074CE87C18B26C91020E15 /* Debug */,
+				89C68177307D3F04B055FD0AA2FC173A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		2E8D4ECE8C49444F29C531059B32A46E /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6B119F7AC2DCC7121A30BFF775C46557 /* Debug */,
+				9715671A3B214B77299431783A3C79AF /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1144,8 +1173,8 @@
 		419E5D95491847CD79841B971A8A3277 /* Build configuration list for PBXNativeTarget "Alamofire" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D60F8C4DE6B0D221A33959774DA3DAFF /* Debug */,
-				077C4BB7DBEAA715DED46C057DC8051C /* Release */,
+				7B0415700290D1DEBAB6B173951CC0C7 /* Debug */,
+				95DBEF0AB0B74932A7CEF4BB6099470D /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1153,26 +1182,17 @@
 		5DE561894A3D2FE43769BF10CB87D407 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClient" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				86E66B7CE6321797D5D4EB3E7593B23B /* Debug */,
-				8ABD810FE320ED013B51DFEA7CBA6A0D /* Release */,
+				E944E2E9660E4E16301165EDE14498C3 /* Debug */,
+				1061787EE37EF1635F9DDF717212E04E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
+		6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				F89C2DC5B4DBA79FB9C8BA8F24E52DF4 /* Debug */,
-				C66477B6E5656B1F4785FD5D9546905A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		F3A56D5CC2C98220366FF2A73BD8D5DD /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				9C5DAD5759A0A21C275605C95B748A4D /* Debug */,
-				6B59346B3AB8E509089589F4EDBEE69C /* Release */,
+				AA44C748B579D9822A4F1DA83E57D74C /* Debug */,
+				5E110A36DB7BF1BF01973770C95C3047 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
index 619e5f4acef..6b8baab300a 100644
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
@@ -1,9 +1,8 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Alamofire
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Alamofire
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/Alamofire
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
index 904973a3bdc..c24f97366d1 100644
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
@@ -1,10 +1,9 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/PetstoreClient
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire"
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
index 4d253d90186..3680284d666 100755
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
@@ -1,15 +1,28 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+# Used as a return value for each invocation of `strip_invalid_archs` function.
+STRIP_BINARY_RETVAL=0
+
 # This protects against multiple targets copying the same framework dependency at the same time. The solution
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
+# Copies and strips a vendored framework
 install_framework()
 {
   if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -58,21 +71,40 @@ install_framework()
   fi
 }
 
-# Copies the dSYM of a vendored framework
+# Copies and strips a vendored dSYM
 install_dsym() {
   local source="$1"
   if [ -r "$source" ]; then
-    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\""
-    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
+    # Copy the dSYM into a the targets temp dir.
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
+
+    local basename
+    basename="$(basename -s .framework.dSYM "$source")"
+    binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+    # Strip invalid architectures so "fat" simulator / device frameworks work on device
+    if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+      strip_invalid_archs "$binary"
+    fi
+
+    if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
+      # Move the stripped file into its final destination.
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+    else
+      # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
+    fi
   fi
 }
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
@@ -85,10 +117,18 @@ code_sign_if_enabled() {
 # Strip invalid architectures
 strip_invalid_archs() {
   binary="$1"
-  # Get architectures for current file
-  archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+  # Get architectures for current target binary
+  binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+  # Intersect them with the architectures we are building for
+  intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
+  # If there are no archs supported by this binary then warn the user
+  if [[ -z "$intersected_archs" ]]; then
+    echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+    STRIP_BINARY_RETVAL=0
+    return
+  fi
   stripped=""
-  for arch in $archs; do
+  for arch in $binary_archs; do
     if ! [[ "${ARCHS}" == *"$arch"* ]]; then
       # Strip non-valid architectures in-place
       lipo -remove "$arch" -output "$binary" "$binary" || exit 1
@@ -98,6 +138,7 @@ strip_invalid_archs() {
   if [[ "$stripped" ]]; then
     echo "Stripped $binary of architectures:$stripped"
   fi
+  STRIP_BINARY_RETVAL=1
 }
 
 
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig
index ad32982f5bf..5ab6f3adf4f 100644
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig	
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig	
@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "PetstoreClient"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig
index ad32982f5bf..5ab6f3adf4f 100644
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig	
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig	
@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "PetstoreClient"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
index 88dd5379907..08e3eaaca45 100755
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
@@ -1,15 +1,28 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+# Used as a return value for each invocation of `strip_invalid_archs` function.
+STRIP_BINARY_RETVAL=0
+
 # This protects against multiple targets copying the same framework dependency at the same time. The solution
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
+# Copies and strips a vendored framework
 install_framework()
 {
   if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -58,21 +71,40 @@ install_framework()
   fi
 }
 
-# Copies the dSYM of a vendored framework
+# Copies and strips a vendored dSYM
 install_dsym() {
   local source="$1"
   if [ -r "$source" ]; then
-    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\""
-    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
+    # Copy the dSYM into a the targets temp dir.
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
+
+    local basename
+    basename="$(basename -s .framework.dSYM "$source")"
+    binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+    # Strip invalid architectures so "fat" simulator / device frameworks work on device
+    if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+      strip_invalid_archs "$binary"
+    fi
+
+    if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
+      # Move the stripped file into its final destination.
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+    else
+      # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
+    fi
   fi
 }
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
@@ -85,10 +117,18 @@ code_sign_if_enabled() {
 # Strip invalid architectures
 strip_invalid_archs() {
   binary="$1"
-  # Get architectures for current file
-  archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+  # Get architectures for current target binary
+  binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+  # Intersect them with the architectures we are building for
+  intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
+  # If there are no archs supported by this binary then warn the user
+  if [[ -z "$intersected_archs" ]]; then
+    echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+    STRIP_BINARY_RETVAL=0
+    return
+  fi
   stripped=""
-  for arch in $archs; do
+  for arch in $binary_archs; do
     if ! [[ "${ARCHS}" == *"$arch"* ]]; then
       # Strip non-valid architectures in-place
       lipo -remove "$arch" -output "$binary" "$binary" || exit 1
@@ -98,6 +138,7 @@ strip_invalid_archs() {
   if [[ "$stripped" ]]; then
     echo "Stripped $binary of architectures:$stripped"
   fi
+  STRIP_BINARY_RETVAL=1
 }
 
 if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig
index a3871374db0..43fd8e36c03 100644
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig	
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig	
@@ -1,8 +1,8 @@
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig
index a3871374db0..43fd8e36c03 100644
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig	
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig	
@@ -1,8 +1,8 @@
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift3/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
index 1406071ba7e..a6881f1db9f 100644
--- a/samples/client/petstore/swift3/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift3/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
@@ -149,7 +149,6 @@
 				6D4EFB8E1C692C6300B96B06 /* Frameworks */,
 				6D4EFB8F1C692C6300B96B06 /* Resources */,
 				4485A75250058E2D5BBDF63F /* [CP] Embed Pods Frameworks */,
-				808CE4A0CE801CAC5ABF5B08 /* [CP] Copy Pods Resources */,
 				3D9471620628F03313096EB2 /* 📦 Embed Pods Frameworks */,
 				EEEC2B2D0497D38CEAD2DB24 /* 📦 Copy Pods Resources */,
 			);
@@ -171,8 +170,6 @@
 				6D4EFBA11C692C6300B96B06 /* Sources */,
 				6D4EFBA21C692C6300B96B06 /* Frameworks */,
 				6D4EFBA31C692C6300B96B06 /* Resources */,
-				796EAD48F1BCCDAA291CD963 /* [CP] Embed Pods Frameworks */,
-				1652CB1A246A4689869E442D /* [CP] Copy Pods Resources */,
 				ECE47F6BF90C3848F6E94AFF /* 📦 Embed Pods Frameworks */,
 				1494090872F3F18E536E8902 /* 📦 Copy Pods Resources */,
 			);
@@ -262,21 +259,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		1652CB1A246A4689869E442D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		1F03F780DC2D9727E5E64BA9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -327,21 +309,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		796EAD48F1BCCDAA291CD963 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		79FE27B09B2DD354C831BD49 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -357,21 +324,6 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		808CE4A0CE801CAC5ABF5B08 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		B4DB169E5F018305D6759D34 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
diff --git a/samples/client/petstore/swift3/objcCompatible/.openapi-generator/VERSION b/samples/client/petstore/swift3/objcCompatible/.openapi-generator/VERSION
index ad121e8340e..4395ff59232 100644
--- a/samples/client/petstore/swift3/objcCompatible/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift3/objcCompatible/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.1-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index 3ed9e7cfddf..e44709f2459 100644
--- a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -239,8 +239,8 @@ open class FakeAPI: APIBase {
      * enum for parameter enumHeaderStringArray
      */
     public enum EnumHeaderStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
+        case greaterThan = "">""
+        case dollar = ""$""
     }
 
     /**
@@ -256,8 +256,8 @@ open class FakeAPI: APIBase {
      * enum for parameter enumQueryStringArray
      */
     public enum EnumQueryStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
+        case greaterThan = "">""
+        case dollar = ""$""
     }
 
     /**
diff --git a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index a54e0ff03f4..20514a3b6e6 100644
--- a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -25,6 +25,7 @@ open class FakeClassnameTags123API: APIBase {
     /**
      To test class name in snake case
      - PATCH /fake_classname_test
+     - To test class name in snake case
      - API Key:
        - type: apiKey api_key_query (QUERY)
        - name: api_key_query
diff --git a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 1460cbe2955..8648214c730 100644
--- a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -89,9 +89,9 @@ open class PetAPI: APIBase {
      * enum for parameter status
      */
     public enum Status_findPetsByStatus: String { 
-        case available = "available"
-        case pending = "pending"
-        case sold = "sold"
+        case available = ""available""
+        case pending = ""pending""
+        case sold = ""sold""
     }
 
     /**
diff --git a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 928449dfcbc..c2414d1023e 100644
--- a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -15,8 +15,8 @@ open class EnumArrays: JSONEncodable {
         case dollar = "$"
     }
     public enum ArrayEnum: String { 
-        case fish = "fish"
-        case crab = "crab"
+        case fish = ""fish""
+        case crab = ""crab""
     }
     public var justSymbol: JustSymbol?
     public var arrayEnum: [ArrayEnum]?
diff --git a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 58548bee74d..7b6af62b057 100644
--- a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -11,8 +11,8 @@ import Foundation
 open class MapTest: JSONEncodable {
 
     public enum MapOfEnumString: String { 
-        case upper = "UPPER"
-        case lower = "lower"
+        case upper = ""UPPER""
+        case lower = ""lower""
     }
     public var mapMapOfString: [String:[String:String]]?
     public var mapOfEnumString: [String:String]?
diff --git a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index b346eb47e5f..ba3fa230f34 100644
--- a/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift3/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -11,8 +11,18 @@ import Foundation
 open class OuterComposite: JSONEncodable {
 
     public var myNumber: Double?
+    public var myNumberNum: NSNumber? {
+        get {
+            return myNumber.map({ return NSNumber(value: $0) })
+        }
+    }
     public var myString: String?
     public var myBoolean: Bool?
+    public var myBooleanNum: NSNumber? {
+        get {
+            return myBoolean.map({ return NSNumber(value: $0) })
+        }
+    }
 
     public init() {}
 
diff --git a/samples/client/petstore/swift3/promisekit/.openapi-generator/VERSION b/samples/client/petstore/swift3/promisekit/.openapi-generator/VERSION
index ad121e8340e..4395ff59232 100644
--- a/samples/client/petstore/swift3/promisekit/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift3/promisekit/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.1-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index daf7ed7ad4a..d9ab85604de 100644
--- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -345,8 +345,8 @@ open class FakeAPI: APIBase {
      * enum for parameter enumHeaderStringArray
      */
     public enum EnumHeaderStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
+        case greaterThan = "">""
+        case dollar = ""$""
     }
 
     /**
@@ -362,8 +362,8 @@ open class FakeAPI: APIBase {
      * enum for parameter enumQueryStringArray
      */
     public enum EnumQueryStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
+        case greaterThan = "">""
+        case dollar = ""$""
     }
 
     /**
diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index 757d5fbe468..7bf28fcfb2c 100644
--- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -42,6 +42,7 @@ open class FakeClassnameTags123API: APIBase {
     /**
      To test class name in snake case
      - PATCH /fake_classname_test
+     - To test class name in snake case
      - API Key:
        - type: apiKey api_key_query (QUERY)
        - name: api_key_query
diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 239005397eb..36338aafb97 100644
--- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -123,9 +123,9 @@ open class PetAPI: APIBase {
      * enum for parameter status
      */
     public enum Status_findPetsByStatus: String { 
-        case available = "available"
-        case pending = "pending"
-        case sold = "sold"
+        case available = ""available""
+        case pending = ""pending""
+        case sold = ""sold""
     }
 
     /**
diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 928449dfcbc..c2414d1023e 100644
--- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -15,8 +15,8 @@ open class EnumArrays: JSONEncodable {
         case dollar = "$"
     }
     public enum ArrayEnum: String { 
-        case fish = "fish"
-        case crab = "crab"
+        case fish = ""fish""
+        case crab = ""crab""
     }
     public var justSymbol: JustSymbol?
     public var arrayEnum: [ArrayEnum]?
diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 58548bee74d..7b6af62b057 100644
--- a/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift3/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -11,8 +11,8 @@ import Foundation
 open class MapTest: JSONEncodable {
 
     public enum MapOfEnumString: String { 
-        case upper = "UPPER"
-        case lower = "lower"
+        case upper = ""UPPER""
+        case lower = ""lower""
     }
     public var mapMapOfString: [String:[String:String]]?
     public var mapOfEnumString: [String:String]?
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Podfile.lock b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Podfile.lock
index 3add4cf9b4a..5f69a517d4b 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Podfile.lock
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Podfile.lock
@@ -8,15 +8,20 @@ PODS:
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - PromiseKit
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: 529644d7d853d985a2748d43c7d4848db0fd62bb
+  PetstoreClient: b5876a16a88cce6a4fc71443a62f9892171b48e2
   PromiseKit: ecf5fe92275d57ee77c9ede858af47a162e9b97e
 
 PODFILE CHECKSUM: da9f5a7ad6086f2c7abb73cf2c35cefce04a9a30
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
index bfdc58db09e..95f4d993980 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
@@ -2,16 +2,17 @@
   "name": "PetstoreClient",
   "platforms": {
     "ios": "9.0",
-    "osx": "10.11"
+    "osx": "10.11",
+    "tvos": "9.0"
   },
   "version": "0.0.1",
   "source": {
-    "git": "git@github.com:swagger-api/swagger-mustache.git",
+    "git": "git@github.com:openapitools/openapi-generator.git",
     "tag": "v1.0.0"
   },
   "authors": "",
   "license": "Proprietary",
-  "homepage": "https://github.com/swagger-api/swagger-codegen",
+  "homepage": "https://github.com/openapitools/openapi-generator",
   "summary": "PetstoreClient",
   "source_files": "PetstoreClient/Classes/**/*.swift",
   "dependencies": {
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Manifest.lock b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Manifest.lock
index 3add4cf9b4a..5f69a517d4b 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Manifest.lock
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Manifest.lock
@@ -8,15 +8,20 @@ PODS:
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - PromiseKit
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: 529644d7d853d985a2748d43c7d4848db0fd62bb
+  PetstoreClient: b5876a16a88cce6a4fc71443a62f9892171b48e2
   PromiseKit: ecf5fe92275d57ee77c9ede858af47a162e9b97e
 
 PODFILE CHECKSUM: da9f5a7ad6086f2c7abb73cf2c35cefce04a9a30
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
index d56472dd444..313e55a56ed 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
@@ -7,126 +7,123 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		053E27E4E66AB2D2151D9776585F1FA7 /* after.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AFE5B442894FF7BEA9ECAB0A39B4AD /* after.swift */; };
-		05A6FFA5B3630FD63A5CFA863DEFFE4F /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 052400F31168326FF2A3E229D65D1B39 /* EnumTest.swift */; };
-		06338FA7F6A0C237789ED8BDCB637AD3 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7017BC38FCA103F2518FE2C4942EB8A3 /* AnimalFarm.swift */; };
-		0667FE82295343616E4C3E975E61E2DE /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09CECC4989EF7F2028490D9A4CC6C9B7 /* OuterEnum.swift */; };
-		09882E9EDEBB7356D33B97A5934E3227 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEEEB561582A92AB799221584DDDAD6 /* Capitalization.swift */; };
-		0A04A65465FDD547158AA925C95F6B69 /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8480516CD063566F07F5D08643F3BA9F /* Cat.swift */; };
-		0B2977ECFB1DCD215E8A05E477DDBA6A /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9769FD713F522BC6BA9A6C8B6C3BA7 /* EnumClass.swift */; };
+		01CFE58A73E5BF020E8D6E295B526567 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
+		04EF4F9A97B11DB9A5FED91F47B25982 /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08583885463D1EDB2F8023584348659C /* Dog.swift */; };
+		06F013FCC3383A42626ABDD06BAF5B16 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0E62A4CE2C6F59AE92D9D02B41649D5 /* ApiResponse.swift */; };
+		0FFCB09E3E9B2CE432C9A1DA196F336F /* join.m in Sources */ = {isa = PBXBuildFile; fileRef = 47F1D5162720B2001CA614017A1ACE90 /* join.m */; };
+		103703B2AFC3F1B129FBDF5B94D6DFEF /* when.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05D32F7DA10CFDD71EAA3EA19946CD1D /* when.swift */; };
 		10EB23E9ECC4B33E16933BB1EA560B6A /* Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6E736FF5D4320FE1647DB1724C14B8 /* Timeline.swift */; };
-		1205979ACE7FBA4EB49E5653FA2D1C21 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B3E802F6708C08B257C5E6F550D3FDB /* APIHelper.swift */; };
-		146087D66852238BD415594F4096CDB7 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 580886F727A89668FA28D3BA11678585 /* Order.swift */; };
-		179674B41CDC3DCEE7DB902C0F553285 /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA45912AE978F0840F94A8D308944E6B /* OuterComposite.swift */; };
-		17AA9C279DC342C47E2E3002B30CA60D /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5351A4A344C05ACDF996E3630E69366C /* ArrayOfArrayOfNumberOnly.swift */; };
-		1B9EDEDC964E6B08F78920B4F4B9DB84 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 95DA780B317CD76B87D2843B3922D627 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1D9F8E6252D07755D7145BD5B01A2001 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 311A10F75B7649E2E301E8EC58A6A5EA /* Configuration.swift */; };
-		1DE9D90349D9177D527C15E5A57D7031 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7896C2D88FC42331AEA0607792B4510A /* Tag.swift */; };
-		20E2CC1FD887EC3DA74724A32DDA1132 /* Pods-SwaggerClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		264F59B087C997C8DAF2A010366FD9B0 /* PromiseKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = E7B845A9435BD8A5A34664D1A66B8484 /* PromiseKit-dummy.m */; };
-		277E86F43EC003B6FF423B020D732A9D /* race.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2293B3E9936106C01A2A831A2C1E8AD6 /* race.swift */; };
-		2B00D1C16A6142361F09AE15EFC5827E /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BAC2B27DBB94AEC209B05FC0541894E /* StoreAPI.swift */; };
-		2B86E7C61F0D8144F603B3219D1EE5F0 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A03102A2289886143D394C1EEF173C69 /* Alamofire.framework */; };
-		2D040E855A9DBDC57A921ED5232836BB /* when.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E9E772008F75FBB98AEE83B59F519A9 /* when.m */; };
-		2E3E42AF5ACF1DA12162BEE3755C79C0 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 06F576B1286B5129A7A77654A92AAFCF /* PetstoreClient-dummy.m */; };
-		31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		33D656C917337CEA212DB903ECD0E6C0 /* AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CE45709BBC984B7998B833B10FC058 /* AnyPromise.swift */; };
-		344E99585E0E1F196B6E8E9D5E2EC2A5 /* OuterNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3AE9FA5F3483AB2497E1D3B488F0562 /* OuterNumber.swift */; };
-		35910E5DCB2E234D2D743D899E50A83D /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DAD68F75B538EE67EB80CC354DCE787 /* Extensions.swift */; };
+		1B9EDEDC964E6B08F78920B4F4B9DB84 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = A16286911EF2D17072D77A2B43E34006 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		1D9CEF79CC2D5FFE3A7C56C7ED6ACA9A /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E3D0C745CE3A020C8BC5C96CAFB616F /* PetstoreClient-dummy.m */; };
+		20E2CC1FD887EC3DA74724A32DDA1132 /* Pods-SwaggerClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		219FE1E23C00F7FD807754240B209C92 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9623461D845F7EE6E2BBDBC44B8FE867 /* SpecialModelName.swift */; };
+		231F732DA4194F2BBB495B8C55A4731F /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE05BA43EDFECD3CB825712216F42CE9 /* APIs.swift */; };
+		2367D029393B6AD52DF45A90051AFCA8 /* fwd.h in Headers */ = {isa = PBXBuildFile; fileRef = 645D2C8A204D8C820EEF9684DC5A65F8 /* fwd.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		23ECCCE721C0E2B6AC2101CF0CBBBC3B /* hang.m in Sources */ = {isa = PBXBuildFile; fileRef = CA6251246DA0044C165AC891CDE64344 /* hang.m */; };
+		25BB94C34507196F4BA2B4E77134F3B9 /* wrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B96D6AE9F0F69FC801059349B8A234 /* wrap.swift */; };
+		265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		26B718D25FB0C7F996174784716061A3 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3911B66DC4AC99DD29F10D115CF4555A /* PetAPI.swift */; };
+		27CB0A250126F6D24E806E69A705EBDB /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FCF0B9190C58BD7493583E8133B3E56 /* EnumClass.swift */; };
+		27D78C37454409BA11AB73A7EC9DDB5B /* DispatchQueue+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B75FBDF2B74DA3B74C5F0ADD20F42A2 /* DispatchQueue+Promise.swift */; };
+		2A72C39269BFFC89FEE2B4D9C6CC49C0 /* Promise+Properties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24AEF2E680D3A5F36B2C7C53FA70938A /* Promise+Properties.swift */; };
+		2EBE61A399E8FBF68BC9E4DA41B42993 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BCC6F35A8BC2A442A13DE66D59CAC87 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2F9B8B649CCAF9E6FB4CAD7471B8DDED /* when.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E9E772008F75FBB98AEE83B59F519A9 /* when.m */; };
+		32BB3604C571D998D14FE2250AB66C87 /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EB881F0C1B1D1F90FAB084334D6C13D /* EnumTest.swift */; };
 		3626B94094672CB1C9DEA32B9F9502E1 /* TaskDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F8D293ABA4E6DE8B257C7E9899F1B08 /* TaskDelegate.swift */; };
-		38067FEC32DCDB6E4F6215EAD63437C3 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B693DDC1E69F657EACB36EFF2276AB9 /* ArrayOfNumberOnly.swift */; };
-		3E9543717A86AC66C62BEBF05326977F /* OuterBoolean.swift in Sources */ = {isa = PBXBuildFile; fileRef = 863C495665994A46B8848CBC998B332A /* OuterBoolean.swift */; };
-		3F4E19A844EFA6C087276743DF604FDF /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7092AD06F0EF38CC9D8C3FE8B772E65 /* Dog.swift */; };
-		403E2169606F2DEEA7EAAAC045B46BEF /* PromiseKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6456A8E3DB29C967B8479EA4438C76F3 /* PromiseKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4049562FD0514CC1979A8AD7EF001AD1 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 541CB75E23648A3EE2925E81E345B0FB /* MapTest.swift */; };
-		40F309F2DDD2EC48E7A24D35CA9EA368 /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 888EE37DF287C4063756B72B2D0DBB04 /* FakeAPI.swift */; };
-		4CF3C7AAB7A5940C292EE3CCC3A3C4D0 /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = E775A7621846699F1A762DB966B3DC48 /* State.swift */; };
-		4E63F97E3E36D9A8576F710D193EB330 /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2B00793CB30A6A5C0C3497B890D7A1 /* Animal.swift */; };
-		5135F85CE891C74CF289365F3D665B62 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7645FEA4F23C54852D28771CC2FF3B80 /* User.swift */; };
-		5140E3AF1B2AC4EF35D24062003B822D /* Zalgo.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA33807992507937BA2869E4D72BA073 /* Zalgo.swift */; };
+		38D74E81D7448683908E85A2CDAC98C2 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A1AE5E1B215E1D53DCB6AB501CB0DAE /* Configuration.swift */; };
+		3CD8CD323460E6D9EAA3E73589C4C090 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 749EFF1B930D930529640C8004714C51 /* ArrayTest.swift */; };
+		42D2092C84FDC3E0813B03FBD8336E75 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CAA626D85FBD1FF53F144A14B3A3230 /* Extensions.swift */; };
+		44AE6FB3DED64897C2FA694470E92786 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C103637D74EC198CF949454436D3616 /* Category.swift */; };
+		44BE905B96695A8C23EAE61A770CDCB3 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00FC3821A8BFCD6F05D00696BF175619 /* MapTest.swift */; };
+		499CB252CEE9BCBB301FC00864DEA23F /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DD27DB5AB64425B97113FA8D5A10F19 /* PromiseKit.framework */; };
+		4C10F55358B408559757EFA795BA759B /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A03102A2289886143D394C1EEF173C69 /* Alamofire.framework */; };
+		5334E14F60DFB828EF27BB85CB0BF3AA /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD481458DC0F63AEFBD495121305D6D8 /* AdditionalPropertiesClass.swift */; };
 		5387216E723A3C68E851CA15573CDD71 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A3F20B5239DF2DF6CB987D4827C198 /* Request.swift */; };
-		545704EF756212DC400A4C252806077D /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C7F83F8F72A49EA9D543B4B32260F64 /* Return.swift */; };
-		587447A22F4AB55382FAE09950120C8B /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = F381FC45001ED67FBA800D5DEACBE414 /* HasOnlyReadOnly.swift */; };
-		58BC833C2E0ACD339E79A966F9C937B7 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB7377A43FADE63746BBC7D1CCAD93D /* ClassModel.swift */; };
-		5CBFA7F10B16CE082F3DEB42782BB20B /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F434ADE4363A510D2EFDCE14A0C5746 /* Error.swift */; };
-		5E9A0AA061E16D2F41B0DA9A56C0A5A4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
-		5EB6840C80C4AF36E53852FA25B9FE2E /* join.m in Sources */ = {isa = PBXBuildFile; fileRef = 47F1D5162720B2001CA614017A1ACE90 /* join.m */; };
-		5F255DAA5EC5598D66A2A22A052C4642 /* AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = CB66B121BF9B4DF48FE2F6A4D044C443 /* AnyPromise.m */; };
+		585961AE2C313F0484DC94E7123B7384 /* after.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AFE5B442894FF7BEA9ECAB0A39B4AD /* after.swift */; };
 		5F4F4E0D84288987C470DFAE80E9C7AB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
+		5F8B6F0D85F60DDEB217EE08168CADB7 /* GlobalState.m in Sources */ = {isa = PBXBuildFile; fileRef = 7824BE1937712800889974B222CAB1AD /* GlobalState.m */; };
 		61200D01A1855D7920CEF835C8BE00B0 /* DispatchQueue+Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = F48DFEE4376C36D6CF4C7DBFEBF91F45 /* DispatchQueue+Alamofire.swift */; };
 		62F65AD8DC4F0F9610F4B8B4738EC094 /* ServerTrustPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 428236967C1B816363FB039AD9A0D098 /* ServerTrustPolicy.swift */; };
-		655906A84ACFBE897B9B0854CA5ED146 /* Promise+Properties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24AEF2E680D3A5F36B2C7C53FA70938A /* Promise+Properties.swift */; };
-		667E578EA712E1DF2380BF164C5E29AA /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85F20E4DF6D1F32E36AE3823008F92BE /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
-		67EEBC5D0C5449E64F7070B12742BE5C /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0CC1C18E268F223DDA59BAA121FE88E /* List.swift */; };
-		6DAC90FE278E810EA89A32891F6F726D /* dispatch_promise.m in Sources */ = {isa = PBXBuildFile; fileRef = ACDBB9A0818694ED3F5545A2102E7624 /* dispatch_promise.m */; };
-		6F6D5E95B91D0B89D19D8B07CC34B058 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 428C78B74D8A4ECEA1E6470057D3562B /* PetAPI.swift */; };
+		63DB912E169D1F8BF4B64B5EE73F6AB9 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14FE73E27209DA05667C0D3E1B601734 /* Pet.swift */; };
+		63E2034DB2CC4ABA407CB11F2CD5F8EA /* dispatch_promise.m in Sources */ = {isa = PBXBuildFile; fileRef = ACDBB9A0818694ED3F5545A2102E7624 /* dispatch_promise.m */; };
+		63E686B0A0025A45E0D18215008FCBB5 /* race.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2293B3E9936106C01A2A831A2C1E8AD6 /* race.swift */; };
+		641381821D2DB1A4E01C6C095E6C56A4 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA5F47130C28C4C5652E69E59A0902BD /* User.swift */; };
+		691A19D66B4AC099C54D2BAF40068C5A /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0644BE2FFAA5C8FE7F15E3BF2557AFC /* Order.swift */; };
+		699ED9DCDE1A4C8346C0EDA41B142AD8 /* AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = CB66B121BF9B4DF48FE2F6A4D044C443 /* AnyPromise.m */; };
+		6E3AD6CCFCA63569D8DE3A32C7A1132A /* after.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDF4D8C4A3CD3A61ACE20A71F71A107 /* after.m */; };
+		6FA118FD3264A4102AAB1F3926DFED5F /* PromiseKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E63746E0EEDB9AB11F3F623A63F36BB3 /* PromiseKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		718DD7A904E6D014EFC81CDE3DFBF930 /* PromiseKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6456A8E3DB29C967B8479EA4438C76F3 /* PromiseKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		73B9C996AED49ED7CF8EC2A6F1738059 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
-		76020E5CECD3FCC592D2C59CB2EC27FA /* fwd.h in Headers */ = {isa = PBXBuildFile; fileRef = 645D2C8A204D8C820EEF9684DC5A65F8 /* fwd.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		73E09CEF7AFEE6F395D2B9D6E74ADEFE /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = E775A7621846699F1A762DB966B3DC48 /* State.swift */; };
+		77A2033DE971F9E3B91FDFE2E38FEA6D /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59022FD592AB91A0B2EDA3A2EA5EC8D9 /* OuterComposite.swift */; };
 		7B5FE28C7EA4122B0598738E54DBEBD8 /* SessionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64759A200040719DDE024A0F1BCDDDEE /* SessionDelegate.swift */; };
 		7D8CC01E8C9EFFF9F4D65406CDE0AB66 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE689938DB1BB3BAF7C98928CB02978A /* Result.swift */; };
-		8097FDFC90106EB1EE632DBA2D3E8F85 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E2C57703EA0D61575D878820DE56A5E4 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		82310F627E8C49D9F906723C6C3DA3BA /* DispatchQueue+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B75FBDF2B74DA3B74C5F0ADD20F42A2 /* DispatchQueue+Promise.swift */; };
-		86E587687F8286990E1BD25FD5AB0A37 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00925AB5384C3976E53F0437FE1311C5 /* AlamofireImplementations.swift */; };
-		870322F063522D314752502D12D30BF3 /* Promise+AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947066689D96D035F88E7408FA47E193 /* Promise+AnyPromise.swift */; };
-		8740BC8B595A54E9C973D7110740D43F /* Pods-SwaggerClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */; };
-		87C6D2D31470ECE88A057BB415CA093A /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95821A5031076AE0FDCDE22E0954A02D /* EnumArrays.swift */; };
-		887BBB5306DA732DD350E38BAAABB118 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB0115D0EE604B8618320E1C6B52390 /* Client.swift */; };
-		897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */; };
-		97AB35CEB1F8147F512C403765C24366 /* Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22932972F4F492160D4694C01CAF311D /* Promise.swift */; };
-		9B605CCF6FBB08279AAAF5A1E08E8019 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270C457C18A9B3C93FE2C196EC065A1A /* SpecialModelName.swift */; };
-		9B80CE10037E884E4F14B60E5BCEF038 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A557F23780CA069BA61AE2BE3C0C935 /* ApiResponse.swift */; };
-		9D4D03BC83CA4C1FDA0C88CC8B386B30 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BA02A166AA3B7EC3B8DF4103088DE8A /* Pet.swift */; };
+		7F3C4DAEF3A108B4936F52CB7247D55B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
+		80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */; };
+		814D37FBB96C14ADCF09D927378CCE16 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64104A4C68341D80F2DB4CF5DE7779F /* Models.swift */; };
+		8740BC8B595A54E9C973D7110740D43F /* Pods-SwaggerClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */; };
+		883EEA3DD1A2F81816A97D866E326883 /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BAEE07194E1BFA72B1110849C7B348A /* Return.swift */; };
+		8C73430A31E483D393F5DEF88A508EA1 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5921D679A4009B3F216FEF671EB69158 /* NumberOnly.swift */; };
+		8CDBE98AF0551E45E72B7B1648D31F80 /* AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CE45709BBC984B7998B833B10FC058 /* AnyPromise.swift */; };
+		8DDBE39C464CF72A61F21BA253A4CC90 /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2274608F6E89920A7FBADABEF6A20A1F /* Animal.swift */; };
+		8EA32ABEE6939D03B78008BBCD75F184 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2AAC6F82FCBCF2CE32522143CBF59D6 /* List.swift */; };
+		9B2E9A05870436FB6A8F0F1BD348D929 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC890DE67452A9F63BD12B30135E3BD6 /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		9B9E66A0DEA1D13FA40F8B96E2B52E44 /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93D9DA1CB883DC1FCCF639FECF14930D /* FakeClassnameTags123API.swift */; };
+		9D3E58EBB53AAA758A9CC82687F573FB /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57299EE6209AFEBA56C717433863E136 /* Model200Response.swift */; };
 		9ED2BB2981896E0A39EFA365503F58CE /* AFError.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA7D6AB49001069ED310CBCA8FCBB44 /* AFError.swift */; };
-		A03C561A3CE745179C9F246A5B8D7E21 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
-		A1083DDC06C37F84D105231BC7AC2078 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FDCB2CCAC42FDF414F93594CF7F2D6D /* Category.swift */; };
+		9FF2CFB0995902A220D313224467091D /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCD2D0F8C81B81BFB4306011CAC48A20 /* AlamofireImplementations.swift */; };
 		A2A6F71B727312BD45CC7A4AAD7B0AB7 /* NetworkReachabilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AE857E00E364AD3F18C2C39D49D6DDD /* NetworkReachabilityManager.swift */; };
-		A6A60DD672777F2A2AC647658506B2C9 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 885795F7A7783B007F026944B55862FF /* Models.swift */; };
-		A9EEEA7477981DEEBC72432DE9990A4B /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AC04C8B5F4B690622341DB807DAEB0B /* Alamofire-dummy.m */; };
-		AC0DC62D4728E6A27014ED1D5DB39869 /* OuterString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 547A70BA5BF7A5A411F65BEFD9BF0B07 /* OuterString.swift */; };
-		AD96DA86AD0D6C1D132B5EEEC33758FD /* hang.m in Sources */ = {isa = PBXBuildFile; fileRef = CA6251246DA0044C165AC891CDE64344 /* hang.m */; };
+		A9AB67BC9B70F93C9750B2C9FEDA17F5 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = C049305B9A26A2FD2A88D0394DD37678 /* HasOnlyReadOnly.swift */; };
+		A9EEEA7477981DEEBC72432DE9990A4B /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 60347AB0041CEAF3AFE665EDD5ED3839 /* Alamofire-dummy.m */; };
 		AE1EF48399533730D0066E04B22CA2D6 /* SessionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9585493102C1567226760B6BACFDF648 /* SessionManager.swift */; };
-		AF95CFE493C440AE05EFDAACE7E4E7DE /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91DFFBF289A62730BCCBAC4851A1AC8B /* AdditionalPropertiesClass.swift */; };
-		B24ED08E9E7E64C67C7F886A1B26C9C4 /* Fake_classname_tags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80F9261093894D0B652D42D5A3D1D1F9 /* Fake_classname_tags123API.swift */; };
-		B2B48F66496BB746373C6B7A0D209F36 /* when.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05D32F7DA10CFDD71EAA3EA19946CD1D /* when.swift */; };
+		AFC93E2F0FC280C96F56714503FD791E /* PromiseKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4667C7609366DAC2FC770F6565F7F2A2 /* PromiseKit-dummy.m */; };
+		AFFE3E17AE77FA05D77C29D9B1341110 /* Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22932972F4F492160D4694C01CAF311D /* Promise.swift */; };
 		B65FCF589DA398C3EFE0128064E510EC /* MultipartFormData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D75CBCB14282D5EBA5A424CCF0655C2A /* MultipartFormData.swift */; };
-		BB27103F0D590065B8B96158A158C07E /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B6FF05C8B29C32FB1710F116C21BB4 /* FormatTest.swift */; };
+		B93DCCA0C3EFD603321B83568BAF3528 /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ED78F1E81F4EF6FE5B0E77CA5BFB40C /* Cat.swift */; };
+		B966CB82AA59221824B1A312DCA732BF /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B11E91D22910944308DE39CB8CBF3AE /* OuterEnum.swift */; };
 		BBEFE2F9CEB73DC7BD97FFA66A0D9D4F /* Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A7F97EB8AC32E44E21839FA607D2CE /* Validation.swift */; };
+		BE13C1CEC5F1054D0C811F948144BB6D /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDE4AF9A5A88886D7B60AF0F0996D9FA /* EnumArrays.swift */; };
 		BE5C67A07E289FE1F9BE27335B159997 /* ParameterEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D5BF61C764F8D1E7F2631DE14AC6B36 /* ParameterEncoding.swift */; };
-		C17B1A5739A83DE224286D84B67D4F2A /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE862CC5FFB80999FD1500D5801F2A21 /* ReadOnlyFirst.swift */; };
-		C23C578EB36914B7B7993ACB7451DAEE /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59945A57D8EEE7EBE8146D516EA7257D /* Name.swift */; };
-		C25AC96F7A1662899D9B7369AD5C3718 /* PromiseKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C7BB9DA6D00D51D3DB475EDCFC925B3 /* PromiseKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C57027F4FF1F8BA21E021D7378186BAF /* after.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDF4D8C4A3CD3A61ACE20A71F71A107 /* after.m */; };
-		C84C5C33E6C3CD718D8D3D6839F5BB77 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B30C52CDC21F3188E5A50C469937008F /* NumberOnly.swift */; };
-		C8F87B4EC3E7D6B2EA869BB0A2B24A5E /* GlobalState.m in Sources */ = {isa = PBXBuildFile; fileRef = 7824BE1937712800889974B222CAB1AD /* GlobalState.m */; };
-		CB553CE49FF0AF2C666B96C680173F65 /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C4834C40334FCBD463B4BC38A966C9 /* Model200Response.swift */; };
+		C446D5151005AE86668FC8E3302F9322 /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8261F606FFC7AA4F9C45CA8016E8B1C7 /* FormatTest.swift */; };
+		C5C4410C4E0FFAC1B32B06F8CBFB6259 /* Promise+AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947066689D96D035F88E7408FA47E193 /* Promise+AnyPromise.swift */; };
+		C93ED6D8E9EC20D0BE77A55B6E00C52C /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = D931C41179C1EA52307316C7F51D1245 /* ArrayOfNumberOnly.swift */; };
 		CB6D60925223897FFA2662667DF83E8A /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 714D784CFA6CB99C3B07B03487960BE0 /* Response.swift */; };
-		D61F5BF2B4BBB073BF87700BAE29B79D /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68E391F21156718CBAB2638D6A02FAA3 /* UserAPI.swift */; };
-		D9495580483FAECB1F454A88F5E98425 /* join.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54DD29EE59FE04DF98E96700B3A276DB /* join.swift */; };
-		E25942E2E76810D3C819B2C624AFA087 /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF2F015C5D4E807D437D0EE9528B3CE /* APIs.swift */; };
-		E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
-		E7646AE8D28791DE9F6738F8429C6AB8 /* AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 80933905730AC186F9CA86852B3817E6 /* AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E79B2343A16824E335FF99F92D100B56 /* FakeclassnametagsAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = F25F7F29B763AB9B70C3140B53E8F5A1 /* FakeclassnametagsAPI.swift */; };
-		ECB7ADCAB05E41A34AE5D162F76B48CA /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB010C5D4A7300AD69E8389F8E09BDF /* ArrayTest.swift */; };
+		CC7367CCDE0BBC9D2A51A49D73863DF9 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A0B504F5FC1B5E5369C2AD8ABA9482A /* AnimalFarm.swift */; };
+		CEBC19117C306BC35BDB1E3E323E9D0E /* join.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54DD29EE59FE04DF98E96700B3A276DB /* join.swift */; };
+		CFB4111F30C45601D2002E2A1AE388E4 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F3B836F14594A6EF1923CC07B61E893 /* ClassModel.swift */; };
+		D02CA2F93049B1BC3D40BF7B1A47CF19 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2CEC365CFACB91EC9E750D659D5ED10 /* Client.swift */; };
+		D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
+		D242EA2DA2F73FE9179A2DC38A1DBA94 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A15B50BA886EAD6427ADC7E68BBD4FE /* StoreAPI.swift */; };
+		D3BC76F41203E1F97E43A5B056361539 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4C9F81DD3B2DAC61C014790FAFD205E /* Name.swift */; };
+		DBA7023E4D92933BCED1925AC4A1F66C /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB9FB7676C53BD9BE06337BB539478B1 /* Tag.swift */; };
+		DDE87E79D21CAFCD4BD44205D8952996 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F434ADE4363A510D2EFDCE14A0C5746 /* Error.swift */; };
+		E52198D4DEBEB022BA31C65ECD467B6F /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DD46253330346E885D5966DBB25FE8B /* ArrayOfArrayOfNumberOnly.swift */; };
+		ED5F3591C7F1037A271BA08F78F006D2 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4FB407CB8C792BFB02EADD91D6A4DFA /* ReadOnlyFirst.swift */; };
 		EFD264FC408EBF3BA2528E70B08DDD94 /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC1CEE597A54C622C960B36A5EC2FA0F /* Notifications.swift */; };
+		F4578EC1C5C581113AD691B0B3C2A116 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2A82E1B6CEC50F002C59C255C26B381 /* Capitalization.swift */; };
+		F520D6DFDCDE9A76E253C33790C72A36 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E982F66B9CB4E2C2083F9B02EF41011 /* APIHelper.swift */; };
+		F5FB347092197098AFBC705080CA1DAC /* AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 80933905730AC186F9CA86852B3817E6 /* AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F673C12859ABA85B07C53573619F4319 /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD8EF004C7534401577C1694D823F3 /* FakeAPI.swift */; };
 		F6BECD98B97CBFEBE2C96F0E9E72A6C0 /* ResponseSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948BFEDB052F09AD8DAE3BD3CB286673 /* ResponseSerialization.swift */; };
-		F702666B7BC058BDEFF8798F3022141C /* wrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B96D6AE9F0F69FC801059349B8A234 /* wrap.swift */; };
 		F8B3D3092ED0417E8CDF32033F6122F5 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23C4E6603FB90F49BE8906508887D859 /* Alamofire.swift */; };
-		FC42DC8E07B65FE4A25C6A6CAF0BE887 /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DD27DB5AB64425B97113FA8D5A10F19 /* PromiseKit.framework */; };
+		FB99E623D7F83A48B5460F58DEFD0F76 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BFA1723A93AA1DB0952B2F750421B32 /* UserAPI.swift */; };
+		FC5EDB72D2571F4CF5206E7D71B1AFEF /* AnotherFakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45ED3A5E50AA60588D6ADA19ACBF0C66 /* AnotherFakeAPI.swift */; };
+		FD1E2558C46622C1D769AFD511EC87CE /* Zalgo.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA33807992507937BA2869E4D72BA073 /* Zalgo.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		896E1F3954A958778BFD791F45C40099 /* PBXContainerItemProxy */ = {
+		39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 88E9EC28B8B46C3631E6B242B50F4442;
-			remoteInfo = Alamofire;
+			remoteGlobalIDString = E5B96E99C219DDBC57BC27EE9DF5EC22;
+			remoteInfo = "Pods-SwaggerClient";
 		};
 		B173CFF2A1174933D7851E8CE1CA77AB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 771863E05E5496503F52AD4A5C96E634;
+			remoteGlobalIDString = FF7E20767096F041BFF22A3EDFD030E8;
 			remoteInfo = PetstoreClient;
 		};
 		BBE116AAF20C2D98E0CC5B0D86765D22 /* PBXContainerItemProxy */ = {
@@ -136,158 +133,163 @@
 			remoteGlobalIDString = 88E9EC28B8B46C3631E6B242B50F4442;
 			remoteInfo = Alamofire;
 		};
-		E323057E8BB3AC74973F3CBF3727AD44 /* PBXContainerItemProxy */ = {
+		CD31F0032076F778C8017DBDFF3DCA0B /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 64F186B4DD2329A6687EE7E1C6BB489B;
+			remoteGlobalIDString = C6AEB3EDCE021B764B46D50BFC2D7F0C;
 			remoteInfo = PromiseKit;
 		};
 		F4F5C9A84714BE23040A5FB7588DA6BD /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 64F186B4DD2329A6687EE7E1C6BB489B;
+			remoteGlobalIDString = C6AEB3EDCE021B764B46D50BFC2D7F0C;
 			remoteInfo = PromiseKit;
 		};
+		F7D43D16B4131241D02F5FCD10F79D65 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 88E9EC28B8B46C3631E6B242B50F4442;
+			remoteInfo = Alamofire;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		00925AB5384C3976E53F0437FE1311C5 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift; sourceTree = "<group>"; };
-		00ACB4396DD1B4E4539E4E81C1D7A14E /* Pods-SwaggerClientTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-SwaggerClientTests.modulemap"; sourceTree = "<group>"; };
-		02F28E719AA874BE9213D6CF8CE7E36B /* Pods-SwaggerClientTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClientTests-acknowledgements.plist"; sourceTree = "<group>"; };
+		00FC3821A8BFCD6F05D00696BF175619 /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
 		04B96D6AE9F0F69FC801059349B8A234 /* wrap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = wrap.swift; path = Sources/wrap.swift; sourceTree = "<group>"; };
-		052400F31168326FF2A3E229D65D1B39 /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
 		05D32F7DA10CFDD71EAA3EA19946CD1D /* when.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = when.swift; path = Sources/when.swift; sourceTree = "<group>"; };
-		06F576B1286B5129A7A77654A92AAFCF /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
+		08583885463D1EDB2F8023584348659C /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
 		08A7F97EB8AC32E44E21839FA607D2CE /* Validation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Validation.swift; path = Source/Validation.swift; sourceTree = "<group>"; };
-		09CECC4989EF7F2028490D9A4CC6C9B7 /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
-		0B3E802F6708C08B257C5E6F550D3FDB /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/Swaggers/APIHelper.swift; sourceTree = "<group>"; };
+		08BDFE9C9E9365771FF2D47928E3E79A /* Pods-SwaggerClient-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClient-acknowledgements.plist"; sourceTree = "<group>"; };
+		0AD61F8554C909A3AFA66AD9ECCB5F23 /* Pods-SwaggerClient-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-frameworks.sh"; sourceTree = "<group>"; };
 		0B4A4A4EB2DBD6F56B1383E53763FD1B /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = PetstoreClient.framework; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0B75FBDF2B74DA3B74C5F0ADD20F42A2 /* DispatchQueue+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Promise.swift"; path = "Sources/DispatchQueue+Promise.swift"; sourceTree = "<group>"; };
-		16C4834C40334FCBD463B4BC38A966C9 /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
-		17FF216D0378037475BAB48A20D5CB0F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		1B693DDC1E69F657EACB36EFF2276AB9 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
-		1BA02A166AA3B7EC3B8DF4103088DE8A /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
-		1BAC2B27DBB94AEC209B05FC0541894E /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
-		1F11D15E4489C7F4DC1171EB9F5448D0 /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = Alamofire.modulemap; sourceTree = "<group>"; };
+		0BCC6F35A8BC2A442A13DE66D59CAC87 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
+		14FE73E27209DA05667C0D3E1B601734 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		15EC3D8D715BC3F25A366C403ED02060 /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
+		1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.debug.xcconfig"; sourceTree = "<group>"; };
+		1BAEE07194E1BFA72B1110849C7B348A /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		1C103637D74EC198CF949454436D3616 /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		1E982F66B9CB4E2C2083F9B02EF41011 /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/OpenAPIs/APIHelper.swift; sourceTree = "<group>"; };
+		1FCF0B9190C58BD7493583E8133B3E56 /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		2274608F6E89920A7FBADABEF6A20A1F /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
 		22932972F4F492160D4694C01CAF311D /* Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Promise.swift; path = Sources/Promise.swift; sourceTree = "<group>"; };
 		2293B3E9936106C01A2A831A2C1E8AD6 /* race.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = race.swift; path = Sources/race.swift; sourceTree = "<group>"; };
 		23C4E6603FB90F49BE8906508887D859 /* Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Alamofire.swift; path = Source/Alamofire.swift; sourceTree = "<group>"; };
 		24AEF2E680D3A5F36B2C7C53FA70938A /* Promise+Properties.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Promise+Properties.swift"; path = "Sources/Promise+Properties.swift"; sourceTree = "<group>"; };
-		270C457C18A9B3C93FE2C196EC065A1A /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
-		291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClient-dummy.m"; sourceTree = "<group>"; };
-		2FF17440CCD2E1A69791A4AA23325AD5 /* Pods-SwaggerClient-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClient-acknowledgements.markdown"; sourceTree = "<group>"; };
-		311A10F75B7649E2E301E8EC58A6A5EA /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/Swaggers/Configuration.swift; sourceTree = "<group>"; };
-		34E180DB9A06BFDDA525853716B57541 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		3C7BB9DA6D00D51D3DB475EDCFC925B3 /* PromiseKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PromiseKit-umbrella.h"; sourceTree = "<group>"; };
-		3C7F83F8F72A49EA9D543B4B32260F64 /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		27E9F1130735B56DF22A1439B5BA6333 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		2A8ED560E3DF01E75E0272F7A1B911DD /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Alamofire.modulemap; sourceTree = "<group>"; };
+		2EB881F0C1B1D1F90FAB084334D6C13D /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
+		2F3B836F14594A6EF1923CC07B61E893 /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
+		32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClient-umbrella.h"; sourceTree = "<group>"; };
+		3911B66DC4AC99DD29F10D115CF4555A /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		3BFA1723A93AA1DB0952B2F750421B32 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
 		3D5BF61C764F8D1E7F2631DE14AC6B36 /* ParameterEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ParameterEncoding.swift; path = Source/ParameterEncoding.swift; sourceTree = "<group>"; };
+		3ED78F1E81F4EF6FE5B0E77CA5BFB40C /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
 		3EDF4D8C4A3CD3A61ACE20A71F71A107 /* after.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = after.m; path = Sources/after.m; sourceTree = "<group>"; };
-		3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClient-umbrella.h"; sourceTree = "<group>"; };
-		3F16B43ABD2C8CD4A311AA1AB3B6C02F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		425268D5A6D1CD870A663BBE38B62B46 /* PromiseKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PromiseKit.xcconfig; sourceTree = "<group>"; };
+		4050C78B3A61270CDB69C80EFEB9BF4B /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
+		408CD558DEC1EFB9C57002ADB50665FC /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		419496CDDD7E7536CBEA02BAEE2C7C21 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		428236967C1B816363FB039AD9A0D098 /* ServerTrustPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ServerTrustPolicy.swift; path = Source/ServerTrustPolicy.swift; sourceTree = "<group>"; };
-		428C78B74D8A4ECEA1E6470057D3562B /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
-		43FC49AA70D3E2A84CAED9C37BE9C4B5 /* Pods-SwaggerClientTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-frameworks.sh"; sourceTree = "<group>"; };
+		451D13FDA61BDE9EB91BBC6CEA52AED4 /* PromiseKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PromiseKit.xcconfig; sourceTree = "<group>"; };
+		45ED3A5E50AA60588D6ADA19ACBF0C66 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = "<group>"; };
+		45FB2502919E80623D265FE19C0A8FC4 /* Alamofire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Alamofire.xcconfig; sourceTree = "<group>"; };
+		4667C7609366DAC2FC770F6565F7F2A2 /* PromiseKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PromiseKit-dummy.m"; sourceTree = "<group>"; };
 		46A00B403166BEF9EE215F6CB59BE9A6 /* Pods_SwaggerClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClient.framework; path = "Pods-SwaggerClient.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
 		47F1D5162720B2001CA614017A1ACE90 /* join.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = join.m; path = Sources/join.m; sourceTree = "<group>"; };
-		48CCB9793CCE13A24831B3E01B29171A /* PromiseKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PromiseKit-prefix.pch"; sourceTree = "<group>"; };
-		4AC04C8B5F4B690622341DB807DAEB0B /* Alamofire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Alamofire-dummy.m"; sourceTree = "<group>"; };
-		4BB010C5D4A7300AD69E8389F8E09BDF /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
+		48B406C5392E8AC40762B8EDE6DF1FE8 /* PromiseKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PromiseKit-prefix.pch"; sourceTree = "<group>"; };
 		4DD27DB5AB64425B97113FA8D5A10F19 /* PromiseKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PromiseKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		4DD46253330346E885D5966DBB25FE8B /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
 		4F8D293ABA4E6DE8B257C7E9899F1B08 /* TaskDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TaskDelegate.swift; path = Source/TaskDelegate.swift; sourceTree = "<group>"; };
-		4FF2F015C5D4E807D437D0EE9528B3CE /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/Swaggers/APIs.swift; sourceTree = "<group>"; };
-		5351A4A344C05ACDF996E3630E69366C /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
-		541CB75E23648A3EE2925E81E345B0FB /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
-		547A70BA5BF7A5A411F65BEFD9BF0B07 /* OuterString.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterString.swift; sourceTree = "<group>"; };
-		549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.debug.xcconfig"; sourceTree = "<group>"; };
+		536A8BDFB104F4132169F2B758A6AA0C /* PetstoreClient.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = PetstoreClient.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		54DD29EE59FE04DF98E96700B3A276DB /* join.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = join.swift; path = Sources/join.swift; sourceTree = "<group>"; };
-		580886F727A89668FA28D3BA11678585 /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
-		59945A57D8EEE7EBE8146D516EA7257D /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
-		5DB0115D0EE604B8618320E1C6B52390 /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
-		5E79C2313007533BFFA709832BE18FDC /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		57299EE6209AFEBA56C717433863E136 /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		59022FD592AB91A0B2EDA3A2EA5EC8D9 /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
+		5921D679A4009B3F216FEF671EB69158 /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
 		5F434ADE4363A510D2EFDCE14A0C5746 /* Error.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Error.swift; path = Sources/Error.swift; sourceTree = "<group>"; };
-		607281BBD24DC152F24F58E6046F4652 /* Alamofire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-prefix.pch"; sourceTree = "<group>"; };
+		60347AB0041CEAF3AFE665EDD5ED3839 /* Alamofire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Alamofire-dummy.m"; sourceTree = "<group>"; };
 		6456A8E3DB29C967B8479EA4438C76F3 /* PromiseKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PromiseKit.h; path = Sources/PromiseKit.h; sourceTree = "<group>"; };
 		645D2C8A204D8C820EEF9684DC5A65F8 /* fwd.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = fwd.h; path = Sources/fwd.h; sourceTree = "<group>"; };
 		64759A200040719DDE024A0F1BCDDDEE /* SessionDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionDelegate.swift; path = Source/SessionDelegate.swift; sourceTree = "<group>"; };
-		687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClientTests-dummy.m"; sourceTree = "<group>"; };
-		68E391F21156718CBAB2638D6A02FAA3 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
-		694EDDB57CDB8FB6CB5088BF3F66CE8A /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
+		6A0B504F5FC1B5E5369C2AD8ABA9482A /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
 		6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
-		6C68BF2CC332C9D6485B777BA7C063AE /* Alamofire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Alamofire.xcconfig; sourceTree = "<group>"; };
-		6D7294312CFFF12B79A7AD2E8D219344 /* PromiseKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = PromiseKit.modulemap; sourceTree = "<group>"; };
-		6DB7377A43FADE63746BBC7D1CCAD93D /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
-		7017BC38FCA103F2518FE2C4942EB8A3 /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
+		6CAA626D85FBD1FF53F144A14B3A3230 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/OpenAPIs/Extensions.swift; sourceTree = "<group>"; };
 		714D784CFA6CB99C3B07B03487960BE0 /* Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Response.swift; path = Source/Response.swift; sourceTree = "<group>"; };
-		7645FEA4F23C54852D28771CC2FF3B80 /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClientTests-dummy.m"; sourceTree = "<group>"; };
+		749EFF1B930D930529640C8004714C51 /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
+		76645699475D3AB6EB5242AC4D0CEFAE /* Pods-SwaggerClient-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClient-acknowledgements.markdown"; sourceTree = "<group>"; };
 		7824BE1937712800889974B222CAB1AD /* GlobalState.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GlobalState.m; path = Sources/GlobalState.m; sourceTree = "<group>"; };
-		7896C2D88FC42331AEA0607792B4510A /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
-		78B6FF05C8B29C32FB1710F116C21BB4 /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
+		79DD8EF004C7534401577C1694D823F3 /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
+		7A15B50BA886EAD6427ADC7E68BBD4FE /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		7A1AE5E1B215E1D53DCB6AB501CB0DAE /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/OpenAPIs/Configuration.swift; sourceTree = "<group>"; };
 		7AE857E00E364AD3F18C2C39D49D6DDD /* NetworkReachabilityManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NetworkReachabilityManager.swift; path = Source/NetworkReachabilityManager.swift; sourceTree = "<group>"; };
-		7C8E63660D346FD8ED2A97242E74EA09 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		7CEEEB561582A92AB799221584DDDAD6 /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		7B11E91D22910944308DE39CB8CBF3AE /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
+		7E3D0C745CE3A020C8BC5C96CAFB616F /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
 		80933905730AC186F9CA86852B3817E6 /* AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AnyPromise.h; path = Sources/AnyPromise.h; sourceTree = "<group>"; };
-		80F9261093894D0B652D42D5A3D1D1F9 /* Fake_classname_tags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Fake_classname_tags123API.swift; sourceTree = "<group>"; };
-		8480516CD063566F07F5D08643F3BA9F /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
-		849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.release.xcconfig"; sourceTree = "<group>"; };
-		855FBD05ABAD1AE4A03E58EEBA975DAA /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
-		85F20E4DF6D1F32E36AE3823008F92BE /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
-		863C495665994A46B8848CBC998B332A /* OuterBoolean.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterBoolean.swift; sourceTree = "<group>"; };
-		86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.release.xcconfig"; sourceTree = "<group>"; };
-		885795F7A7783B007F026944B55862FF /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/Swaggers/Models.swift; sourceTree = "<group>"; };
-		888EE37DF287C4063756B72B2D0DBB04 /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
+		814471C0F27B39D751143F0CD53670BD /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		8261F606FFC7AA4F9C45CA8016E8B1C7 /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
 		8BBF3490280C4ED53738743F84C890BC /* Pods_SwaggerClientTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClientTests.framework; path = "Pods-SwaggerClientTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
-		8FDCB2CCAC42FDF414F93594CF7F2D6D /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
-		91DFFBF289A62730BCCBAC4851A1AC8B /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
 		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		93D9DA1CB883DC1FCCF639FECF14930D /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
 		947066689D96D035F88E7408FA47E193 /* Promise+AnyPromise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Promise+AnyPromise.swift"; path = "Sources/Promise+AnyPromise.swift"; sourceTree = "<group>"; };
 		948BFEDB052F09AD8DAE3BD3CB286673 /* ResponseSerialization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResponseSerialization.swift; path = Source/ResponseSerialization.swift; sourceTree = "<group>"; };
-		95821A5031076AE0FDCDE22E0954A02D /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
 		9585493102C1567226760B6BACFDF648 /* SessionManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionManager.swift; path = Source/SessionManager.swift; sourceTree = "<group>"; };
-		95DA780B317CD76B87D2843B3922D627 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
-		969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.debug.xcconfig"; sourceTree = "<group>"; };
-		9A557F23780CA069BA61AE2BE3C0C935 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
-		9DAD68F75B538EE67EB80CC354DCE787 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/Swaggers/Extensions.swift; sourceTree = "<group>"; };
+		9623461D845F7EE6E2BBDBC44B8FE867 /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
+		9D08EC9B39FEBA43A5B55DAF97AAEBE9 /* Pods-SwaggerClientTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClientTests.modulemap"; sourceTree = "<group>"; };
+		9D780FDAD16A03CC25F4D6F3317B9423 /* Pods-SwaggerClientTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClientTests-acknowledgements.plist"; sourceTree = "<group>"; };
 		9E9E772008F75FBB98AEE83B59F519A9 /* when.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = when.m; path = Sources/when.m; sourceTree = "<group>"; };
 		A03102A2289886143D394C1EEF173C69 /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		A0CC1C18E268F223DDA59BAA121FE88E /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		A16286911EF2D17072D77A2B43E34006 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
+		AB9FB7676C53BD9BE06337BB539478B1 /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
 		ACDBB9A0818694ED3F5545A2102E7624 /* dispatch_promise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = dispatch_promise.m; path = Sources/dispatch_promise.m; sourceTree = "<group>"; };
 		AD3B511F5C43568AAFBA2714468F9FD5 /* PromiseKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = PromiseKit.framework; path = PromiseKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		AE6E736FF5D4320FE1647DB1724C14B8 /* Timeline.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeline.swift; path = Source/Timeline.swift; sourceTree = "<group>"; };
-		B30C52CDC21F3188E5A50C469937008F /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
+		AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.debug.xcconfig"; sourceTree = "<group>"; };
+		AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
+		B2AAC6F82FCBCF2CE32522143CBF59D6 /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		B2CEC365CFACB91EC9E750D659D5ED10 /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
+		B4FB407CB8C792BFB02EADD91D6A4DFA /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
+		B64104A4C68341D80F2DB4CF5DE7779F /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/OpenAPIs/Models.swift; sourceTree = "<group>"; };
 		B6AFE5B442894FF7BEA9ECAB0A39B4AD /* after.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = after.swift; path = Sources/after.swift; sourceTree = "<group>"; };
 		BC1CEE597A54C622C960B36A5EC2FA0F /* Notifications.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Notifications.swift; path = Source/Notifications.swift; sourceTree = "<group>"; };
-		BCF2D4DFF08D2A18E8C8FE4C4B4633FB /* Pods-SwaggerClient-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-frameworks.sh"; sourceTree = "<group>"; };
+		BCD2D0F8C81B81BFB4306011CAC48A20 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift; sourceTree = "<group>"; };
+		BDE4AF9A5A88886D7B60AF0F0996D9FA /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
+		C049305B9A26A2FD2A88D0394DD37678 /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
 		C8A3F20B5239DF2DF6CB987D4827C198 /* Request.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Request.swift; path = Source/Request.swift; sourceTree = "<group>"; };
 		C9CE45709BBC984B7998B833B10FC058 /* AnyPromise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyPromise.swift; path = Sources/AnyPromise.swift; sourceTree = "<group>"; };
 		CA6251246DA0044C165AC891CDE64344 /* hang.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = hang.m; path = Sources/hang.m; sourceTree = "<group>"; };
-		CA9769FD713F522BC6BA9A6C8B6C3BA7 /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		CAF6F32F117197F6F08B477687F09728 /* Pods-SwaggerClientTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-frameworks.sh"; sourceTree = "<group>"; };
 		CB66B121BF9B4DF48FE2F6A4D044C443 /* AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AnyPromise.m; path = Sources/AnyPromise.m; sourceTree = "<group>"; };
-		D2841E5E2183846280B97F6E660DA26C /* Pods-SwaggerClient-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-resources.sh"; sourceTree = "<group>"; };
-		D3AE9FA5F3483AB2497E1D3B488F0562 /* OuterNumber.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterNumber.swift; sourceTree = "<group>"; };
-		D7092AD06F0EF38CC9D8C3FE8B772E65 /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		CC890DE67452A9F63BD12B30135E3BD6 /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClientTests-umbrella.h"; sourceTree = "<group>"; };
+		CFA4F581E074596AB5C3DAF3D9C39F17 /* Pods-SwaggerClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClient.modulemap"; sourceTree = "<group>"; };
+		D47B812D78D0AE64D85D16A96840F8C4 /* Pods-SwaggerClientTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClientTests-acknowledgements.markdown"; sourceTree = "<group>"; };
+		D4C9F81DD3B2DAC61C014790FAFD205E /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
 		D75CBCB14282D5EBA5A424CCF0655C2A /* MultipartFormData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MultipartFormData.swift; path = Source/MultipartFormData.swift; sourceTree = "<group>"; };
-		DA2B00793CB30A6A5C0C3497B890D7A1 /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
+		D931C41179C1EA52307316C7F51D1245 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
 		DA33807992507937BA2869E4D72BA073 /* Zalgo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Zalgo.swift; path = Sources/Zalgo.swift; sourceTree = "<group>"; };
-		DE164497A94DD3215ED4D1AE0D4703B1 /* Pods-SwaggerClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-SwaggerClient.modulemap"; sourceTree = "<group>"; };
+		DA5F47130C28C4C5652E69E59A0902BD /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		DE05BA43EDFECD3CB825712216F42CE9 /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/OpenAPIs/APIs.swift; sourceTree = "<group>"; };
 		DE689938DB1BB3BAF7C98928CB02978A /* Result.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Result.swift; path = Source/Result.swift; sourceTree = "<group>"; };
-		DE862CC5FFB80999FD1500D5801F2A21 /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
-		E1E4BCB344D3C100253B24B79421F00A /* Pods-SwaggerClient-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClient-acknowledgements.plist"; sourceTree = "<group>"; };
-		E2C57703EA0D61575D878820DE56A5E4 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
-		E4B3DD8A15BBF3791DE2AE67DF7DD23C /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
-		E4E6F4A58FE7868CA2177D3AC79AD2FA /* Pods-SwaggerClientTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-resources.sh"; sourceTree = "<group>"; };
+		E0644BE2FFAA5C8FE7F15E3BF2557AFC /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		E19AF5866D261DB5B6AEC5D575086EA2 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		E564E86B6F817ED6259E08FB2B589CAA /* Alamofire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-prefix.pch"; sourceTree = "<group>"; };
+		E63746E0EEDB9AB11F3F623A63F36BB3 /* PromiseKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PromiseKit-umbrella.h"; sourceTree = "<group>"; };
+		E708155DC6E87EA22044EC19AB55DD05 /* PromiseKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PromiseKit.modulemap; sourceTree = "<group>"; };
 		E775A7621846699F1A762DB966B3DC48 /* State.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = State.swift; path = Sources/State.swift; sourceTree = "<group>"; };
-		E7B845A9435BD8A5A34664D1A66B8484 /* PromiseKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PromiseKit-dummy.m"; sourceTree = "<group>"; };
 		E80A16C989615AAE419866DB4FD10185 /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Alamofire.framework; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		EEA7D6AB49001069ED310CBCA8FCBB44 /* AFError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AFError.swift; path = Source/AFError.swift; sourceTree = "<group>"; };
-		F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClientTests-umbrella.h"; sourceTree = "<group>"; };
-		F25F7F29B763AB9B70C3140B53E8F5A1 /* FakeclassnametagsAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeclassnametagsAPI.swift; sourceTree = "<group>"; };
-		F381FC45001ED67FBA800D5DEACBE414 /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
+		F0E62A4CE2C6F59AE92D9D02B41649D5 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
+		F2A82E1B6CEC50F002C59C255C26B381 /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.release.xcconfig"; sourceTree = "<group>"; };
+		F3E1116FA9F9F3AFD9332B7236F6E711 /* Pods-SwaggerClientTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-resources.sh"; sourceTree = "<group>"; };
 		F48DFEE4376C36D6CF4C7DBFEBF91F45 /* DispatchQueue+Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Alamofire.swift"; path = "Source/DispatchQueue+Alamofire.swift"; sourceTree = "<group>"; };
-		FA45912AE978F0840F94A8D308944E6B /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
-		FB170EFD14935F121CDE3211DB4C5CA3 /* Pods-SwaggerClientTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClientTests-acknowledgements.markdown"; sourceTree = "<group>"; };
+		F4BB3B2146310CA18C30F145BFF15BD9 /* Pods-SwaggerClient-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-resources.sh"; sourceTree = "<group>"; };
+		F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClient-dummy.m"; sourceTree = "<group>"; };
+		FD481458DC0F63AEFBD495121305D6D8 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -299,11 +301,29 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */ = {
+		2AD45FCB2069AB57E58A481FA3D91BDD /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */,
+				01CFE58A73E5BF020E8D6E295B526567 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		57369C46F0A9150DAF16BA64D5DEF3C1 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4C10F55358B408559757EFA795BA759B /* Alamofire.framework in Frameworks */,
+				7F3C4DAEF3A108B4936F52CB7247D55B /* Foundation.framework in Frameworks */,
+				499CB252CEE9BCBB301FC00864DEA23F /* PromiseKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		7139BF778844E2A9E420524D8146ECD8 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -315,49 +335,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		9FAFC1E488B61EB220454BF6C14BDB62 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2B86E7C61F0D8144F603B3219D1EE5F0 /* Alamofire.framework in Frameworks */,
-				A03C561A3CE745179C9F246A5B8D7E21 /* Foundation.framework in Frameworks */,
-				FC42DC8E07B65FE4A25C6A6CAF0BE887 /* PromiseKit.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		A4294342AAE4322C007571DAA6D36C0B /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				5E9A0AA061E16D2F41B0DA9A56C0A5A4 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		0BDA8E0BE198EED1AD88B926509C3382 /* PetstoreClient */ = {
-			isa = PBXGroup;
-			children = (
-				00925AB5384C3976E53F0437FE1311C5 /* AlamofireImplementations.swift */,
-				0B3E802F6708C08B257C5E6F550D3FDB /* APIHelper.swift */,
-				4FF2F015C5D4E807D437D0EE9528B3CE /* APIs.swift */,
-				311A10F75B7649E2E301E8EC58A6A5EA /* Configuration.swift */,
-				9DAD68F75B538EE67EB80CC354DCE787 /* Extensions.swift */,
-				885795F7A7783B007F026944B55862FF /* Models.swift */,
-				45EE0834297896279B488DCD3D66C373 /* APIs */,
-				28BE76357A2CB1D1115C90F572A15193 /* Models */,
-				E44C17565AC7C2BF978747A8E3FBDEAA /* Support Files */,
-			);
-			name = PetstoreClient;
-			path = ../..;
-			sourceTree = "<group>";
-		};
 		107C3DDE80B0397D875BC41D8D8F734E /* PromiseKit */ = {
 			isa = PBXGroup;
 			children = (
 				15CB611E37F9E1F821FFD8B29C385FF9 /* CorePromise */,
-				A5A38542CF9E498066C1C41B2E15BBFF /* Support Files */,
+				63AC42361BEBCC6C083B9575B72D40DE /* Support Files */,
 			);
 			name = PromiseKit;
 			path = PromiseKit;
@@ -393,48 +378,22 @@
 			name = CorePromise;
 			sourceTree = "<group>";
 		};
-		28BE76357A2CB1D1115C90F572A15193 /* Models */ = {
+		38BCEE2B62E7F17FC1A6B47F74A915B1 /* PetstoreClient */ = {
 			isa = PBXGroup;
 			children = (
-				91DFFBF289A62730BCCBAC4851A1AC8B /* AdditionalPropertiesClass.swift */,
-				DA2B00793CB30A6A5C0C3497B890D7A1 /* Animal.swift */,
-				7017BC38FCA103F2518FE2C4942EB8A3 /* AnimalFarm.swift */,
-				9A557F23780CA069BA61AE2BE3C0C935 /* ApiResponse.swift */,
-				5351A4A344C05ACDF996E3630E69366C /* ArrayOfArrayOfNumberOnly.swift */,
-				1B693DDC1E69F657EACB36EFF2276AB9 /* ArrayOfNumberOnly.swift */,
-				4BB010C5D4A7300AD69E8389F8E09BDF /* ArrayTest.swift */,
-				7CEEEB561582A92AB799221584DDDAD6 /* Capitalization.swift */,
-				8480516CD063566F07F5D08643F3BA9F /* Cat.swift */,
-				8FDCB2CCAC42FDF414F93594CF7F2D6D /* Category.swift */,
-				6DB7377A43FADE63746BBC7D1CCAD93D /* ClassModel.swift */,
-				5DB0115D0EE604B8618320E1C6B52390 /* Client.swift */,
-				D7092AD06F0EF38CC9D8C3FE8B772E65 /* Dog.swift */,
-				95821A5031076AE0FDCDE22E0954A02D /* EnumArrays.swift */,
-				CA9769FD713F522BC6BA9A6C8B6C3BA7 /* EnumClass.swift */,
-				052400F31168326FF2A3E229D65D1B39 /* EnumTest.swift */,
-				78B6FF05C8B29C32FB1710F116C21BB4 /* FormatTest.swift */,
-				F381FC45001ED67FBA800D5DEACBE414 /* HasOnlyReadOnly.swift */,
-				A0CC1C18E268F223DDA59BAA121FE88E /* List.swift */,
-				541CB75E23648A3EE2925E81E345B0FB /* MapTest.swift */,
-				85F20E4DF6D1F32E36AE3823008F92BE /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
-				16C4834C40334FCBD463B4BC38A966C9 /* Model200Response.swift */,
-				59945A57D8EEE7EBE8146D516EA7257D /* Name.swift */,
-				B30C52CDC21F3188E5A50C469937008F /* NumberOnly.swift */,
-				580886F727A89668FA28D3BA11678585 /* Order.swift */,
-				863C495665994A46B8848CBC998B332A /* OuterBoolean.swift */,
-				FA45912AE978F0840F94A8D308944E6B /* OuterComposite.swift */,
-				09CECC4989EF7F2028490D9A4CC6C9B7 /* OuterEnum.swift */,
-				D3AE9FA5F3483AB2497E1D3B488F0562 /* OuterNumber.swift */,
-				547A70BA5BF7A5A411F65BEFD9BF0B07 /* OuterString.swift */,
-				1BA02A166AA3B7EC3B8DF4103088DE8A /* Pet.swift */,
-				DE862CC5FFB80999FD1500D5801F2A21 /* ReadOnlyFirst.swift */,
-				3C7F83F8F72A49EA9D543B4B32260F64 /* Return.swift */,
-				270C457C18A9B3C93FE2C196EC065A1A /* SpecialModelName.swift */,
-				7896C2D88FC42331AEA0607792B4510A /* Tag.swift */,
-				7645FEA4F23C54852D28771CC2FF3B80 /* User.swift */,
+				BCD2D0F8C81B81BFB4306011CAC48A20 /* AlamofireImplementations.swift */,
+				1E982F66B9CB4E2C2083F9B02EF41011 /* APIHelper.swift */,
+				DE05BA43EDFECD3CB825712216F42CE9 /* APIs.swift */,
+				7A1AE5E1B215E1D53DCB6AB501CB0DAE /* Configuration.swift */,
+				6CAA626D85FBD1FF53F144A14B3A3230 /* Extensions.swift */,
+				B64104A4C68341D80F2DB4CF5DE7779F /* Models.swift */,
+				71EF1D86BA306C7F68FA92ABA15B0633 /* APIs */,
+				5540224464BBA954BAFB3FC559814D13 /* Models */,
+				758ACCF640B62D96565B035F4A4931A6 /* Pod */,
+				FC9FD763F0BBF138A397EE0401BEA7BE /* Support Files */,
 			);
-			name = Models;
-			path = PetstoreClient/Classes/Swaggers/Models;
+			name = PetstoreClient;
+			path = ../..;
 			sourceTree = "<group>";
 		};
 		439566E0F816C232FEEB9A3F1FFFEF20 /* Alamofire */ = {
@@ -457,32 +416,79 @@
 				4F8D293ABA4E6DE8B257C7E9899F1B08 /* TaskDelegate.swift */,
 				AE6E736FF5D4320FE1647DB1724C14B8 /* Timeline.swift */,
 				08A7F97EB8AC32E44E21839FA607D2CE /* Validation.swift */,
-				8949F214ACEA39133A2AAB6508F73CC0 /* Support Files */,
+				699F78D1F95BB0051EF9E96BA468FBDD /* Support Files */,
 			);
 			name = Alamofire;
 			path = Alamofire;
 			sourceTree = "<group>";
 		};
-		45EE0834297896279B488DCD3D66C373 /* APIs */ = {
+		5540224464BBA954BAFB3FC559814D13 /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				80F9261093894D0B652D42D5A3D1D1F9 /* Fake_classname_tags123API.swift */,
-				888EE37DF287C4063756B72B2D0DBB04 /* FakeAPI.swift */,
-				F25F7F29B763AB9B70C3140B53E8F5A1 /* FakeclassnametagsAPI.swift */,
-				428C78B74D8A4ECEA1E6470057D3562B /* PetAPI.swift */,
-				1BAC2B27DBB94AEC209B05FC0541894E /* StoreAPI.swift */,
-				68E391F21156718CBAB2638D6A02FAA3 /* UserAPI.swift */,
+				FD481458DC0F63AEFBD495121305D6D8 /* AdditionalPropertiesClass.swift */,
+				2274608F6E89920A7FBADABEF6A20A1F /* Animal.swift */,
+				6A0B504F5FC1B5E5369C2AD8ABA9482A /* AnimalFarm.swift */,
+				F0E62A4CE2C6F59AE92D9D02B41649D5 /* ApiResponse.swift */,
+				4DD46253330346E885D5966DBB25FE8B /* ArrayOfArrayOfNumberOnly.swift */,
+				D931C41179C1EA52307316C7F51D1245 /* ArrayOfNumberOnly.swift */,
+				749EFF1B930D930529640C8004714C51 /* ArrayTest.swift */,
+				F2A82E1B6CEC50F002C59C255C26B381 /* Capitalization.swift */,
+				3ED78F1E81F4EF6FE5B0E77CA5BFB40C /* Cat.swift */,
+				1C103637D74EC198CF949454436D3616 /* Category.swift */,
+				2F3B836F14594A6EF1923CC07B61E893 /* ClassModel.swift */,
+				B2CEC365CFACB91EC9E750D659D5ED10 /* Client.swift */,
+				08583885463D1EDB2F8023584348659C /* Dog.swift */,
+				BDE4AF9A5A88886D7B60AF0F0996D9FA /* EnumArrays.swift */,
+				1FCF0B9190C58BD7493583E8133B3E56 /* EnumClass.swift */,
+				2EB881F0C1B1D1F90FAB084334D6C13D /* EnumTest.swift */,
+				8261F606FFC7AA4F9C45CA8016E8B1C7 /* FormatTest.swift */,
+				C049305B9A26A2FD2A88D0394DD37678 /* HasOnlyReadOnly.swift */,
+				B2AAC6F82FCBCF2CE32522143CBF59D6 /* List.swift */,
+				00FC3821A8BFCD6F05D00696BF175619 /* MapTest.swift */,
+				CC890DE67452A9F63BD12B30135E3BD6 /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
+				57299EE6209AFEBA56C717433863E136 /* Model200Response.swift */,
+				D4C9F81DD3B2DAC61C014790FAFD205E /* Name.swift */,
+				5921D679A4009B3F216FEF671EB69158 /* NumberOnly.swift */,
+				E0644BE2FFAA5C8FE7F15E3BF2557AFC /* Order.swift */,
+				59022FD592AB91A0B2EDA3A2EA5EC8D9 /* OuterComposite.swift */,
+				7B11E91D22910944308DE39CB8CBF3AE /* OuterEnum.swift */,
+				14FE73E27209DA05667C0D3E1B601734 /* Pet.swift */,
+				B4FB407CB8C792BFB02EADD91D6A4DFA /* ReadOnlyFirst.swift */,
+				1BAEE07194E1BFA72B1110849C7B348A /* Return.swift */,
+				9623461D845F7EE6E2BBDBC44B8FE867 /* SpecialModelName.swift */,
+				AB9FB7676C53BD9BE06337BB539478B1 /* Tag.swift */,
+				DA5F47130C28C4C5652E69E59A0902BD /* User.swift */,
 			);
-			name = APIs;
-			path = PetstoreClient/Classes/Swaggers/APIs;
+			name = Models;
+			path = PetstoreClient/Classes/OpenAPIs/Models;
 			sourceTree = "<group>";
 		};
-		4DEB624A2186E265CF56EBC3503FD8C9 /* Development Pods */ = {
+		63AC42361BEBCC6C083B9575B72D40DE /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				0BDA8E0BE198EED1AD88B926509C3382 /* PetstoreClient */,
+				27E9F1130735B56DF22A1439B5BA6333 /* Info.plist */,
+				E708155DC6E87EA22044EC19AB55DD05 /* PromiseKit.modulemap */,
+				451D13FDA61BDE9EB91BBC6CEA52AED4 /* PromiseKit.xcconfig */,
+				4667C7609366DAC2FC770F6565F7F2A2 /* PromiseKit-dummy.m */,
+				48B406C5392E8AC40762B8EDE6DF1FE8 /* PromiseKit-prefix.pch */,
+				E63746E0EEDB9AB11F3F623A63F36BB3 /* PromiseKit-umbrella.h */,
 			);
-			name = "Development Pods";
+			name = "Support Files";
+			path = "../Target Support Files/PromiseKit";
+			sourceTree = "<group>";
+		};
+		699F78D1F95BB0051EF9E96BA468FBDD /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				2A8ED560E3DF01E75E0272F7A1B911DD /* Alamofire.modulemap */,
+				45FB2502919E80623D265FE19C0A8FC4 /* Alamofire.xcconfig */,
+				60347AB0041CEAF3AFE665EDD5ED3839 /* Alamofire-dummy.m */,
+				E564E86B6F817ED6259E08FB2B589CAA /* Alamofire-prefix.pch */,
+				A16286911EF2D17072D77A2B43E34006 /* Alamofire-umbrella.h */,
+				408CD558DEC1EFB9C57002ADB50665FC /* Info.plist */,
+			);
+			name = "Support Files";
+			path = "../Target Support Files/Alamofire";
 			sourceTree = "<group>";
 		};
 		6BB94E4B786CD1A837889A78D18EDA58 /* Frameworks */ = {
@@ -495,11 +501,33 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		71EF1D86BA306C7F68FA92ABA15B0633 /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				45ED3A5E50AA60588D6ADA19ACBF0C66 /* AnotherFakeAPI.swift */,
+				79DD8EF004C7534401577C1694D823F3 /* FakeAPI.swift */,
+				93D9DA1CB883DC1FCCF639FECF14930D /* FakeClassnameTags123API.swift */,
+				3911B66DC4AC99DD29F10D115CF4555A /* PetAPI.swift */,
+				7A15B50BA886EAD6427ADC7E68BBD4FE /* StoreAPI.swift */,
+				3BFA1723A93AA1DB0952B2F750421B32 /* UserAPI.swift */,
+			);
+			name = APIs;
+			path = PetstoreClient/Classes/OpenAPIs/APIs;
+			sourceTree = "<group>";
+		};
+		758ACCF640B62D96565B035F4A4931A6 /* Pod */ = {
+			isa = PBXGroup;
+			children = (
+				536A8BDFB104F4132169F2B758A6AA0C /* PetstoreClient.podspec */,
+			);
+			name = Pod;
+			sourceTree = "<group>";
+		};
 		7DB346D0F39D3F0E887471402A8071AB = {
 			isa = PBXGroup;
 			children = (
 				93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */,
-				4DEB624A2186E265CF56EBC3503FD8C9 /* Development Pods */,
+				8F0C005305764051BE9B8E1DEE8C7E64 /* Development Pods */,
 				6BB94E4B786CD1A837889A78D18EDA58 /* Frameworks */,
 				A1A7A33E3B583AD8CD782AFD6B69D4A0 /* Pods */,
 				D2A28169658A67F83CC3B568D7E0E6A1 /* Products */,
@@ -507,36 +535,12 @@
 			);
 			sourceTree = "<group>";
 		};
-		88CE2B3F08C34DDB098AD8A5DCC1DF1E /* Pods-SwaggerClient */ = {
+		8F0C005305764051BE9B8E1DEE8C7E64 /* Development Pods */ = {
 			isa = PBXGroup;
 			children = (
-				7C8E63660D346FD8ED2A97242E74EA09 /* Info.plist */,
-				DE164497A94DD3215ED4D1AE0D4703B1 /* Pods-SwaggerClient.modulemap */,
-				2FF17440CCD2E1A69791A4AA23325AD5 /* Pods-SwaggerClient-acknowledgements.markdown */,
-				E1E4BCB344D3C100253B24B79421F00A /* Pods-SwaggerClient-acknowledgements.plist */,
-				291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */,
-				BCF2D4DFF08D2A18E8C8FE4C4B4633FB /* Pods-SwaggerClient-frameworks.sh */,
-				D2841E5E2183846280B97F6E660DA26C /* Pods-SwaggerClient-resources.sh */,
-				3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */,
-				549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */,
-				86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */,
+				38BCEE2B62E7F17FC1A6B47F74A915B1 /* PetstoreClient */,
 			);
-			name = "Pods-SwaggerClient";
-			path = "Target Support Files/Pods-SwaggerClient";
-			sourceTree = "<group>";
-		};
-		8949F214ACEA39133A2AAB6508F73CC0 /* Support Files */ = {
-			isa = PBXGroup;
-			children = (
-				1F11D15E4489C7F4DC1171EB9F5448D0 /* Alamofire.modulemap */,
-				6C68BF2CC332C9D6485B777BA7C063AE /* Alamofire.xcconfig */,
-				4AC04C8B5F4B690622341DB807DAEB0B /* Alamofire-dummy.m */,
-				607281BBD24DC152F24F58E6046F4652 /* Alamofire-prefix.pch */,
-				95DA780B317CD76B87D2843B3922D627 /* Alamofire-umbrella.h */,
-				17FF216D0378037475BAB48A20D5CB0F /* Info.plist */,
-			);
-			name = "Support Files";
-			path = "../Target Support Files/Alamofire";
+			name = "Development Pods";
 			sourceTree = "<group>";
 		};
 		A1A7A33E3B583AD8CD782AFD6B69D4A0 /* Pods */ = {
@@ -548,25 +552,11 @@
 			name = Pods;
 			sourceTree = "<group>";
 		};
-		A5A38542CF9E498066C1C41B2E15BBFF /* Support Files */ = {
-			isa = PBXGroup;
-			children = (
-				34E180DB9A06BFDDA525853716B57541 /* Info.plist */,
-				6D7294312CFFF12B79A7AD2E8D219344 /* PromiseKit.modulemap */,
-				425268D5A6D1CD870A663BBE38B62B46 /* PromiseKit.xcconfig */,
-				E7B845A9435BD8A5A34664D1A66B8484 /* PromiseKit-dummy.m */,
-				48CCB9793CCE13A24831B3E01B29171A /* PromiseKit-prefix.pch */,
-				3C7BB9DA6D00D51D3DB475EDCFC925B3 /* PromiseKit-umbrella.h */,
-			);
-			name = "Support Files";
-			path = "../Target Support Files/PromiseKit";
-			sourceTree = "<group>";
-		};
 		C1A60D10CED0E61146591438999C7502 /* Targets Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				88CE2B3F08C34DDB098AD8A5DCC1DF1E /* Pods-SwaggerClient */,
-				D6D0CD30E3EAF2ED10AE0CBC07506C5A /* Pods-SwaggerClientTests */,
+				DE503BFFEBBF78BDC743C8A6A50DFF47 /* Pods-SwaggerClient */,
+				E9EDF70990CC7A4463ED5FC2E3719BD0 /* Pods-SwaggerClientTests */,
 			);
 			name = "Targets Support Files";
 			sourceTree = "<group>";
@@ -583,24 +573,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		D6D0CD30E3EAF2ED10AE0CBC07506C5A /* Pods-SwaggerClientTests */ = {
-			isa = PBXGroup;
-			children = (
-				3F16B43ABD2C8CD4A311AA1AB3B6C02F /* Info.plist */,
-				00ACB4396DD1B4E4539E4E81C1D7A14E /* Pods-SwaggerClientTests.modulemap */,
-				FB170EFD14935F121CDE3211DB4C5CA3 /* Pods-SwaggerClientTests-acknowledgements.markdown */,
-				02F28E719AA874BE9213D6CF8CE7E36B /* Pods-SwaggerClientTests-acknowledgements.plist */,
-				687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */,
-				43FC49AA70D3E2A84CAED9C37BE9C4B5 /* Pods-SwaggerClientTests-frameworks.sh */,
-				E4E6F4A58FE7868CA2177D3AC79AD2FA /* Pods-SwaggerClientTests-resources.sh */,
-				F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */,
-				969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */,
-				849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */,
-			);
-			name = "Pods-SwaggerClientTests";
-			path = "Target Support Files/Pods-SwaggerClientTests";
-			sourceTree = "<group>";
-		};
 		DD9EED10DC8740383600E1BFF8D2162B /* iOS */ = {
 			isa = PBXGroup;
 			children = (
@@ -609,15 +581,51 @@
 			name = iOS;
 			sourceTree = "<group>";
 		};
-		E44C17565AC7C2BF978747A8E3FBDEAA /* Support Files */ = {
+		DE503BFFEBBF78BDC743C8A6A50DFF47 /* Pods-SwaggerClient */ = {
 			isa = PBXGroup;
 			children = (
-				5E79C2313007533BFFA709832BE18FDC /* Info.plist */,
-				855FBD05ABAD1AE4A03E58EEBA975DAA /* PetstoreClient.modulemap */,
-				E4B3DD8A15BBF3791DE2AE67DF7DD23C /* PetstoreClient.xcconfig */,
-				06F576B1286B5129A7A77654A92AAFCF /* PetstoreClient-dummy.m */,
-				694EDDB57CDB8FB6CB5088BF3F66CE8A /* PetstoreClient-prefix.pch */,
-				E2C57703EA0D61575D878820DE56A5E4 /* PetstoreClient-umbrella.h */,
+				814471C0F27B39D751143F0CD53670BD /* Info.plist */,
+				CFA4F581E074596AB5C3DAF3D9C39F17 /* Pods-SwaggerClient.modulemap */,
+				76645699475D3AB6EB5242AC4D0CEFAE /* Pods-SwaggerClient-acknowledgements.markdown */,
+				08BDFE9C9E9365771FF2D47928E3E79A /* Pods-SwaggerClient-acknowledgements.plist */,
+				F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */,
+				0AD61F8554C909A3AFA66AD9ECCB5F23 /* Pods-SwaggerClient-frameworks.sh */,
+				F4BB3B2146310CA18C30F145BFF15BD9 /* Pods-SwaggerClient-resources.sh */,
+				32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */,
+				AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */,
+				F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */,
+			);
+			name = "Pods-SwaggerClient";
+			path = "Target Support Files/Pods-SwaggerClient";
+			sourceTree = "<group>";
+		};
+		E9EDF70990CC7A4463ED5FC2E3719BD0 /* Pods-SwaggerClientTests */ = {
+			isa = PBXGroup;
+			children = (
+				419496CDDD7E7536CBEA02BAEE2C7C21 /* Info.plist */,
+				9D08EC9B39FEBA43A5B55DAF97AAEBE9 /* Pods-SwaggerClientTests.modulemap */,
+				D47B812D78D0AE64D85D16A96840F8C4 /* Pods-SwaggerClientTests-acknowledgements.markdown */,
+				9D780FDAD16A03CC25F4D6F3317B9423 /* Pods-SwaggerClientTests-acknowledgements.plist */,
+				721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */,
+				CAF6F32F117197F6F08B477687F09728 /* Pods-SwaggerClientTests-frameworks.sh */,
+				F3E1116FA9F9F3AFD9332B7236F6E711 /* Pods-SwaggerClientTests-resources.sh */,
+				CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */,
+				1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */,
+				FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */,
+			);
+			name = "Pods-SwaggerClientTests";
+			path = "Target Support Files/Pods-SwaggerClientTests";
+			sourceTree = "<group>";
+		};
+		FC9FD763F0BBF138A397EE0401BEA7BE /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				E19AF5866D261DB5B6AEC5D575086EA2 /* Info.plist */,
+				15EC3D8D715BC3F25A366C403ED02060 /* PetstoreClient.modulemap */,
+				AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */,
+				7E3D0C745CE3A020C8BC5C96CAFB616F /* PetstoreClient-dummy.m */,
+				4050C78B3A61270CDB69C80EFEB9BF4B /* PetstoreClient-prefix.pch */,
+				0BCC6F35A8BC2A442A13DE66D59CAC87 /* PetstoreClient-umbrella.h */,
 			);
 			name = "Support Files";
 			path = "SwaggerClientTests/Pods/Target Support Files/PetstoreClient";
@@ -626,30 +634,14 @@
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		0F365CF5DACC65D972AAB14DA12BC86D /* Headers */ = {
+		287EA94FA1CD1479B7ECFB5B20FA49F6 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E7646AE8D28791DE9F6738F8429C6AB8 /* AnyPromise.h in Headers */,
-				76020E5CECD3FCC592D2C59CB2EC27FA /* fwd.h in Headers */,
-				C25AC96F7A1662899D9B7369AD5C3718 /* PromiseKit-umbrella.h in Headers */,
-				403E2169606F2DEEA7EAAAC045B46BEF /* PromiseKit.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		1353AC7A6419F876B294A55E5550D1E4 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		91E93AC6E669B2001D04F2FC6A30B4D8 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8097FDFC90106EB1EE632DBA2D3E8F85 /* PetstoreClient-umbrella.h in Headers */,
+				F5FB347092197098AFBC705080CA1DAC /* AnyPromise.h in Headers */,
+				2367D029393B6AD52DF45A90051AFCA8 /* fwd.h in Headers */,
+				6FA118FD3264A4102AAB1F3926DFED5F /* PromiseKit-umbrella.h in Headers */,
+				718DD7A904E6D014EFC81CDE3DFBF930 /* PromiseKit.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -669,45 +661,25 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C0DEF2D68A236AE58DF2DB42D8D41154 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2EBE61A399E8FBF68BC9E4DA41B42993 /* PetstoreClient-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C19E54C800095CFA2457EC19C7C2E974 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		64F186B4DD2329A6687EE7E1C6BB489B /* PromiseKit */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 9704F3468D80EEF41AAE27F6787CE8B5 /* Build configuration list for PBXNativeTarget "PromiseKit" */;
-			buildPhases = (
-				F774C8F0AD383E9905417E42A8B6B9AC /* Sources */,
-				A4294342AAE4322C007571DAA6D36C0B /* Frameworks */,
-				0F365CF5DACC65D972AAB14DA12BC86D /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = PromiseKit;
-			productName = PromiseKit;
-			productReference = AD3B511F5C43568AAFBA2714468F9FD5 /* PromiseKit.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-		771863E05E5496503F52AD4A5C96E634 /* PetstoreClient */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 6FB824209F1EB710D7C2E96778EF898B /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
-			buildPhases = (
-				3A6A0CC35555AD4684FE2808D0C6817D /* Sources */,
-				9FAFC1E488B61EB220454BF6C14BDB62 /* Frameworks */,
-				91E93AC6E669B2001D04F2FC6A30B4D8 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				834052653D62A423D134CE97B2DDC11F /* PBXTargetDependency */,
-				EE52296AA3F61AC09DFA8344317E265F /* PBXTargetDependency */,
-			);
-			name = PetstoreClient;
-			productName = PetstoreClient;
-			productReference = 0B4A4A4EB2DBD6F56B1383E53763FD1B /* PetstoreClient.framework */;
-			productType = "com.apple.product-type.framework";
-		};
 		88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 419E5D95491847CD79841B971A8A3277 /* Build configuration list for PBXNativeTarget "Alamofire" */;
@@ -725,6 +697,41 @@
 			productReference = E80A16C989615AAE419866DB4FD10185 /* Alamofire.framework */;
 			productType = "com.apple.product-type.framework";
 		};
+		BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
+			buildPhases = (
+				61868F2FE74A9422171483DBABE7C61F /* Sources */,
+				7139BF778844E2A9E420524D8146ECD8 /* Frameworks */,
+				C19E54C800095CFA2457EC19C7C2E974 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */,
+			);
+			name = "Pods-SwaggerClientTests";
+			productName = "Pods-SwaggerClientTests";
+			productReference = 8BBF3490280C4ED53738743F84C890BC /* Pods_SwaggerClientTests.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		C6AEB3EDCE021B764B46D50BFC2D7F0C /* PromiseKit */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 8B17A4388FD8556EDC88266E4AB754DD /* Build configuration list for PBXNativeTarget "PromiseKit" */;
+			buildPhases = (
+				4A5B07B4D80E54BC27E3213F63897D52 /* Sources */,
+				2AD45FCB2069AB57E58A481FA3D91BDD /* Frameworks */,
+				287EA94FA1CD1479B7ECFB5B20FA49F6 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = PromiseKit;
+			productName = PromiseKit;
+			productReference = AD3B511F5C43568AAFBA2714468F9FD5 /* PromiseKit.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 		E5B96E99C219DDBC57BC27EE9DF5EC22 /* Pods-SwaggerClient */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 607382BCFF2B60BA932C95EC3C22A69F /* Build configuration list for PBXNativeTarget "Pods-SwaggerClient" */;
@@ -745,21 +752,23 @@
 			productReference = 46A00B403166BEF9EE215F6CB59BE9A6 /* Pods_SwaggerClient.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */ = {
+		FF7E20767096F041BFF22A3EDFD030E8 /* PetstoreClient */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
+			buildConfigurationList = 32FC64AFF0587C67379066614065C3B0 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
 			buildPhases = (
-				BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */,
-				87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */,
-				1353AC7A6419F876B294A55E5550D1E4 /* Headers */,
+				409DF77D8A04CEB7AC7992A00FCD5CE8 /* Sources */,
+				57369C46F0A9150DAF16BA64D5DEF3C1 /* Frameworks */,
+				C0DEF2D68A236AE58DF2DB42D8D41154 /* Headers */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				1C394C3A43F0FA6E4BF76856613DB176 /* PBXTargetDependency */,
+				1D8FED0E6764FE46BE3E03DEC5959C3B /* PBXTargetDependency */,
 			);
-			name = "Pods-SwaggerClientTests";
-			productName = "Pods-SwaggerClientTests";
-			productReference = 8BBF3490280C4ED53738743F84C890BC /* Pods_SwaggerClientTests.framework */;
+			name = PetstoreClient;
+			productName = PetstoreClient;
+			productReference = 0B4A4A4EB2DBD6F56B1383E53763FD1B /* PetstoreClient.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
@@ -768,8 +777,8 @@
 		D41D8CD98F00B204E9800998ECF8427E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0700;
+				LastSwiftUpdateCheck = 0930;
+				LastUpgradeCheck = 0930;
 			};
 			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -784,10 +793,10 @@
 			projectRoot = "";
 			targets = (
 				88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */,
-				771863E05E5496503F52AD4A5C96E634 /* PetstoreClient */,
+				FF7E20767096F041BFF22A3EDFD030E8 /* PetstoreClient */,
 				E5B96E99C219DDBC57BC27EE9DF5EC22 /* Pods-SwaggerClient */,
-				F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */,
-				64F186B4DD2329A6687EE7E1C6BB489B /* PromiseKit */,
+				BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */,
+				C6AEB3EDCE021B764B46D50BFC2D7F0C /* PromiseKit */,
 			);
 		};
 /* End PBXProject section */
@@ -818,95 +827,92 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		3A6A0CC35555AD4684FE2808D0C6817D /* Sources */ = {
+		409DF77D8A04CEB7AC7992A00FCD5CE8 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AF95CFE493C440AE05EFDAACE7E4E7DE /* AdditionalPropertiesClass.swift in Sources */,
-				86E587687F8286990E1BD25FD5AB0A37 /* AlamofireImplementations.swift in Sources */,
-				4E63F97E3E36D9A8576F710D193EB330 /* Animal.swift in Sources */,
-				06338FA7F6A0C237789ED8BDCB637AD3 /* AnimalFarm.swift in Sources */,
-				1205979ACE7FBA4EB49E5653FA2D1C21 /* APIHelper.swift in Sources */,
-				9B80CE10037E884E4F14B60E5BCEF038 /* ApiResponse.swift in Sources */,
-				E25942E2E76810D3C819B2C624AFA087 /* APIs.swift in Sources */,
-				17AA9C279DC342C47E2E3002B30CA60D /* ArrayOfArrayOfNumberOnly.swift in Sources */,
-				38067FEC32DCDB6E4F6215EAD63437C3 /* ArrayOfNumberOnly.swift in Sources */,
-				ECB7ADCAB05E41A34AE5D162F76B48CA /* ArrayTest.swift in Sources */,
-				09882E9EDEBB7356D33B97A5934E3227 /* Capitalization.swift in Sources */,
-				0A04A65465FDD547158AA925C95F6B69 /* Cat.swift in Sources */,
-				A1083DDC06C37F84D105231BC7AC2078 /* Category.swift in Sources */,
-				58BC833C2E0ACD339E79A966F9C937B7 /* ClassModel.swift in Sources */,
-				887BBB5306DA732DD350E38BAAABB118 /* Client.swift in Sources */,
-				1D9F8E6252D07755D7145BD5B01A2001 /* Configuration.swift in Sources */,
-				3F4E19A844EFA6C087276743DF604FDF /* Dog.swift in Sources */,
-				87C6D2D31470ECE88A057BB415CA093A /* EnumArrays.swift in Sources */,
-				0B2977ECFB1DCD215E8A05E477DDBA6A /* EnumClass.swift in Sources */,
-				05A6FFA5B3630FD63A5CFA863DEFFE4F /* EnumTest.swift in Sources */,
-				35910E5DCB2E234D2D743D899E50A83D /* Extensions.swift in Sources */,
-				B24ED08E9E7E64C67C7F886A1B26C9C4 /* Fake_classname_tags123API.swift in Sources */,
-				40F309F2DDD2EC48E7A24D35CA9EA368 /* FakeAPI.swift in Sources */,
-				E79B2343A16824E335FF99F92D100B56 /* FakeclassnametagsAPI.swift in Sources */,
-				BB27103F0D590065B8B96158A158C07E /* FormatTest.swift in Sources */,
-				587447A22F4AB55382FAE09950120C8B /* HasOnlyReadOnly.swift in Sources */,
-				67EEBC5D0C5449E64F7070B12742BE5C /* List.swift in Sources */,
-				4049562FD0514CC1979A8AD7EF001AD1 /* MapTest.swift in Sources */,
-				667E578EA712E1DF2380BF164C5E29AA /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
-				CB553CE49FF0AF2C666B96C680173F65 /* Model200Response.swift in Sources */,
-				A6A60DD672777F2A2AC647658506B2C9 /* Models.swift in Sources */,
-				C23C578EB36914B7B7993ACB7451DAEE /* Name.swift in Sources */,
-				C84C5C33E6C3CD718D8D3D6839F5BB77 /* NumberOnly.swift in Sources */,
-				146087D66852238BD415594F4096CDB7 /* Order.swift in Sources */,
-				3E9543717A86AC66C62BEBF05326977F /* OuterBoolean.swift in Sources */,
-				179674B41CDC3DCEE7DB902C0F553285 /* OuterComposite.swift in Sources */,
-				0667FE82295343616E4C3E975E61E2DE /* OuterEnum.swift in Sources */,
-				344E99585E0E1F196B6E8E9D5E2EC2A5 /* OuterNumber.swift in Sources */,
-				AC0DC62D4728E6A27014ED1D5DB39869 /* OuterString.swift in Sources */,
-				9D4D03BC83CA4C1FDA0C88CC8B386B30 /* Pet.swift in Sources */,
-				6F6D5E95B91D0B89D19D8B07CC34B058 /* PetAPI.swift in Sources */,
-				2E3E42AF5ACF1DA12162BEE3755C79C0 /* PetstoreClient-dummy.m in Sources */,
-				C17B1A5739A83DE224286D84B67D4F2A /* ReadOnlyFirst.swift in Sources */,
-				545704EF756212DC400A4C252806077D /* Return.swift in Sources */,
-				9B605CCF6FBB08279AAAF5A1E08E8019 /* SpecialModelName.swift in Sources */,
-				2B00D1C16A6142361F09AE15EFC5827E /* StoreAPI.swift in Sources */,
-				1DE9D90349D9177D527C15E5A57D7031 /* Tag.swift in Sources */,
-				5135F85CE891C74CF289365F3D665B62 /* User.swift in Sources */,
-				D61F5BF2B4BBB073BF87700BAE29B79D /* UserAPI.swift in Sources */,
+				5334E14F60DFB828EF27BB85CB0BF3AA /* AdditionalPropertiesClass.swift in Sources */,
+				9FF2CFB0995902A220D313224467091D /* AlamofireImplementations.swift in Sources */,
+				8DDBE39C464CF72A61F21BA253A4CC90 /* Animal.swift in Sources */,
+				CC7367CCDE0BBC9D2A51A49D73863DF9 /* AnimalFarm.swift in Sources */,
+				FC5EDB72D2571F4CF5206E7D71B1AFEF /* AnotherFakeAPI.swift in Sources */,
+				F520D6DFDCDE9A76E253C33790C72A36 /* APIHelper.swift in Sources */,
+				06F013FCC3383A42626ABDD06BAF5B16 /* ApiResponse.swift in Sources */,
+				231F732DA4194F2BBB495B8C55A4731F /* APIs.swift in Sources */,
+				E52198D4DEBEB022BA31C65ECD467B6F /* ArrayOfArrayOfNumberOnly.swift in Sources */,
+				C93ED6D8E9EC20D0BE77A55B6E00C52C /* ArrayOfNumberOnly.swift in Sources */,
+				3CD8CD323460E6D9EAA3E73589C4C090 /* ArrayTest.swift in Sources */,
+				F4578EC1C5C581113AD691B0B3C2A116 /* Capitalization.swift in Sources */,
+				B93DCCA0C3EFD603321B83568BAF3528 /* Cat.swift in Sources */,
+				44AE6FB3DED64897C2FA694470E92786 /* Category.swift in Sources */,
+				CFB4111F30C45601D2002E2A1AE388E4 /* ClassModel.swift in Sources */,
+				D02CA2F93049B1BC3D40BF7B1A47CF19 /* Client.swift in Sources */,
+				38D74E81D7448683908E85A2CDAC98C2 /* Configuration.swift in Sources */,
+				04EF4F9A97B11DB9A5FED91F47B25982 /* Dog.swift in Sources */,
+				BE13C1CEC5F1054D0C811F948144BB6D /* EnumArrays.swift in Sources */,
+				27CB0A250126F6D24E806E69A705EBDB /* EnumClass.swift in Sources */,
+				32BB3604C571D998D14FE2250AB66C87 /* EnumTest.swift in Sources */,
+				42D2092C84FDC3E0813B03FBD8336E75 /* Extensions.swift in Sources */,
+				F673C12859ABA85B07C53573619F4319 /* FakeAPI.swift in Sources */,
+				9B9E66A0DEA1D13FA40F8B96E2B52E44 /* FakeClassnameTags123API.swift in Sources */,
+				C446D5151005AE86668FC8E3302F9322 /* FormatTest.swift in Sources */,
+				A9AB67BC9B70F93C9750B2C9FEDA17F5 /* HasOnlyReadOnly.swift in Sources */,
+				8EA32ABEE6939D03B78008BBCD75F184 /* List.swift in Sources */,
+				44BE905B96695A8C23EAE61A770CDCB3 /* MapTest.swift in Sources */,
+				9B2E9A05870436FB6A8F0F1BD348D929 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
+				9D3E58EBB53AAA758A9CC82687F573FB /* Model200Response.swift in Sources */,
+				814D37FBB96C14ADCF09D927378CCE16 /* Models.swift in Sources */,
+				D3BC76F41203E1F97E43A5B056361539 /* Name.swift in Sources */,
+				8C73430A31E483D393F5DEF88A508EA1 /* NumberOnly.swift in Sources */,
+				691A19D66B4AC099C54D2BAF40068C5A /* Order.swift in Sources */,
+				77A2033DE971F9E3B91FDFE2E38FEA6D /* OuterComposite.swift in Sources */,
+				B966CB82AA59221824B1A312DCA732BF /* OuterEnum.swift in Sources */,
+				63DB912E169D1F8BF4B64B5EE73F6AB9 /* Pet.swift in Sources */,
+				26B718D25FB0C7F996174784716061A3 /* PetAPI.swift in Sources */,
+				1D9CEF79CC2D5FFE3A7C56C7ED6ACA9A /* PetstoreClient-dummy.m in Sources */,
+				ED5F3591C7F1037A271BA08F78F006D2 /* ReadOnlyFirst.swift in Sources */,
+				883EEA3DD1A2F81816A97D866E326883 /* Return.swift in Sources */,
+				219FE1E23C00F7FD807754240B209C92 /* SpecialModelName.swift in Sources */,
+				D242EA2DA2F73FE9179A2DC38A1DBA94 /* StoreAPI.swift in Sources */,
+				DBA7023E4D92933BCED1925AC4A1F66C /* Tag.swift in Sources */,
+				641381821D2DB1A4E01C6C095E6C56A4 /* User.swift in Sources */,
+				FB99E623D7F83A48B5460F58DEFD0F76 /* UserAPI.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */ = {
+		4A5B07B4D80E54BC27E3213F63897D52 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */,
+				6E3AD6CCFCA63569D8DE3A32C7A1132A /* after.m in Sources */,
+				585961AE2C313F0484DC94E7123B7384 /* after.swift in Sources */,
+				699ED9DCDE1A4C8346C0EDA41B142AD8 /* AnyPromise.m in Sources */,
+				8CDBE98AF0551E45E72B7B1648D31F80 /* AnyPromise.swift in Sources */,
+				63E2034DB2CC4ABA407CB11F2CD5F8EA /* dispatch_promise.m in Sources */,
+				27D78C37454409BA11AB73A7EC9DDB5B /* DispatchQueue+Promise.swift in Sources */,
+				DDE87E79D21CAFCD4BD44205D8952996 /* Error.swift in Sources */,
+				5F8B6F0D85F60DDEB217EE08168CADB7 /* GlobalState.m in Sources */,
+				23ECCCE721C0E2B6AC2101CF0CBBBC3B /* hang.m in Sources */,
+				0FFCB09E3E9B2CE432C9A1DA196F336F /* join.m in Sources */,
+				CEBC19117C306BC35BDB1E3E323E9D0E /* join.swift in Sources */,
+				C5C4410C4E0FFAC1B32B06F8CBFB6259 /* Promise+AnyPromise.swift in Sources */,
+				2A72C39269BFFC89FEE2B4D9C6CC49C0 /* Promise+Properties.swift in Sources */,
+				AFFE3E17AE77FA05D77C29D9B1341110 /* Promise.swift in Sources */,
+				AFC93E2F0FC280C96F56714503FD791E /* PromiseKit-dummy.m in Sources */,
+				63E686B0A0025A45E0D18215008FCBB5 /* race.swift in Sources */,
+				73E09CEF7AFEE6F395D2B9D6E74ADEFE /* State.swift in Sources */,
+				2F9B8B649CCAF9E6FB4CAD7471B8DDED /* when.m in Sources */,
+				103703B2AFC3F1B129FBDF5B94D6DFEF /* when.swift in Sources */,
+				25BB94C34507196F4BA2B4E77134F3B9 /* wrap.swift in Sources */,
+				FD1E2558C46622C1D769AFD511EC87CE /* Zalgo.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		F774C8F0AD383E9905417E42A8B6B9AC /* Sources */ = {
+		61868F2FE74A9422171483DBABE7C61F /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C57027F4FF1F8BA21E021D7378186BAF /* after.m in Sources */,
-				053E27E4E66AB2D2151D9776585F1FA7 /* after.swift in Sources */,
-				5F255DAA5EC5598D66A2A22A052C4642 /* AnyPromise.m in Sources */,
-				33D656C917337CEA212DB903ECD0E6C0 /* AnyPromise.swift in Sources */,
-				6DAC90FE278E810EA89A32891F6F726D /* dispatch_promise.m in Sources */,
-				82310F627E8C49D9F906723C6C3DA3BA /* DispatchQueue+Promise.swift in Sources */,
-				5CBFA7F10B16CE082F3DEB42782BB20B /* Error.swift in Sources */,
-				C8F87B4EC3E7D6B2EA869BB0A2B24A5E /* GlobalState.m in Sources */,
-				AD96DA86AD0D6C1D132B5EEEC33758FD /* hang.m in Sources */,
-				5EB6840C80C4AF36E53852FA25B9FE2E /* join.m in Sources */,
-				D9495580483FAECB1F454A88F5E98425 /* join.swift in Sources */,
-				870322F063522D314752502D12D30BF3 /* Promise+AnyPromise.swift in Sources */,
-				655906A84ACFBE897B9B0854CA5ED146 /* Promise+Properties.swift in Sources */,
-				97AB35CEB1F8147F512C403765C24366 /* Promise.swift in Sources */,
-				264F59B087C997C8DAF2A010366FD9B0 /* PromiseKit-dummy.m in Sources */,
-				277E86F43EC003B6FF423B020D732A9D /* race.swift in Sources */,
-				4CF3C7AAB7A5940C292EE3CCC3A3C4D0 /* State.swift in Sources */,
-				2D040E855A9DBDC57A921ED5232836BB /* when.m in Sources */,
-				B2B48F66496BB746373C6B7A0D209F36 /* when.swift in Sources */,
-				F702666B7BC058BDEFF8798F3022141C /* wrap.swift in Sources */,
-				5140E3AF1B2AC4EF35D24062003B822D /* Zalgo.swift in Sources */,
+				80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -921,139 +927,73 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		1C394C3A43F0FA6E4BF76856613DB176 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Alamofire;
+			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
+			targetProxy = F7D43D16B4131241D02F5FCD10F79D65 /* PBXContainerItemProxy */;
+		};
 		1C76F9E08AAB9400CF7937D3DBF4E272 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = Alamofire;
 			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
 			targetProxy = BBE116AAF20C2D98E0CC5B0D86765D22 /* PBXContainerItemProxy */;
 		};
+		1D8FED0E6764FE46BE3E03DEC5959C3B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = PromiseKit;
+			target = C6AEB3EDCE021B764B46D50BFC2D7F0C /* PromiseKit */;
+			targetProxy = CD31F0032076F778C8017DBDFF3DCA0B /* PBXContainerItemProxy */;
+		};
 		328C6C7DF03199CFF8F5B47C39DEE2BC /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PromiseKit;
-			target = 64F186B4DD2329A6687EE7E1C6BB489B /* PromiseKit */;
+			target = C6AEB3EDCE021B764B46D50BFC2D7F0C /* PromiseKit */;
 			targetProxy = F4F5C9A84714BE23040A5FB7588DA6BD /* PBXContainerItemProxy */;
 		};
 		405120CD9D9120CBBC452E54C91FA485 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PetstoreClient;
-			target = 771863E05E5496503F52AD4A5C96E634 /* PetstoreClient */;
+			target = FF7E20767096F041BFF22A3EDFD030E8 /* PetstoreClient */;
 			targetProxy = B173CFF2A1174933D7851E8CE1CA77AB /* PBXContainerItemProxy */;
 		};
-		834052653D62A423D134CE97B2DDC11F /* PBXTargetDependency */ = {
+		CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			name = Alamofire;
-			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
-			targetProxy = 896E1F3954A958778BFD791F45C40099 /* PBXContainerItemProxy */;
-		};
-		EE52296AA3F61AC09DFA8344317E265F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = PromiseKit;
-			target = 64F186B4DD2329A6687EE7E1C6BB489B /* PromiseKit */;
-			targetProxy = E323057E8BB3AC74973F3CBF3727AD44 /* PBXContainerItemProxy */;
+			name = "Pods-SwaggerClient";
+			target = E5B96E99C219DDBC57BC27EE9DF5EC22 /* Pods-SwaggerClient */;
+			targetProxy = 39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		007503D8498115ADB100193B3AD6BACC /* Release */ = {
+		0EE8843F198A5F366A4E623FAAE15059 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */;
+			baseConfigurationReference = AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
 				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		077C4BB7DBEAA715DED46C057DC8051C /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 6C68BF2CC332C9D6485B777BA7C063AE /* Alamofire.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_NAME = Alamofire;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		0833374B84DE03636F41B3BFC66F760E /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 425268D5A6D1CD870A663BBE38B62B46 /* PromiseKit.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/PromiseKit/PromiseKit-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PromiseKit/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PromiseKit/PromiseKit.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_NAME = PromiseKit;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1062,198 +1002,122 @@
 			};
 			name = Debug;
 		};
-		3F44D50290D52EC3C557274BDDAB4C7A /* Debug */ = {
+		1E204B6C5E33E3503DCAA188ED1F93D8 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 451D13FDA61BDE9EB91BBC6CEA52AED4 /* PromiseKit.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/PromiseKit/PromiseKit-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PromiseKit/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PromiseKit/PromiseKit.modulemap";
+				PRODUCT_MODULE_NAME = PromiseKit;
+				PRODUCT_NAME = PromiseKit;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		1FE3B4CE8C074CE87C18B26C91020E15 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
 				CODE_SIGNING_REQUIRED = NO;
 				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"POD_CONFIGURATION_DEBUG=1",
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				ONLY_ACTIVE_ARCH = YES;
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
-				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SYMROOT = "${SRCROOT}/../build";
-			};
-			name = Debug;
-		};
-		5FD3C308E1FF2B6C127426676CBBBEF9 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGNING_REQUIRED = NO;
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"POD_CONFIGURATION_RELEASE=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
-				STRIP_INSTALLED_PRODUCT = NO;
-				SYMROOT = "${SRCROOT}/../build";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		8892A82330D242C8CE8BF39F1275BA41 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
 				MTL_ENABLE_DEBUG_INFO = YES;
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRIP_INSTALLED_PRODUCT = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
+				SYMROOT = "${SRCROOT}/../build";
 			};
 			name = Debug;
 		};
-		C66477B6E5656B1F4785FD5D9546905A /* Release */ = {
+		24EFEA6461F4ACD7936C9831B0D6C4C6 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */;
+			baseConfigurationReference = AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		CD3E6F275BA32FAD325E40B365C2BAB6 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = E4B3DD8A15BBF3791DE2AE67DF7DD23C /* PetstoreClient.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
 				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_MODULE_NAME = PetstoreClient;
 				PRODUCT_NAME = PetstoreClient;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -1266,29 +1130,126 @@
 			};
 			name = Debug;
 		};
-		D60F8C4DE6B0D221A33959774DA3DAFF /* Debug */ = {
+		3726956BB7B8AB9D056C83310D723F67 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 6C68BF2CC332C9D6485B777BA7C063AE /* Alamofire.xcconfig */;
+			baseConfigurationReference = 451D13FDA61BDE9EB91BBC6CEA52AED4 /* PromiseKit.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/PromiseKit/PromiseKit-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PromiseKit/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PromiseKit/PromiseKit.modulemap";
+				PRODUCT_MODULE_NAME = PromiseKit;
+				PRODUCT_NAME = PromiseKit;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		5E110A36DB7BF1BF01973770C95C3047 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		75DC358D76CB10021D9785F4066DF13C /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				PRODUCT_MODULE_NAME = PetstoreClient;
+				PRODUCT_NAME = PetstoreClient;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		7B0415700290D1DEBAB6B173951CC0C7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 45FB2502919E80623D265FE19C0A8FC4 /* Alamofire.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
 				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_MODULE_NAME = Alamofire;
 				PRODUCT_NAME = Alamofire;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -1301,69 +1262,122 @@
 			};
 			name = Debug;
 		};
-		F800598617CDD20AD8CB5F992D1176B0 /* Release */ = {
+		89C68177307D3F04B055FD0AA2FC173A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 425268D5A6D1CD870A663BBE38B62B46 /* PromiseKit.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
+				CODE_SIGNING_REQUIRED = NO;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"POD_CONFIGURATION_RELEASE=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+			};
+			name = Release;
+		};
+		95DBEF0AB0B74932A7CEF4BB6099470D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 45FB2502919E80623D265FE19C0A8FC4 /* Alamofire.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/PromiseKit/PromiseKit-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PromiseKit/Info.plist";
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PromiseKit/PromiseKit.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_NAME = PromiseKit;
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				PRODUCT_MODULE_NAME = Alamofire;
+				PRODUCT_NAME = Alamofire;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
 			name = Release;
 		};
-		F89C2DC5B4DBA79FB9C8BA8F24E52DF4 /* Debug */ = {
+		AA44C748B579D9822A4F1DA83E57D74C /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */;
+			baseConfigurationReference = 1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
 				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 3.0;
@@ -1373,36 +1387,37 @@
 			};
 			name = Debug;
 		};
-		FE0EC0291E771C19AD2CD2E0E86AE07A /* Release */ = {
+		C6B2F4D332313254F97F583C4C1F5703 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E4B3DD8A15BBF3791DE2AE67DF7DD23C /* PetstoreClient.xcconfig */;
+			baseConfigurationReference = F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_NAME = PetstoreClient;
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1414,8 +1429,17 @@
 		2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				3F44D50290D52EC3C557274BDDAB4C7A /* Debug */,
-				5FD3C308E1FF2B6C127426676CBBBEF9 /* Release */,
+				1FE3B4CE8C074CE87C18B26C91020E15 /* Debug */,
+				89C68177307D3F04B055FD0AA2FC173A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		32FC64AFF0587C67379066614065C3B0 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				24EFEA6461F4ACD7936C9831B0D6C4C6 /* Debug */,
+				75DC358D76CB10021D9785F4066DF13C /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1423,8 +1447,17 @@
 		419E5D95491847CD79841B971A8A3277 /* Build configuration list for PBXNativeTarget "Alamofire" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D60F8C4DE6B0D221A33959774DA3DAFF /* Debug */,
-				077C4BB7DBEAA715DED46C057DC8051C /* Release */,
+				7B0415700290D1DEBAB6B173951CC0C7 /* Debug */,
+				95DBEF0AB0B74932A7CEF4BB6099470D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				AA44C748B579D9822A4F1DA83E57D74C /* Debug */,
+				5E110A36DB7BF1BF01973770C95C3047 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1432,35 +1465,17 @@
 		607382BCFF2B60BA932C95EC3C22A69F /* Build configuration list for PBXNativeTarget "Pods-SwaggerClient" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				8892A82330D242C8CE8BF39F1275BA41 /* Debug */,
-				007503D8498115ADB100193B3AD6BACC /* Release */,
+				0EE8843F198A5F366A4E623FAAE15059 /* Debug */,
+				C6B2F4D332313254F97F583C4C1F5703 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		6FB824209F1EB710D7C2E96778EF898B /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+		8B17A4388FD8556EDC88266E4AB754DD /* Build configuration list for PBXNativeTarget "PromiseKit" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				CD3E6F275BA32FAD325E40B365C2BAB6 /* Debug */,
-				FE0EC0291E771C19AD2CD2E0E86AE07A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		9704F3468D80EEF41AAE27F6787CE8B5 /* Build configuration list for PBXNativeTarget "PromiseKit" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				0833374B84DE03636F41B3BFC66F760E /* Debug */,
-				F800598617CDD20AD8CB5F992D1176B0 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				F89C2DC5B4DBA79FB9C8BA8F24E52DF4 /* Debug */,
-				C66477B6E5656B1F4785FD5D9546905A /* Release */,
+				3726956BB7B8AB9D056C83310D723F67 /* Debug */,
+				1E204B6C5E33E3503DCAA188ED1F93D8 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
index 619e5f4acef..6b8baab300a 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
@@ -1,9 +1,8 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Alamofire
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Alamofire
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/Alamofire
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
index 7a567144865..1704e72da48 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
@@ -1,10 +1,9 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/PetstoreClient
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PromiseKit"
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
index 0fbbf6892e0..9e0a7d4afaa 100755
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
@@ -1,15 +1,28 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+# Used as a return value for each invocation of `strip_invalid_archs` function.
+STRIP_BINARY_RETVAL=0
+
 # This protects against multiple targets copying the same framework dependency at the same time. The solution
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
+# Copies and strips a vendored framework
 install_framework()
 {
   if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -58,21 +71,40 @@ install_framework()
   fi
 }
 
-# Copies the dSYM of a vendored framework
+# Copies and strips a vendored dSYM
 install_dsym() {
   local source="$1"
   if [ -r "$source" ]; then
-    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\""
-    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
+    # Copy the dSYM into a the targets temp dir.
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
+
+    local basename
+    basename="$(basename -s .framework.dSYM "$source")"
+    binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+    # Strip invalid architectures so "fat" simulator / device frameworks work on device
+    if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+      strip_invalid_archs "$binary"
+    fi
+
+    if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
+      # Move the stripped file into its final destination.
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+    else
+      # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
+    fi
   fi
 }
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
@@ -85,10 +117,18 @@ code_sign_if_enabled() {
 # Strip invalid architectures
 strip_invalid_archs() {
   binary="$1"
-  # Get architectures for current file
-  archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+  # Get architectures for current target binary
+  binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+  # Intersect them with the architectures we are building for
+  intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
+  # If there are no archs supported by this binary then warn the user
+  if [[ -z "$intersected_archs" ]]; then
+    echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+    STRIP_BINARY_RETVAL=0
+    return
+  fi
   stripped=""
-  for arch in $archs; do
+  for arch in $binary_archs; do
     if ! [[ "${ARCHS}" == *"$arch"* ]]; then
       # Strip non-valid architectures in-place
       lipo -remove "$arch" -output "$binary" "$binary" || exit 1
@@ -98,6 +138,7 @@ strip_invalid_archs() {
   if [[ "$stripped" ]]; then
     echo "Stripped $binary of architectures:$stripped"
   fi
+  STRIP_BINARY_RETVAL=1
 }
 
 
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig
index e6e847883ae..52a643ada6e 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig	
@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/PromiseKit"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PromiseKit/PromiseKit.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit/PromiseKit.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "PetstoreClient" -framework "PromiseKit"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig
index e6e847883ae..52a643ada6e 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig	
@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/PromiseKit"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PromiseKit/PromiseKit.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit/PromiseKit.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "PetstoreClient" -framework "PromiseKit"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
index 88dd5379907..08e3eaaca45 100755
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
@@ -1,15 +1,28 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+# Used as a return value for each invocation of `strip_invalid_archs` function.
+STRIP_BINARY_RETVAL=0
+
 # This protects against multiple targets copying the same framework dependency at the same time. The solution
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
+# Copies and strips a vendored framework
 install_framework()
 {
   if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -58,21 +71,40 @@ install_framework()
   fi
 }
 
-# Copies the dSYM of a vendored framework
+# Copies and strips a vendored dSYM
 install_dsym() {
   local source="$1"
   if [ -r "$source" ]; then
-    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\""
-    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
+    # Copy the dSYM into a the targets temp dir.
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
+
+    local basename
+    basename="$(basename -s .framework.dSYM "$source")"
+    binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+    # Strip invalid architectures so "fat" simulator / device frameworks work on device
+    if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+      strip_invalid_archs "$binary"
+    fi
+
+    if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
+      # Move the stripped file into its final destination.
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+    else
+      # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
+    fi
   fi
 }
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
@@ -85,10 +117,18 @@ code_sign_if_enabled() {
 # Strip invalid architectures
 strip_invalid_archs() {
   binary="$1"
-  # Get architectures for current file
-  archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+  # Get architectures for current target binary
+  binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+  # Intersect them with the architectures we are building for
+  intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
+  # If there are no archs supported by this binary then warn the user
+  if [[ -z "$intersected_archs" ]]; then
+    echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+    STRIP_BINARY_RETVAL=0
+    return
+  fi
   stripped=""
-  for arch in $archs; do
+  for arch in $binary_archs; do
     if ! [[ "${ARCHS}" == *"$arch"* ]]; then
       # Strip non-valid architectures in-place
       lipo -remove "$arch" -output "$binary" "$binary" || exit 1
@@ -98,6 +138,7 @@ strip_invalid_archs() {
   if [[ "$stripped" ]]; then
     echo "Stripped $binary of architectures:$stripped"
   fi
+  STRIP_BINARY_RETVAL=1
 }
 
 if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig
index ccac9379a86..436aa2cb9ed 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig	
@@ -1,8 +1,8 @@
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/PromiseKit"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PromiseKit/PromiseKit.framework/Headers"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit/PromiseKit.framework/Headers"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig
index ccac9379a86..436aa2cb9ed 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig	
@@ -1,8 +1,8 @@
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/PromiseKit"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PromiseKit/PromiseKit.framework/Headers"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit/PromiseKit.framework/Headers"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig
index 657ad7b3dfb..6c47b4c1b92 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig	
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig	
@@ -1,10 +1,9 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/PromiseKit
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_LDFLAGS = -framework "Foundation"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/PromiseKit
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
diff --git a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
index a0cf7c49cf3..fafcbb55afc 100644
--- a/samples/client/petstore/swift3/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift3/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
@@ -148,7 +148,6 @@
 				6D4EFB8E1C692C6300B96B06 /* Frameworks */,
 				6D4EFB8F1C692C6300B96B06 /* Resources */,
 				4485A75250058E2D5BBDF63F /* [CP] Embed Pods Frameworks */,
-				808CE4A0CE801CAC5ABF5B08 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -167,8 +166,6 @@
 				6D4EFBA11C692C6300B96B06 /* Sources */,
 				6D4EFBA21C692C6300B96B06 /* Frameworks */,
 				6D4EFBA31C692C6300B96B06 /* Resources */,
-				796EAD48F1BCCDAA291CD963 /* [CP] Embed Pods Frameworks */,
-				1652CB1A246A4689869E442D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -241,21 +238,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		1652CB1A246A4689869E442D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		1F03F780DC2D9727E5E64BA9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -296,21 +278,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		796EAD48F1BCCDAA291CD963 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		79FE27B09B2DD354C831BD49 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -329,21 +296,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		808CE4A0CE801CAC5ABF5B08 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/samples/client/petstore/swift3/rxswift/.openapi-generator/VERSION b/samples/client/petstore/swift3/rxswift/.openapi-generator/VERSION
index ad121e8340e..4395ff59232 100644
--- a/samples/client/petstore/swift3/rxswift/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift3/rxswift/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.1-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index cf09fa027fe..9197924fff8 100644
--- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -357,8 +357,8 @@ open class FakeAPI: APIBase {
      * enum for parameter enumHeaderStringArray
      */
     public enum EnumHeaderStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
+        case greaterThan = "">""
+        case dollar = ""$""
     }
 
     /**
@@ -374,8 +374,8 @@ open class FakeAPI: APIBase {
      * enum for parameter enumQueryStringArray
      */
     public enum EnumQueryStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
+        case greaterThan = "">""
+        case dollar = ""$""
     }
 
     /**
diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index ee7f77c9de6..d2a6ecf2197 100644
--- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -44,6 +44,7 @@ open class FakeClassnameTags123API: APIBase {
     /**
      To test class name in snake case
      - PATCH /fake_classname_test
+     - To test class name in snake case
      - API Key:
        - type: apiKey api_key_query (QUERY)
        - name: api_key_query
diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 51543ddc2e6..0cb25ffcbdb 100644
--- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -127,9 +127,9 @@ open class PetAPI: APIBase {
      * enum for parameter status
      */
     public enum Status_findPetsByStatus: String { 
-        case available = "available"
-        case pending = "pending"
-        case sold = "sold"
+        case available = ""available""
+        case pending = ""pending""
+        case sold = ""sold""
     }
 
     /**
diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 928449dfcbc..c2414d1023e 100644
--- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -15,8 +15,8 @@ open class EnumArrays: JSONEncodable {
         case dollar = "$"
     }
     public enum ArrayEnum: String { 
-        case fish = "fish"
-        case crab = "crab"
+        case fish = ""fish""
+        case crab = ""crab""
     }
     public var justSymbol: JustSymbol?
     public var arrayEnum: [ArrayEnum]?
diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 58548bee74d..7b6af62b057 100644
--- a/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift3/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -11,8 +11,8 @@ import Foundation
 open class MapTest: JSONEncodable {
 
     public enum MapOfEnumString: String { 
-        case upper = "UPPER"
-        case lower = "lower"
+        case upper = ""UPPER""
+        case lower = ""lower""
     }
     public var mapMapOfString: [String:[String:String]]?
     public var mapOfEnumString: [String:String]?
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Podfile.lock b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Podfile.lock
index 56a6c42e699..e999e49e506 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Podfile.lock
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Podfile.lock
@@ -2,21 +2,26 @@ PODS:
   - Alamofire (4.5.0)
   - PetstoreClient (0.0.1):
     - Alamofire (~> 4.5.0)
-    - RxSwift (~> 3.4.1)
-  - RxSwift (3.4.1)
+    - RxSwift (= 3.6.1)
+  - RxSwift (3.6.1)
 
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - RxSwift
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: 89ba1ed13b6653200cc34a2248644e7e6a142b60
-  RxSwift: 656f8fbeca5bc372121a72d9ebdd3cd3bc0ffade
+  PetstoreClient: 8c4d20911bfd9f88418b64c1f141c8a47ab85e60
+  RxSwift: f9de85ea20cd2f7716ee5409fc13523dc638e4e4
 
 PODFILE CHECKSUM: 417049e9ed0e4680602b34d838294778389bd418
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
index 501a53c3721..ffa5ba95584 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
@@ -2,21 +2,22 @@
   "name": "PetstoreClient",
   "platforms": {
     "ios": "9.0",
-    "osx": "10.11"
+    "osx": "10.11",
+    "tvos": "9.0"
   },
   "version": "0.0.1",
   "source": {
-    "git": "git@github.com:swagger-api/swagger-mustache.git",
+    "git": "git@github.com:openapitools/openapi-generator.git",
     "tag": "v1.0.0"
   },
   "authors": "",
   "license": "Proprietary",
-  "homepage": "https://github.com/swagger-api/swagger-codegen",
+  "homepage": "https://github.com/openapitools/openapi-generator",
   "summary": "PetstoreClient",
   "source_files": "PetstoreClient/Classes/**/*.swift",
   "dependencies": {
     "RxSwift": [
-      "~> 3.4.1"
+      "3.6.1"
     ],
     "Alamofire": [
       "~> 4.5.0"
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Manifest.lock b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Manifest.lock
index 56a6c42e699..e999e49e506 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Manifest.lock
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Manifest.lock
@@ -2,21 +2,26 @@ PODS:
   - Alamofire (4.5.0)
   - PetstoreClient (0.0.1):
     - Alamofire (~> 4.5.0)
-    - RxSwift (~> 3.4.1)
-  - RxSwift (3.4.1)
+    - RxSwift (= 3.6.1)
+  - RxSwift (3.6.1)
 
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - RxSwift
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: 89ba1ed13b6653200cc34a2248644e7e6a142b60
-  RxSwift: 656f8fbeca5bc372121a72d9ebdd3cd3bc0ffade
+  PetstoreClient: 8c4d20911bfd9f88418b64c1f141c8a47ab85e60
+  RxSwift: f9de85ea20cd2f7716ee5409fc13523dc638e4e4
 
 PODFILE CHECKSUM: 417049e9ed0e4680602b34d838294778389bd418
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
index a6ddee94f5e..5b49e36396a 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
@@ -7,236 +7,240 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		00C50CA5DCB5BA090375BB3B524C50E6 /* ScheduledItemType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF9D1F5A21CB847E913BF41EC110B1F /* ScheduledItemType.swift */; };
-		058099234763329A48424C8A10C5824E /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E8814B64707AA238E44CC6739648D2B /* PetstoreClient-dummy.m */; };
-		0588C627138A5FC717BE474F7F6099F4 /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = F511E345C77AFF186F61FCC34A664ED5 /* Return.swift */; };
-		069D8D323EA2AC0D1C41A0835C810485 /* Using.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA907F82073836CB66D5D606FB1333D9 /* Using.swift */; };
-		07538F6EF28CF0D537B45B6210077B6F /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3BBD18F117F47C44487A0FB4650EF0D /* Client.swift */; };
-		088619C9CB8ECAB44A0079814877AC2B /* TakeLast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EACF73E072E466AF5911B9BB191E174 /* TakeLast.swift */; };
-		0B548DFB67637B2D68A1F676F4A105B9 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BED5103BCF9D40F85068CF32B24A63E /* Event.swift */; };
-		0BB84EADE161C2D47B619ACB31218339 /* DispatchQueue+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C7AD0D97D1F541A20DEDFD5AC30AF /* DispatchQueue+Extensions.swift */; };
-		0CAD756A07CDD3214A87984F53D2D553 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69AC2285C925A617C06C7FB2086BAA68 /* ReadOnlyFirst.swift */; };
-		0D452D986DA48DEAB11DECEAC1BEF52D /* SynchronizedDisposeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34B9F812BB8C50E3EA28F4FB51A1095 /* SynchronizedDisposeType.swift */; };
-		0D5164E0905ADFD6E8801868FF767491 /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = B88AB92BE71D793E0172BDB03CBBAA1E /* Model200Response.swift */; };
-		0DBFC6A3AFDB21E14DE42949EFAB52C3 /* DisposeBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32C44C9A30733440A3D263B43861FBA1 /* DisposeBase.swift */; };
-		0E06A7A24FEC623CCD59A64464FA0F4B /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5ABAF432E141A4D578C1ECEA8D3D06 /* Models.swift */; };
-		10EB23E9ECC4B33E16933BB1EA560B6A /* Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F0AE167B06634076A6A2605697CE49 /* Timeline.swift */; };
-		113B52D926F2B09AFA1F46F428D8AC8C /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63A236E8B385B46BC8C1268A38CCBDE5 /* Deprecated.swift */; };
-		14ED92A114891418E3C30810DCE5CD53 /* Sample.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7FE769331C0AFEF35319E2F6260F9DF /* Sample.swift */; };
-		14F8FBD0D3FBFC5BDE6C3A8DF72484CA /* Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = D14A5F119805F0FCFCC8C1314040D871 /* Delay.swift */; };
-		1717E048D5754063AE1315867E52EE19 /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80C18B1881A0F511B8D6DDA77F355B51 /* Range.swift */; };
-		18033E5B30880169F7A60CD98AE9A06B /* PublishSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA436001918C6F92DC029B7E695520E8 /* PublishSubject.swift */; };
-		18CF543833BAA1E34BAAFAA2B57B9709 /* Debounce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09CF571E27DC65BF77EFFF62354B5EF0 /* Debounce.swift */; };
-		18D7A50E1BB3A20E0D7E8CE121988DD9 /* Map.swift in Sources */ = {isa = PBXBuildFile; fileRef = 939E73AB843F47D6C9EA0D065BAF63FC /* Map.swift */; };
-		1A54AFBFE909D0F2608D4F47C52ED045 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A02E1847AE8F11E47BE4161FCABFA7 /* Name.swift */; };
-		1B4189B0E3CD1C28CC7B8A33DD40CD1A /* InvocableScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30436E554B573E5078213F681DA0061F /* InvocableScheduledItem.swift */; };
-		1B4349FCBC055EC01D28BE388D9C27C9 /* ImmediateScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F777764A45E0A77BE276ADA473AF453A /* ImmediateScheduler.swift */; };
-		1B9EDEDC964E6B08F78920B4F4B9DB84 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F42569FD7843064F8467B7215CC7A9A9 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1F1681836E1A46010E64F9F74A9688A5 /* ToArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEC3599B3E7B7EB3DA8FBA9610E255 /* ToArray.swift */; };
-		20AD9923B7484C3062DC1782090D5CC0 /* Platform.Linux.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48242CA8E564C2C50CFF8E3E77668FB7 /* Platform.Linux.swift */; };
-		22EE4A36063EC92A1E44595D3CA1285E /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5D46171F3DE7355BBDB8A0594675BB4 /* HasOnlyReadOnly.swift */; };
-		234470CC48A18683C120E00A087C42E7 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA9C5856BEAE5090A7D1EB450A10C04F /* Alamofire.framework */; };
-		25150A74A8D3312556CF7125A05CC7FF /* GroupedObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC7E0F67AECA3C1CBDBF7BC409CDADC /* GroupedObservable.swift */; };
-		2528BD9FDA9E26A202E8A8AB6DEFFB0F /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 590A7488E9B89273069B539F03421606 /* MapTest.swift */; };
-		26BAE89C26DE9986FE8796564747C1FD /* SynchronizedUnsubscribeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA39A7A8DF958888156A2207EF666EB1 /* SynchronizedUnsubscribeType.swift */; };
-		27203A3E758C690E81BFA192020F8CD4 /* ScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C32D4D3484C860B70069CD1C629F666 /* ScheduledItem.swift */; };
-		27E1DA817DC3FF6513B59C55B726A920 /* Amb.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6635256007E4FB66691FA58431C5B23 /* Amb.swift */; };
-		281AFAEA94C9F83ACC6296BBD7A0D2E4 /* Pods-SwaggerClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		2834247529DA25BC7EAD2A5F93BC3BA5 /* AsSingle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4644DAD437464D93509A585F99B235E /* AsSingle.swift */; };
-		2883D5F3AAAB2B6F1244E2C5AD01B7C8 /* SubscriptionDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15F7B4D89DB784C462A959824F1E698C /* SubscriptionDisposable.swift */; };
-		29D7DC0AA2A54C8F8F8CA0179FF7649A /* SynchronizedSubscribeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B70F2B6C174F1E6C285A5F774C3C97E /* SynchronizedSubscribeType.swift */; };
-		2CBFA5FE714C0F310B12B085944C58A8 /* Queue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A98B8DAD74FBDB55E3D879266AA14CA /* Queue.swift */; };
-		2D6753FA5CBC09FF42D12F0DB2601286 /* SingleAssignmentDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D311EA38EC997A02CB05BACC0DD7D /* SingleAssignmentDisposable.swift */; };
-		2E8F4D9F164ED6C8CA2089200FCDD626 /* Sink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18254952242D69F129DC1ACD4BDF8AF4 /* Sink.swift */; };
-		2E938891BE5C8FF254F6793DD6E4ED41 /* Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBD0B4CB17B692257A69160584B0895 /* Zip+arity.swift */; };
-		3171E380E58A3F14BDD85C246D75826F /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7A01B1A67EE04FE1D9C036932C4C037 /* Filter.swift */; };
-		31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		34EFD0CA858F154A1A07FD30FC4E7D6D /* Scan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FA4778A42883943FE99141A948880BE /* Scan.swift */; };
-		35E29ACA4FFE9CFE36119C2B5E6BE631 /* TakeUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65518CF96489DBA6322987069B264467 /* TakeUntil.swift */; };
-		3626B94094672CB1C9DEA32B9F9502E1 /* TaskDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E181A2141028C3EB376581163644E247 /* TaskDelegate.swift */; };
-		371D450E9B85ACBA18E949DEEC06DAE3 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F379571B66704590E35A4719E6769F9 /* Pet.swift */; };
-		37A1223C80BA6EB819FFDB0DB9018565 /* SerialDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8317D3F53EA1D6DC62811B7F71E22E8E /* SerialDispatchQueueScheduler.swift */; };
-		386F9A49ADAB8E03CE41B6EC146B5FA2 /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CC7A4A0D213AA0C7831EA91E658003C /* EnumTest.swift */; };
-		388A3818CA2462513CBD366E481EB479 /* ScheduledDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48E60FBF9296448D4A2FEC7E14FBE6DB /* ScheduledDisposable.swift */; };
-		395353DBA02265CE8A088384D9C21C96 /* CurrentThreadScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BEFD5C825FC7E42B492A86160C4B4D9 /* CurrentThreadScheduler.swift */; };
-		3EC30116BE2A106102E6D8E6F0420A32 /* Merge.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1FCEDB728FD2060B1A8C36A71039328 /* Merge.swift */; };
-		413C5140802B635E5EFD061A5973C8D0 /* AsyncSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80AD53E4312C3B362D3336BDC9D80A80 /* AsyncSubject.swift */; };
-		41D4AF198FF453F16AA231156D254F5C /* Bag+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D641B399A74F0F9D45B05F8D357C806 /* Bag+Rx.swift */; };
-		41D7E74614B7E7289F55DC3C2C5E1BC7 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = E94FD1527D47A90A58A6E226AF6C4A44 /* ApiResponse.swift */; };
-		422071460CEC4FD457FAE4EB0E4B3826 /* Generate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9675783D8A4B72DF63BAA2050C4E5659 /* Generate.swift */; };
-		4417ABCFF958D02DF8E985AF534F7BCC /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2545A0BD077774D3CA3B35CFD1FE40 /* OuterComposite.swift */; };
-		4458039943079C18B66FC8E07192B004 /* OperationQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24917B863385D1BB04A2303451C9E272 /* OperationQueueScheduler.swift */; };
-		44722D2979B06E2738E4247E124C0D71 /* ReplaySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7269CAD149BFD0BE4D3B1CA43FE6424F /* ReplaySubject.swift */; };
-		47A4C299DC0AF262F3B147BECA1716C0 /* AnonymousObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6472AECA91A4E834A9AF15721BC6D569 /* AnonymousObserver.swift */; };
-		48828B8EF5A8A114E02744EF755861B1 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 7F4C7EC001A7DAE883053BE9583EECF1 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4913653A4B5B249F7C112FDEB8E0CB9F /* AnonymousDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB186FED84E02D4539A7335A7D657AEB /* AnonymousDisposable.swift */; };
-		4BEC58109676367D63BB38513BDE4E61 /* Cancelable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 463ABD4055AB6537A2C5B0EDB617C139 /* Cancelable.swift */; };
-		4FE00C14C1F53B67BC42F1DFD7AEB134 /* DelaySubscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B939DC5892884F0418DD9231B1C333B /* DelaySubscription.swift */; };
-		4FE4C667BB96C218E29D53392D21AEC9 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3726BB3EDFF36AE68CFA5EFB3F8ADCF /* Extensions.swift */; };
-		50524C5E1DB23EA18A06AAECFBF0EF6F /* RecursiveLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7C61BEED15998D9D7B47AD6F3E069D /* RecursiveLock.swift */; };
-		50C8F042293151DF7160103359D24C19 /* Never.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F94DF516E7B950F928922C1D41C6D4D /* Never.swift */; };
-		537747BEC46420B59A6E6404B55519E0 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CAB06DC6B0D4E914DE8355ABD73685 /* ArrayOfNumberOnly.swift */; };
-		5387216E723A3C68E851CA15573CDD71 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = F57EA9DD77194E4F1E5E5E6CB4CDAE4E /* Request.swift */; };
-		541ECA77541A6B87BEA04693733BDC6B /* Repeat.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAED6E7C8067874A040C7B3863732D73 /* Repeat.swift */; };
-		558E7976032468B4B3290802329281BB /* PriorityQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 880C5FA0EC7B351BE64E748163FA1C31 /* PriorityQueue.swift */; };
-		5640D4D6568ED402D0789D4CE76CA707 /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBC3E633FF7A6EF8F18280770400F6E /* Animal.swift */; };
-		58268455FBFAB2C66217240430A7DF92 /* SubjectType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18328C3FA1839793D455774B0473668C /* SubjectType.swift */; };
-		5AFF43F00A5EF8C6D3A18198BC6B3A61 /* CompositeDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D497E96ABC5BEF4E26087D1F8D61D35E /* CompositeDisposable.swift */; };
-		5BDE8CA34FCA4A007C7186DA5FD5A801 /* InvocableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56CC0097103243FBF2702AB35BF7C0A4 /* InvocableType.swift */; };
-		5C1C84AC7009B654DE4EC1677435B429 /* ShareReplay1WhileConnected.swift in Sources */ = {isa = PBXBuildFile; fileRef = 365AE864123C488FD72C61ADC9EC624D /* ShareReplay1WhileConnected.swift */; };
-		5D4EE628D324BC4A7EF5878364796DED /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C74872D21B74B20DED53ABF8CAF1C0A8 /* PetAPI.swift */; };
-		5DEC0EEBF7176C7F8FF1207B01E39F3B /* ConnectableObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFDFA640848914890DC3B2555740FF84 /* ConnectableObservableType.swift */; };
-		605ADF93B7CEBEFB1E9B6ED64F279069 /* Disposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A98136CD6F078204F8B95D995205F04 /* Disposable.swift */; };
-		609D36645D868B8D4B2175FF76785490 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24CAB582243A8ABBCDA17324B26EB57 /* Capitalization.swift */; };
-		61200D01A1855D7920CEF835C8BE00B0 /* DispatchQueue+Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA0155598FD96A2BBFF3496F7380D93 /* DispatchQueue+Alamofire.swift */; };
-		620D3D599A225398EDB5128038997704 /* Optional.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECB0A2EA86FF43E01E3D3ACE3BD2752B /* Optional.swift */; };
-		62F65AD8DC4F0F9610F4B8B4738EC094 /* ServerTrustPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AB42C9C8AA1EFF0761D23E6FEF4776 /* ServerTrustPolicy.swift */; };
-		647E4A693C240F1DCC36E18702CA22F2 /* Deferred.swift in Sources */ = {isa = PBXBuildFile; fileRef = F119426570E6238D04EAB498E1902F13 /* Deferred.swift */; };
-		670915CFD068A67AA6C01E7596315E4D /* OuterNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = A844E504E62CB6AEA00B8DA3BAF7359B /* OuterNumber.swift */; };
-		6755ED61C48BEFFAAB92F736C0118D84 /* ObserveOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC5B3446AD01BE42D27E9F1B9673C334 /* ObserveOn.swift */; };
-		6882F5FF908C82E3BC550D5EDD5DC128 /* Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAE679F6024F9BDC9690AFE107798377 /* Window.swift */; };
-		6899402E8FEA5BBBD5B4167868069E97 /* SchedulerServices+Emulation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60544C2EB93D2C784EF3673B4BA12FAD /* SchedulerServices+Emulation.swift */; };
-		68F02607B836CA98B2E3F69A29ABE456 /* VirtualTimeScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = E721CFEFA8C057FD4766D5603B283218 /* VirtualTimeScheduler.swift */; };
-		69E31A4B72F18870572A3D860D1DF5A5 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FCDAA2549A70BCA3749CF5FCCF837E9 /* Error.swift */; };
-		6A366BBAFAD2E0C249DF77A193516D52 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = A353DBED5E7E7B0EC48E7A4A4B5C5806 /* Category.swift */; };
-		6B266E73D0D76B5DFF4900963F3561FC /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = EACCA67328F0A3AC89EA2158DAFC9B3A /* FormatTest.swift */; };
-		6BF97EA13738721A7AB6387154BE8672 /* Zip+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = B23F66A643FB8A1DEAC31DC3B637ACEB /* Zip+Collection.swift */; };
-		6C7806F381D2AC4D92A3C93986F18F82 /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2DDCF83AFCDDE5126ED96168870FCB4 /* EnumArrays.swift */; };
-		6E6191F60C604ACE4AD5B02F8D2407B3 /* MainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AF8DBA8D803E5226616EC41FA7405ED /* MainScheduler.swift */; };
-		7017FDF93D52934C6F558DFB677FE522 /* ObserverType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88515C2D0E31A4BB398381850BBA2A54 /* ObserverType.swift */; };
-		71AA7E64651C50855F1E8D6672A92A97 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E13D55B14894773A8FAECA0A7D37DE /* ClassModel.swift */; };
-		71B9FE7CEAE97B22F7326A474DDAFF51 /* AddRef.swift in Sources */ = {isa = PBXBuildFile; fileRef = A962E5C6DA31E53BA6DEFCE4F2BC34B8 /* AddRef.swift */; };
-		72F37125F2F0F01BF47E5E3FA196F362 /* NopDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7737478C5B309559EBEB826D48D81C26 /* NopDisposable.swift */; };
+		00DF0F7239A239F6EF9E06E68864C12C /* Concat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8872875BE1C248970BE0C0E6A4F54B2E /* Concat.swift */; };
+		02FD9B892BE5971F34F1F33B48259152 /* DisposeBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2454112DD5AEE5186A4664E9A126BED /* DisposeBase.swift */; };
+		0701E374B489C0ABFE501E3E203BA4D2 /* AnonymousInvocable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68F6F9541A2714DA6125FB3E9BB9727 /* AnonymousInvocable.swift */; };
+		07646291B1A70D36C21FA0B73C43A86C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
+		078B39669CAE5CAA0B4F881A1D953831 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4C9F81DD3B2DAC61C014790FAFD205E /* Name.swift */; };
+		0A53E3607BFAD28B3BDBEBD4060AF4AD /* ConnectableObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95ABE9C8F7D6635646F6C100B2B637B5 /* ConnectableObservableType.swift */; };
+		0D59BBE92D161E0C5D65B3D72E32B445 /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7ABE12F4F77E42B352D072ACD9946AC /* ObservableConvertibleType.swift */; };
+		0DA16962ECAE07F74660E01B8596405D /* Take.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48AC41077AE8968D02C47F5F8FEB91EF /* Take.swift */; };
+		0FEF1C28FD87288A71D6CB36C7E834F8 /* PrimitiveSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 281B6953B58178760E6D8AE7FDA3CCFB /* PrimitiveSequence.swift */; };
+		10EB23E9ECC4B33E16933BB1EA560B6A /* Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31EE482CF21D19C54B33E17B7A4E43F3 /* Timeline.swift */; };
+		11BF530A4D0362FF7255073E1A86FCC4 /* ImmediateScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 295257ADE79CBF71EDDB457361B2E80E /* ImmediateScheduler.swift */; };
+		13CBC288264AB845A079CF354481902F /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDE4AF9A5A88886D7B60AF0F0996D9FA /* EnumArrays.swift */; };
+		13E8EF2C11EACF9F667BFA33DB4BE1F6 /* SynchronizedDisposeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D71252188831E0A81462FE21E33B84CE /* SynchronizedDisposeType.swift */; };
+		18EA6C3EB4F28FABE7EAC20145C371EF /* NopDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 184A223909D425D6876C780724E7B2DA /* NopDisposable.swift */; };
+		1A39147EC345B333F96135FEAA1EA162 /* Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79E124948BC6C0A5B04B02009B037987 /* Zip+arity.swift */; };
+		1B9EDEDC964E6B08F78920B4F4B9DB84 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C879BF6973F64B5E2A20498F1411169 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		1C9DFCC78A774BFC20D854D2876F1A55 /* SubjectType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 139BFBACE8A3AD8B5733AD2B94C930C3 /* SubjectType.swift */; };
+		1CDF8860135719D9B67BDC6453A1DB07 /* InfiniteSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6D9C76F23B7D6E1FAEFE7F3EA079003 /* InfiniteSequence.swift */; };
+		1CEB283CB5C6161FD3079564C416F582 /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59022FD592AB91A0B2EDA3A2EA5EC8D9 /* OuterComposite.swift */; };
+		1F0573234DBE02637E714764DD6FF78E /* ObserverType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5101A83B512E74F49467146FE96350A /* ObserverType.swift */; };
+		1F51E8FA18E73CDD1753B47BACDE8B56 /* SerialDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2F8A7D1F3AA17C12A89128D163EFDF5 /* SerialDispatchQueueScheduler.swift */; };
+		206834A2D53A2C0E3ECE945C768B8EB8 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14FE73E27209DA05667C0D3E1B601734 /* Pet.swift */; };
+		236550E146C48E5FCAB68D8C6368D92B /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4FB407CB8C792BFB02EADD91D6A4DFA /* ReadOnlyFirst.swift */; };
+		265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		273CC6F689134C1BFA35BBA3F024FA1A /* SchedulerServices+Emulation.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD087C1A176984F7F186AFBC444C6DF9 /* SchedulerServices+Emulation.swift */; };
+		27E65DDC557373A5BCA8ECE76305B022 /* AsyncLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 149DE31C5C5A1FF69EA3FE40F9791130 /* AsyncLock.swift */; };
+		281AFAEA94C9F83ACC6296BBD7A0D2E4 /* Pods-SwaggerClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		28295BE414CF6415C641D10EEF4E144C /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 949911686773B44C613A58E025C223BA /* Filter.swift */; };
+		288CF8B3281E9A8E196EAD966DCCCF3F /* ConcurrentMainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACE351254D9CADACBCE214EB425A2B43 /* ConcurrentMainScheduler.swift */; };
+		2A9EC7B938356D259F37E64466AED071 /* DisposeBag.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF09AC4A7016BDFDF5D4642172938A90 /* DisposeBag.swift */; };
+		2AE82A559BEB897CB1C17DC3F8A2D67D /* AsSingle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 683556396167E2BC804256F1F9B46794 /* AsSingle.swift */; };
+		2B22029126CD2DB4CE15A3EE200431CD /* Debounce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0408C4724C6E604F4F4EEE2856302250 /* Debounce.swift */; };
+		2BCF537D3707AE25F5CE467E30423CCE /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8261F606FFC7AA4F9C45CA8016E8B1C7 /* FormatTest.swift */; };
+		2C684BE18659784FA9D5C18B8E2F56C4 /* BehaviorSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6D7F52145D6986DDC613D7FB6DF4F3D /* BehaviorSubject.swift */; };
+		2CB87E8301D75048872CC80AF0F39191 /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EB881F0C1B1D1F90FAB084334D6C13D /* EnumTest.swift */; };
+		2E35FF49479CD266D11B201C4F425D88 /* ReplaySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DF9E242A80EC5685B3D5731E9176BB /* ReplaySubject.swift */; };
+		2E4E7221D236CDDCA9936FF409668157 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F3B836F14594A6EF1923CC07B61E893 /* ClassModel.swift */; };
+		2E6C2FC6A7E76480C639AC51CC0894C2 /* Do.swift in Sources */ = {isa = PBXBuildFile; fileRef = 535CA1EA937AD886FAD4EC1309B331DD /* Do.swift */; };
+		3016477B301E7E1F2237A46F4D040562 /* Sink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82310F12B492F60A13F62CF52702755C /* Sink.swift */; };
+		30DDFCEDA0032F625237387B44E122D3 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A15B50BA886EAD6427ADC7E68BBD4FE /* StoreAPI.swift */; };
+		30EE6C005A481E34141B3B582370CB49 /* SubscriptionDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCB5AA92F6DEDE2AC3F479C60C7212C /* SubscriptionDisposable.swift */; };
+		31886B413F1EE6BD11B1720F62E09EB8 /* Queue.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA911BA97CC3081E2363ED0B4580209F /* Queue.swift */; };
+		32FACB02BE3AE41039792DB80AC20FB1 /* Map.swift in Sources */ = {isa = PBXBuildFile; fileRef = 888D25A758FE1CF355E7A48F6D418E36 /* Map.swift */; };
+		354836898B12CDD0AC0F178607EC60F3 /* Amb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E28232337E7C27CF55A409886C712B8 /* Amb.swift */; };
+		35F53DFB2143E85E802BD2598B01FD42 /* ObserverBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2265FC97FA4169ED188CF2E34F23DACF /* ObserverBase.swift */; };
+		3626B94094672CB1C9DEA32B9F9502E1 /* TaskDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A12A7ADC5FD1C8C9DFC3B65FF135191 /* TaskDelegate.swift */; };
+		36C597BA9BB747DA51B85ED0CC4C5380 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CAA626D85FBD1FF53F144A14B3A3230 /* Extensions.swift */; };
+		378DF713B6DCEE98B1121E1C82AA528A /* Catch.swift in Sources */ = {isa = PBXBuildFile; fileRef = B47AE62054C888B75C48419EBF7EF1A7 /* Catch.swift */; };
+		3B009A721464098ABBAB99943C15E8E3 /* ObservableType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B17A77CECF7B4996B33CC78A683AFEC /* ObservableType+Extensions.swift */; };
+		3B5E8842032A0EC5BB4BD5F99E5C633F /* Merge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D19299E0C5CBA41113508BC57DA9395 /* Merge.swift */; };
+		3B78236E5721DF44006119A96CB2297A /* Multicast.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD55BB66B76757868058C24E16A79BEC /* Multicast.swift */; };
+		3CFC78E889B5B01E41D07FA8B7D3F20F /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 749EFF1B930D930529640C8004714C51 /* ArrayTest.swift */; };
+		3DD6224508DDC3BBF8A184D20DBD6318 /* InvocableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20E32B939BDA9B05C26957643F21B95E /* InvocableType.swift */; };
+		40BE340D2D8DBAC30CCB5647E07DF9B1 /* ImmediateSchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF980894DB7449C53D44D590F6197C88 /* ImmediateSchedulerType.swift */; };
+		42D3883B0296558083DFBE5375552905 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4A73DFC5EC70ADEC8DB5A65A07196B /* Event.swift */; };
+		45B2FF4DAF9FBAB97D814EC9B3D6E1A8 /* Using.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92BD912F8B8ED40C37699519197E61C6 /* Using.swift */; };
+		469B15AD1F6DA1B495CC2AA54B5D78B6 /* String+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3EE8437BC7F2156A710F1EEA545EBC2 /* String+Rx.swift */; };
+		490FC3C33AC45753F2B8295D46C6C93A /* SingleAssignmentDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0132F153B6C6244F3078E6A5F7D98CA9 /* SingleAssignmentDisposable.swift */; };
+		4C85A4DF1FE85A71264C1235490B4CB8 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FCF0B9190C58BD7493583E8133B3E56 /* EnumClass.swift */; };
+		4D4420A3806244A28021BAC382499B98 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3911B66DC4AC99DD29F10D115CF4555A /* PetAPI.swift */; };
+		4EBFA027A211DFDD7736AD31C9B28BB6 /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC76461A77281664DFA98D53498ECD13 /* Range.swift */; };
+		4EC9D9884B0E59836149DE74E86ED32C /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A1AE5E1B215E1D53DCB6AB501CB0DAE /* Configuration.swift */; };
+		52944493AAD6238E0C4D4473C09F9697 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A0B504F5FC1B5E5369C2AD8ABA9482A /* AnimalFarm.swift */; };
+		5387216E723A3C68E851CA15573CDD71 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64E2FC7F6A4850DCB9BBCB9D83E40C34 /* Request.swift */; };
+		53CE54C6169C04A9EC42AEFA26DBF4E7 /* AsyncSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F1000F4487C2C0150A606F30D92AFAF /* AsyncSubject.swift */; };
+		54A23EABA7C6CA3C2761E55C832212CD /* RecursiveLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 486092B50FE0BFF30D503E7DE4A5E634 /* RecursiveLock.swift */; };
+		559E3223631967618E57D02F9A692AAC /* Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A83AF1902D8C6A7D243C1EB1B632FD4 /* Delay.swift */; };
+		55A0ADE7B16EF10C76A139DF785498C3 /* CombineLatest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4322C1C10B70D563B5B508A53CD5704B /* CombineLatest.swift */; };
+		586CD484DFDF8D1ABED25DF0BA1D6A90 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCD2D0F8C81B81BFB4306011CAC48A20 /* AlamofireImplementations.swift */; };
+		59C6B968D13835981B5EDABB8BE4852A /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA5F47130C28C4C5652E69E59A0902BD /* User.swift */; };
+		5E28EE8AD40978238703E0A9D9BAC23C /* Skip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37451A8A1EDFE1BFB039614775982399 /* Skip.swift */; };
+		61200D01A1855D7920CEF835C8BE00B0 /* DispatchQueue+Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = CFA2BB0A87B62F067FBD44D8EFB93058 /* DispatchQueue+Alamofire.swift */; };
+		613618A88EE02862BCE84869AA89E4AE /* Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = A625DF4508148061AAB7EBC23E067525 /* Empty.swift */; };
+		62F65AD8DC4F0F9610F4B8B4738EC094 /* ServerTrustPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F0CC5EE4C8B956EA02B0CD91AE32394 /* ServerTrustPolicy.swift */; };
+		63FB5F594F411D8D6BDC157C854EEE8E /* DelaySubscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1072258F1D85C96C8DE0D43A4D17535E /* DelaySubscription.swift */; };
+		65DB637553156629C46FC1F02E624D9E /* CombineLatest+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA86CCB6DD23509D8E393B3EBB39E7C /* CombineLatest+Collection.swift */; };
+		65ECA0FE8FA1DB003A1C4E2F6F5068ED /* SkipUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDA64805F9AEB3535908A7D984AB5BE8 /* SkipUntil.swift */; };
+		66390F82F9F5412C64A7C24D8016A73F /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9623461D845F7EE6E2BBDBC44B8FE867 /* SpecialModelName.swift */; };
+		675BA3879823193A505ADA24E26A640C /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38DC7C1C0A0A337E524268345E748CA3 /* Lock.swift */; };
+		6E170ABE9ACD8548EAC55656F97F4907 /* TakeWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EC31C3AF1A745A2E941C3B1884E2FA3 /* TakeWhile.swift */; };
+		7018CC80523C7192A8C6F535499F9663 /* GroupedObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2E37D73483B20FFF4A5A9CC687985 /* GroupedObservable.swift */; };
+		701AFF28B13BC1B54B2EC0E7139296A6 /* BinaryDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893081A9D1C037310A86F3182BF38098 /* BinaryDisposable.swift */; };
+		728056B28FF21ADB01C3D4E76685D2CA /* Sample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8796EDFC02FDC2F169BA74667BB3E3CA /* Sample.swift */; };
 		73B9C996AED49ED7CF8EC2A6F1738059 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
-		744D8076BF0589E55B920CB1EDBAB734 /* PrimitiveSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D9BF77ECD45A0F08FB7892B9597B135 /* PrimitiveSequence.swift */; };
-		77B7D95462F0444B51629B77F40E353A /* RecursiveScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAE1A43C13EDE68CF0C6AEA7EA3A2521 /* RecursiveScheduler.swift */; };
-		78F05FA712773066C65C7652F102892C /* AnonymousInvocable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83CF28DA7318DA2566376ACECE87D6E3 /* AnonymousInvocable.swift */; };
-		79F35F2B656D39743899E74A96F80CE4 /* Platform.Darwin.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB1413438046E9B3E8A94F51358A8205 /* Platform.Darwin.swift */; };
-		79F64699E911193029E1D5471ADCA488 /* ObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B4FF38E4CA2AFB54D788C9F1919BFA8 /* ObservableType.swift */; };
-		79FE0B73A3F9EE4A7E0CACBB97650798 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A9FC90934F7A68C930C0F99508A737 /* User.swift */; };
-		7A2028722035DA3B8440147EE06D9F10 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = B85C133791E08589EB1DCDD30204E0D1 /* OuterEnum.swift */; };
-		7A52D7C82439E940A3519511BB20A0C1 /* Take.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16B7B7BE1A379F72CFC27449A45EE5AE /* Take.swift */; };
-		7A5F2C5E7D876A8765A1063B8536758E /* DispatchQueueConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = F847CE4C82EA73A82952D85A608F86AB /* DispatchQueueConfiguration.swift */; };
-		7B3A68DD690D4DC76D988FFDABA3A53C /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 365E9435D48E21D0C47AFA0FC453B002 /* UserAPI.swift */; };
-		7B5FE28C7EA4122B0598738E54DBEBD8 /* SessionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7098927F58CDA88AF2F555BD54050500 /* SessionDelegate.swift */; };
-		7BFA5CE6E3698A79CE6269680DC4DAB3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
-		7D5356806AA02F1EFC5F3C311DB63E80 /* DisposeBag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77762B0005C750E84813994CE0075E3B /* DisposeBag.swift */; };
-		7D6CCE326AAA99B1A2DA9C84E72C2ED6 /* Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B5F05AEF12013DFCBEBE433EEBB3C8F /* Rx.swift */; };
-		7D8CC01E8C9EFFF9F4D65406CDE0AB66 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ECB713449813E363ABB94C83D77F3A9 /* Result.swift */; };
-		7E2750102B3F7BA21006DA3786D4FEDE /* ConcurrentDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B1C5A8AB9C095DD01A23DB6B7179E5C /* ConcurrentDispatchQueueScheduler.swift */; };
-		7E3483337526BAB8F018A0D3F4AB3301 /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D9270FF743FC000569F250E309CB89E /* APIs.swift */; };
-		8247F2627BAC72EAA0C957B8882F1E3A /* Reduce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A9E77B670AC48E19FB2C9FE2BD11E32 /* Reduce.swift */; };
-		826B19A12F104BCE96210377CECB1797 /* ObservableType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C30419C2A3E0EC1B15E0D3AF3D91FB15 /* ObservableType+Extensions.swift */; };
-		84AA76C9E940EF23C4579B9CE71BE070 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 19296A8C5E948345E5744A748B1CC720 /* RxSwift.framework */; };
-		84DC86DC08E5E56C379AF890D699F00D /* RxSwift-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E047D08FB3120A3AFA0DF05CCC1712A /* RxSwift-dummy.m */; };
-		851B77C98ACB863EB896E1E4F2BC1837 /* Throttle.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F0644CBB2BCA2DB969F16E2B5D92CE /* Throttle.swift */; };
-		8532C2AADED94C7F02886B1B9C7B290B /* TakeWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61148633F9614B9AD57C5470C729902C /* TakeWhile.swift */; };
-		8562F754DA6779830E215663770A8324 /* ShareReplay1.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7513ADBA4C19938F615442415D28732 /* ShareReplay1.swift */; };
-		860E77C38C6A9E6F9C6DD4457119C4CE /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = E70ED98C12C528D9F88F8CF7A7E3E518 /* FakeAPI.swift */; };
-		8762C28B6D2F2FA712859CE216EA75AC /* Reactive.swift in Sources */ = {isa = PBXBuildFile; fileRef = D984AFE3BDFDD95C397A0D0F80DFECA6 /* Reactive.swift */; };
-		8927C21953F14CBA4280C0D842EF7F97 /* AnyObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA58F20D8C1234D395CD1165DC3690F3 /* AnyObserver.swift */; };
-		895E052093A91F080FC5F7D96FAF9212 /* Catch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4313BF26CA6B25832E158F8FC403D849 /* Catch.swift */; };
-		897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */; };
-		89C85DE461A14206F7755EB3A32B8197 /* Variable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39A2B57F2DAE55FA57D315FDD6953365 /* Variable.swift */; };
-		8A58D0AAB7B9BB46909105648C10693B /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = A45D3DB105B4381656B330C1B2B6301E /* Zip.swift */; };
-		8AF09C038B23AC50B0FEAA59F71A9FD0 /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6887D641E8100CE8A13FFA165FC59B73 /* Observable.swift */; };
-		8DB2E2E6A3028665B918CE6156E6D14A /* Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = C860BEC2AFE3C3670391CECBA2707574 /* Empty.swift */; };
-		8E2EFD0C6CDAF463C86336664605F955 /* RxMutableBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59EA941CFCC415131D36B17780FA7F33 /* RxMutableBox.swift */; };
-		8F82AE7F51351B9E13D405006482FEE6 /* Fake_classname_tags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88877D161F2CFC94AEB9EC3A87DCE137 /* Fake_classname_tags123API.swift */; };
-		91BCA631F516CB40742B0D2B1A211246 /* Pods-SwaggerClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */; };
-		92BE2CB715953E9F5045AD0E2D958CC4 /* Do.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB3FCE54551234A4F3910C33EB48C016 /* Do.swift */; };
-		9394E57451C8F3C330109A51E1483CCB /* Disposables.swift in Sources */ = {isa = PBXBuildFile; fileRef = E841A5E38033B35ED3073E4BBB921518 /* Disposables.swift */; };
-		93D8A47EB2C424AAD343C7E5C3A5C93F /* StartWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = B77F93192159DCCC6CEF8FC5A0924F9A /* StartWith.swift */; };
-		98660A76B52376A3D70B3F521728176D /* HistoricalScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C071467FD72C9E762BDC54865F1A4193 /* HistoricalScheduler.swift */; };
-		9BB27EC494EC7A1DE605C2F9C651EAC8 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC04CE09EBAD4D6F48048F82504397F4 /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
-		9C5C95CBEBBF8ADB142C102234C396EC /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45DDB27E2A52C09D734190B2C3E83BF5 /* StoreAPI.swift */; };
-		9D10DFE3C68E6C8E744001CF49CAE642 /* DistinctUntilChanged.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75DAC3F84E978269F03F6516EE7E9FAE /* DistinctUntilChanged.swift */; };
-		9E0C80D55FB3B40455E6D85FC5543063 /* ObserverBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BE04EA000FD69A9AF7258C56417D785 /* ObserverBase.swift */; };
-		9ED2BB2981896E0A39EFA365503F58CE /* AFError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7728F2E75E01542A06BFA62D24420ADB /* AFError.swift */; };
-		A1240A21E7B537453B116F2BAD730FBB /* Timeout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CBCC23A46623376CB1616C1C121603D /* Timeout.swift */; };
-		A26C90236BB15DB7900521CC97C4F1D6 /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80C1B1AFFC108C1C4EC607179620DD8 /* Cat.swift */; };
-		A2A6F71B727312BD45CC7A4AAD7B0AB7 /* NetworkReachabilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4668C7356C845C883E13EAB41F34154 /* NetworkReachabilityManager.swift */; };
-		A37E6CFD18F2FBD9E7F921BE64516410 /* CombineLatest+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86B5A2A541FCAB86964565123DAF4719 /* CombineLatest+Collection.swift */; };
-		A43177FC0E6314931FEF78D804F7A5A0 /* BooleanDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B6D35FB8DCCEAAD8DC223CD5BC95E99 /* BooleanDisposable.swift */; };
-		A56413C6A12B1D2F50BF5461C2849DB9 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48144D6C24CA10B6A3584D425416F37A /* SpecialModelName.swift */; };
-		A738D49AC9C1C91E616EBB69E90C34FE /* SerialDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C367D19B8DD4C0F9954A24DD5A2A6AFB /* SerialDisposable.swift */; };
+		780DC70EC33DBE792680FF224C6B3189 /* LockOwnerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0697E081BC2A5EEB6F014A72AA1FA6FE /* LockOwnerType.swift */; };
+		7A484927B5885C32681B9C0F981164E2 /* Reduce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C26DF960562568F8AAA198AB9D0ADE9 /* Reduce.swift */; };
+		7B1D784EEEE456BA1599F4EF2B0DEEC9 /* SynchronizedUnsubscribeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE668A71E275DF34C1ACD8E01FAA0F47 /* SynchronizedUnsubscribeType.swift */; };
+		7B5FE28C7EA4122B0598738E54DBEBD8 /* SessionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCFE6D738B9A72C55748A3EE0D669FFC /* SessionDelegate.swift */; };
+		7CDFFB7F904FAA05F2549B97F83C208B /* SchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBCF44963E46D2655B43F77741342C5D /* SchedulerType.swift */; };
+		7D3FE25E621C0B5DF33BE49EC44285B6 /* AnyObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = D21B67854DF0875502A22FE967BB22A4 /* AnyObserver.swift */; };
+		7D8CC01E8C9EFFF9F4D65406CDE0AB66 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68968F00A741CAAE57D479C8747F4248 /* Result.swift */; };
+		7E58FC0F8CEA885D0978B978C1AFDA39 /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DD46253330346E885D5966DBB25FE8B /* ArrayOfArrayOfNumberOnly.swift */; };
+		7E8943764477D589A4D425FEA758249A /* WithLatestFrom.swift in Sources */ = {isa = PBXBuildFile; fileRef = A47F43BE5B9D458EBB11F65DF3012B31 /* WithLatestFrom.swift */; };
+		7F6C06307179982AFA169539C59878A6 /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33C30173D8DC512E4B32B8D4DB6D422 /* Observable.swift */; };
+		80A14AE8567A89125CDA2D1E9E3C9EA5 /* Bag+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38DB1B1AED2692F4747813CAC4965A06 /* Bag+Rx.swift */; };
+		80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */; };
+		814CCE747E50503E645AB6A4BEA9C3B9 /* CombineLatest+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05B19EE7BB7CFC2E18ADF610F26BD9F7 /* CombineLatest+arity.swift */; };
+		81E833CC467CE9A868C4992EED22E90B /* SubscribeOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33F225BF47E139D7C104629809615ED8 /* SubscribeOn.swift */; };
+		82DCAB1B03B1FF4922EEAA7284CD8891 /* Optional.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45F5E5F79EBFF05F9B7B392CEBEBE03B /* Optional.swift */; };
+		832A38EA2BEF84AED0C1232AF683E14E /* ObserveOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80B940734051003693AB8C9396B9A95 /* ObserveOn.swift */; };
+		83A278FC1771188BF654862D87A79497 /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A47B1C8E00C3410BA35859590AFBB3 /* Debug.swift */; };
+		83ADD423F64E3EA0A04827FEDB4551F5 /* Generate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22AF3598D1B586D34A9092DD1A51FA03 /* Generate.swift */; };
+		8409E8357E6E556D947C0883002F14DA /* Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC25882FB329122EF59BC09D5C5B42B9 /* Window.swift */; };
+		85CFCEF4B3B5D9B5782E002EBC964C07 /* TailRecursiveSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2A996D8F9E9BFA159AF4333CEAB7E2 /* TailRecursiveSink.swift */; };
+		87561C5525FF161AC0D9BE8E4878B012 /* SingleAsync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49E417E77B6316B84A6E574BA392BCDF /* SingleAsync.swift */; };
+		881DF840D562167EA8BECCD4F3DE44A5 /* Bag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE85DA2956A05DBEC69727C4E8FD99 /* Bag.swift */; };
+		883AF2FA5F21ECEFA5AA052EA2AA52D1 /* ShareReplayScope.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7413D0DEA3FCB4E2B6B61AA738939609 /* ShareReplayScope.swift */; };
+		8A7DA1410CC7793A911EFF7961D871A7 /* HistoricalSchedulerTimeConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4077DE55AEFACC6E0237454995C93E57 /* HistoricalSchedulerTimeConverter.swift */; };
+		8C391D10E5780A3AD69F0B48D81873C2 /* BooleanDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85F748990FBD91519A91098D6BA6366 /* BooleanDisposable.swift */; };
+		8D139181B7F153687292979FA042AD3B /* ElementAt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FEC3DCD86C07B65B23ABB64AD5CDA68 /* ElementAt.swift */; };
+		8EE6CAA016BB77D98A94C6A8A6035B5C /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = C049305B9A26A2FD2A88D0394DD37678 /* HasOnlyReadOnly.swift */; };
+		91BCA631F516CB40742B0D2B1A211246 /* Pods-SwaggerClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */; };
+		92202E005A3283B86D2FD8C13A7B6984 /* ObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5F32B59881971A1405610DC089DD57 /* ObservableType.swift */; };
+		92C33C8F9615FAC4C1FCE4F44F7AC373 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 998EC6F6A2EE477EE6F698F57FFC3750 /* Deprecated.swift */; };
+		94A76A58C03383E6AEF5954B048EA943 /* PublishSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 538A32CCEDC18E4888E6C1A766DF1F02 /* PublishSubject.swift */; };
+		94EBC7DB7F9E78474473121B58017231 /* ScheduledItemType.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB599C6476D3B5ADBA90BD6EAFB4C115 /* ScheduledItemType.swift */; };
+		95319323AA47177F07DC434862E8786B /* Cancelable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695B2C5AEB6FE1A766CC26F3BE48BC1C /* Cancelable.swift */; };
+		95F38402EDA23648E2E9643BF23B0A99 /* Just.swift in Sources */ = {isa = PBXBuildFile; fileRef = E172658949F5AACBFEFB9F2A7A45121B /* Just.swift */; };
+		98ABF68A5893A05770B62C70FF2D9B39 /* InvocableScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AA6FF029E25846278724FECC2B0CD33 /* InvocableScheduledItem.swift */; };
+		9CBA62F0AFF0A5826B59553CFA6547E9 /* AddRef.swift in Sources */ = {isa = PBXBuildFile; fileRef = B232F9C4224779F256F29E0CF4EF3322 /* AddRef.swift */; };
+		9DAD079E8BFA8BB8C6270BD59F12B75A /* ConcurrentDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 631DEA4DC6C852A962E761306DC8E5AF /* ConcurrentDispatchQueueScheduler.swift */; };
+		9ED2BB2981896E0A39EFA365503F58CE /* AFError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D48DC023BF473789CEF045FB00121FA /* AFError.swift */; };
+		9FB30BA094639E9D209E7E46ECB04873 /* Repeat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EA12B9820292EF94959B987736473C9 /* Repeat.swift */; };
+		A1156AAA078DA49A2F84A73498ACFFA8 /* SwitchIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A04930FB5D53B406D0E4B419625FF1B /* SwitchIfEmpty.swift */; };
+		A1888B4C68923F294CC00FA69C2D3FA0 /* Dematerialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 424053B5F8188A5A9D86378ECF17AF7F /* Dematerialize.swift */; };
+		A2A6F71B727312BD45CC7A4AAD7B0AB7 /* NetworkReachabilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBD2925843939637E459525857FA3FA8 /* NetworkReachabilityManager.swift */; };
+		A461BFEA1D55600A0C20FEE62B2AC808 /* Create.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BED44127AD26D0B00F9FD2ECB9CEDA4 /* Create.swift */; };
+		A4D75955E70AE28814436BFD3A667877 /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93D9DA1CB883DC1FCCF639FECF14930D /* FakeClassnameTags123API.swift */; };
+		A4F3B4D94EEFE3A4C297F7D2254720A7 /* StartWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15CBB9F5E4043A504EE8F7320CDF3F41 /* StartWith.swift */; };
+		A66D6FDA68BE83B5082CE656909F78D6 /* PriorityQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0BC99D27861517EF33E4AFD427CE3 /* PriorityQueue.swift */; };
+		A75F3F8315F50D4FAAD79784972AEE3E /* Disposables.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC5C19FAC757DF61EE5B83BA514D8F78 /* Disposables.swift */; };
 		A7C5CF056E08D8CF885F5A923F8A7655 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
-		A81EEE957FDA65C14FE55CBF2BBDC937 /* LockOwnerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72730856B78AF39AB4D248DDA7771A5B /* LockOwnerType.swift */; };
-		A82A9149306EF4D972CCDEBE265B37F2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
-		A95E05FA3760CAA9BD09D1DA2E63C1C7 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 213681FAAEF7EA349FE2EB13483D4CE0 /* AnimalFarm.swift */; };
-		A9D66665CAD0759B39F1F7B8BDDB40AF /* BinaryDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 510BB12F1D8076F5BA1888E67E121E79 /* BinaryDisposable.swift */; };
-		A9EEEA7477981DEEBC72432DE9990A4B /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F9CD1F74BF087D277406BF9164B9D058 /* Alamofire-dummy.m */; };
-		AC5EA05CC3AB722B8FAFA500AE9AE14D /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2988432DEBFCFD8A5F5F0E2A220A8E /* List.swift */; };
-		AE183CF99826B88B9409460FFF6D7DA9 /* Producer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CCE606004614C138E5498F58AA0D8DF /* Producer.swift */; };
-		AE1EF48399533730D0066E04B22CA2D6 /* SessionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 321FE523C25A0EAF6FF886D6FDE6D24D /* SessionManager.swift */; };
-		AE299B219B7029799F4E859488B2A65C /* Skip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7011CBC583696921D4186C6121A7F67F /* Skip.swift */; };
-		B0FF886BA53B7E0856F8BE9B30B58D71 /* Switch.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7677FD01A3CD0014041B75BD92F6D97 /* Switch.swift */; };
-		B225D1FD8A326EB19114D8F295AF2431 /* AsyncLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4F47C5A2E55E47E45F95C0672F0820 /* AsyncLock.swift */; };
-		B49A7BC55758A8FD4C1B6C0D1E6BD5E4 /* String+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = F104D45199031F05FCEEFA8E947F210E /* String+Rx.swift */; };
-		B5294D873A7C90C77A5FC6BA24C80BC4 /* BehaviorSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FE676DC3C01D76D82723E22A695A308 /* BehaviorSubject.swift */; };
-		B55EB691D0BA0B3A7B30B397735B8C45 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3FD0F9796D0E174012697BE40B68BF /* Configuration.swift */; };
-		B562A927F1447725C696075D18A000E8 /* RefCountDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31DC6B167D2D13AFD8EAAF1E63021B52 /* RefCountDisposable.swift */; };
-		B65FCF589DA398C3EFE0128064E510EC /* MultipartFormData.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA42FD2B1F921714FC4FEABAFB8D190A /* MultipartFormData.swift */; };
-		B7E707ED3304DC2880A70A648405C3F4 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6E0B4B99BC9F44A670C49699492A9FE /* Order.swift */; };
-		B8B06AE345D2EDFAADBA24DE5B9F9E8F /* OuterString.swift in Sources */ = {isa = PBXBuildFile; fileRef = A48E3D95D5FE201A1BC906340E5BA25C /* OuterString.swift */; };
-		B96B42A1676C1B43E7E9D7AC8BE2B6D7 /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1F0B7854DD41D311F76522F61203F7F /* Sequence.swift */; };
-		BBEFE2F9CEB73DC7BD97FFA66A0D9D4F /* Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0528EC401C03A7544A658C38016A893 /* Validation.swift */; };
-		BE5C67A07E289FE1F9BE27335B159997 /* ParameterEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F69F88B1008A9EE1DDF85CBC79677A8 /* ParameterEncoding.swift */; };
-		BEA978738EF7DCA94F7B3C190FD11E6B /* GroupBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F067CE8E1D793F3477FF78E26651CDB /* GroupBy.swift */; };
-		BF2C7E37667C7124C9B28A2DCE81870B /* Multicast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59E44229281B70ACA538454D8DB49FC0 /* Multicast.swift */; };
-		C0784BB732755A6A13BCFFE7CD7662B9 /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = DACA1956515F0B0CED7487724276C51B /* Lock.swift */; };
-		C18B62BC2701E2D05B1352515F91A5C1 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 911C6A3C96205B93025F13FBCA992687 /* Tag.swift */; };
-		C532982400133E7580724ADF30551965 /* Concat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 287F0ED0B2D6A3F3220B6F4E92A7F350 /* Concat.swift */; };
-		C58B42EA7B120CFDA0D45ED69CC347FD /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8133C1AF527695DF9F34BEBFBAD4CB /* ArrayOfArrayOfNumberOnly.swift */; };
-		C7D96CE5C9E8C426F0A4E23201D71897 /* ConcurrentMainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B782CE63F4EDE0F2FE5908E009D66D3 /* ConcurrentMainScheduler.swift */; };
-		C7EBEDBD417428925528DC9BE13C3CD5 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD5077A09F9E9D3CA4F4FA368889BB02 /* ArrayTest.swift */; };
-		C820F2E6B25335D6288388FA5FD21F39 /* WithLatestFrom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A07BFAFDAB02F19561FDA4115668F66 /* WithLatestFrom.swift */; };
-		C88D778A956F43A56BA03D6D8CBFDCE5 /* OuterBoolean.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100C86AE9F32218EF6A633C7B7895CCC /* OuterBoolean.swift */; };
-		C93468AFEE47CED3CF2C9EE43647369E /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C78926FAD7615329921AC6B3E036268E /* APIHelper.swift */; };
-		CAFED669A4C8B0AE6DA35F45CE1D71BC /* Just.swift in Sources */ = {isa = PBXBuildFile; fileRef = C541B03ABB2F0F5E10F027D5E3C9DF4B /* Just.swift */; };
-		CB6D60925223897FFA2662667DF83E8A /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF7CAA870676F2440AC2CCFC5A522F6C /* Response.swift */; };
-		CB9B0ED17EF239AEBD38EADE3ECDD377 /* ImmediateSchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 883F8BF59AD1E1C16492B6CA9A82FB3D /* ImmediateSchedulerType.swift */; };
-		CBB4CFA6177305321ACCB113E8E94226 /* Dematerialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33E7362EED7450FC886B01AB15E22681 /* Dematerialize.swift */; };
-		CC8D6B2CC3103AED90E9C82EBEA811B3 /* Buffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 596A0129DA8C10F8A3BEECED9EE16F68 /* Buffer.swift */; };
-		CE029DCA960041A2AC042F9C03FFDCB9 /* SkipUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C897A93D54D11502C0795F3D0F8510F /* SkipUntil.swift */; };
-		CEE7C773476EC0FD247E202637C84861 /* SchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B258A9C347C516AA8D8A3FB2CD665D6D /* SchedulerType.swift */; };
-		D18EB5C2A679A80B7AE777522A469B82 /* RxSwift-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 36918AB1CF9222600ABF5A21CBEDEAAC /* RxSwift-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D237954312B88EAF4DDB292F498C65E7 /* DefaultIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14E29B89A0BDB135B2088F4F20D14F46 /* DefaultIfEmpty.swift */; };
-		D285D4EB606DA906E58F886325157E7A /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 016E5F3C3DA72BE3740A226E72B26933 /* NumberOnly.swift */; };
-		D2ECEB1A744E6AB4EB03988D8FB6E029 /* ConnectableObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AC613DA00AD0B2ACF145E94AED80E86 /* ConnectableObservable.swift */; };
-		D9E153A5494E897ACF92A0D54873E3CA /* ElementAt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0668A90FD8DFEB8D178EE6721979B788 /* ElementAt.swift */; };
-		DB1674B5221497F0781506BC3D3DB14D /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D2F69F61823A75B9D3A37C6EA502AB9 /* AdditionalPropertiesClass.swift */; };
-		DDCECA86BA5EA0402D24F995BA009730 /* CombineLatest.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA3E73A8C322E8F93F432A4821A988DD /* CombineLatest.swift */; };
-		DE82657C3F2C8448F284C22F24ED66D5 /* SkipWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E3BEFA00C2C7854A37F845BF40B59F4 /* SkipWhile.swift */; };
-		DECDCFF8F77B285B8E565E1F3D759D86 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE38C38CB1C97603C0C7266A3B45F2AC /* AlamofireImplementations.swift */; };
-		DFDFDB3E1FC7EA20EDD5BD50F3FD8982 /* RetryWhen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62F9DE8CE4FBC650CD1C45E4D55A76AB /* RetryWhen.swift */; };
-		E103DB3EB5359F4FE898B24CB6C1FCA6 /* VirtualTimeConverterType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 772DB63372E4253C20C516EBF68DD251 /* VirtualTimeConverterType.swift */; };
-		E67B1B718006058F330F898B17D8E790 /* PrimitiveSequence+Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269E63D0B9C1F5552DF3ABA3F5BF88EB /* PrimitiveSequence+Zip+arity.swift */; };
-		E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
-		E9DBC7D8412FCFEB52E4FBC1BAF0A3BB /* AsMaybe.swift in Sources */ = {isa = PBXBuildFile; fileRef = A222C21465FACA23A74CB83AA9A51FF9 /* AsMaybe.swift */; };
-		EBC209AC9E49B6748B6C92985F4288A6 /* CombineLatest+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AF6AF4017DB31B86B803FEA577F7A22 /* CombineLatest+arity.swift */; };
-		EE4A6BADF6A7164008D832EDD87FEED6 /* Create.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A96069F19C031BE285BF982214ABCB4 /* Create.swift */; };
-		EED2BF29C9A9C8B0391B6111A93AAD29 /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93D2B184ED95D52B41994F4AA9D93A6C /* ObservableConvertibleType.swift */; };
-		EF0932F6037779CBEFA7914E034EA345 /* InfiniteSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5017E276F3AE00F1F45A62F9A35F51C0 /* InfiniteSequence.swift */; };
-		EFD264FC408EBF3BA2528E70B08DDD94 /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64082BE2455C7B840B138508D24C0B0C /* Notifications.swift */; };
-		F01964782FE633EB69390B3F433D7C64 /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF46ACE1C78929AB44803AE915B394F /* Debug.swift */; };
-		F03314F98A25C519B11F849BC7A325D0 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03F1F9E6E7C4A8537A517AD7A19AF471 /* EnumClass.swift */; };
-		F35ACF9966EDC4459F3FEF1913904AF5 /* SingleAsync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 805F15552659D5E233243B40C0C6F028 /* SingleAsync.swift */; };
-		F49B8D0ACCA99304CA948C03F9849C4C /* SynchronizedOnType.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9178D3690ADCB4F8C9057F81C073A45 /* SynchronizedOnType.swift */; };
-		F6BECD98B97CBFEBE2C96F0E9E72A6C0 /* ResponseSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FCD92EC4EAB245624BBB2DDECF9B2C /* ResponseSerialization.swift */; };
-		F70C9E990861723D8B1785BD76D76353 /* SwitchIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4EEA393253D8586EB38190FC649A3FA /* SwitchIfEmpty.swift */; };
-		F79B8F1D869B9F255166AACBE92AC569 /* Bag.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5FE55155242FEDEC1B330C78429337F /* Bag.swift */; };
-		F8728CCDE6AD8408BFD6F9C612A7B116 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 821702C06296B57D769A8DCDD13DE971 /* Errors.swift */; };
-		F8B3D3092ED0417E8CDF32033F6122F5 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6489C0664BA4C768FBB891CF9DF2CFD1 /* Alamofire.swift */; };
-		FA7E218FB106CAAA4F223D5EAD85B651 /* TailRecursiveSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11316F7A1A5EB2E5B756703C0EE77CF6 /* TailRecursiveSink.swift */; };
-		FD6E37C6BDBAAED7F2B7076C8DD48010 /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26CDF11A8572688E0011727ADD962B74 /* Timer.swift */; };
-		FE117050A9DD8D8B7B10768B97070C9F /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = AACF3F3D813203894318A8EB451E126A /* Dog.swift */; };
-		FE9C72CF6913B5204B794AFA0BC44DB1 /* HistoricalSchedulerTimeConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 870EAFD138EAD59EAC7EE2CE19DE25B4 /* HistoricalSchedulerTimeConverter.swift */; };
-		FEDEC41FE3E34FB114D871C645951310 /* SubscribeOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = B80609FF38FDE35E5FE2D38886D2361F /* SubscribeOn.swift */; };
-		FEF6B9251547131BEC87C78EC07E5A04 /* Materialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1D34B07FCD98BCADAA8A3B68F1ACF1E /* Materialize.swift */; };
+		A88687F0D5C7B8F17FE6E8C560FF27C2 /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08583885463D1EDB2F8023584348659C /* Dog.swift */; };
+		A8907D8BB13490C6BDDEB718A825ED3B /* CurrentThreadScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7E51BBDAB04A3D67CADD9C9DF54CC05 /* CurrentThreadScheduler.swift */; };
+		A8F07D61BA5B044BCF2528FE814802F8 /* SynchronizedOnType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E80F14B05E38C811C7DB2355F884967 /* SynchronizedOnType.swift */; };
+		A9EEEA7477981DEEBC72432DE9990A4B /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BB023BDD73FF5AAC5686C18261C2E59 /* Alamofire-dummy.m */; };
+		AA00DE5B6E4CEB7619A109AEE765E899 /* Zip+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7388ECAD6E93F2CDDA035F993F552D87 /* Zip+Collection.swift */; };
+		AA5924E7A2767173A488CD67448A344F /* PrimitiveSequence+Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F255791BA4F8E78F887B201CEB9A70 /* PrimitiveSequence+Zip+arity.swift */; };
+		AAA4BB328D5B9974CAE7079EADCB55F3 /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD481458DC0F63AEFBD495121305D6D8 /* AdditionalPropertiesClass.swift */; };
+		AAAFD62D4E1F93C4EC939BDE9AE36B40 /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BAEE07194E1BFA72B1110849C7B348A /* Return.swift */; };
+		AAC833250183E5D26197A6A7FBDDBE31 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E3D0C745CE3A020C8BC5C96CAFB616F /* PetstoreClient-dummy.m */; };
+		AAD5D545A27D3235B11AB5F312D4F9CC /* AsMaybe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 248FA48ED4232A749B19E8326B107390 /* AsMaybe.swift */; };
+		AC84DFF4BBABCF4F8DA619E8E0A71770 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2AAC6F82FCBCF2CE32522143CBF59D6 /* List.swift */; };
+		AD3D283352C4C58D37373ACEAAD21CCA /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C103637D74EC198CF949454436D3616 /* Category.swift */; };
+		AD72FC77B132100856099D6BE08BA946 /* VirtualTimeConverterType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45CF1E9C72669473CD2D3E71DBD63E9 /* VirtualTimeConverterType.swift */; };
+		AE1EF48399533730D0066E04B22CA2D6 /* SessionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D98F114B4846AE45CE5B90B57DBA35 /* SessionManager.swift */; };
+		AE91B9C7676BED08DD29D919667641EF /* SynchronizedSubscribeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAF3CD60CC66BB642D72FD7DD9FA47EA /* SynchronizedSubscribeType.swift */; };
+		AF8F5FE11B128B96067030DD9FC7B9C3 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64104A4C68341D80F2DB4CF5DE7779F /* Models.swift */; };
+		B1D90A96F361927E2C864B8B2E0C6998 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = D931C41179C1EA52307316C7F51D1245 /* ArrayOfNumberOnly.swift */; };
+		B2167A447DC5D9CC8B3194F650D3F766 /* RxSwift-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = EFA925A9B9BFE80C3EDB17F2F0BF4A11 /* RxSwift-dummy.m */; };
+		B3900C161CAD5762104495FFD825D417 /* Deferred.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7416EC69ECF5772C560109A5ED8D588E /* Deferred.swift */; };
+		B570FDBFFB6C8319B1822F6D1CA57618 /* RefCountDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC59FD558680F110C9CF1E09C4B30234 /* RefCountDisposable.swift */; };
+		B65FCF589DA398C3EFE0128064E510EC /* MultipartFormData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C7D11F28E762B650DCE249F9231AFF6 /* MultipartFormData.swift */; };
+		B71E8D1BA38979387FB07B2DE375CC78 /* VirtualTimeScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CCDEE642D802F7DE9D54E99B029D94 /* VirtualTimeScheduler.swift */; };
+		B7DCE8A53F3C2E56E4CC1EBFC51CFBBB /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E982F66B9CB4E2C2083F9B02EF41011 /* APIHelper.swift */; };
+		B80E85AD2BA24EF11F641050D4306011 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0E62A4CE2C6F59AE92D9D02B41649D5 /* ApiResponse.swift */; };
+		B8216658C16040E40C3121638EB83BB7 /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B8FD648A2922AEAC6DD6AB816E2592B /* Sequence.swift */; };
+		BA90CC03E356EC0CB00EE000FE8ED8FF /* Materialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2D5B54A93C8D77EF18876416B0DB27 /* Materialize.swift */; };
+		BB2ADF1D564AC603088379085CBB5E00 /* Variable.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6697B7A5CC377C3AC35303B0D0487D /* Variable.swift */; };
+		BBEFE2F9CEB73DC7BD97FFA66A0D9D4F /* Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852FA37D9D05B1C1C334C97888ED40D3 /* Validation.swift */; };
+		BC6FE7B95D4381C14034EA0158A27943 /* MainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7CDE3DF48D0BD49F53158F547F2F814 /* MainScheduler.swift */; };
+		BD13F16DB254433B71AE9E50D25BAFB3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
+		BE5C67A07E289FE1F9BE27335B159997 /* ParameterEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93893E6B21291795613092CE89A054B9 /* ParameterEncoding.swift */; };
+		BE84A0438BB1CAC7F8B734D0071F6B5B /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9744CAC1B97675B5C8BDFE1483E34D21 /* Timer.swift */; };
+		C02152ADEC441FFA411DE0BFB5574C6E /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2274608F6E89920A7FBADABEF6A20A1F /* Animal.swift */; };
+		C04E4412EE56D42C6E6E3A4A35E74916 /* Producer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D651D943838D79481E5485342F6E37DA /* Producer.swift */; };
+		C06FFF2DCFC2E38F7183A390DB548039 /* SerialDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85C44B8250F6BDF2F4746605665C079 /* SerialDisposable.swift */; };
+		C0E8935F39D43182341F9237E14FEB48 /* GroupBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99662E82007C3712D4A6C84D9442D945 /* GroupBy.swift */; };
+		C30834A9E888DC5752BB464AA4C6B583 /* Platform.Darwin.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10682A3553F0BC32058B81F6157D67B /* Platform.Darwin.swift */; };
+		C5C72F359C98A639D16BEBC44D45AD58 /* Never.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05EB6180D204793B411E78063D728D37 /* Never.swift */; };
+		C614A64F12B85A30B4E179111161A4F2 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB9FB7676C53BD9BE06337BB539478B1 /* Tag.swift */; };
+		C6B6E0537CACAD67C6C53CB52D3AF430 /* ScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BB5ADF1D60C58E7C212E5AC4A17E03D /* ScheduledItem.swift */; };
+		C88A07F5CBEECD3C3287EF230542E9BA /* DistinctUntilChanged.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAFE2F8BED3AD876496367E70110B27 /* DistinctUntilChanged.swift */; };
+		C9FEFA9F181D03BC5A33843BA80BA501 /* RecursiveScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AB52055ABAC52DC0BB0AB8FBF07F23 /* RecursiveScheduler.swift */; };
+		CB6D60925223897FFA2662667DF83E8A /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0348E245661C3C2ECB814A85A081A5 /* Response.swift */; };
+		CC3D6772A375C8384DEAF649FB2E799B /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ED78F1E81F4EF6FE5B0E77CA5BFB40C /* Cat.swift */; };
+		CD72FF21E244B422BAA707396ADD5F84 /* SkipWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D6457286A14A38BBD82D8C6099798B /* SkipWhile.swift */; };
+		CD7F8A63D0F72B0A4F515C63433BC805 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC890DE67452A9F63BD12B30135E3BD6 /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		CFE18A460774777238539B6816CA0865 /* HistoricalScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00130C4D6737A3B01F28CBD7BA4EEDD3 /* HistoricalScheduler.swift */; };
+		D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
+		D2D8098C55A83C6090F0FED29B4CAC6A /* TakeUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 229212B9293B7746DAE74AF7ED2EF8BD /* TakeUntil.swift */; };
+		D36500BA67AB18E64F4743796274C7F6 /* Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 651788C4235096156C06C2938F64FDC0 /* Rx.swift */; };
+		D49D0B2348D2A35E9A39124C979DFDE0 /* DispatchQueue+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95B56C2C53C700F09ACF424C9C68CFC /* DispatchQueue+Extensions.swift */; };
+		D5F12C5EFF4CA158297A1BDE3788B931 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0644BE2FFAA5C8FE7F15E3BF2557AFC /* Order.swift */; };
+		D95808D482B2CCE0A57E617BBE1C24CF /* CompositeDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1C89F468280F8359E898DC2281CAC89 /* CompositeDisposable.swift */; };
+		DD7EA78A0E20276FBEA92A47B29D675B /* Switch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93EC0AF4A1BE4FA92D40CE454B203C73 /* Switch.swift */; };
+		DDFBECD67E5A6A9645A66D7919513F64 /* Reactive.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD1FBFAF29C8BB9FEF76A9F3F5B0061 /* Reactive.swift */; };
+		DE983659BDB585F117E8D5A6035691EC /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57299EE6209AFEBA56C717433863E136 /* Model200Response.swift */; };
+		DFE3AC8FE52397BB76BEF114A0825E26 /* Disposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 516D52E4A92E72BFCD8998DBA0BE9B03 /* Disposable.swift */; };
+		E0C3813806F9C243364888B92E3F6A58 /* TakeLast.swift in Sources */ = {isa = PBXBuildFile; fileRef = E65642813E0667C81374DA8D6C4D7C96 /* TakeLast.swift */; };
+		E20117C8508C1E21BF6F96D5A67430A5 /* AnonymousDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74201A6B694096DAEAC939BF5A23C46D /* AnonymousDisposable.swift */; };
+		E25F484C36B0BD9B3AF5F671766A362E /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BFA1723A93AA1DB0952B2F750421B32 /* UserAPI.swift */; };
+		E2FCA242C2D21DEF5CF64A4948B303E5 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2A82E1B6CEC50F002C59C255C26B381 /* Capitalization.swift */; };
+		E3983118B0AEF9B702F6513C8C4630B5 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DC50E863EDEB9C0996B2B6DAA0B99AD /* Errors.swift */; };
+		E4B4E729EF665FA241A3CAAB77622D12 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00FC3821A8BFCD6F05D00696BF175619 /* MapTest.swift */; };
+		E615C98E97CFD31CDC08C103E8C9AFCC /* Platform.Linux.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514D99EB5CB7550B570526741912C8C6 /* Platform.Linux.swift */; };
+		E646989B1C390802DE99BC11A99A6195 /* Buffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A915BB8C0650173C2558895A4B43A73B /* Buffer.swift */; };
+		E7CFD93574F6D9FFC1E20C79933BF9B7 /* DefaultIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BE266C827C7427D0C31408FE919905 /* DefaultIfEmpty.swift */; };
+		E8E275B7A3686605EDE9844688758CF2 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA9C5856BEAE5090A7D1EB450A10C04F /* Alamofire.framework */; };
+		E8FB135391A3DB1932525FA4C7B868D9 /* Throttle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92278B77A7357596D58AB0C075D0948C /* Throttle.swift */; };
+		E90B654B54B4E686AABC7E1346FC99DA /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B79E9399FA4CC143E00DD4B8CEA0D33 /* Zip.swift */; };
+		EAE0C66CFAA8E970D961796CA9E3B6A3 /* AnonymousObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28B85FF3973524921D29C28D32B60939 /* AnonymousObserver.swift */; };
+		EB02B86DAE80B2F604DFF745291CD97E /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD8EF004C7534401577C1694D823F3 /* FakeAPI.swift */; };
+		EEE78DB914769229A6F7D18F1AFDD1E1 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BCC6F35A8BC2A442A13DE66D59CAC87 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EF3864ECC6F81AA9290D334DD8958829 /* Scan.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6DAD9E105266B1758339618389747E4 /* Scan.swift */; };
+		EFAE4DCFFA55CB5C8FAF4092224E67CF /* Timeout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69138EC14ACB61D4A4FE4CEF74B2D278 /* Timeout.swift */; };
+		EFD264FC408EBF3BA2528E70B08DDD94 /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F6B1DF26896BB3C53B013DCB6CAC2A2 /* Notifications.swift */; };
+		F041E9FD775EEFE794AB22C632050442 /* AnotherFakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45ED3A5E50AA60588D6ADA19ACBF0C66 /* AnotherFakeAPI.swift */; };
+		F0724B08BA9C030769B8B071407FA875 /* RetryWhen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647B15E397B92CD0E6B089800A79E32D /* RetryWhen.swift */; };
+		F0773FB51871142573829B798A320088 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 19296A8C5E948345E5744A748B1CC720 /* RxSwift.framework */; };
+		F374C9C0BBD2E98835074F1117D19025 /* Completable+AndThen.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC1DDBA7954D27380AA9FE905490F925 /* Completable+AndThen.swift */; };
+		F4EDA8CB7455BCABFFD6992BE4D7E53A /* DispatchQueueConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEA375D4493914B5629827903F168466 /* DispatchQueueConfiguration.swift */; };
+		F5267C956BA9631B2CBDB207340F3C31 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B11E91D22910944308DE39CB8CBF3AE /* OuterEnum.swift */; };
+		F5A2918BDB2BA50E47C84F9CA95ABC89 /* ToArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = A21868904DAD64FC72F911E44FE2429E /* ToArray.swift */; };
+		F5D7352A8D14A89B873F35F23953495F /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5921D679A4009B3F216FEF671EB69158 /* NumberOnly.swift */; };
+		F6BECD98B97CBFEBE2C96F0E9E72A6C0 /* ResponseSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A677D3D79730410F53DE1DB6D509BF6 /* ResponseSerialization.swift */; };
+		F8B3D3092ED0417E8CDF32033F6122F5 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777A63E817CA5F873A73B02928A334CE /* Alamofire.swift */; };
+		FADAE4698562DB2F08EEE38B2838D7C3 /* RxMutableBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7B793869715E1AEF65DF4D148BD88E0 /* RxMutableBox.swift */; };
+		FC2BA04F51DF605708177391FC5CBEB1 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2CEC365CFACB91EC9E750D659D5ED10 /* Client.swift */; };
+		FC5F971819DF37E080DD24B4659D292D /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE05BA43EDFECD3CB825712216F42CE9 /* APIs.swift */; };
+		FCFB16CA31EE1C1E0FA859C0779D4BE6 /* RxSwift-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = C87B58E988280B4B9A04835B9570BAAB /* RxSwift-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FF735B76D45E1208C767A7C01B9FEB6B /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72AE8E25B88FDA8DCA0CE1D1C785AE2D /* Error.swift */; };
+		FF8E2A66A632AE79D440E2492242AD5A /* ScheduledDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48D0E94099FF7A758F7C5B102623B302 /* ScheduledDisposable.swift */; };
+		FFCEFEACA09A0AB1E772939BEE1251D0 /* OperationQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 024D11AC8314E034F9EE51129F3D2460 /* OperationQueueScheduler.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		00C0A2B6414C2055A4C6AAB9D0425884 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = E4538CBB68117C90F63369F02EAEEE96;
+			remoteInfo = RxSwift;
+		};
 		0B2AA791B256C6F1530511EEF7AB4A24 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
@@ -244,21 +248,21 @@
 			remoteGlobalIDString = 88E9EC28B8B46C3631E6B242B50F4442;
 			remoteInfo = Alamofire;
 		};
-		1B7FB01D467CF11D5941EEAF91C410DF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 66B5B8B6B5FC2686D07D242FFA858CEA;
-			remoteInfo = RxSwift;
-		};
 		2B4A36E763D78D2BA39A638AF167D81A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = EF06448C65A1D8090D2CD44AAE4AD621;
+			remoteGlobalIDString = 9D0BAE1F914D3BCB466ABD23C347B5CF;
 			remoteInfo = PetstoreClient;
 		};
-		5C3F762558DC2D7B716E03DF2DDBDF45 /* PBXContainerItemProxy */ = {
+		39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 136F0A318F13DF38351AC0F2E6934563;
+			remoteInfo = "Pods-SwaggerClient";
+		};
+		75C5BB87F29EE0C4D5C19FF05D2AEF02 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
@@ -269,287 +273,275 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 66B5B8B6B5FC2686D07D242FFA858CEA;
+			remoteGlobalIDString = E4538CBB68117C90F63369F02EAEEE96;
 			remoteInfo = RxSwift;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		00ACB4396DD1B4E4539E4E81C1D7A14E /* Pods-SwaggerClientTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-SwaggerClientTests.modulemap"; sourceTree = "<group>"; };
-		016E5F3C3DA72BE3740A226E72B26933 /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
-		02F28E719AA874BE9213D6CF8CE7E36B /* Pods-SwaggerClientTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClientTests-acknowledgements.plist"; sourceTree = "<group>"; };
-		03F1F9E6E7C4A8537A517AD7A19AF471 /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		00130C4D6737A3B01F28CBD7BA4EEDD3 /* HistoricalScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HistoricalScheduler.swift; path = RxSwift/Schedulers/HistoricalScheduler.swift; sourceTree = "<group>"; };
+		00FC3821A8BFCD6F05D00696BF175619 /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
+		0132F153B6C6244F3078E6A5F7D98CA9 /* SingleAssignmentDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SingleAssignmentDisposable.swift; path = RxSwift/Disposables/SingleAssignmentDisposable.swift; sourceTree = "<group>"; };
+		024D11AC8314E034F9EE51129F3D2460 /* OperationQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = OperationQueueScheduler.swift; path = RxSwift/Schedulers/OperationQueueScheduler.swift; sourceTree = "<group>"; };
+		0408C4724C6E604F4F4EEE2856302250 /* Debounce.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Debounce.swift; path = RxSwift/Observables/Debounce.swift; sourceTree = "<group>"; };
 		057FC3E5DE19EA8F4DD600557D771032 /* Pods_SwaggerClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClient.framework; path = "Pods-SwaggerClient.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
-		0668A90FD8DFEB8D178EE6721979B788 /* ElementAt.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ElementAt.swift; path = RxSwift/Observables/ElementAt.swift; sourceTree = "<group>"; };
-		08A9FC90934F7A68C930C0F99508A737 /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
-		09CF571E27DC65BF77EFFF62354B5EF0 /* Debounce.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Debounce.swift; path = RxSwift/Observables/Debounce.swift; sourceTree = "<group>"; };
-		0AF6AF4017DB31B86B803FEA577F7A22 /* CombineLatest+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "CombineLatest+arity.swift"; path = "RxSwift/Observables/CombineLatest+arity.swift"; sourceTree = "<group>"; };
-		0B6D35FB8DCCEAAD8DC223CD5BC95E99 /* BooleanDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BooleanDisposable.swift; path = RxSwift/Disposables/BooleanDisposable.swift; sourceTree = "<group>"; };
-		0BED5103BCF9D40F85068CF32B24A63E /* Event.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Event.swift; path = RxSwift/Event.swift; sourceTree = "<group>"; };
-		100C86AE9F32218EF6A633C7B7895CCC /* OuterBoolean.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterBoolean.swift; sourceTree = "<group>"; };
-		11316F7A1A5EB2E5B756703C0EE77CF6 /* TailRecursiveSink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TailRecursiveSink.swift; path = RxSwift/Observers/TailRecursiveSink.swift; sourceTree = "<group>"; };
-		14E29B89A0BDB135B2088F4F20D14F46 /* DefaultIfEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DefaultIfEmpty.swift; path = RxSwift/Observables/DefaultIfEmpty.swift; sourceTree = "<group>"; };
-		15F7B4D89DB784C462A959824F1E698C /* SubscriptionDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubscriptionDisposable.swift; path = RxSwift/Disposables/SubscriptionDisposable.swift; sourceTree = "<group>"; };
-		16B7B7BE1A379F72CFC27449A45EE5AE /* Take.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Take.swift; path = RxSwift/Observables/Take.swift; sourceTree = "<group>"; };
-		18254952242D69F129DC1ACD4BDF8AF4 /* Sink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sink.swift; path = RxSwift/Observables/Sink.swift; sourceTree = "<group>"; };
-		18328C3FA1839793D455774B0473668C /* SubjectType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubjectType.swift; path = RxSwift/Subjects/SubjectType.swift; sourceTree = "<group>"; };
+		05B19EE7BB7CFC2E18ADF610F26BD9F7 /* CombineLatest+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "CombineLatest+arity.swift"; path = "RxSwift/Observables/CombineLatest+arity.swift"; sourceTree = "<group>"; };
+		05EB6180D204793B411E78063D728D37 /* Never.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Never.swift; path = RxSwift/Observables/Never.swift; sourceTree = "<group>"; };
+		0697E081BC2A5EEB6F014A72AA1FA6FE /* LockOwnerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LockOwnerType.swift; path = RxSwift/Concurrency/LockOwnerType.swift; sourceTree = "<group>"; };
+		08583885463D1EDB2F8023584348659C /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		08BDFE9C9E9365771FF2D47928E3E79A /* Pods-SwaggerClient-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClient-acknowledgements.plist"; sourceTree = "<group>"; };
+		0AD61F8554C909A3AFA66AD9ECCB5F23 /* Pods-SwaggerClient-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-frameworks.sh"; sourceTree = "<group>"; };
+		0BCC6F35A8BC2A442A13DE66D59CAC87 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
+		0BED44127AD26D0B00F9FD2ECB9CEDA4 /* Create.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Create.swift; path = RxSwift/Observables/Create.swift; sourceTree = "<group>"; };
+		0C2D5B54A93C8D77EF18876416B0DB27 /* Materialize.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Materialize.swift; path = RxSwift/Observables/Materialize.swift; sourceTree = "<group>"; };
+		0DC50E863EDEB9C0996B2B6DAA0B99AD /* Errors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = RxSwift/Errors.swift; sourceTree = "<group>"; };
+		0E80F14B05E38C811C7DB2355F884967 /* SynchronizedOnType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedOnType.swift; path = RxSwift/Concurrency/SynchronizedOnType.swift; sourceTree = "<group>"; };
+		0EB2E37D73483B20FFF4A5A9CC687985 /* GroupedObservable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GroupedObservable.swift; path = RxSwift/GroupedObservable.swift; sourceTree = "<group>"; };
+		0F6B1DF26896BB3C53B013DCB6CAC2A2 /* Notifications.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Notifications.swift; path = Source/Notifications.swift; sourceTree = "<group>"; };
+		1072258F1D85C96C8DE0D43A4D17535E /* DelaySubscription.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DelaySubscription.swift; path = RxSwift/Observables/DelaySubscription.swift; sourceTree = "<group>"; };
+		139BFBACE8A3AD8B5733AD2B94C930C3 /* SubjectType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubjectType.swift; path = RxSwift/Subjects/SubjectType.swift; sourceTree = "<group>"; };
+		149DE31C5C5A1FF69EA3FE40F9791130 /* AsyncLock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncLock.swift; path = RxSwift/Concurrency/AsyncLock.swift; sourceTree = "<group>"; };
+		14FE73E27209DA05667C0D3E1B601734 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		15CBB9F5E4043A504EE8F7320CDF3F41 /* StartWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = StartWith.swift; path = RxSwift/Observables/StartWith.swift; sourceTree = "<group>"; };
+		15EC3D8D715BC3F25A366C403ED02060 /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
+		184A223909D425D6876C780724E7B2DA /* NopDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NopDisposable.swift; path = RxSwift/Disposables/NopDisposable.swift; sourceTree = "<group>"; };
+		18F255791BA4F8E78F887B201CEB9A70 /* PrimitiveSequence+Zip+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "PrimitiveSequence+Zip+arity.swift"; path = "RxSwift/Traits/PrimitiveSequence+Zip+arity.swift"; sourceTree = "<group>"; };
 		19296A8C5E948345E5744A748B1CC720 /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		1A3D311EA38EC997A02CB05BACC0DD7D /* SingleAssignmentDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SingleAssignmentDisposable.swift; path = RxSwift/Disposables/SingleAssignmentDisposable.swift; sourceTree = "<group>"; };
-		1C897A93D54D11502C0795F3D0F8510F /* SkipUntil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SkipUntil.swift; path = RxSwift/Observables/SkipUntil.swift; sourceTree = "<group>"; };
-		213681FAAEF7EA349FE2EB13483D4CE0 /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
-		24917B863385D1BB04A2303451C9E272 /* OperationQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = OperationQueueScheduler.swift; path = RxSwift/Schedulers/OperationQueueScheduler.swift; sourceTree = "<group>"; };
-		269E63D0B9C1F5552DF3ABA3F5BF88EB /* PrimitiveSequence+Zip+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "PrimitiveSequence+Zip+arity.swift"; path = "RxSwift/Traits/PrimitiveSequence+Zip+arity.swift"; sourceTree = "<group>"; };
-		26CDF11A8572688E0011727ADD962B74 /* Timer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timer.swift; path = RxSwift/Observables/Timer.swift; sourceTree = "<group>"; };
-		287F0ED0B2D6A3F3220B6F4E92A7F350 /* Concat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Concat.swift; path = RxSwift/Observables/Concat.swift; sourceTree = "<group>"; };
-		291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClient-dummy.m"; sourceTree = "<group>"; };
-		2AF9D1F5A21CB847E913BF41EC110B1F /* ScheduledItemType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledItemType.swift; path = RxSwift/Schedulers/Internal/ScheduledItemType.swift; sourceTree = "<group>"; };
+		1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.debug.xcconfig"; sourceTree = "<group>"; };
+		1BAEE07194E1BFA72B1110849C7B348A /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		1C103637D74EC198CF949454436D3616 /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		1E982F66B9CB4E2C2083F9B02EF41011 /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/OpenAPIs/APIHelper.swift; sourceTree = "<group>"; };
+		1FCF0B9190C58BD7493583E8133B3E56 /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		20E32B939BDA9B05C26957643F21B95E /* InvocableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InvocableType.swift; path = RxSwift/Schedulers/Internal/InvocableType.swift; sourceTree = "<group>"; };
+		2265FC97FA4169ED188CF2E34F23DACF /* ObserverBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserverBase.swift; path = RxSwift/Observers/ObserverBase.swift; sourceTree = "<group>"; };
+		2274608F6E89920A7FBADABEF6A20A1F /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
+		229212B9293B7746DAE74AF7ED2EF8BD /* TakeUntil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeUntil.swift; path = RxSwift/Observables/TakeUntil.swift; sourceTree = "<group>"; };
+		22AF3598D1B586D34A9092DD1A51FA03 /* Generate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Generate.swift; path = RxSwift/Observables/Generate.swift; sourceTree = "<group>"; };
+		248FA48ED4232A749B19E8326B107390 /* AsMaybe.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsMaybe.swift; path = RxSwift/Observables/AsMaybe.swift; sourceTree = "<group>"; };
+		281B6953B58178760E6D8AE7FDA3CCFB /* PrimitiveSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PrimitiveSequence.swift; path = RxSwift/Traits/PrimitiveSequence.swift; sourceTree = "<group>"; };
+		28B85FF3973524921D29C28D32B60939 /* AnonymousObserver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousObserver.swift; path = RxSwift/Observers/AnonymousObserver.swift; sourceTree = "<group>"; };
+		295257ADE79CBF71EDDB457361B2E80E /* ImmediateScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ImmediateScheduler.swift; path = RxSwift/Schedulers/ImmediateScheduler.swift; sourceTree = "<group>"; };
+		2A04930FB5D53B406D0E4B419625FF1B /* SwitchIfEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SwitchIfEmpty.swift; path = RxSwift/Observables/SwitchIfEmpty.swift; sourceTree = "<group>"; };
+		2A83AF1902D8C6A7D243C1EB1B632FD4 /* Delay.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Delay.swift; path = RxSwift/Observables/Delay.swift; sourceTree = "<group>"; };
+		2AAFE2F8BED3AD876496367E70110B27 /* DistinctUntilChanged.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DistinctUntilChanged.swift; path = RxSwift/Observables/DistinctUntilChanged.swift; sourceTree = "<group>"; };
 		2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
-		2CC7A4A0D213AA0C7831EA91E658003C /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
-		2FF17440CCD2E1A69791A4AA23325AD5 /* Pods-SwaggerClient-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClient-acknowledgements.markdown"; sourceTree = "<group>"; };
-		30436E554B573E5078213F681DA0061F /* InvocableScheduledItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InvocableScheduledItem.swift; path = RxSwift/Schedulers/Internal/InvocableScheduledItem.swift; sourceTree = "<group>"; };
-		31DC6B167D2D13AFD8EAAF1E63021B52 /* RefCountDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RefCountDisposable.swift; path = RxSwift/Disposables/RefCountDisposable.swift; sourceTree = "<group>"; };
-		321FE523C25A0EAF6FF886D6FDE6D24D /* SessionManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionManager.swift; path = Source/SessionManager.swift; sourceTree = "<group>"; };
-		32C44C9A30733440A3D263B43861FBA1 /* DisposeBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DisposeBase.swift; path = RxSwift/Disposables/DisposeBase.swift; sourceTree = "<group>"; };
-		33E7362EED7450FC886B01AB15E22681 /* Dematerialize.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Dematerialize.swift; path = RxSwift/Observables/Dematerialize.swift; sourceTree = "<group>"; };
-		34CAB06DC6B0D4E914DE8355ABD73685 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
-		365AE864123C488FD72C61ADC9EC624D /* ShareReplay1WhileConnected.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ShareReplay1WhileConnected.swift; path = RxSwift/Observables/ShareReplay1WhileConnected.swift; sourceTree = "<group>"; };
-		365E9435D48E21D0C47AFA0FC453B002 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
-		36918AB1CF9222600ABF5A21CBEDEAAC /* RxSwift-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-umbrella.h"; sourceTree = "<group>"; };
-		37CEC3599B3E7B7EB3DA8FBA9610E255 /* ToArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ToArray.swift; path = RxSwift/Observables/ToArray.swift; sourceTree = "<group>"; };
-		39A2B57F2DAE55FA57D315FDD6953365 /* Variable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Variable.swift; path = RxSwift/Subjects/Variable.swift; sourceTree = "<group>"; };
-		3A07BFAFDAB02F19561FDA4115668F66 /* WithLatestFrom.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = WithLatestFrom.swift; path = RxSwift/Observables/WithLatestFrom.swift; sourceTree = "<group>"; };
-		3B1C5A8AB9C095DD01A23DB6B7179E5C /* ConcurrentDispatchQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConcurrentDispatchQueueScheduler.swift; path = RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift; sourceTree = "<group>"; };
-		3C2545A0BD077774D3CA3B35CFD1FE40 /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
-		3C2988432DEBFCFD8A5F5F0E2A220A8E /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
-		3D2F69F61823A75B9D3A37C6EA502AB9 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
-		3D9270FF743FC000569F250E309CB89E /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/Swaggers/APIs.swift; sourceTree = "<group>"; };
-		3ECB713449813E363ABB94C83D77F3A9 /* Result.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Result.swift; path = Source/Result.swift; sourceTree = "<group>"; };
-		3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClient-umbrella.h"; sourceTree = "<group>"; };
-		3F16B43ABD2C8CD4A311AA1AB3B6C02F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		3F1C7AD0D97D1F541A20DEDFD5AC30AF /* DispatchQueue+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Extensions.swift"; path = "Platform/DispatchQueue+Extensions.swift"; sourceTree = "<group>"; };
-		4313BF26CA6B25832E158F8FC403D849 /* Catch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Catch.swift; path = RxSwift/Observables/Catch.swift; sourceTree = "<group>"; };
-		43FC49AA70D3E2A84CAED9C37BE9C4B5 /* Pods-SwaggerClientTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-frameworks.sh"; sourceTree = "<group>"; };
-		45DDB27E2A52C09D734190B2C3E83BF5 /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
-		463ABD4055AB6537A2C5B0EDB617C139 /* Cancelable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Cancelable.swift; path = RxSwift/Cancelable.swift; sourceTree = "<group>"; };
-		48144D6C24CA10B6A3584D425416F37A /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
-		48242CA8E564C2C50CFF8E3E77668FB7 /* Platform.Linux.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Platform.Linux.swift; path = Platform/Platform.Linux.swift; sourceTree = "<group>"; };
-		48E60FBF9296448D4A2FEC7E14FBE6DB /* ScheduledDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledDisposable.swift; path = RxSwift/Disposables/ScheduledDisposable.swift; sourceTree = "<group>"; };
-		4AF8DBA8D803E5226616EC41FA7405ED /* MainScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MainScheduler.swift; path = RxSwift/Schedulers/MainScheduler.swift; sourceTree = "<group>"; };
-		4EACF73E072E466AF5911B9BB191E174 /* TakeLast.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeLast.swift; path = RxSwift/Observables/TakeLast.swift; sourceTree = "<group>"; };
-		4F69F88B1008A9EE1DDF85CBC79677A8 /* ParameterEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ParameterEncoding.swift; path = Source/ParameterEncoding.swift; sourceTree = "<group>"; };
-		4FE676DC3C01D76D82723E22A695A308 /* BehaviorSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BehaviorSubject.swift; path = RxSwift/Subjects/BehaviorSubject.swift; sourceTree = "<group>"; };
-		4FF46ACE1C78929AB44803AE915B394F /* Debug.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Debug.swift; path = RxSwift/Observables/Debug.swift; sourceTree = "<group>"; };
-		5017E276F3AE00F1F45A62F9A35F51C0 /* InfiniteSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InfiniteSequence.swift; path = Platform/DataStructures/InfiniteSequence.swift; sourceTree = "<group>"; };
-		503A5FA54C11AE46D3333E6080D61E9A /* RxSwift.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = RxSwift.modulemap; sourceTree = "<group>"; };
-		510BB12F1D8076F5BA1888E67E121E79 /* BinaryDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryDisposable.swift; path = RxSwift/Disposables/BinaryDisposable.swift; sourceTree = "<group>"; };
-		549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.debug.xcconfig"; sourceTree = "<group>"; };
-		56CC0097103243FBF2702AB35BF7C0A4 /* InvocableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InvocableType.swift; path = RxSwift/Schedulers/Internal/InvocableType.swift; sourceTree = "<group>"; };
-		590A7488E9B89273069B539F03421606 /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
-		596A0129DA8C10F8A3BEECED9EE16F68 /* Buffer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Buffer.swift; path = RxSwift/Observables/Buffer.swift; sourceTree = "<group>"; };
-		59E44229281B70ACA538454D8DB49FC0 /* Multicast.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Multicast.swift; path = RxSwift/Observables/Multicast.swift; sourceTree = "<group>"; };
-		59EA941CFCC415131D36B17780FA7F33 /* RxMutableBox.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RxMutableBox.swift; path = RxSwift/RxMutableBox.swift; sourceTree = "<group>"; };
-		5A98136CD6F078204F8B95D995205F04 /* Disposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Disposable.swift; path = RxSwift/Disposable.swift; sourceTree = "<group>"; };
-		5A98B8DAD74FBDB55E3D879266AA14CA /* Queue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Queue.swift; path = Platform/DataStructures/Queue.swift; sourceTree = "<group>"; };
-		5AC613DA00AD0B2ACF145E94AED80E86 /* ConnectableObservable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConnectableObservable.swift; path = RxSwift/Observables/ConnectableObservable.swift; sourceTree = "<group>"; };
-		5B4FF38E4CA2AFB54D788C9F1919BFA8 /* ObservableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObservableType.swift; path = RxSwift/ObservableType.swift; sourceTree = "<group>"; };
+		2EB881F0C1B1D1F90FAB084334D6C13D /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
+		2EC31C3AF1A745A2E941C3B1884E2FA3 /* TakeWhile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeWhile.swift; path = RxSwift/Observables/TakeWhile.swift; sourceTree = "<group>"; };
+		2F3B836F14594A6EF1923CC07B61E893 /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
+		30A47B1C8E00C3410BA35859590AFBB3 /* Debug.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Debug.swift; path = RxSwift/Observables/Debug.swift; sourceTree = "<group>"; };
+		31EE482CF21D19C54B33E17B7A4E43F3 /* Timeline.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeline.swift; path = Source/Timeline.swift; sourceTree = "<group>"; };
+		32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClient-umbrella.h"; sourceTree = "<group>"; };
+		32CAA23B558D5641EE6320708FECD03E /* Alamofire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Alamofire.xcconfig; sourceTree = "<group>"; };
+		33F225BF47E139D7C104629809615ED8 /* SubscribeOn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubscribeOn.swift; path = RxSwift/Observables/SubscribeOn.swift; sourceTree = "<group>"; };
+		37451A8A1EDFE1BFB039614775982399 /* Skip.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Skip.swift; path = RxSwift/Observables/Skip.swift; sourceTree = "<group>"; };
+		38AB52055ABAC52DC0BB0AB8FBF07F23 /* RecursiveScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RecursiveScheduler.swift; path = RxSwift/Schedulers/RecursiveScheduler.swift; sourceTree = "<group>"; };
+		38DB1B1AED2692F4747813CAC4965A06 /* Bag+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Bag+Rx.swift"; path = "RxSwift/Extensions/Bag+Rx.swift"; sourceTree = "<group>"; };
+		38DC7C1C0A0A337E524268345E748CA3 /* Lock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Lock.swift; path = RxSwift/Concurrency/Lock.swift; sourceTree = "<group>"; };
+		3911B66DC4AC99DD29F10D115CF4555A /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		3BB5ADF1D60C58E7C212E5AC4A17E03D /* ScheduledItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledItem.swift; path = RxSwift/Schedulers/Internal/ScheduledItem.swift; sourceTree = "<group>"; };
+		3BFA1723A93AA1DB0952B2F750421B32 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
+		3EA0BC99D27861517EF33E4AFD427CE3 /* PriorityQueue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PriorityQueue.swift; path = Platform/DataStructures/PriorityQueue.swift; sourceTree = "<group>"; };
+		3ED78F1E81F4EF6FE5B0E77CA5BFB40C /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
+		4050C78B3A61270CDB69C80EFEB9BF4B /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
+		4077DE55AEFACC6E0237454995C93E57 /* HistoricalSchedulerTimeConverter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HistoricalSchedulerTimeConverter.swift; path = RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift; sourceTree = "<group>"; };
+		419496CDDD7E7536CBEA02BAEE2C7C21 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		424053B5F8188A5A9D86378ECF17AF7F /* Dematerialize.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Dematerialize.swift; path = RxSwift/Observables/Dematerialize.swift; sourceTree = "<group>"; };
+		4244ABA189342D2269E1D874A6A8F286 /* RxSwift.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RxSwift.xcconfig; sourceTree = "<group>"; };
+		4322C1C10B70D563B5B508A53CD5704B /* CombineLatest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombineLatest.swift; path = RxSwift/Observables/CombineLatest.swift; sourceTree = "<group>"; };
+		45ED3A5E50AA60588D6ADA19ACBF0C66 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = "<group>"; };
+		45F5E5F79EBFF05F9B7B392CEBEBE03B /* Optional.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Optional.swift; path = RxSwift/Observables/Optional.swift; sourceTree = "<group>"; };
+		47CCDEE642D802F7DE9D54E99B029D94 /* VirtualTimeScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VirtualTimeScheduler.swift; path = RxSwift/Schedulers/VirtualTimeScheduler.swift; sourceTree = "<group>"; };
+		486092B50FE0BFF30D503E7DE4A5E634 /* RecursiveLock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RecursiveLock.swift; path = Platform/RecursiveLock.swift; sourceTree = "<group>"; };
+		48AC41077AE8968D02C47F5F8FEB91EF /* Take.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Take.swift; path = RxSwift/Observables/Take.swift; sourceTree = "<group>"; };
+		48D0E94099FF7A758F7C5B102623B302 /* ScheduledDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledDisposable.swift; path = RxSwift/Disposables/ScheduledDisposable.swift; sourceTree = "<group>"; };
+		49E417E77B6316B84A6E574BA392BCDF /* SingleAsync.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SingleAsync.swift; path = RxSwift/Observables/SingleAsync.swift; sourceTree = "<group>"; };
+		4B17A77CECF7B4996B33CC78A683AFEC /* ObservableType+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "ObservableType+Extensions.swift"; path = "RxSwift/ObservableType+Extensions.swift"; sourceTree = "<group>"; };
+		4B79E9399FA4CC143E00DD4B8CEA0D33 /* Zip.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Zip.swift; path = RxSwift/Observables/Zip.swift; sourceTree = "<group>"; };
+		4BCB5AA92F6DEDE2AC3F479C60C7212C /* SubscriptionDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubscriptionDisposable.swift; path = RxSwift/Disposables/SubscriptionDisposable.swift; sourceTree = "<group>"; };
+		4DD46253330346E885D5966DBB25FE8B /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		4F1000F4487C2C0150A606F30D92AFAF /* AsyncSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncSubject.swift; path = RxSwift/Subjects/AsyncSubject.swift; sourceTree = "<group>"; };
+		514D99EB5CB7550B570526741912C8C6 /* Platform.Linux.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Platform.Linux.swift; path = Platform/Platform.Linux.swift; sourceTree = "<group>"; };
+		516D52E4A92E72BFCD8998DBA0BE9B03 /* Disposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Disposable.swift; path = RxSwift/Disposable.swift; sourceTree = "<group>"; };
+		51FE85DA2956A05DBEC69727C4E8FD99 /* Bag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Bag.swift; path = Platform/DataStructures/Bag.swift; sourceTree = "<group>"; };
+		52D6457286A14A38BBD82D8C6099798B /* SkipWhile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SkipWhile.swift; path = RxSwift/Observables/SkipWhile.swift; sourceTree = "<group>"; };
+		535CA1EA937AD886FAD4EC1309B331DD /* Do.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Do.swift; path = RxSwift/Observables/Do.swift; sourceTree = "<group>"; };
+		536A8BDFB104F4132169F2B758A6AA0C /* PetstoreClient.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = PetstoreClient.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		538A32CCEDC18E4888E6C1A766DF1F02 /* PublishSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PublishSubject.swift; path = RxSwift/Subjects/PublishSubject.swift; sourceTree = "<group>"; };
+		57299EE6209AFEBA56C717433863E136 /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		59022FD592AB91A0B2EDA3A2EA5EC8D9 /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
+		5921D679A4009B3F216FEF671EB69158 /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
 		5B598E168B47485DC60F9DBBCBEEF5BB /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Alamofire.framework; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		5B5F05AEF12013DFCBEBE433EEBB3C8F /* Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Rx.swift; path = RxSwift/Rx.swift; sourceTree = "<group>"; };
-		5D641B399A74F0F9D45B05F8D357C806 /* Bag+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Bag+Rx.swift"; path = "RxSwift/Extensions/Bag+Rx.swift"; sourceTree = "<group>"; };
-		5E047D08FB3120A3AFA0DF05CCC1712A /* RxSwift-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "RxSwift-dummy.m"; sourceTree = "<group>"; };
-		5F379571B66704590E35A4719E6769F9 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
-		5FA4778A42883943FE99141A948880BE /* Scan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Scan.swift; path = RxSwift/Observables/Scan.swift; sourceTree = "<group>"; };
-		60544C2EB93D2C784EF3673B4BA12FAD /* SchedulerServices+Emulation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "SchedulerServices+Emulation.swift"; path = "RxSwift/Schedulers/SchedulerServices+Emulation.swift"; sourceTree = "<group>"; };
-		61148633F9614B9AD57C5470C729902C /* TakeWhile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeWhile.swift; path = RxSwift/Observables/TakeWhile.swift; sourceTree = "<group>"; };
-		62F9DE8CE4FBC650CD1C45E4D55A76AB /* RetryWhen.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RetryWhen.swift; path = RxSwift/Observables/RetryWhen.swift; sourceTree = "<group>"; };
-		63A236E8B385B46BC8C1268A38CCBDE5 /* Deprecated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Deprecated.swift; path = RxSwift/Deprecated.swift; sourceTree = "<group>"; };
-		64082BE2455C7B840B138508D24C0B0C /* Notifications.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Notifications.swift; path = Source/Notifications.swift; sourceTree = "<group>"; };
-		6472AECA91A4E834A9AF15721BC6D569 /* AnonymousObserver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousObserver.swift; path = RxSwift/Observers/AnonymousObserver.swift; sourceTree = "<group>"; };
-		6489C0664BA4C768FBB891CF9DF2CFD1 /* Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Alamofire.swift; path = Source/Alamofire.swift; sourceTree = "<group>"; };
-		64AB42C9C8AA1EFF0761D23E6FEF4776 /* ServerTrustPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ServerTrustPolicy.swift; path = Source/ServerTrustPolicy.swift; sourceTree = "<group>"; };
-		65518CF96489DBA6322987069B264467 /* TakeUntil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeUntil.swift; path = RxSwift/Observables/TakeUntil.swift; sourceTree = "<group>"; };
-		687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClientTests-dummy.m"; sourceTree = "<group>"; };
-		6887D641E8100CE8A13FFA165FC59B73 /* Observable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Observable.swift; path = RxSwift/Observable.swift; sourceTree = "<group>"; };
-		69AC2285C925A617C06C7FB2086BAA68 /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
-		6A96069F19C031BE285BF982214ABCB4 /* Create.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Create.swift; path = RxSwift/Observables/Create.swift; sourceTree = "<group>"; };
-		6BE16D6C9576956764F467AFD25183DC /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		6C32D4D3484C860B70069CD1C629F666 /* ScheduledItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledItem.swift; path = RxSwift/Schedulers/Internal/ScheduledItem.swift; sourceTree = "<group>"; };
-		6CBCC23A46623376CB1616C1C121603D /* Timeout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeout.swift; path = RxSwift/Observables/Timeout.swift; sourceTree = "<group>"; };
-		6CCE606004614C138E5498F58AA0D8DF /* Producer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Producer.swift; path = RxSwift/Observables/Producer.swift; sourceTree = "<group>"; };
-		6DA0155598FD96A2BBFF3496F7380D93 /* DispatchQueue+Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Alamofire.swift"; path = "Source/DispatchQueue+Alamofire.swift"; sourceTree = "<group>"; };
-		7011CBC583696921D4186C6121A7F67F /* Skip.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Skip.swift; path = RxSwift/Observables/Skip.swift; sourceTree = "<group>"; };
-		7098927F58CDA88AF2F555BD54050500 /* SessionDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionDelegate.swift; path = Source/SessionDelegate.swift; sourceTree = "<group>"; };
-		726381CBB76FD8C7554573BCD08F831E /* Alamofire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-prefix.pch"; sourceTree = "<group>"; };
-		7269CAD149BFD0BE4D3B1CA43FE6424F /* ReplaySubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ReplaySubject.swift; path = RxSwift/Subjects/ReplaySubject.swift; sourceTree = "<group>"; };
-		72730856B78AF39AB4D248DDA7771A5B /* LockOwnerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LockOwnerType.swift; path = RxSwift/Concurrency/LockOwnerType.swift; sourceTree = "<group>"; };
-		75DAC3F84E978269F03F6516EE7E9FAE /* DistinctUntilChanged.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DistinctUntilChanged.swift; path = RxSwift/Observables/DistinctUntilChanged.swift; sourceTree = "<group>"; };
-		7728F2E75E01542A06BFA62D24420ADB /* AFError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AFError.swift; path = Source/AFError.swift; sourceTree = "<group>"; };
-		772DB63372E4253C20C516EBF68DD251 /* VirtualTimeConverterType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VirtualTimeConverterType.swift; path = RxSwift/Schedulers/VirtualTimeConverterType.swift; sourceTree = "<group>"; };
-		7737478C5B309559EBEB826D48D81C26 /* NopDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NopDisposable.swift; path = RxSwift/Disposables/NopDisposable.swift; sourceTree = "<group>"; };
-		77762B0005C750E84813994CE0075E3B /* DisposeBag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DisposeBag.swift; path = RxSwift/Disposables/DisposeBag.swift; sourceTree = "<group>"; };
-		7A9E77B670AC48E19FB2C9FE2BD11E32 /* Reduce.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Reduce.swift; path = RxSwift/Observables/Reduce.swift; sourceTree = "<group>"; };
-		7AC7E0F67AECA3C1CBDBF7BC409CDADC /* GroupedObservable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GroupedObservable.swift; path = RxSwift/GroupedObservable.swift; sourceTree = "<group>"; };
-		7B70F2B6C174F1E6C285A5F774C3C97E /* SynchronizedSubscribeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedSubscribeType.swift; path = RxSwift/Concurrency/SynchronizedSubscribeType.swift; sourceTree = "<group>"; };
-		7C7C61BEED15998D9D7B47AD6F3E069D /* RecursiveLock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RecursiveLock.swift; path = Platform/RecursiveLock.swift; sourceTree = "<group>"; };
-		7C8E63660D346FD8ED2A97242E74EA09 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		7D9BF77ECD45A0F08FB7892B9597B135 /* PrimitiveSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PrimitiveSequence.swift; path = RxSwift/Traits/PrimitiveSequence.swift; sourceTree = "<group>"; };
-		7E3BEFA00C2C7854A37F845BF40B59F4 /* SkipWhile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SkipWhile.swift; path = RxSwift/Observables/SkipWhile.swift; sourceTree = "<group>"; };
-		7F4C7EC001A7DAE883053BE9583EECF1 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
-		7FCDAA2549A70BCA3749CF5FCCF837E9 /* Error.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Error.swift; path = RxSwift/Observables/Error.swift; sourceTree = "<group>"; };
-		805F15552659D5E233243B40C0C6F028 /* SingleAsync.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SingleAsync.swift; path = RxSwift/Observables/SingleAsync.swift; sourceTree = "<group>"; };
-		80AD53E4312C3B362D3336BDC9D80A80 /* AsyncSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncSubject.swift; path = RxSwift/Subjects/AsyncSubject.swift; sourceTree = "<group>"; };
-		80C18B1881A0F511B8D6DDA77F355B51 /* Range.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Range.swift; path = RxSwift/Observables/Range.swift; sourceTree = "<group>"; };
-		821702C06296B57D769A8DCDD13DE971 /* Errors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = RxSwift/Errors.swift; sourceTree = "<group>"; };
-		8317D3F53EA1D6DC62811B7F71E22E8E /* SerialDispatchQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SerialDispatchQueueScheduler.swift; path = RxSwift/Schedulers/SerialDispatchQueueScheduler.swift; sourceTree = "<group>"; };
-		83CF28DA7318DA2566376ACECE87D6E3 /* AnonymousInvocable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousInvocable.swift; path = RxSwift/Schedulers/Internal/AnonymousInvocable.swift; sourceTree = "<group>"; };
-		849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.release.xcconfig"; sourceTree = "<group>"; };
+		5BB023BDD73FF5AAC5686C18261C2E59 /* Alamofire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Alamofire-dummy.m"; sourceTree = "<group>"; };
+		5C879BF6973F64B5E2A20498F1411169 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
+		5D19299E0C5CBA41113508BC57DA9395 /* Merge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Merge.swift; path = RxSwift/Observables/Merge.swift; sourceTree = "<group>"; };
+		5D48DC023BF473789CEF045FB00121FA /* AFError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AFError.swift; path = Source/AFError.swift; sourceTree = "<group>"; };
+		5E28232337E7C27CF55A409886C712B8 /* Amb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Amb.swift; path = RxSwift/Observables/Amb.swift; sourceTree = "<group>"; };
+		5EA12B9820292EF94959B987736473C9 /* Repeat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Repeat.swift; path = RxSwift/Observables/Repeat.swift; sourceTree = "<group>"; };
+		631DEA4DC6C852A962E761306DC8E5AF /* ConcurrentDispatchQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConcurrentDispatchQueueScheduler.swift; path = RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift; sourceTree = "<group>"; };
+		647B15E397B92CD0E6B089800A79E32D /* RetryWhen.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RetryWhen.swift; path = RxSwift/Observables/RetryWhen.swift; sourceTree = "<group>"; };
+		64E2FC7F6A4850DCB9BBCB9D83E40C34 /* Request.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Request.swift; path = Source/Request.swift; sourceTree = "<group>"; };
+		651788C4235096156C06C2938F64FDC0 /* Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Rx.swift; path = RxSwift/Rx.swift; sourceTree = "<group>"; };
+		65291C76071A7F24B8CD055721199A73 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		683556396167E2BC804256F1F9B46794 /* AsSingle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsSingle.swift; path = RxSwift/Observables/AsSingle.swift; sourceTree = "<group>"; };
+		68968F00A741CAAE57D479C8747F4248 /* Result.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Result.swift; path = Source/Result.swift; sourceTree = "<group>"; };
+		68D91ADF79F3222DA753503175249139 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		69138EC14ACB61D4A4FE4CEF74B2D278 /* Timeout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeout.swift; path = RxSwift/Observables/Timeout.swift; sourceTree = "<group>"; };
+		695B2C5AEB6FE1A766CC26F3BE48BC1C /* Cancelable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Cancelable.swift; path = RxSwift/Cancelable.swift; sourceTree = "<group>"; };
+		6A0B504F5FC1B5E5369C2AD8ABA9482A /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
+		6AA6FF029E25846278724FECC2B0CD33 /* InvocableScheduledItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InvocableScheduledItem.swift; path = RxSwift/Schedulers/Internal/InvocableScheduledItem.swift; sourceTree = "<group>"; };
+		6C26DF960562568F8AAA198AB9D0ADE9 /* Reduce.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Reduce.swift; path = RxSwift/Observables/Reduce.swift; sourceTree = "<group>"; };
+		6CAA626D85FBD1FF53F144A14B3A3230 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/OpenAPIs/Extensions.swift; sourceTree = "<group>"; };
+		6F0CC5EE4C8B956EA02B0CD91AE32394 /* ServerTrustPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ServerTrustPolicy.swift; path = Source/ServerTrustPolicy.swift; sourceTree = "<group>"; };
+		721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClientTests-dummy.m"; sourceTree = "<group>"; };
+		72AE8E25B88FDA8DCA0CE1D1C785AE2D /* Error.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Error.swift; path = RxSwift/Observables/Error.swift; sourceTree = "<group>"; };
+		7388ECAD6E93F2CDDA035F993F552D87 /* Zip+Collection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Zip+Collection.swift"; path = "RxSwift/Observables/Zip+Collection.swift"; sourceTree = "<group>"; };
+		7413D0DEA3FCB4E2B6B61AA738939609 /* ShareReplayScope.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ShareReplayScope.swift; path = RxSwift/Observables/ShareReplayScope.swift; sourceTree = "<group>"; };
+		7416EC69ECF5772C560109A5ED8D588E /* Deferred.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Deferred.swift; path = RxSwift/Observables/Deferred.swift; sourceTree = "<group>"; };
+		74201A6B694096DAEAC939BF5A23C46D /* AnonymousDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousDisposable.swift; path = RxSwift/Disposables/AnonymousDisposable.swift; sourceTree = "<group>"; };
+		749EFF1B930D930529640C8004714C51 /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
+		75D98F114B4846AE45CE5B90B57DBA35 /* SessionManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionManager.swift; path = Source/SessionManager.swift; sourceTree = "<group>"; };
+		76645699475D3AB6EB5242AC4D0CEFAE /* Pods-SwaggerClient-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClient-acknowledgements.markdown"; sourceTree = "<group>"; };
+		777A63E817CA5F873A73B02928A334CE /* Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Alamofire.swift; path = Source/Alamofire.swift; sourceTree = "<group>"; };
+		79DD8EF004C7534401577C1694D823F3 /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
+		79E124948BC6C0A5B04B02009B037987 /* Zip+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Zip+arity.swift"; path = "RxSwift/Observables/Zip+arity.swift"; sourceTree = "<group>"; };
+		7A15B50BA886EAD6427ADC7E68BBD4FE /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		7A1AE5E1B215E1D53DCB6AB501CB0DAE /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/OpenAPIs/Configuration.swift; sourceTree = "<group>"; };
+		7B11E91D22910944308DE39CB8CBF3AE /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
+		7E3D0C745CE3A020C8BC5C96CAFB616F /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
+		7FEC3DCD86C07B65B23ABB64AD5CDA68 /* ElementAt.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ElementAt.swift; path = RxSwift/Observables/ElementAt.swift; sourceTree = "<group>"; };
+		814471C0F27B39D751143F0CD53670BD /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		82310F12B492F60A13F62CF52702755C /* Sink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sink.swift; path = RxSwift/Observables/Sink.swift; sourceTree = "<group>"; };
+		8261F606FFC7AA4F9C45CA8016E8B1C7 /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
 		84A09D760BA2EA13D5BE269086BAD34C /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = RxSwift.framework; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.release.xcconfig"; sourceTree = "<group>"; };
-		86B5A2A541FCAB86964565123DAF4719 /* CombineLatest+Collection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "CombineLatest+Collection.swift"; path = "RxSwift/Observables/CombineLatest+Collection.swift"; sourceTree = "<group>"; };
-		870EAFD138EAD59EAC7EE2CE19DE25B4 /* HistoricalSchedulerTimeConverter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HistoricalSchedulerTimeConverter.swift; path = RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift; sourceTree = "<group>"; };
-		880C5FA0EC7B351BE64E748163FA1C31 /* PriorityQueue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PriorityQueue.swift; path = Platform/DataStructures/PriorityQueue.swift; sourceTree = "<group>"; };
-		883F8BF59AD1E1C16492B6CA9A82FB3D /* ImmediateSchedulerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ImmediateSchedulerType.swift; path = RxSwift/ImmediateSchedulerType.swift; sourceTree = "<group>"; };
-		88515C2D0E31A4BB398381850BBA2A54 /* ObserverType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserverType.swift; path = RxSwift/ObserverType.swift; sourceTree = "<group>"; };
-		88877D161F2CFC94AEB9EC3A87DCE137 /* Fake_classname_tags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Fake_classname_tags123API.swift; sourceTree = "<group>"; };
-		89E13D55B14894773A8FAECA0A7D37DE /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
-		8D8133C1AF527695DF9F34BEBFBAD4CB /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
-		8F94DF516E7B950F928922C1D41C6D4D /* Never.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Never.swift; path = RxSwift/Observables/Never.swift; sourceTree = "<group>"; };
-		911C6A3C96205B93025F13FBCA992687 /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
-		939E73AB843F47D6C9EA0D065BAF63FC /* Map.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Map.swift; path = RxSwift/Observables/Map.swift; sourceTree = "<group>"; };
+		852FA37D9D05B1C1C334C97888ED40D3 /* Validation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Validation.swift; path = Source/Validation.swift; sourceTree = "<group>"; };
+		8796EDFC02FDC2F169BA74667BB3E3CA /* Sample.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sample.swift; path = RxSwift/Observables/Sample.swift; sourceTree = "<group>"; };
+		8872875BE1C248970BE0C0E6A4F54B2E /* Concat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Concat.swift; path = RxSwift/Observables/Concat.swift; sourceTree = "<group>"; };
+		888D25A758FE1CF355E7A48F6D418E36 /* Map.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Map.swift; path = RxSwift/Observables/Map.swift; sourceTree = "<group>"; };
+		893081A9D1C037310A86F3182BF38098 /* BinaryDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryDisposable.swift; path = RxSwift/Disposables/BinaryDisposable.swift; sourceTree = "<group>"; };
+		899C7116CD1C1652D453B63AA281232B /* RxSwift-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-prefix.pch"; sourceTree = "<group>"; };
+		8A12A7ADC5FD1C8C9DFC3B65FF135191 /* TaskDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TaskDelegate.swift; path = Source/TaskDelegate.swift; sourceTree = "<group>"; };
+		8B8FD648A2922AEAC6DD6AB816E2592B /* Sequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sequence.swift; path = RxSwift/Observables/Sequence.swift; sourceTree = "<group>"; };
+		92278B77A7357596D58AB0C075D0948C /* Throttle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Throttle.swift; path = RxSwift/Observables/Throttle.swift; sourceTree = "<group>"; };
+		92BD912F8B8ED40C37699519197E61C6 /* Using.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Using.swift; path = RxSwift/Observables/Using.swift; sourceTree = "<group>"; };
+		93893E6B21291795613092CE89A054B9 /* ParameterEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ParameterEncoding.swift; path = Source/ParameterEncoding.swift; sourceTree = "<group>"; };
 		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
-		93D2B184ED95D52B41994F4AA9D93A6C /* ObservableConvertibleType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObservableConvertibleType.swift; path = RxSwift/ObservableConvertibleType.swift; sourceTree = "<group>"; };
-		9675783D8A4B72DF63BAA2050C4E5659 /* Generate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Generate.swift; path = RxSwift/Observables/Generate.swift; sourceTree = "<group>"; };
-		969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.debug.xcconfig"; sourceTree = "<group>"; };
-		99787387CBF8F606AB2284B149518528 /* RxSwift-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-prefix.pch"; sourceTree = "<group>"; };
-		9B782CE63F4EDE0F2FE5908E009D66D3 /* ConcurrentMainScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConcurrentMainScheduler.swift; path = RxSwift/Schedulers/ConcurrentMainScheduler.swift; sourceTree = "<group>"; };
-		9B939DC5892884F0418DD9231B1C333B /* DelaySubscription.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DelaySubscription.swift; path = RxSwift/Observables/DelaySubscription.swift; sourceTree = "<group>"; };
-		9B9FC0446DF4BE1DB94CBC0AB085954E /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
-		9BE04EA000FD69A9AF7258C56417D785 /* ObserverBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserverBase.swift; path = RxSwift/Observers/ObserverBase.swift; sourceTree = "<group>"; };
-		9BEFD5C825FC7E42B492A86160C4B4D9 /* CurrentThreadScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CurrentThreadScheduler.swift; path = RxSwift/Schedulers/CurrentThreadScheduler.swift; sourceTree = "<group>"; };
-		9E8814B64707AA238E44CC6739648D2B /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
-		9F067CE8E1D793F3477FF78E26651CDB /* GroupBy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GroupBy.swift; path = RxSwift/Observables/GroupBy.swift; sourceTree = "<group>"; };
-		9F3FD0F9796D0E174012697BE40B68BF /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/Swaggers/Configuration.swift; sourceTree = "<group>"; };
-		A222C21465FACA23A74CB83AA9A51FF9 /* AsMaybe.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsMaybe.swift; path = RxSwift/Observables/AsMaybe.swift; sourceTree = "<group>"; };
-		A2DDCF83AFCDDE5126ED96168870FCB4 /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
-		A353DBED5E7E7B0EC48E7A4A4B5C5806 /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
-		A45D3DB105B4381656B330C1B2B6301E /* Zip.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Zip.swift; path = RxSwift/Observables/Zip.swift; sourceTree = "<group>"; };
-		A48E3D95D5FE201A1BC906340E5BA25C /* OuterString.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterString.swift; sourceTree = "<group>"; };
-		A6635256007E4FB66691FA58431C5B23 /* Amb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Amb.swift; path = RxSwift/Observables/Amb.swift; sourceTree = "<group>"; };
-		A844E504E62CB6AEA00B8DA3BAF7359B /* OuterNumber.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterNumber.swift; sourceTree = "<group>"; };
-		A962E5C6DA31E53BA6DEFCE4F2BC34B8 /* AddRef.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AddRef.swift; path = RxSwift/Observables/AddRef.swift; sourceTree = "<group>"; };
-		AA42FD2B1F921714FC4FEABAFB8D190A /* MultipartFormData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MultipartFormData.swift; path = Source/MultipartFormData.swift; sourceTree = "<group>"; };
+		93D9DA1CB883DC1FCCF639FECF14930D /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
+		93EC0AF4A1BE4FA92D40CE454B203C73 /* Switch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Switch.swift; path = RxSwift/Observables/Switch.swift; sourceTree = "<group>"; };
+		949911686773B44C613A58E025C223BA /* Filter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Filter.swift; path = RxSwift/Observables/Filter.swift; sourceTree = "<group>"; };
+		95ABE9C8F7D6635646F6C100B2B637B5 /* ConnectableObservableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConnectableObservableType.swift; path = RxSwift/ConnectableObservableType.swift; sourceTree = "<group>"; };
+		9623461D845F7EE6E2BBDBC44B8FE867 /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
+		9744CAC1B97675B5C8BDFE1483E34D21 /* Timer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timer.swift; path = RxSwift/Observables/Timer.swift; sourceTree = "<group>"; };
+		99662E82007C3712D4A6C84D9442D945 /* GroupBy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GroupBy.swift; path = RxSwift/Observables/GroupBy.swift; sourceTree = "<group>"; };
+		998EC6F6A2EE477EE6F698F57FFC3750 /* Deprecated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Deprecated.swift; path = RxSwift/Deprecated.swift; sourceTree = "<group>"; };
+		9A677D3D79730410F53DE1DB6D509BF6 /* ResponseSerialization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResponseSerialization.swift; path = Source/ResponseSerialization.swift; sourceTree = "<group>"; };
+		9C7D11F28E762B650DCE249F9231AFF6 /* MultipartFormData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MultipartFormData.swift; path = Source/MultipartFormData.swift; sourceTree = "<group>"; };
+		9D08EC9B39FEBA43A5B55DAF97AAEBE9 /* Pods-SwaggerClientTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClientTests.modulemap"; sourceTree = "<group>"; };
+		9D780FDAD16A03CC25F4D6F3317B9423 /* Pods-SwaggerClientTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClientTests-acknowledgements.plist"; sourceTree = "<group>"; };
+		A21868904DAD64FC72F911E44FE2429E /* ToArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ToArray.swift; path = RxSwift/Observables/ToArray.swift; sourceTree = "<group>"; };
+		A2454112DD5AEE5186A4664E9A126BED /* DisposeBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DisposeBase.swift; path = RxSwift/Disposables/DisposeBase.swift; sourceTree = "<group>"; };
+		A47F43BE5B9D458EBB11F65DF3012B31 /* WithLatestFrom.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = WithLatestFrom.swift; path = RxSwift/Observables/WithLatestFrom.swift; sourceTree = "<group>"; };
+		A625DF4508148061AAB7EBC23E067525 /* Empty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Empty.swift; path = RxSwift/Observables/Empty.swift; sourceTree = "<group>"; };
+		A6D9C76F23B7D6E1FAEFE7F3EA079003 /* InfiniteSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InfiniteSequence.swift; path = Platform/DataStructures/InfiniteSequence.swift; sourceTree = "<group>"; };
+		A6DAD9E105266B1758339618389747E4 /* Scan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Scan.swift; path = RxSwift/Observables/Scan.swift; sourceTree = "<group>"; };
+		A7ABE12F4F77E42B352D072ACD9946AC /* ObservableConvertibleType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObservableConvertibleType.swift; path = RxSwift/ObservableConvertibleType.swift; sourceTree = "<group>"; };
+		A915BB8C0650173C2558895A4B43A73B /* Buffer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Buffer.swift; path = RxSwift/Observables/Buffer.swift; sourceTree = "<group>"; };
 		AA9C5856BEAE5090A7D1EB450A10C04F /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		AACF3F3D813203894318A8EB451E126A /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
-		AD5077A09F9E9D3CA4F4FA368889BB02 /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
-		ADF7C6067B822BBAD3F14822D1B1CC81 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		AFDFA640848914890DC3B2555740FF84 /* ConnectableObservableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConnectableObservableType.swift; path = RxSwift/ConnectableObservableType.swift; sourceTree = "<group>"; };
-		B1F0B7854DD41D311F76522F61203F7F /* Sequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sequence.swift; path = RxSwift/Observables/Sequence.swift; sourceTree = "<group>"; };
-		B23F66A643FB8A1DEAC31DC3B637ACEB /* Zip+Collection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Zip+Collection.swift"; path = "RxSwift/Observables/Zip+Collection.swift"; sourceTree = "<group>"; };
-		B258A9C347C516AA8D8A3FB2CD665D6D /* SchedulerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SchedulerType.swift; path = RxSwift/SchedulerType.swift; sourceTree = "<group>"; };
-		B34B9F812BB8C50E3EA28F4FB51A1095 /* SynchronizedDisposeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedDisposeType.swift; path = RxSwift/Concurrency/SynchronizedDisposeType.swift; sourceTree = "<group>"; };
-		B34E08DA58315FFF5FCCF17FBA995360 /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = Alamofire.modulemap; sourceTree = "<group>"; };
-		B4644DAD437464D93509A585F99B235E /* AsSingle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsSingle.swift; path = RxSwift/Observables/AsSingle.swift; sourceTree = "<group>"; };
-		B4EEA393253D8586EB38190FC649A3FA /* SwitchIfEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SwitchIfEmpty.swift; path = RxSwift/Observables/SwitchIfEmpty.swift; sourceTree = "<group>"; };
-		B7677FD01A3CD0014041B75BD92F6D97 /* Switch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Switch.swift; path = RxSwift/Observables/Switch.swift; sourceTree = "<group>"; };
-		B77F93192159DCCC6CEF8FC5A0924F9A /* StartWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = StartWith.swift; path = RxSwift/Observables/StartWith.swift; sourceTree = "<group>"; };
-		B80609FF38FDE35E5FE2D38886D2361F /* SubscribeOn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubscribeOn.swift; path = RxSwift/Observables/SubscribeOn.swift; sourceTree = "<group>"; };
-		B85C133791E08589EB1DCDD30204E0D1 /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
-		B88AB92BE71D793E0172BDB03CBBAA1E /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
-		BA58F20D8C1234D395CD1165DC3690F3 /* AnyObserver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyObserver.swift; path = RxSwift/AnyObserver.swift; sourceTree = "<group>"; };
-		BB1413438046E9B3E8A94F51358A8205 /* Platform.Darwin.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Platform.Darwin.swift; path = Platform/Platform.Darwin.swift; sourceTree = "<group>"; };
-		BBBC3E633FF7A6EF8F18280770400F6E /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
-		BC5B3446AD01BE42D27E9F1B9673C334 /* ObserveOn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserveOn.swift; path = RxSwift/Observables/ObserveOn.swift; sourceTree = "<group>"; };
-		BCF2D4DFF08D2A18E8C8FE4C4B4633FB /* Pods-SwaggerClient-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-frameworks.sh"; sourceTree = "<group>"; };
-		BFBD0B4CB17B692257A69160584B0895 /* Zip+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Zip+arity.swift"; path = "RxSwift/Observables/Zip+arity.swift"; sourceTree = "<group>"; };
-		C0141EB6EAA64B81BBA6C558E75FE6A3 /* Alamofire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Alamofire.xcconfig; sourceTree = "<group>"; };
-		C0528EC401C03A7544A658C38016A893 /* Validation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Validation.swift; path = Source/Validation.swift; sourceTree = "<group>"; };
-		C071467FD72C9E762BDC54865F1A4193 /* HistoricalScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HistoricalScheduler.swift; path = RxSwift/Schedulers/HistoricalScheduler.swift; sourceTree = "<group>"; };
-		C1A02E1847AE8F11E47BE4161FCABFA7 /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
-		C1FCEDB728FD2060B1A8C36A71039328 /* Merge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Merge.swift; path = RxSwift/Observables/Merge.swift; sourceTree = "<group>"; };
-		C24CAB582243A8ABBCDA17324B26EB57 /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
-		C30419C2A3E0EC1B15E0D3AF3D91FB15 /* ObservableType+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "ObservableType+Extensions.swift"; path = "RxSwift/ObservableType+Extensions.swift"; sourceTree = "<group>"; };
-		C367D19B8DD4C0F9954A24DD5A2A6AFB /* SerialDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SerialDisposable.swift; path = RxSwift/Disposables/SerialDisposable.swift; sourceTree = "<group>"; };
-		C3BBD18F117F47C44487A0FB4650EF0D /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
+		AB9FB7676C53BD9BE06337BB539478B1 /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
+		AC25882FB329122EF59BC09D5C5B42B9 /* Window.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Window.swift; path = RxSwift/Observables/Window.swift; sourceTree = "<group>"; };
+		AC76461A77281664DFA98D53498ECD13 /* Range.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Range.swift; path = RxSwift/Observables/Range.swift; sourceTree = "<group>"; };
+		ACE351254D9CADACBCE214EB425A2B43 /* ConcurrentMainScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConcurrentMainScheduler.swift; path = RxSwift/Schedulers/ConcurrentMainScheduler.swift; sourceTree = "<group>"; };
+		AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.debug.xcconfig"; sourceTree = "<group>"; };
+		AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
+		B10682A3553F0BC32058B81F6157D67B /* Platform.Darwin.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Platform.Darwin.swift; path = Platform/Platform.Darwin.swift; sourceTree = "<group>"; };
+		B232F9C4224779F256F29E0CF4EF3322 /* AddRef.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AddRef.swift; path = RxSwift/Observables/AddRef.swift; sourceTree = "<group>"; };
+		B2AAC6F82FCBCF2CE32522143CBF59D6 /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		B2CEC365CFACB91EC9E750D659D5ED10 /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
+		B3BE266C827C7427D0C31408FE919905 /* DefaultIfEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DefaultIfEmpty.swift; path = RxSwift/Observables/DefaultIfEmpty.swift; sourceTree = "<group>"; };
+		B47AE62054C888B75C48419EBF7EF1A7 /* Catch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Catch.swift; path = RxSwift/Observables/Catch.swift; sourceTree = "<group>"; };
+		B4FB407CB8C792BFB02EADD91D6A4DFA /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
+		B64104A4C68341D80F2DB4CF5DE7779F /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/OpenAPIs/Models.swift; sourceTree = "<group>"; };
+		B6D7F52145D6986DDC613D7FB6DF4F3D /* BehaviorSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BehaviorSubject.swift; path = RxSwift/Subjects/BehaviorSubject.swift; sourceTree = "<group>"; };
+		B6DF9E242A80EC5685B3D5731E9176BB /* ReplaySubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ReplaySubject.swift; path = RxSwift/Subjects/ReplaySubject.swift; sourceTree = "<group>"; };
+		B7B793869715E1AEF65DF4D148BD88E0 /* RxMutableBox.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RxMutableBox.swift; path = RxSwift/RxMutableBox.swift; sourceTree = "<group>"; };
+		BA0348E245661C3C2ECB814A85A081A5 /* Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Response.swift; path = Source/Response.swift; sourceTree = "<group>"; };
+		BC59FD558680F110C9CF1E09C4B30234 /* RefCountDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RefCountDisposable.swift; path = RxSwift/Disposables/RefCountDisposable.swift; sourceTree = "<group>"; };
+		BCD2D0F8C81B81BFB4306011CAC48A20 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift; sourceTree = "<group>"; };
+		BDE4AF9A5A88886D7B60AF0F0996D9FA /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
+		BF980894DB7449C53D44D590F6197C88 /* ImmediateSchedulerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ImmediateSchedulerType.swift; path = RxSwift/ImmediateSchedulerType.swift; sourceTree = "<group>"; };
+		BFA86CCB6DD23509D8E393B3EBB39E7C /* CombineLatest+Collection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "CombineLatest+Collection.swift"; path = "RxSwift/Observables/CombineLatest+Collection.swift"; sourceTree = "<group>"; };
+		C049305B9A26A2FD2A88D0394DD37678 /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
+		C1C89F468280F8359E898DC2281CAC89 /* CompositeDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CompositeDisposable.swift; path = RxSwift/Disposables/CompositeDisposable.swift; sourceTree = "<group>"; };
+		C33C30173D8DC512E4B32B8D4DB6D422 /* Observable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Observable.swift; path = RxSwift/Observable.swift; sourceTree = "<group>"; };
+		C45CF1E9C72669473CD2D3E71DBD63E9 /* VirtualTimeConverterType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VirtualTimeConverterType.swift; path = RxSwift/Schedulers/VirtualTimeConverterType.swift; sourceTree = "<group>"; };
 		C4B474BD9070828C0F786071EEF46CD0 /* Pods_SwaggerClientTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClientTests.framework; path = "Pods-SwaggerClientTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
-		C541B03ABB2F0F5E10F027D5E3C9DF4B /* Just.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Just.swift; path = RxSwift/Observables/Just.swift; sourceTree = "<group>"; };
-		C6E0B4B99BC9F44A670C49699492A9FE /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
-		C74872D21B74B20DED53ABF8CAF1C0A8 /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
-		C78926FAD7615329921AC6B3E036268E /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/Swaggers/APIHelper.swift; sourceTree = "<group>"; };
-		C860BEC2AFE3C3670391CECBA2707574 /* Empty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Empty.swift; path = RxSwift/Observables/Empty.swift; sourceTree = "<group>"; };
-		CA3E73A8C322E8F93F432A4821A988DD /* CombineLatest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombineLatest.swift; path = RxSwift/Observables/CombineLatest.swift; sourceTree = "<group>"; };
-		CB186FED84E02D4539A7335A7D657AEB /* AnonymousDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousDisposable.swift; path = RxSwift/Disposables/AnonymousDisposable.swift; sourceTree = "<group>"; };
-		CB3FCE54551234A4F3910C33EB48C016 /* Do.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Do.swift; path = RxSwift/Observables/Do.swift; sourceTree = "<group>"; };
-		CB5ABAF432E141A4D578C1ECEA8D3D06 /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/Swaggers/Models.swift; sourceTree = "<group>"; };
-		CC04CE09EBAD4D6F48048F82504397F4 /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
-		D14A5F119805F0FCFCC8C1314040D871 /* Delay.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Delay.swift; path = RxSwift/Observables/Delay.swift; sourceTree = "<group>"; };
-		D2841E5E2183846280B97F6E660DA26C /* Pods-SwaggerClient-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-resources.sh"; sourceTree = "<group>"; };
-		D2AD7DFB58BCC2F73ADF9157DD2BA644 /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
-		D3726BB3EDFF36AE68CFA5EFB3F8ADCF /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/Swaggers/Extensions.swift; sourceTree = "<group>"; };
-		D497E96ABC5BEF4E26087D1F8D61D35E /* CompositeDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CompositeDisposable.swift; path = RxSwift/Disposables/CompositeDisposable.swift; sourceTree = "<group>"; };
-		D5D46171F3DE7355BBDB8A0594675BB4 /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
-		D5FE55155242FEDEC1B330C78429337F /* Bag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Bag.swift; path = Platform/DataStructures/Bag.swift; sourceTree = "<group>"; };
-		D80C1B1AFFC108C1C4EC607179620DD8 /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
-		D984AFE3BDFDD95C397A0D0F80DFECA6 /* Reactive.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Reactive.swift; path = RxSwift/Reactive.swift; sourceTree = "<group>"; };
-		DACA1956515F0B0CED7487724276C51B /* Lock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Lock.swift; path = RxSwift/Concurrency/Lock.swift; sourceTree = "<group>"; };
-		DAE1A43C13EDE68CF0C6AEA7EA3A2521 /* RecursiveScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RecursiveScheduler.swift; path = RxSwift/Schedulers/RecursiveScheduler.swift; sourceTree = "<group>"; };
-		DAE679F6024F9BDC9690AFE107798377 /* Window.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Window.swift; path = RxSwift/Observables/Window.swift; sourceTree = "<group>"; };
-		DE164497A94DD3215ED4D1AE0D4703B1 /* Pods-SwaggerClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-SwaggerClient.modulemap"; sourceTree = "<group>"; };
-		DF7CAA870676F2440AC2CCFC5A522F6C /* Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Response.swift; path = Source/Response.swift; sourceTree = "<group>"; };
-		E181A2141028C3EB376581163644E247 /* TaskDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TaskDelegate.swift; path = Source/TaskDelegate.swift; sourceTree = "<group>"; };
-		E1E4BCB344D3C100253B24B79421F00A /* Pods-SwaggerClient-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClient-acknowledgements.plist"; sourceTree = "<group>"; };
-		E4E6F4A58FE7868CA2177D3AC79AD2FA /* Pods-SwaggerClientTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-resources.sh"; sourceTree = "<group>"; };
-		E70ED98C12C528D9F88F8CF7A7E3E518 /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
-		E721CFEFA8C057FD4766D5603B283218 /* VirtualTimeScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VirtualTimeScheduler.swift; path = RxSwift/Schedulers/VirtualTimeScheduler.swift; sourceTree = "<group>"; };
-		E7513ADBA4C19938F615442415D28732 /* ShareReplay1.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ShareReplay1.swift; path = RxSwift/Observables/ShareReplay1.swift; sourceTree = "<group>"; };
-		E7A01B1A67EE04FE1D9C036932C4C037 /* Filter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Filter.swift; path = RxSwift/Observables/Filter.swift; sourceTree = "<group>"; };
-		E841A5E38033B35ED3073E4BBB921518 /* Disposables.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Disposables.swift; path = RxSwift/Disposables/Disposables.swift; sourceTree = "<group>"; };
-		E9178D3690ADCB4F8C9057F81C073A45 /* SynchronizedOnType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedOnType.swift; path = RxSwift/Concurrency/SynchronizedOnType.swift; sourceTree = "<group>"; };
-		E94FD1527D47A90A58A6E226AF6C4A44 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
+		C87B58E988280B4B9A04835B9570BAAB /* RxSwift-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-umbrella.h"; sourceTree = "<group>"; };
+		CA911BA97CC3081E2363ED0B4580209F /* Queue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Queue.swift; path = Platform/DataStructures/Queue.swift; sourceTree = "<group>"; };
+		CAF6F32F117197F6F08B477687F09728 /* Pods-SwaggerClientTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-frameworks.sh"; sourceTree = "<group>"; };
+		CB599C6476D3B5ADBA90BD6EAFB4C115 /* ScheduledItemType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledItemType.swift; path = RxSwift/Schedulers/Internal/ScheduledItemType.swift; sourceTree = "<group>"; };
+		CB5F32B59881971A1405610DC089DD57 /* ObservableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObservableType.swift; path = RxSwift/ObservableType.swift; sourceTree = "<group>"; };
+		CC1DDBA7954D27380AA9FE905490F925 /* Completable+AndThen.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Completable+AndThen.swift"; path = "RxSwift/Traits/Completable+AndThen.swift"; sourceTree = "<group>"; };
+		CC890DE67452A9F63BD12B30135E3BD6 /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		CD087C1A176984F7F186AFBC444C6DF9 /* SchedulerServices+Emulation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "SchedulerServices+Emulation.swift"; path = "RxSwift/Schedulers/SchedulerServices+Emulation.swift"; sourceTree = "<group>"; };
+		CE668A71E275DF34C1ACD8E01FAA0F47 /* SynchronizedUnsubscribeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedUnsubscribeType.swift; path = RxSwift/Concurrency/SynchronizedUnsubscribeType.swift; sourceTree = "<group>"; };
+		CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClientTests-umbrella.h"; sourceTree = "<group>"; };
+		CFA2BB0A87B62F067FBD44D8EFB93058 /* DispatchQueue+Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Alamofire.swift"; path = "Source/DispatchQueue+Alamofire.swift"; sourceTree = "<group>"; };
+		CFA4F581E074596AB5C3DAF3D9C39F17 /* Pods-SwaggerClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClient.modulemap"; sourceTree = "<group>"; };
+		D21B67854DF0875502A22FE967BB22A4 /* AnyObserver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyObserver.swift; path = RxSwift/AnyObserver.swift; sourceTree = "<group>"; };
+		D2F8A7D1F3AA17C12A89128D163EFDF5 /* SerialDispatchQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SerialDispatchQueueScheduler.swift; path = RxSwift/Schedulers/SerialDispatchQueueScheduler.swift; sourceTree = "<group>"; };
+		D3EE8437BC7F2156A710F1EEA545EBC2 /* String+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+Rx.swift"; path = "RxSwift/Extensions/String+Rx.swift"; sourceTree = "<group>"; };
+		D47B812D78D0AE64D85D16A96840F8C4 /* Pods-SwaggerClientTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClientTests-acknowledgements.markdown"; sourceTree = "<group>"; };
+		D4C9F81DD3B2DAC61C014790FAFD205E /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
+		D651D943838D79481E5485342F6E37DA /* Producer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Producer.swift; path = RxSwift/Observables/Producer.swift; sourceTree = "<group>"; };
+		D68F6F9541A2714DA6125FB3E9BB9727 /* AnonymousInvocable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousInvocable.swift; path = RxSwift/Schedulers/Internal/AnonymousInvocable.swift; sourceTree = "<group>"; };
+		D71252188831E0A81462FE21E33B84CE /* SynchronizedDisposeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedDisposeType.swift; path = RxSwift/Concurrency/SynchronizedDisposeType.swift; sourceTree = "<group>"; };
+		D7E51BBDAB04A3D67CADD9C9DF54CC05 /* CurrentThreadScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CurrentThreadScheduler.swift; path = RxSwift/Schedulers/CurrentThreadScheduler.swift; sourceTree = "<group>"; };
+		D931C41179C1EA52307316C7F51D1245 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		D9E14BF8171AF0A150A30FD6EC85B4DF /* Alamofire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-prefix.pch"; sourceTree = "<group>"; };
+		DA5F47130C28C4C5652E69E59A0902BD /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		DB6697B7A5CC377C3AC35303B0D0487D /* Variable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Variable.swift; path = RxSwift/Subjects/Variable.swift; sourceTree = "<group>"; };
+		DCFE6D738B9A72C55748A3EE0D669FFC /* SessionDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionDelegate.swift; path = Source/SessionDelegate.swift; sourceTree = "<group>"; };
+		DD55BB66B76757868058C24E16A79BEC /* Multicast.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Multicast.swift; path = RxSwift/Observables/Multicast.swift; sourceTree = "<group>"; };
+		DDD1FBFAF29C8BB9FEF76A9F3F5B0061 /* Reactive.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Reactive.swift; path = RxSwift/Reactive.swift; sourceTree = "<group>"; };
+		DE05BA43EDFECD3CB825712216F42CE9 /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/OpenAPIs/APIs.swift; sourceTree = "<group>"; };
+		DF09AC4A7016BDFDF5D4642172938A90 /* DisposeBag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DisposeBag.swift; path = RxSwift/Disposables/DisposeBag.swift; sourceTree = "<group>"; };
+		E0644BE2FFAA5C8FE7F15E3BF2557AFC /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		E172658949F5AACBFEFB9F2A7A45121B /* Just.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Just.swift; path = RxSwift/Observables/Just.swift; sourceTree = "<group>"; };
+		E19AF5866D261DB5B6AEC5D575086EA2 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		E65642813E0667C81374DA8D6C4D7C96 /* TakeLast.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeLast.swift; path = RxSwift/Observables/TakeLast.swift; sourceTree = "<group>"; };
 		E9CBBB398E7A62950FA8BC091CBE0359 /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = PetstoreClient.framework; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		EA39A7A8DF958888156A2207EF666EB1 /* SynchronizedUnsubscribeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedUnsubscribeType.swift; path = RxSwift/Concurrency/SynchronizedUnsubscribeType.swift; sourceTree = "<group>"; };
-		EA4F47C5A2E55E47E45F95C0672F0820 /* AsyncLock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncLock.swift; path = RxSwift/Concurrency/AsyncLock.swift; sourceTree = "<group>"; };
-		EA907F82073836CB66D5D606FB1333D9 /* Using.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Using.swift; path = RxSwift/Observables/Using.swift; sourceTree = "<group>"; };
-		EACCA67328F0A3AC89EA2158DAFC9B3A /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
-		EAED6E7C8067874A040C7B3863732D73 /* Repeat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Repeat.swift; path = RxSwift/Observables/Repeat.swift; sourceTree = "<group>"; };
-		ECB0A2EA86FF43E01E3D3ACE3BD2752B /* Optional.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Optional.swift; path = RxSwift/Observables/Optional.swift; sourceTree = "<group>"; };
-		EDC14250FB9B1DCE1112D8F3FB5FCEDA /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		EE38C38CB1C97603C0C7266A3B45F2AC /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift; sourceTree = "<group>"; };
-		F104D45199031F05FCEEFA8E947F210E /* String+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+Rx.swift"; path = "RxSwift/Extensions/String+Rx.swift"; sourceTree = "<group>"; };
-		F119426570E6238D04EAB498E1902F13 /* Deferred.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Deferred.swift; path = RxSwift/Observables/Deferred.swift; sourceTree = "<group>"; };
-		F1D34B07FCD98BCADAA8A3B68F1ACF1E /* Materialize.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Materialize.swift; path = RxSwift/Observables/Materialize.swift; sourceTree = "<group>"; };
-		F1FCD92EC4EAB245624BBB2DDECF9B2C /* ResponseSerialization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResponseSerialization.swift; path = Source/ResponseSerialization.swift; sourceTree = "<group>"; };
-		F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClientTests-umbrella.h"; sourceTree = "<group>"; };
-		F42569FD7843064F8467B7215CC7A9A9 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
-		F4668C7356C845C883E13EAB41F34154 /* NetworkReachabilityManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NetworkReachabilityManager.swift; path = Source/NetworkReachabilityManager.swift; sourceTree = "<group>"; };
-		F511E345C77AFF186F61FCC34A664ED5 /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
-		F57EA9DD77194E4F1E5E5E6CB4CDAE4E /* Request.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Request.swift; path = Source/Request.swift; sourceTree = "<group>"; };
-		F5F0AE167B06634076A6A2605697CE49 /* Timeline.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeline.swift; path = Source/Timeline.swift; sourceTree = "<group>"; };
-		F777764A45E0A77BE276ADA473AF453A /* ImmediateScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ImmediateScheduler.swift; path = RxSwift/Schedulers/ImmediateScheduler.swift; sourceTree = "<group>"; };
-		F7FE769331C0AFEF35319E2F6260F9DF /* Sample.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sample.swift; path = RxSwift/Observables/Sample.swift; sourceTree = "<group>"; };
-		F847CE4C82EA73A82952D85A608F86AB /* DispatchQueueConfiguration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DispatchQueueConfiguration.swift; path = RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift; sourceTree = "<group>"; };
-		F9CD1F74BF087D277406BF9164B9D058 /* Alamofire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Alamofire-dummy.m"; sourceTree = "<group>"; };
-		F9F0644CBB2BCA2DB969F16E2B5D92CE /* Throttle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Throttle.swift; path = RxSwift/Observables/Throttle.swift; sourceTree = "<group>"; };
-		FA436001918C6F92DC029B7E695520E8 /* PublishSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PublishSubject.swift; path = RxSwift/Subjects/PublishSubject.swift; sourceTree = "<group>"; };
-		FB170EFD14935F121CDE3211DB4C5CA3 /* Pods-SwaggerClientTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClientTests-acknowledgements.markdown"; sourceTree = "<group>"; };
-		FB65A0C0C98ACB27CAE43B38C6B4A9FC /* RxSwift.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RxSwift.xcconfig; sourceTree = "<group>"; };
-		FFF5F36FD4FA023FAEED7C490D4112F7 /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
+		EA4A73DFC5EC70ADEC8DB5A65A07196B /* Event.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Event.swift; path = RxSwift/Event.swift; sourceTree = "<group>"; };
+		EBD2925843939637E459525857FA3FA8 /* NetworkReachabilityManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NetworkReachabilityManager.swift; path = Source/NetworkReachabilityManager.swift; sourceTree = "<group>"; };
+		ED2A996D8F9E9BFA159AF4333CEAB7E2 /* TailRecursiveSink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TailRecursiveSink.swift; path = RxSwift/Observers/TailRecursiveSink.swift; sourceTree = "<group>"; };
+		EDA64805F9AEB3535908A7D984AB5BE8 /* SkipUntil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SkipUntil.swift; path = RxSwift/Observables/SkipUntil.swift; sourceTree = "<group>"; };
+		EFA925A9B9BFE80C3EDB17F2F0BF4A11 /* RxSwift-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "RxSwift-dummy.m"; sourceTree = "<group>"; };
+		F0E62A4CE2C6F59AE92D9D02B41649D5 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
+		F1A93A80FFDD8930597E5AF4351E9F40 /* RxSwift.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = RxSwift.modulemap; sourceTree = "<group>"; };
+		F2A82E1B6CEC50F002C59C255C26B381 /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.release.xcconfig"; sourceTree = "<group>"; };
+		F3E1116FA9F9F3AFD9332B7236F6E711 /* Pods-SwaggerClientTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-resources.sh"; sourceTree = "<group>"; };
+		F4A824D76F7E64069335E887FBD40B79 /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Alamofire.modulemap; sourceTree = "<group>"; };
+		F4BB3B2146310CA18C30F145BFF15BD9 /* Pods-SwaggerClient-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-resources.sh"; sourceTree = "<group>"; };
+		F5101A83B512E74F49467146FE96350A /* ObserverType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserverType.swift; path = RxSwift/ObserverType.swift; sourceTree = "<group>"; };
+		F7CDE3DF48D0BD49F53158F547F2F814 /* MainScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MainScheduler.swift; path = RxSwift/Schedulers/MainScheduler.swift; sourceTree = "<group>"; };
+		F80B940734051003693AB8C9396B9A95 /* ObserveOn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserveOn.swift; path = RxSwift/Observables/ObserveOn.swift; sourceTree = "<group>"; };
+		F85C44B8250F6BDF2F4746605665C079 /* SerialDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SerialDisposable.swift; path = RxSwift/Disposables/SerialDisposable.swift; sourceTree = "<group>"; };
+		F85F748990FBD91519A91098D6BA6366 /* BooleanDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BooleanDisposable.swift; path = RxSwift/Disposables/BooleanDisposable.swift; sourceTree = "<group>"; };
+		F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClient-dummy.m"; sourceTree = "<group>"; };
+		F95B56C2C53C700F09ACF424C9C68CFC /* DispatchQueue+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Extensions.swift"; path = "Platform/DispatchQueue+Extensions.swift"; sourceTree = "<group>"; };
+		FAF3CD60CC66BB642D72FD7DD9FA47EA /* SynchronizedSubscribeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedSubscribeType.swift; path = RxSwift/Concurrency/SynchronizedSubscribeType.swift; sourceTree = "<group>"; };
+		FBCF44963E46D2655B43F77741342C5D /* SchedulerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SchedulerType.swift; path = RxSwift/SchedulerType.swift; sourceTree = "<group>"; };
+		FC5C19FAC757DF61EE5B83BA514D8F78 /* Disposables.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Disposables.swift; path = RxSwift/Disposables/Disposables.swift; sourceTree = "<group>"; };
+		FD481458DC0F63AEFBD495121305D6D8 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.release.xcconfig"; sourceTree = "<group>"; };
+		FEA375D4493914B5629827903F168466 /* DispatchQueueConfiguration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DispatchQueueConfiguration.swift; path = RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		2C2AC7F85A0925E946CB2F88456DD41C /* Frameworks */ = {
+		7139BF778844E2A9E420524D8146ECD8 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				234470CC48A18683C120E00A087C42E7 /* Alamofire.framework in Frameworks */,
-				7BFA5CE6E3698A79CE6269680DC4DAB3 /* Foundation.framework in Frameworks */,
-				84AA76C9E940EF23C4579B9CE71BE070 /* RxSwift.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */,
+				D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -561,14 +553,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		B40CDEF7587C8F2096A027DB96993AD3 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				A82A9149306EF4D972CCDEBE265B37F2 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		B61347E4B942D85FB700CD798AEC3A6D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -577,20 +561,39 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C3BBC13F5A99F913D7BF55BAE90FCE86 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E8E275B7A3686605EDE9844688758CF2 /* Alamofire.framework in Frameworks */,
+				07646291B1A70D36C21FA0B73C43A86C /* Foundation.framework in Frameworks */,
+				F0773FB51871142573829B798A320088 /* RxSwift.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C6FBD0205779A1AC7CD0ADD758A3BF95 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				BD13F16DB254433B71AE9E50D25BAFB3 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		1E168A7457F1CC081BB2E1D97AE9AE29 /* APIs */ = {
+		115E81F744E172774E1536D7094D3F87 /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				88877D161F2CFC94AEB9EC3A87DCE137 /* Fake_classname_tags123API.swift */,
-				E70ED98C12C528D9F88F8CF7A7E3E518 /* FakeAPI.swift */,
-				C74872D21B74B20DED53ABF8CAF1C0A8 /* PetAPI.swift */,
-				45DDB27E2A52C09D734190B2C3E83BF5 /* StoreAPI.swift */,
-				365E9435D48E21D0C47AFA0FC453B002 /* UserAPI.swift */,
+				F4A824D76F7E64069335E887FBD40B79 /* Alamofire.modulemap */,
+				32CAA23B558D5641EE6320708FECD03E /* Alamofire.xcconfig */,
+				5BB023BDD73FF5AAC5686C18261C2E59 /* Alamofire-dummy.m */,
+				D9E14BF8171AF0A150A30FD6EC85B4DF /* Alamofire-prefix.pch */,
+				5C879BF6973F64B5E2A20498F1411169 /* Alamofire-umbrella.h */,
+				68D91ADF79F3222DA753503175249139 /* Info.plist */,
 			);
-			name = APIs;
-			path = PetstoreClient/Classes/Swaggers/APIs;
+			name = "Support Files";
+			path = "../Target Support Files/Alamofire";
 			sourceTree = "<group>";
 		};
 		278550D14ED46E76A8C3F458B5E6177F /* iOS */ = {
@@ -601,84 +604,63 @@
 			name = iOS;
 			sourceTree = "<group>";
 		};
-		2E07FFE8D5239059E139DA4A84322919 /* Support Files */ = {
+		38BCEE2B62E7F17FC1A6B47F74A915B1 /* PetstoreClient */ = {
 			isa = PBXGroup;
 			children = (
-				6BE16D6C9576956764F467AFD25183DC /* Info.plist */,
-				503A5FA54C11AE46D3333E6080D61E9A /* RxSwift.modulemap */,
-				FB65A0C0C98ACB27CAE43B38C6B4A9FC /* RxSwift.xcconfig */,
-				5E047D08FB3120A3AFA0DF05CCC1712A /* RxSwift-dummy.m */,
-				99787387CBF8F606AB2284B149518528 /* RxSwift-prefix.pch */,
-				36918AB1CF9222600ABF5A21CBEDEAAC /* RxSwift-umbrella.h */,
+				BCD2D0F8C81B81BFB4306011CAC48A20 /* AlamofireImplementations.swift */,
+				1E982F66B9CB4E2C2083F9B02EF41011 /* APIHelper.swift */,
+				DE05BA43EDFECD3CB825712216F42CE9 /* APIs.swift */,
+				7A1AE5E1B215E1D53DCB6AB501CB0DAE /* Configuration.swift */,
+				6CAA626D85FBD1FF53F144A14B3A3230 /* Extensions.swift */,
+				B64104A4C68341D80F2DB4CF5DE7779F /* Models.swift */,
+				71EF1D86BA306C7F68FA92ABA15B0633 /* APIs */,
+				5540224464BBA954BAFB3FC559814D13 /* Models */,
+				758ACCF640B62D96565B035F4A4931A6 /* Pod */,
+				FC9FD763F0BBF138A397EE0401BEA7BE /* Support Files */,
 			);
-			name = "Support Files";
-			path = "../Target Support Files/RxSwift";
+			name = PetstoreClient;
+			path = ../..;
 			sourceTree = "<group>";
 		};
-		3F6894F6346ED0522534B4531C76C476 /* Support Files */ = {
+		5540224464BBA954BAFB3FC559814D13 /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				B34E08DA58315FFF5FCCF17FBA995360 /* Alamofire.modulemap */,
-				C0141EB6EAA64B81BBA6C558E75FE6A3 /* Alamofire.xcconfig */,
-				F9CD1F74BF087D277406BF9164B9D058 /* Alamofire-dummy.m */,
-				726381CBB76FD8C7554573BCD08F831E /* Alamofire-prefix.pch */,
-				F42569FD7843064F8467B7215CC7A9A9 /* Alamofire-umbrella.h */,
-				EDC14250FB9B1DCE1112D8F3FB5FCEDA /* Info.plist */,
-			);
-			name = "Support Files";
-			path = "../Target Support Files/Alamofire";
-			sourceTree = "<group>";
-		};
-		4C0AE1291BF66ABD86D58AF2CBC25D4A /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				3D2F69F61823A75B9D3A37C6EA502AB9 /* AdditionalPropertiesClass.swift */,
-				BBBC3E633FF7A6EF8F18280770400F6E /* Animal.swift */,
-				213681FAAEF7EA349FE2EB13483D4CE0 /* AnimalFarm.swift */,
-				E94FD1527D47A90A58A6E226AF6C4A44 /* ApiResponse.swift */,
-				8D8133C1AF527695DF9F34BEBFBAD4CB /* ArrayOfArrayOfNumberOnly.swift */,
-				34CAB06DC6B0D4E914DE8355ABD73685 /* ArrayOfNumberOnly.swift */,
-				AD5077A09F9E9D3CA4F4FA368889BB02 /* ArrayTest.swift */,
-				C24CAB582243A8ABBCDA17324B26EB57 /* Capitalization.swift */,
-				D80C1B1AFFC108C1C4EC607179620DD8 /* Cat.swift */,
-				A353DBED5E7E7B0EC48E7A4A4B5C5806 /* Category.swift */,
-				89E13D55B14894773A8FAECA0A7D37DE /* ClassModel.swift */,
-				C3BBD18F117F47C44487A0FB4650EF0D /* Client.swift */,
-				AACF3F3D813203894318A8EB451E126A /* Dog.swift */,
-				A2DDCF83AFCDDE5126ED96168870FCB4 /* EnumArrays.swift */,
-				03F1F9E6E7C4A8537A517AD7A19AF471 /* EnumClass.swift */,
-				2CC7A4A0D213AA0C7831EA91E658003C /* EnumTest.swift */,
-				EACCA67328F0A3AC89EA2158DAFC9B3A /* FormatTest.swift */,
-				D5D46171F3DE7355BBDB8A0594675BB4 /* HasOnlyReadOnly.swift */,
-				3C2988432DEBFCFD8A5F5F0E2A220A8E /* List.swift */,
-				590A7488E9B89273069B539F03421606 /* MapTest.swift */,
-				CC04CE09EBAD4D6F48048F82504397F4 /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
-				B88AB92BE71D793E0172BDB03CBBAA1E /* Model200Response.swift */,
-				C1A02E1847AE8F11E47BE4161FCABFA7 /* Name.swift */,
-				016E5F3C3DA72BE3740A226E72B26933 /* NumberOnly.swift */,
-				C6E0B4B99BC9F44A670C49699492A9FE /* Order.swift */,
-				100C86AE9F32218EF6A633C7B7895CCC /* OuterBoolean.swift */,
-				3C2545A0BD077774D3CA3B35CFD1FE40 /* OuterComposite.swift */,
-				B85C133791E08589EB1DCDD30204E0D1 /* OuterEnum.swift */,
-				A844E504E62CB6AEA00B8DA3BAF7359B /* OuterNumber.swift */,
-				A48E3D95D5FE201A1BC906340E5BA25C /* OuterString.swift */,
-				5F379571B66704590E35A4719E6769F9 /* Pet.swift */,
-				69AC2285C925A617C06C7FB2086BAA68 /* ReadOnlyFirst.swift */,
-				F511E345C77AFF186F61FCC34A664ED5 /* Return.swift */,
-				48144D6C24CA10B6A3584D425416F37A /* SpecialModelName.swift */,
-				911C6A3C96205B93025F13FBCA992687 /* Tag.swift */,
-				08A9FC90934F7A68C930C0F99508A737 /* User.swift */,
+				FD481458DC0F63AEFBD495121305D6D8 /* AdditionalPropertiesClass.swift */,
+				2274608F6E89920A7FBADABEF6A20A1F /* Animal.swift */,
+				6A0B504F5FC1B5E5369C2AD8ABA9482A /* AnimalFarm.swift */,
+				F0E62A4CE2C6F59AE92D9D02B41649D5 /* ApiResponse.swift */,
+				4DD46253330346E885D5966DBB25FE8B /* ArrayOfArrayOfNumberOnly.swift */,
+				D931C41179C1EA52307316C7F51D1245 /* ArrayOfNumberOnly.swift */,
+				749EFF1B930D930529640C8004714C51 /* ArrayTest.swift */,
+				F2A82E1B6CEC50F002C59C255C26B381 /* Capitalization.swift */,
+				3ED78F1E81F4EF6FE5B0E77CA5BFB40C /* Cat.swift */,
+				1C103637D74EC198CF949454436D3616 /* Category.swift */,
+				2F3B836F14594A6EF1923CC07B61E893 /* ClassModel.swift */,
+				B2CEC365CFACB91EC9E750D659D5ED10 /* Client.swift */,
+				08583885463D1EDB2F8023584348659C /* Dog.swift */,
+				BDE4AF9A5A88886D7B60AF0F0996D9FA /* EnumArrays.swift */,
+				1FCF0B9190C58BD7493583E8133B3E56 /* EnumClass.swift */,
+				2EB881F0C1B1D1F90FAB084334D6C13D /* EnumTest.swift */,
+				8261F606FFC7AA4F9C45CA8016E8B1C7 /* FormatTest.swift */,
+				C049305B9A26A2FD2A88D0394DD37678 /* HasOnlyReadOnly.swift */,
+				B2AAC6F82FCBCF2CE32522143CBF59D6 /* List.swift */,
+				00FC3821A8BFCD6F05D00696BF175619 /* MapTest.swift */,
+				CC890DE67452A9F63BD12B30135E3BD6 /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
+				57299EE6209AFEBA56C717433863E136 /* Model200Response.swift */,
+				D4C9F81DD3B2DAC61C014790FAFD205E /* Name.swift */,
+				5921D679A4009B3F216FEF671EB69158 /* NumberOnly.swift */,
+				E0644BE2FFAA5C8FE7F15E3BF2557AFC /* Order.swift */,
+				59022FD592AB91A0B2EDA3A2EA5EC8D9 /* OuterComposite.swift */,
+				7B11E91D22910944308DE39CB8CBF3AE /* OuterEnum.swift */,
+				14FE73E27209DA05667C0D3E1B601734 /* Pet.swift */,
+				B4FB407CB8C792BFB02EADD91D6A4DFA /* ReadOnlyFirst.swift */,
+				1BAEE07194E1BFA72B1110849C7B348A /* Return.swift */,
+				9623461D845F7EE6E2BBDBC44B8FE867 /* SpecialModelName.swift */,
+				AB9FB7676C53BD9BE06337BB539478B1 /* Tag.swift */,
+				DA5F47130C28C4C5652E69E59A0902BD /* User.swift */,
 			);
 			name = Models;
-			path = PetstoreClient/Classes/Swaggers/Models;
-			sourceTree = "<group>";
-		};
-		4DEB624A2186E265CF56EBC3503FD8C9 /* Development Pods */ = {
-			isa = PBXGroup;
-			children = (
-				75DB99FD1A2922D8F12E9A97A5DB2E01 /* PetstoreClient */,
-			);
-			name = "Development Pods";
+			path = PetstoreClient/Classes/OpenAPIs/Models;
 			sourceTree = "<group>";
 		};
 		69750F9014CEFA9B29584C65B2491D2E /* Frameworks */ = {
@@ -691,60 +673,240 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		75DB99FD1A2922D8F12E9A97A5DB2E01 /* PetstoreClient */ = {
+		71EF1D86BA306C7F68FA92ABA15B0633 /* APIs */ = {
 			isa = PBXGroup;
 			children = (
-				EE38C38CB1C97603C0C7266A3B45F2AC /* AlamofireImplementations.swift */,
-				C78926FAD7615329921AC6B3E036268E /* APIHelper.swift */,
-				3D9270FF743FC000569F250E309CB89E /* APIs.swift */,
-				9F3FD0F9796D0E174012697BE40B68BF /* Configuration.swift */,
-				D3726BB3EDFF36AE68CFA5EFB3F8ADCF /* Extensions.swift */,
-				CB5ABAF432E141A4D578C1ECEA8D3D06 /* Models.swift */,
-				1E168A7457F1CC081BB2E1D97AE9AE29 /* APIs */,
-				4C0AE1291BF66ABD86D58AF2CBC25D4A /* Models */,
-				D82B01DC4E2A8A19C06CDA44ECD278AA /* Support Files */,
+				45ED3A5E50AA60588D6ADA19ACBF0C66 /* AnotherFakeAPI.swift */,
+				79DD8EF004C7534401577C1694D823F3 /* FakeAPI.swift */,
+				93D9DA1CB883DC1FCCF639FECF14930D /* FakeClassnameTags123API.swift */,
+				3911B66DC4AC99DD29F10D115CF4555A /* PetAPI.swift */,
+				7A15B50BA886EAD6427ADC7E68BBD4FE /* StoreAPI.swift */,
+				3BFA1723A93AA1DB0952B2F750421B32 /* UserAPI.swift */,
 			);
-			name = PetstoreClient;
-			path = ../..;
+			name = APIs;
+			path = PetstoreClient/Classes/OpenAPIs/APIs;
+			sourceTree = "<group>";
+		};
+		758ACCF640B62D96565B035F4A4931A6 /* Pod */ = {
+			isa = PBXGroup;
+			children = (
+				536A8BDFB104F4132169F2B758A6AA0C /* PetstoreClient.podspec */,
+			);
+			name = Pod;
+			sourceTree = "<group>";
+		};
+		7778267A888101208ECFC73C1D2F5ABD /* Alamofire */ = {
+			isa = PBXGroup;
+			children = (
+				5D48DC023BF473789CEF045FB00121FA /* AFError.swift */,
+				777A63E817CA5F873A73B02928A334CE /* Alamofire.swift */,
+				CFA2BB0A87B62F067FBD44D8EFB93058 /* DispatchQueue+Alamofire.swift */,
+				9C7D11F28E762B650DCE249F9231AFF6 /* MultipartFormData.swift */,
+				EBD2925843939637E459525857FA3FA8 /* NetworkReachabilityManager.swift */,
+				0F6B1DF26896BB3C53B013DCB6CAC2A2 /* Notifications.swift */,
+				93893E6B21291795613092CE89A054B9 /* ParameterEncoding.swift */,
+				64E2FC7F6A4850DCB9BBCB9D83E40C34 /* Request.swift */,
+				BA0348E245661C3C2ECB814A85A081A5 /* Response.swift */,
+				9A677D3D79730410F53DE1DB6D509BF6 /* ResponseSerialization.swift */,
+				68968F00A741CAAE57D479C8747F4248 /* Result.swift */,
+				6F0CC5EE4C8B956EA02B0CD91AE32394 /* ServerTrustPolicy.swift */,
+				DCFE6D738B9A72C55748A3EE0D669FFC /* SessionDelegate.swift */,
+				75D98F114B4846AE45CE5B90B57DBA35 /* SessionManager.swift */,
+				8A12A7ADC5FD1C8C9DFC3B65FF135191 /* TaskDelegate.swift */,
+				31EE482CF21D19C54B33E17B7A4E43F3 /* Timeline.swift */,
+				852FA37D9D05B1C1C334C97888ED40D3 /* Validation.swift */,
+				115E81F744E172774E1536D7094D3F87 /* Support Files */,
+			);
+			name = Alamofire;
+			path = Alamofire;
 			sourceTree = "<group>";
 		};
 		7DB346D0F39D3F0E887471402A8071AB = {
 			isa = PBXGroup;
 			children = (
 				93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */,
-				4DEB624A2186E265CF56EBC3503FD8C9 /* Development Pods */,
+				8F0C005305764051BE9B8E1DEE8C7E64 /* Development Pods */,
 				69750F9014CEFA9B29584C65B2491D2E /* Frameworks */,
-				B569DEF8BE40A2041ADDA9EB1B3163F0 /* Pods */,
+				F425AE79AF3C820F618BDE97C5F5DC44 /* Pods */,
 				C1398CE2D296EEBAA178C160CA6E6AD6 /* Products */,
 				C1A60D10CED0E61146591438999C7502 /* Targets Support Files */,
 			);
 			sourceTree = "<group>";
 		};
-		88CE2B3F08C34DDB098AD8A5DCC1DF1E /* Pods-SwaggerClient */ = {
+		8F0C005305764051BE9B8E1DEE8C7E64 /* Development Pods */ = {
 			isa = PBXGroup;
 			children = (
-				7C8E63660D346FD8ED2A97242E74EA09 /* Info.plist */,
-				DE164497A94DD3215ED4D1AE0D4703B1 /* Pods-SwaggerClient.modulemap */,
-				2FF17440CCD2E1A69791A4AA23325AD5 /* Pods-SwaggerClient-acknowledgements.markdown */,
-				E1E4BCB344D3C100253B24B79421F00A /* Pods-SwaggerClient-acknowledgements.plist */,
-				291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */,
-				BCF2D4DFF08D2A18E8C8FE4C4B4633FB /* Pods-SwaggerClient-frameworks.sh */,
-				D2841E5E2183846280B97F6E660DA26C /* Pods-SwaggerClient-resources.sh */,
-				3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */,
-				549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */,
-				86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */,
+				38BCEE2B62E7F17FC1A6B47F74A915B1 /* PetstoreClient */,
 			);
-			name = "Pods-SwaggerClient";
-			path = "Target Support Files/Pods-SwaggerClient";
+			name = "Development Pods";
 			sourceTree = "<group>";
 		};
-		B569DEF8BE40A2041ADDA9EB1B3163F0 /* Pods */ = {
+		92B5379E461BA80E1DEDB7DA0C44716F /* RxSwift */ = {
 			isa = PBXGroup;
 			children = (
-				FF61792A0279354AB25395F889F59979 /* Alamofire */,
-				E7F23A0F12E60AD47285170493A15C47 /* RxSwift */,
+				B232F9C4224779F256F29E0CF4EF3322 /* AddRef.swift */,
+				5E28232337E7C27CF55A409886C712B8 /* Amb.swift */,
+				74201A6B694096DAEAC939BF5A23C46D /* AnonymousDisposable.swift */,
+				D68F6F9541A2714DA6125FB3E9BB9727 /* AnonymousInvocable.swift */,
+				28B85FF3973524921D29C28D32B60939 /* AnonymousObserver.swift */,
+				D21B67854DF0875502A22FE967BB22A4 /* AnyObserver.swift */,
+				248FA48ED4232A749B19E8326B107390 /* AsMaybe.swift */,
+				683556396167E2BC804256F1F9B46794 /* AsSingle.swift */,
+				149DE31C5C5A1FF69EA3FE40F9791130 /* AsyncLock.swift */,
+				4F1000F4487C2C0150A606F30D92AFAF /* AsyncSubject.swift */,
+				51FE85DA2956A05DBEC69727C4E8FD99 /* Bag.swift */,
+				38DB1B1AED2692F4747813CAC4965A06 /* Bag+Rx.swift */,
+				B6D7F52145D6986DDC613D7FB6DF4F3D /* BehaviorSubject.swift */,
+				893081A9D1C037310A86F3182BF38098 /* BinaryDisposable.swift */,
+				F85F748990FBD91519A91098D6BA6366 /* BooleanDisposable.swift */,
+				A915BB8C0650173C2558895A4B43A73B /* Buffer.swift */,
+				695B2C5AEB6FE1A766CC26F3BE48BC1C /* Cancelable.swift */,
+				B47AE62054C888B75C48419EBF7EF1A7 /* Catch.swift */,
+				4322C1C10B70D563B5B508A53CD5704B /* CombineLatest.swift */,
+				05B19EE7BB7CFC2E18ADF610F26BD9F7 /* CombineLatest+arity.swift */,
+				BFA86CCB6DD23509D8E393B3EBB39E7C /* CombineLatest+Collection.swift */,
+				CC1DDBA7954D27380AA9FE905490F925 /* Completable+AndThen.swift */,
+				C1C89F468280F8359E898DC2281CAC89 /* CompositeDisposable.swift */,
+				8872875BE1C248970BE0C0E6A4F54B2E /* Concat.swift */,
+				631DEA4DC6C852A962E761306DC8E5AF /* ConcurrentDispatchQueueScheduler.swift */,
+				ACE351254D9CADACBCE214EB425A2B43 /* ConcurrentMainScheduler.swift */,
+				95ABE9C8F7D6635646F6C100B2B637B5 /* ConnectableObservableType.swift */,
+				0BED44127AD26D0B00F9FD2ECB9CEDA4 /* Create.swift */,
+				D7E51BBDAB04A3D67CADD9C9DF54CC05 /* CurrentThreadScheduler.swift */,
+				0408C4724C6E604F4F4EEE2856302250 /* Debounce.swift */,
+				30A47B1C8E00C3410BA35859590AFBB3 /* Debug.swift */,
+				B3BE266C827C7427D0C31408FE919905 /* DefaultIfEmpty.swift */,
+				7416EC69ECF5772C560109A5ED8D588E /* Deferred.swift */,
+				2A83AF1902D8C6A7D243C1EB1B632FD4 /* Delay.swift */,
+				1072258F1D85C96C8DE0D43A4D17535E /* DelaySubscription.swift */,
+				424053B5F8188A5A9D86378ECF17AF7F /* Dematerialize.swift */,
+				998EC6F6A2EE477EE6F698F57FFC3750 /* Deprecated.swift */,
+				F95B56C2C53C700F09ACF424C9C68CFC /* DispatchQueue+Extensions.swift */,
+				FEA375D4493914B5629827903F168466 /* DispatchQueueConfiguration.swift */,
+				516D52E4A92E72BFCD8998DBA0BE9B03 /* Disposable.swift */,
+				FC5C19FAC757DF61EE5B83BA514D8F78 /* Disposables.swift */,
+				DF09AC4A7016BDFDF5D4642172938A90 /* DisposeBag.swift */,
+				A2454112DD5AEE5186A4664E9A126BED /* DisposeBase.swift */,
+				2AAFE2F8BED3AD876496367E70110B27 /* DistinctUntilChanged.swift */,
+				535CA1EA937AD886FAD4EC1309B331DD /* Do.swift */,
+				7FEC3DCD86C07B65B23ABB64AD5CDA68 /* ElementAt.swift */,
+				A625DF4508148061AAB7EBC23E067525 /* Empty.swift */,
+				72AE8E25B88FDA8DCA0CE1D1C785AE2D /* Error.swift */,
+				0DC50E863EDEB9C0996B2B6DAA0B99AD /* Errors.swift */,
+				EA4A73DFC5EC70ADEC8DB5A65A07196B /* Event.swift */,
+				949911686773B44C613A58E025C223BA /* Filter.swift */,
+				22AF3598D1B586D34A9092DD1A51FA03 /* Generate.swift */,
+				99662E82007C3712D4A6C84D9442D945 /* GroupBy.swift */,
+				0EB2E37D73483B20FFF4A5A9CC687985 /* GroupedObservable.swift */,
+				00130C4D6737A3B01F28CBD7BA4EEDD3 /* HistoricalScheduler.swift */,
+				4077DE55AEFACC6E0237454995C93E57 /* HistoricalSchedulerTimeConverter.swift */,
+				295257ADE79CBF71EDDB457361B2E80E /* ImmediateScheduler.swift */,
+				BF980894DB7449C53D44D590F6197C88 /* ImmediateSchedulerType.swift */,
+				A6D9C76F23B7D6E1FAEFE7F3EA079003 /* InfiniteSequence.swift */,
+				6AA6FF029E25846278724FECC2B0CD33 /* InvocableScheduledItem.swift */,
+				20E32B939BDA9B05C26957643F21B95E /* InvocableType.swift */,
+				E172658949F5AACBFEFB9F2A7A45121B /* Just.swift */,
+				38DC7C1C0A0A337E524268345E748CA3 /* Lock.swift */,
+				0697E081BC2A5EEB6F014A72AA1FA6FE /* LockOwnerType.swift */,
+				F7CDE3DF48D0BD49F53158F547F2F814 /* MainScheduler.swift */,
+				888D25A758FE1CF355E7A48F6D418E36 /* Map.swift */,
+				0C2D5B54A93C8D77EF18876416B0DB27 /* Materialize.swift */,
+				5D19299E0C5CBA41113508BC57DA9395 /* Merge.swift */,
+				DD55BB66B76757868058C24E16A79BEC /* Multicast.swift */,
+				05EB6180D204793B411E78063D728D37 /* Never.swift */,
+				184A223909D425D6876C780724E7B2DA /* NopDisposable.swift */,
+				C33C30173D8DC512E4B32B8D4DB6D422 /* Observable.swift */,
+				A7ABE12F4F77E42B352D072ACD9946AC /* ObservableConvertibleType.swift */,
+				CB5F32B59881971A1405610DC089DD57 /* ObservableType.swift */,
+				4B17A77CECF7B4996B33CC78A683AFEC /* ObservableType+Extensions.swift */,
+				F80B940734051003693AB8C9396B9A95 /* ObserveOn.swift */,
+				2265FC97FA4169ED188CF2E34F23DACF /* ObserverBase.swift */,
+				F5101A83B512E74F49467146FE96350A /* ObserverType.swift */,
+				024D11AC8314E034F9EE51129F3D2460 /* OperationQueueScheduler.swift */,
+				45F5E5F79EBFF05F9B7B392CEBEBE03B /* Optional.swift */,
+				B10682A3553F0BC32058B81F6157D67B /* Platform.Darwin.swift */,
+				514D99EB5CB7550B570526741912C8C6 /* Platform.Linux.swift */,
+				281B6953B58178760E6D8AE7FDA3CCFB /* PrimitiveSequence.swift */,
+				18F255791BA4F8E78F887B201CEB9A70 /* PrimitiveSequence+Zip+arity.swift */,
+				3EA0BC99D27861517EF33E4AFD427CE3 /* PriorityQueue.swift */,
+				D651D943838D79481E5485342F6E37DA /* Producer.swift */,
+				538A32CCEDC18E4888E6C1A766DF1F02 /* PublishSubject.swift */,
+				CA911BA97CC3081E2363ED0B4580209F /* Queue.swift */,
+				AC76461A77281664DFA98D53498ECD13 /* Range.swift */,
+				DDD1FBFAF29C8BB9FEF76A9F3F5B0061 /* Reactive.swift */,
+				486092B50FE0BFF30D503E7DE4A5E634 /* RecursiveLock.swift */,
+				38AB52055ABAC52DC0BB0AB8FBF07F23 /* RecursiveScheduler.swift */,
+				6C26DF960562568F8AAA198AB9D0ADE9 /* Reduce.swift */,
+				BC59FD558680F110C9CF1E09C4B30234 /* RefCountDisposable.swift */,
+				5EA12B9820292EF94959B987736473C9 /* Repeat.swift */,
+				B6DF9E242A80EC5685B3D5731E9176BB /* ReplaySubject.swift */,
+				647B15E397B92CD0E6B089800A79E32D /* RetryWhen.swift */,
+				651788C4235096156C06C2938F64FDC0 /* Rx.swift */,
+				B7B793869715E1AEF65DF4D148BD88E0 /* RxMutableBox.swift */,
+				8796EDFC02FDC2F169BA74667BB3E3CA /* Sample.swift */,
+				A6DAD9E105266B1758339618389747E4 /* Scan.swift */,
+				48D0E94099FF7A758F7C5B102623B302 /* ScheduledDisposable.swift */,
+				3BB5ADF1D60C58E7C212E5AC4A17E03D /* ScheduledItem.swift */,
+				CB599C6476D3B5ADBA90BD6EAFB4C115 /* ScheduledItemType.swift */,
+				CD087C1A176984F7F186AFBC444C6DF9 /* SchedulerServices+Emulation.swift */,
+				FBCF44963E46D2655B43F77741342C5D /* SchedulerType.swift */,
+				8B8FD648A2922AEAC6DD6AB816E2592B /* Sequence.swift */,
+				D2F8A7D1F3AA17C12A89128D163EFDF5 /* SerialDispatchQueueScheduler.swift */,
+				F85C44B8250F6BDF2F4746605665C079 /* SerialDisposable.swift */,
+				7413D0DEA3FCB4E2B6B61AA738939609 /* ShareReplayScope.swift */,
+				0132F153B6C6244F3078E6A5F7D98CA9 /* SingleAssignmentDisposable.swift */,
+				49E417E77B6316B84A6E574BA392BCDF /* SingleAsync.swift */,
+				82310F12B492F60A13F62CF52702755C /* Sink.swift */,
+				37451A8A1EDFE1BFB039614775982399 /* Skip.swift */,
+				EDA64805F9AEB3535908A7D984AB5BE8 /* SkipUntil.swift */,
+				52D6457286A14A38BBD82D8C6099798B /* SkipWhile.swift */,
+				15CBB9F5E4043A504EE8F7320CDF3F41 /* StartWith.swift */,
+				D3EE8437BC7F2156A710F1EEA545EBC2 /* String+Rx.swift */,
+				139BFBACE8A3AD8B5733AD2B94C930C3 /* SubjectType.swift */,
+				33F225BF47E139D7C104629809615ED8 /* SubscribeOn.swift */,
+				4BCB5AA92F6DEDE2AC3F479C60C7212C /* SubscriptionDisposable.swift */,
+				93EC0AF4A1BE4FA92D40CE454B203C73 /* Switch.swift */,
+				2A04930FB5D53B406D0E4B419625FF1B /* SwitchIfEmpty.swift */,
+				D71252188831E0A81462FE21E33B84CE /* SynchronizedDisposeType.swift */,
+				0E80F14B05E38C811C7DB2355F884967 /* SynchronizedOnType.swift */,
+				FAF3CD60CC66BB642D72FD7DD9FA47EA /* SynchronizedSubscribeType.swift */,
+				CE668A71E275DF34C1ACD8E01FAA0F47 /* SynchronizedUnsubscribeType.swift */,
+				ED2A996D8F9E9BFA159AF4333CEAB7E2 /* TailRecursiveSink.swift */,
+				48AC41077AE8968D02C47F5F8FEB91EF /* Take.swift */,
+				E65642813E0667C81374DA8D6C4D7C96 /* TakeLast.swift */,
+				229212B9293B7746DAE74AF7ED2EF8BD /* TakeUntil.swift */,
+				2EC31C3AF1A745A2E941C3B1884E2FA3 /* TakeWhile.swift */,
+				92278B77A7357596D58AB0C075D0948C /* Throttle.swift */,
+				69138EC14ACB61D4A4FE4CEF74B2D278 /* Timeout.swift */,
+				9744CAC1B97675B5C8BDFE1483E34D21 /* Timer.swift */,
+				A21868904DAD64FC72F911E44FE2429E /* ToArray.swift */,
+				92BD912F8B8ED40C37699519197E61C6 /* Using.swift */,
+				DB6697B7A5CC377C3AC35303B0D0487D /* Variable.swift */,
+				C45CF1E9C72669473CD2D3E71DBD63E9 /* VirtualTimeConverterType.swift */,
+				47CCDEE642D802F7DE9D54E99B029D94 /* VirtualTimeScheduler.swift */,
+				AC25882FB329122EF59BC09D5C5B42B9 /* Window.swift */,
+				A47F43BE5B9D458EBB11F65DF3012B31 /* WithLatestFrom.swift */,
+				4B79E9399FA4CC143E00DD4B8CEA0D33 /* Zip.swift */,
+				79E124948BC6C0A5B04B02009B037987 /* Zip+arity.swift */,
+				7388ECAD6E93F2CDDA035F993F552D87 /* Zip+Collection.swift */,
+				9647DCCDFF9E87508F3EAD2C72DE100B /* Support Files */,
 			);
-			name = Pods;
+			name = RxSwift;
+			path = RxSwift;
+			sourceTree = "<group>";
+		};
+		9647DCCDFF9E87508F3EAD2C72DE100B /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				65291C76071A7F24B8CD055721199A73 /* Info.plist */,
+				F1A93A80FFDD8930597E5AF4351E9F40 /* RxSwift.modulemap */,
+				4244ABA189342D2269E1D874A6A8F286 /* RxSwift.xcconfig */,
+				EFA925A9B9BFE80C3EDB17F2F0BF4A11 /* RxSwift-dummy.m */,
+				899C7116CD1C1652D453B63AA281232B /* RxSwift-prefix.pch */,
+				C87B58E988280B4B9A04835B9570BAAB /* RxSwift-umbrella.h */,
+			);
+			name = "Support Files";
+			path = "../Target Support Files/RxSwift";
 			sourceTree = "<group>";
 		};
 		C1398CE2D296EEBAA178C160CA6E6AD6 /* Products */ = {
@@ -762,244 +924,74 @@
 		C1A60D10CED0E61146591438999C7502 /* Targets Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				88CE2B3F08C34DDB098AD8A5DCC1DF1E /* Pods-SwaggerClient */,
-				D6D0CD30E3EAF2ED10AE0CBC07506C5A /* Pods-SwaggerClientTests */,
+				DE503BFFEBBF78BDC743C8A6A50DFF47 /* Pods-SwaggerClient */,
+				E9EDF70990CC7A4463ED5FC2E3719BD0 /* Pods-SwaggerClientTests */,
 			);
 			name = "Targets Support Files";
 			sourceTree = "<group>";
 		};
-		D6D0CD30E3EAF2ED10AE0CBC07506C5A /* Pods-SwaggerClientTests */ = {
+		DE503BFFEBBF78BDC743C8A6A50DFF47 /* Pods-SwaggerClient */ = {
 			isa = PBXGroup;
 			children = (
-				3F16B43ABD2C8CD4A311AA1AB3B6C02F /* Info.plist */,
-				00ACB4396DD1B4E4539E4E81C1D7A14E /* Pods-SwaggerClientTests.modulemap */,
-				FB170EFD14935F121CDE3211DB4C5CA3 /* Pods-SwaggerClientTests-acknowledgements.markdown */,
-				02F28E719AA874BE9213D6CF8CE7E36B /* Pods-SwaggerClientTests-acknowledgements.plist */,
-				687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */,
-				43FC49AA70D3E2A84CAED9C37BE9C4B5 /* Pods-SwaggerClientTests-frameworks.sh */,
-				E4E6F4A58FE7868CA2177D3AC79AD2FA /* Pods-SwaggerClientTests-resources.sh */,
-				F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */,
-				969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */,
-				849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */,
+				814471C0F27B39D751143F0CD53670BD /* Info.plist */,
+				CFA4F581E074596AB5C3DAF3D9C39F17 /* Pods-SwaggerClient.modulemap */,
+				76645699475D3AB6EB5242AC4D0CEFAE /* Pods-SwaggerClient-acknowledgements.markdown */,
+				08BDFE9C9E9365771FF2D47928E3E79A /* Pods-SwaggerClient-acknowledgements.plist */,
+				F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */,
+				0AD61F8554C909A3AFA66AD9ECCB5F23 /* Pods-SwaggerClient-frameworks.sh */,
+				F4BB3B2146310CA18C30F145BFF15BD9 /* Pods-SwaggerClient-resources.sh */,
+				32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */,
+				AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */,
+				F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */,
+			);
+			name = "Pods-SwaggerClient";
+			path = "Target Support Files/Pods-SwaggerClient";
+			sourceTree = "<group>";
+		};
+		E9EDF70990CC7A4463ED5FC2E3719BD0 /* Pods-SwaggerClientTests */ = {
+			isa = PBXGroup;
+			children = (
+				419496CDDD7E7536CBEA02BAEE2C7C21 /* Info.plist */,
+				9D08EC9B39FEBA43A5B55DAF97AAEBE9 /* Pods-SwaggerClientTests.modulemap */,
+				D47B812D78D0AE64D85D16A96840F8C4 /* Pods-SwaggerClientTests-acknowledgements.markdown */,
+				9D780FDAD16A03CC25F4D6F3317B9423 /* Pods-SwaggerClientTests-acknowledgements.plist */,
+				721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */,
+				CAF6F32F117197F6F08B477687F09728 /* Pods-SwaggerClientTests-frameworks.sh */,
+				F3E1116FA9F9F3AFD9332B7236F6E711 /* Pods-SwaggerClientTests-resources.sh */,
+				CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */,
+				1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */,
+				FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */,
 			);
 			name = "Pods-SwaggerClientTests";
 			path = "Target Support Files/Pods-SwaggerClientTests";
 			sourceTree = "<group>";
 		};
-		D82B01DC4E2A8A19C06CDA44ECD278AA /* Support Files */ = {
+		F425AE79AF3C820F618BDE97C5F5DC44 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				ADF7C6067B822BBAD3F14822D1B1CC81 /* Info.plist */,
-				FFF5F36FD4FA023FAEED7C490D4112F7 /* PetstoreClient.modulemap */,
-				9B9FC0446DF4BE1DB94CBC0AB085954E /* PetstoreClient.xcconfig */,
-				9E8814B64707AA238E44CC6739648D2B /* PetstoreClient-dummy.m */,
-				D2AD7DFB58BCC2F73ADF9157DD2BA644 /* PetstoreClient-prefix.pch */,
-				7F4C7EC001A7DAE883053BE9583EECF1 /* PetstoreClient-umbrella.h */,
+				7778267A888101208ECFC73C1D2F5ABD /* Alamofire */,
+				92B5379E461BA80E1DEDB7DA0C44716F /* RxSwift */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+		FC9FD763F0BBF138A397EE0401BEA7BE /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				E19AF5866D261DB5B6AEC5D575086EA2 /* Info.plist */,
+				15EC3D8D715BC3F25A366C403ED02060 /* PetstoreClient.modulemap */,
+				AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */,
+				7E3D0C745CE3A020C8BC5C96CAFB616F /* PetstoreClient-dummy.m */,
+				4050C78B3A61270CDB69C80EFEB9BF4B /* PetstoreClient-prefix.pch */,
+				0BCC6F35A8BC2A442A13DE66D59CAC87 /* PetstoreClient-umbrella.h */,
 			);
 			name = "Support Files";
 			path = "SwaggerClientTests/Pods/Target Support Files/PetstoreClient";
 			sourceTree = "<group>";
 		};
-		E7F23A0F12E60AD47285170493A15C47 /* RxSwift */ = {
-			isa = PBXGroup;
-			children = (
-				A962E5C6DA31E53BA6DEFCE4F2BC34B8 /* AddRef.swift */,
-				A6635256007E4FB66691FA58431C5B23 /* Amb.swift */,
-				CB186FED84E02D4539A7335A7D657AEB /* AnonymousDisposable.swift */,
-				83CF28DA7318DA2566376ACECE87D6E3 /* AnonymousInvocable.swift */,
-				6472AECA91A4E834A9AF15721BC6D569 /* AnonymousObserver.swift */,
-				BA58F20D8C1234D395CD1165DC3690F3 /* AnyObserver.swift */,
-				A222C21465FACA23A74CB83AA9A51FF9 /* AsMaybe.swift */,
-				B4644DAD437464D93509A585F99B235E /* AsSingle.swift */,
-				EA4F47C5A2E55E47E45F95C0672F0820 /* AsyncLock.swift */,
-				80AD53E4312C3B362D3336BDC9D80A80 /* AsyncSubject.swift */,
-				D5FE55155242FEDEC1B330C78429337F /* Bag.swift */,
-				5D641B399A74F0F9D45B05F8D357C806 /* Bag+Rx.swift */,
-				4FE676DC3C01D76D82723E22A695A308 /* BehaviorSubject.swift */,
-				510BB12F1D8076F5BA1888E67E121E79 /* BinaryDisposable.swift */,
-				0B6D35FB8DCCEAAD8DC223CD5BC95E99 /* BooleanDisposable.swift */,
-				596A0129DA8C10F8A3BEECED9EE16F68 /* Buffer.swift */,
-				463ABD4055AB6537A2C5B0EDB617C139 /* Cancelable.swift */,
-				4313BF26CA6B25832E158F8FC403D849 /* Catch.swift */,
-				CA3E73A8C322E8F93F432A4821A988DD /* CombineLatest.swift */,
-				0AF6AF4017DB31B86B803FEA577F7A22 /* CombineLatest+arity.swift */,
-				86B5A2A541FCAB86964565123DAF4719 /* CombineLatest+Collection.swift */,
-				D497E96ABC5BEF4E26087D1F8D61D35E /* CompositeDisposable.swift */,
-				287F0ED0B2D6A3F3220B6F4E92A7F350 /* Concat.swift */,
-				3B1C5A8AB9C095DD01A23DB6B7179E5C /* ConcurrentDispatchQueueScheduler.swift */,
-				9B782CE63F4EDE0F2FE5908E009D66D3 /* ConcurrentMainScheduler.swift */,
-				5AC613DA00AD0B2ACF145E94AED80E86 /* ConnectableObservable.swift */,
-				AFDFA640848914890DC3B2555740FF84 /* ConnectableObservableType.swift */,
-				6A96069F19C031BE285BF982214ABCB4 /* Create.swift */,
-				9BEFD5C825FC7E42B492A86160C4B4D9 /* CurrentThreadScheduler.swift */,
-				09CF571E27DC65BF77EFFF62354B5EF0 /* Debounce.swift */,
-				4FF46ACE1C78929AB44803AE915B394F /* Debug.swift */,
-				14E29B89A0BDB135B2088F4F20D14F46 /* DefaultIfEmpty.swift */,
-				F119426570E6238D04EAB498E1902F13 /* Deferred.swift */,
-				D14A5F119805F0FCFCC8C1314040D871 /* Delay.swift */,
-				9B939DC5892884F0418DD9231B1C333B /* DelaySubscription.swift */,
-				33E7362EED7450FC886B01AB15E22681 /* Dematerialize.swift */,
-				63A236E8B385B46BC8C1268A38CCBDE5 /* Deprecated.swift */,
-				3F1C7AD0D97D1F541A20DEDFD5AC30AF /* DispatchQueue+Extensions.swift */,
-				F847CE4C82EA73A82952D85A608F86AB /* DispatchQueueConfiguration.swift */,
-				5A98136CD6F078204F8B95D995205F04 /* Disposable.swift */,
-				E841A5E38033B35ED3073E4BBB921518 /* Disposables.swift */,
-				77762B0005C750E84813994CE0075E3B /* DisposeBag.swift */,
-				32C44C9A30733440A3D263B43861FBA1 /* DisposeBase.swift */,
-				75DAC3F84E978269F03F6516EE7E9FAE /* DistinctUntilChanged.swift */,
-				CB3FCE54551234A4F3910C33EB48C016 /* Do.swift */,
-				0668A90FD8DFEB8D178EE6721979B788 /* ElementAt.swift */,
-				C860BEC2AFE3C3670391CECBA2707574 /* Empty.swift */,
-				7FCDAA2549A70BCA3749CF5FCCF837E9 /* Error.swift */,
-				821702C06296B57D769A8DCDD13DE971 /* Errors.swift */,
-				0BED5103BCF9D40F85068CF32B24A63E /* Event.swift */,
-				E7A01B1A67EE04FE1D9C036932C4C037 /* Filter.swift */,
-				9675783D8A4B72DF63BAA2050C4E5659 /* Generate.swift */,
-				9F067CE8E1D793F3477FF78E26651CDB /* GroupBy.swift */,
-				7AC7E0F67AECA3C1CBDBF7BC409CDADC /* GroupedObservable.swift */,
-				C071467FD72C9E762BDC54865F1A4193 /* HistoricalScheduler.swift */,
-				870EAFD138EAD59EAC7EE2CE19DE25B4 /* HistoricalSchedulerTimeConverter.swift */,
-				F777764A45E0A77BE276ADA473AF453A /* ImmediateScheduler.swift */,
-				883F8BF59AD1E1C16492B6CA9A82FB3D /* ImmediateSchedulerType.swift */,
-				5017E276F3AE00F1F45A62F9A35F51C0 /* InfiniteSequence.swift */,
-				30436E554B573E5078213F681DA0061F /* InvocableScheduledItem.swift */,
-				56CC0097103243FBF2702AB35BF7C0A4 /* InvocableType.swift */,
-				C541B03ABB2F0F5E10F027D5E3C9DF4B /* Just.swift */,
-				DACA1956515F0B0CED7487724276C51B /* Lock.swift */,
-				72730856B78AF39AB4D248DDA7771A5B /* LockOwnerType.swift */,
-				4AF8DBA8D803E5226616EC41FA7405ED /* MainScheduler.swift */,
-				939E73AB843F47D6C9EA0D065BAF63FC /* Map.swift */,
-				F1D34B07FCD98BCADAA8A3B68F1ACF1E /* Materialize.swift */,
-				C1FCEDB728FD2060B1A8C36A71039328 /* Merge.swift */,
-				59E44229281B70ACA538454D8DB49FC0 /* Multicast.swift */,
-				8F94DF516E7B950F928922C1D41C6D4D /* Never.swift */,
-				7737478C5B309559EBEB826D48D81C26 /* NopDisposable.swift */,
-				6887D641E8100CE8A13FFA165FC59B73 /* Observable.swift */,
-				93D2B184ED95D52B41994F4AA9D93A6C /* ObservableConvertibleType.swift */,
-				5B4FF38E4CA2AFB54D788C9F1919BFA8 /* ObservableType.swift */,
-				C30419C2A3E0EC1B15E0D3AF3D91FB15 /* ObservableType+Extensions.swift */,
-				BC5B3446AD01BE42D27E9F1B9673C334 /* ObserveOn.swift */,
-				9BE04EA000FD69A9AF7258C56417D785 /* ObserverBase.swift */,
-				88515C2D0E31A4BB398381850BBA2A54 /* ObserverType.swift */,
-				24917B863385D1BB04A2303451C9E272 /* OperationQueueScheduler.swift */,
-				ECB0A2EA86FF43E01E3D3ACE3BD2752B /* Optional.swift */,
-				BB1413438046E9B3E8A94F51358A8205 /* Platform.Darwin.swift */,
-				48242CA8E564C2C50CFF8E3E77668FB7 /* Platform.Linux.swift */,
-				7D9BF77ECD45A0F08FB7892B9597B135 /* PrimitiveSequence.swift */,
-				269E63D0B9C1F5552DF3ABA3F5BF88EB /* PrimitiveSequence+Zip+arity.swift */,
-				880C5FA0EC7B351BE64E748163FA1C31 /* PriorityQueue.swift */,
-				6CCE606004614C138E5498F58AA0D8DF /* Producer.swift */,
-				FA436001918C6F92DC029B7E695520E8 /* PublishSubject.swift */,
-				5A98B8DAD74FBDB55E3D879266AA14CA /* Queue.swift */,
-				80C18B1881A0F511B8D6DDA77F355B51 /* Range.swift */,
-				D984AFE3BDFDD95C397A0D0F80DFECA6 /* Reactive.swift */,
-				7C7C61BEED15998D9D7B47AD6F3E069D /* RecursiveLock.swift */,
-				DAE1A43C13EDE68CF0C6AEA7EA3A2521 /* RecursiveScheduler.swift */,
-				7A9E77B670AC48E19FB2C9FE2BD11E32 /* Reduce.swift */,
-				31DC6B167D2D13AFD8EAAF1E63021B52 /* RefCountDisposable.swift */,
-				EAED6E7C8067874A040C7B3863732D73 /* Repeat.swift */,
-				7269CAD149BFD0BE4D3B1CA43FE6424F /* ReplaySubject.swift */,
-				62F9DE8CE4FBC650CD1C45E4D55A76AB /* RetryWhen.swift */,
-				5B5F05AEF12013DFCBEBE433EEBB3C8F /* Rx.swift */,
-				59EA941CFCC415131D36B17780FA7F33 /* RxMutableBox.swift */,
-				F7FE769331C0AFEF35319E2F6260F9DF /* Sample.swift */,
-				5FA4778A42883943FE99141A948880BE /* Scan.swift */,
-				48E60FBF9296448D4A2FEC7E14FBE6DB /* ScheduledDisposable.swift */,
-				6C32D4D3484C860B70069CD1C629F666 /* ScheduledItem.swift */,
-				2AF9D1F5A21CB847E913BF41EC110B1F /* ScheduledItemType.swift */,
-				60544C2EB93D2C784EF3673B4BA12FAD /* SchedulerServices+Emulation.swift */,
-				B258A9C347C516AA8D8A3FB2CD665D6D /* SchedulerType.swift */,
-				B1F0B7854DD41D311F76522F61203F7F /* Sequence.swift */,
-				8317D3F53EA1D6DC62811B7F71E22E8E /* SerialDispatchQueueScheduler.swift */,
-				C367D19B8DD4C0F9954A24DD5A2A6AFB /* SerialDisposable.swift */,
-				E7513ADBA4C19938F615442415D28732 /* ShareReplay1.swift */,
-				365AE864123C488FD72C61ADC9EC624D /* ShareReplay1WhileConnected.swift */,
-				1A3D311EA38EC997A02CB05BACC0DD7D /* SingleAssignmentDisposable.swift */,
-				805F15552659D5E233243B40C0C6F028 /* SingleAsync.swift */,
-				18254952242D69F129DC1ACD4BDF8AF4 /* Sink.swift */,
-				7011CBC583696921D4186C6121A7F67F /* Skip.swift */,
-				1C897A93D54D11502C0795F3D0F8510F /* SkipUntil.swift */,
-				7E3BEFA00C2C7854A37F845BF40B59F4 /* SkipWhile.swift */,
-				B77F93192159DCCC6CEF8FC5A0924F9A /* StartWith.swift */,
-				F104D45199031F05FCEEFA8E947F210E /* String+Rx.swift */,
-				18328C3FA1839793D455774B0473668C /* SubjectType.swift */,
-				B80609FF38FDE35E5FE2D38886D2361F /* SubscribeOn.swift */,
-				15F7B4D89DB784C462A959824F1E698C /* SubscriptionDisposable.swift */,
-				B7677FD01A3CD0014041B75BD92F6D97 /* Switch.swift */,
-				B4EEA393253D8586EB38190FC649A3FA /* SwitchIfEmpty.swift */,
-				B34B9F812BB8C50E3EA28F4FB51A1095 /* SynchronizedDisposeType.swift */,
-				E9178D3690ADCB4F8C9057F81C073A45 /* SynchronizedOnType.swift */,
-				7B70F2B6C174F1E6C285A5F774C3C97E /* SynchronizedSubscribeType.swift */,
-				EA39A7A8DF958888156A2207EF666EB1 /* SynchronizedUnsubscribeType.swift */,
-				11316F7A1A5EB2E5B756703C0EE77CF6 /* TailRecursiveSink.swift */,
-				16B7B7BE1A379F72CFC27449A45EE5AE /* Take.swift */,
-				4EACF73E072E466AF5911B9BB191E174 /* TakeLast.swift */,
-				65518CF96489DBA6322987069B264467 /* TakeUntil.swift */,
-				61148633F9614B9AD57C5470C729902C /* TakeWhile.swift */,
-				F9F0644CBB2BCA2DB969F16E2B5D92CE /* Throttle.swift */,
-				6CBCC23A46623376CB1616C1C121603D /* Timeout.swift */,
-				26CDF11A8572688E0011727ADD962B74 /* Timer.swift */,
-				37CEC3599B3E7B7EB3DA8FBA9610E255 /* ToArray.swift */,
-				EA907F82073836CB66D5D606FB1333D9 /* Using.swift */,
-				39A2B57F2DAE55FA57D315FDD6953365 /* Variable.swift */,
-				772DB63372E4253C20C516EBF68DD251 /* VirtualTimeConverterType.swift */,
-				E721CFEFA8C057FD4766D5603B283218 /* VirtualTimeScheduler.swift */,
-				DAE679F6024F9BDC9690AFE107798377 /* Window.swift */,
-				3A07BFAFDAB02F19561FDA4115668F66 /* WithLatestFrom.swift */,
-				A45D3DB105B4381656B330C1B2B6301E /* Zip.swift */,
-				BFBD0B4CB17B692257A69160584B0895 /* Zip+arity.swift */,
-				B23F66A643FB8A1DEAC31DC3B637ACEB /* Zip+Collection.swift */,
-				2E07FFE8D5239059E139DA4A84322919 /* Support Files */,
-			);
-			name = RxSwift;
-			path = RxSwift;
-			sourceTree = "<group>";
-		};
-		FF61792A0279354AB25395F889F59979 /* Alamofire */ = {
-			isa = PBXGroup;
-			children = (
-				7728F2E75E01542A06BFA62D24420ADB /* AFError.swift */,
-				6489C0664BA4C768FBB891CF9DF2CFD1 /* Alamofire.swift */,
-				6DA0155598FD96A2BBFF3496F7380D93 /* DispatchQueue+Alamofire.swift */,
-				AA42FD2B1F921714FC4FEABAFB8D190A /* MultipartFormData.swift */,
-				F4668C7356C845C883E13EAB41F34154 /* NetworkReachabilityManager.swift */,
-				64082BE2455C7B840B138508D24C0B0C /* Notifications.swift */,
-				4F69F88B1008A9EE1DDF85CBC79677A8 /* ParameterEncoding.swift */,
-				F57EA9DD77194E4F1E5E5E6CB4CDAE4E /* Request.swift */,
-				DF7CAA870676F2440AC2CCFC5A522F6C /* Response.swift */,
-				F1FCD92EC4EAB245624BBB2DDECF9B2C /* ResponseSerialization.swift */,
-				3ECB713449813E363ABB94C83D77F3A9 /* Result.swift */,
-				64AB42C9C8AA1EFF0761D23E6FEF4776 /* ServerTrustPolicy.swift */,
-				7098927F58CDA88AF2F555BD54050500 /* SessionDelegate.swift */,
-				321FE523C25A0EAF6FF886D6FDE6D24D /* SessionManager.swift */,
-				E181A2141028C3EB376581163644E247 /* TaskDelegate.swift */,
-				F5F0AE167B06634076A6A2605697CE49 /* Timeline.swift */,
-				C0528EC401C03A7544A658C38016A893 /* Validation.swift */,
-				3F6894F6346ED0522534B4531C76C476 /* Support Files */,
-			);
-			name = Alamofire;
-			path = Alamofire;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		0645BE36A8C72C3632F756C0AD71E090 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D18EB5C2A679A80B7AE777522A469B82 /* RxSwift-umbrella.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		1353AC7A6419F876B294A55E5550D1E4 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		411A88E43D5D9D797C82EAD090B6B7C3 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -1008,6 +1000,22 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		471B30B26227EFA841DFB8C1908F33E2 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FCFB16CA31EE1C1E0FA859C0779D4BE6 /* RxSwift-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		5663D37173550E1C99124B9D28AF2295 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EEE78DB914769229A6F7D18F1AFDD1E1 /* PetstoreClient-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		B4002B6E97835FDCCAA5963EFE09A3E0 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -1016,11 +1024,11 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		EB7C12C7ADF8C984756CB74177CB2B54 /* Headers */ = {
+		C19E54C800095CFA2457EC19C7C2E974 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				48828B8EF5A8A114E02744EF755861B1 /* PetstoreClient-umbrella.h in Headers */,
+				265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1047,23 +1055,6 @@
 			productReference = 057FC3E5DE19EA8F4DD600557D771032 /* Pods_SwaggerClient.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		66B5B8B6B5FC2686D07D242FFA858CEA /* RxSwift */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DB44D5A97F47588D95DEAB88B712FB63 /* Build configuration list for PBXNativeTarget "RxSwift" */;
-			buildPhases = (
-				5FE10DC0F04F6C5990B1305EE9B78785 /* Sources */,
-				B40CDEF7587C8F2096A027DB96993AD3 /* Frameworks */,
-				0645BE36A8C72C3632F756C0AD71E090 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = RxSwift;
-			productName = RxSwift;
-			productReference = 84A09D760BA2EA13D5BE269086BAD34C /* RxSwift.framework */;
-			productType = "com.apple.product-type.framework";
-		};
 		88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 419E5D95491847CD79841B971A8A3277 /* Build configuration list for PBXNativeTarget "Alamofire" */;
@@ -1081,40 +1072,58 @@
 			productReference = 5B598E168B47485DC60F9DBBCBEEF5BB /* Alamofire.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		EF06448C65A1D8090D2CD44AAE4AD621 /* PetstoreClient */ = {
+		9D0BAE1F914D3BCB466ABD23C347B5CF /* PetstoreClient */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 571608A4767C3A782EB9F4C0D6CE6BAF /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildConfigurationList = C3A6EBAD4C0AFB16D6AAA10AADD98D05 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
 			buildPhases = (
-				F894D75CBDE6A4F9B7DA28460CF690AB /* Sources */,
-				2C2AC7F85A0925E946CB2F88456DD41C /* Frameworks */,
-				EB7C12C7ADF8C984756CB74177CB2B54 /* Headers */,
+				833629681F82DA1B06D389A5835555B6 /* Sources */,
+				C3BBC13F5A99F913D7BF55BAE90FCE86 /* Frameworks */,
+				5663D37173550E1C99124B9D28AF2295 /* Headers */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				02544073B35237E87A44684627876383 /* PBXTargetDependency */,
-				0190C78B4796D5AC8B02F78A3E131553 /* PBXTargetDependency */,
+				376A429C878F8646399C6B23BCE58F2F /* PBXTargetDependency */,
+				5B0F04B9B75692629053A2F9356FF2EF /* PBXTargetDependency */,
 			);
 			name = PetstoreClient;
 			productName = PetstoreClient;
 			productReference = E9CBBB398E7A62950FA8BC091CBE0359 /* PetstoreClient.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */ = {
+		BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
+			buildConfigurationList = 6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
 			buildPhases = (
-				BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */,
-				87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */,
-				1353AC7A6419F876B294A55E5550D1E4 /* Headers */,
+				61868F2FE74A9422171483DBABE7C61F /* Sources */,
+				7139BF778844E2A9E420524D8146ECD8 /* Frameworks */,
+				C19E54C800095CFA2457EC19C7C2E974 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */,
+			);
+			name = "Pods-SwaggerClientTests";
+			productName = "Pods-SwaggerClientTests";
+			productReference = C4B474BD9070828C0F786071EEF46CD0 /* Pods_SwaggerClientTests.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		E4538CBB68117C90F63369F02EAEEE96 /* RxSwift */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D3C420C0DF364B7B39CC6B7B86AF9FEA /* Build configuration list for PBXNativeTarget "RxSwift" */;
+			buildPhases = (
+				50B11722F298EA98745B8D3A0017BE1F /* Sources */,
+				C6FBD0205779A1AC7CD0ADD758A3BF95 /* Frameworks */,
+				471B30B26227EFA841DFB8C1908F33E2 /* Headers */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
-			name = "Pods-SwaggerClientTests";
-			productName = "Pods-SwaggerClientTests";
-			productReference = C4B474BD9070828C0F786071EEF46CD0 /* Pods_SwaggerClientTests.framework */;
+			name = RxSwift;
+			productName = RxSwift;
+			productReference = 84A09D760BA2EA13D5BE269086BAD34C /* RxSwift.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
@@ -1123,8 +1132,8 @@
 		D41D8CD98F00B204E9800998ECF8427E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0700;
+				LastSwiftUpdateCheck = 0930;
+				LastUpgradeCheck = 0930;
 			};
 			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -1139,10 +1148,10 @@
 			projectRoot = "";
 			targets = (
 				88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */,
-				EF06448C65A1D8090D2CD44AAE4AD621 /* PetstoreClient */,
+				9D0BAE1F914D3BCB466ABD23C347B5CF /* PetstoreClient */,
 				136F0A318F13DF38351AC0F2E6934563 /* Pods-SwaggerClient */,
-				F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */,
-				66B5B8B6B5FC2686D07D242FFA858CEA /* RxSwift */,
+				BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */,
+				E4538CBB68117C90F63369F02EAEEE96 /* RxSwift */,
 			);
 		};
 /* End PBXProject section */
@@ -1173,165 +1182,217 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		5FE10DC0F04F6C5990B1305EE9B78785 /* Sources */ = {
+		50B11722F298EA98745B8D3A0017BE1F /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				71B9FE7CEAE97B22F7326A474DDAFF51 /* AddRef.swift in Sources */,
-				27E1DA817DC3FF6513B59C55B726A920 /* Amb.swift in Sources */,
-				4913653A4B5B249F7C112FDEB8E0CB9F /* AnonymousDisposable.swift in Sources */,
-				78F05FA712773066C65C7652F102892C /* AnonymousInvocable.swift in Sources */,
-				47A4C299DC0AF262F3B147BECA1716C0 /* AnonymousObserver.swift in Sources */,
-				8927C21953F14CBA4280C0D842EF7F97 /* AnyObserver.swift in Sources */,
-				E9DBC7D8412FCFEB52E4FBC1BAF0A3BB /* AsMaybe.swift in Sources */,
-				2834247529DA25BC7EAD2A5F93BC3BA5 /* AsSingle.swift in Sources */,
-				B225D1FD8A326EB19114D8F295AF2431 /* AsyncLock.swift in Sources */,
-				413C5140802B635E5EFD061A5973C8D0 /* AsyncSubject.swift in Sources */,
-				41D4AF198FF453F16AA231156D254F5C /* Bag+Rx.swift in Sources */,
-				F79B8F1D869B9F255166AACBE92AC569 /* Bag.swift in Sources */,
-				B5294D873A7C90C77A5FC6BA24C80BC4 /* BehaviorSubject.swift in Sources */,
-				A9D66665CAD0759B39F1F7B8BDDB40AF /* BinaryDisposable.swift in Sources */,
-				A43177FC0E6314931FEF78D804F7A5A0 /* BooleanDisposable.swift in Sources */,
-				CC8D6B2CC3103AED90E9C82EBEA811B3 /* Buffer.swift in Sources */,
-				4BEC58109676367D63BB38513BDE4E61 /* Cancelable.swift in Sources */,
-				895E052093A91F080FC5F7D96FAF9212 /* Catch.swift in Sources */,
-				EBC209AC9E49B6748B6C92985F4288A6 /* CombineLatest+arity.swift in Sources */,
-				A37E6CFD18F2FBD9E7F921BE64516410 /* CombineLatest+Collection.swift in Sources */,
-				DDCECA86BA5EA0402D24F995BA009730 /* CombineLatest.swift in Sources */,
-				5AFF43F00A5EF8C6D3A18198BC6B3A61 /* CompositeDisposable.swift in Sources */,
-				C532982400133E7580724ADF30551965 /* Concat.swift in Sources */,
-				7E2750102B3F7BA21006DA3786D4FEDE /* ConcurrentDispatchQueueScheduler.swift in Sources */,
-				C7D96CE5C9E8C426F0A4E23201D71897 /* ConcurrentMainScheduler.swift in Sources */,
-				D2ECEB1A744E6AB4EB03988D8FB6E029 /* ConnectableObservable.swift in Sources */,
-				5DEC0EEBF7176C7F8FF1207B01E39F3B /* ConnectableObservableType.swift in Sources */,
-				EE4A6BADF6A7164008D832EDD87FEED6 /* Create.swift in Sources */,
-				395353DBA02265CE8A088384D9C21C96 /* CurrentThreadScheduler.swift in Sources */,
-				18CF543833BAA1E34BAAFAA2B57B9709 /* Debounce.swift in Sources */,
-				F01964782FE633EB69390B3F433D7C64 /* Debug.swift in Sources */,
-				D237954312B88EAF4DDB292F498C65E7 /* DefaultIfEmpty.swift in Sources */,
-				647E4A693C240F1DCC36E18702CA22F2 /* Deferred.swift in Sources */,
-				14F8FBD0D3FBFC5BDE6C3A8DF72484CA /* Delay.swift in Sources */,
-				4FE00C14C1F53B67BC42F1DFD7AEB134 /* DelaySubscription.swift in Sources */,
-				CBB4CFA6177305321ACCB113E8E94226 /* Dematerialize.swift in Sources */,
-				113B52D926F2B09AFA1F46F428D8AC8C /* Deprecated.swift in Sources */,
-				0BB84EADE161C2D47B619ACB31218339 /* DispatchQueue+Extensions.swift in Sources */,
-				7A5F2C5E7D876A8765A1063B8536758E /* DispatchQueueConfiguration.swift in Sources */,
-				605ADF93B7CEBEFB1E9B6ED64F279069 /* Disposable.swift in Sources */,
-				9394E57451C8F3C330109A51E1483CCB /* Disposables.swift in Sources */,
-				7D5356806AA02F1EFC5F3C311DB63E80 /* DisposeBag.swift in Sources */,
-				0DBFC6A3AFDB21E14DE42949EFAB52C3 /* DisposeBase.swift in Sources */,
-				9D10DFE3C68E6C8E744001CF49CAE642 /* DistinctUntilChanged.swift in Sources */,
-				92BE2CB715953E9F5045AD0E2D958CC4 /* Do.swift in Sources */,
-				D9E153A5494E897ACF92A0D54873E3CA /* ElementAt.swift in Sources */,
-				8DB2E2E6A3028665B918CE6156E6D14A /* Empty.swift in Sources */,
-				69E31A4B72F18870572A3D860D1DF5A5 /* Error.swift in Sources */,
-				F8728CCDE6AD8408BFD6F9C612A7B116 /* Errors.swift in Sources */,
-				0B548DFB67637B2D68A1F676F4A105B9 /* Event.swift in Sources */,
-				3171E380E58A3F14BDD85C246D75826F /* Filter.swift in Sources */,
-				422071460CEC4FD457FAE4EB0E4B3826 /* Generate.swift in Sources */,
-				BEA978738EF7DCA94F7B3C190FD11E6B /* GroupBy.swift in Sources */,
-				25150A74A8D3312556CF7125A05CC7FF /* GroupedObservable.swift in Sources */,
-				98660A76B52376A3D70B3F521728176D /* HistoricalScheduler.swift in Sources */,
-				FE9C72CF6913B5204B794AFA0BC44DB1 /* HistoricalSchedulerTimeConverter.swift in Sources */,
-				1B4349FCBC055EC01D28BE388D9C27C9 /* ImmediateScheduler.swift in Sources */,
-				CB9B0ED17EF239AEBD38EADE3ECDD377 /* ImmediateSchedulerType.swift in Sources */,
-				EF0932F6037779CBEFA7914E034EA345 /* InfiniteSequence.swift in Sources */,
-				1B4189B0E3CD1C28CC7B8A33DD40CD1A /* InvocableScheduledItem.swift in Sources */,
-				5BDE8CA34FCA4A007C7186DA5FD5A801 /* InvocableType.swift in Sources */,
-				CAFED669A4C8B0AE6DA35F45CE1D71BC /* Just.swift in Sources */,
-				C0784BB732755A6A13BCFFE7CD7662B9 /* Lock.swift in Sources */,
-				A81EEE957FDA65C14FE55CBF2BBDC937 /* LockOwnerType.swift in Sources */,
-				6E6191F60C604ACE4AD5B02F8D2407B3 /* MainScheduler.swift in Sources */,
-				18D7A50E1BB3A20E0D7E8CE121988DD9 /* Map.swift in Sources */,
-				FEF6B9251547131BEC87C78EC07E5A04 /* Materialize.swift in Sources */,
-				3EC30116BE2A106102E6D8E6F0420A32 /* Merge.swift in Sources */,
-				BF2C7E37667C7124C9B28A2DCE81870B /* Multicast.swift in Sources */,
-				50C8F042293151DF7160103359D24C19 /* Never.swift in Sources */,
-				72F37125F2F0F01BF47E5E3FA196F362 /* NopDisposable.swift in Sources */,
-				8AF09C038B23AC50B0FEAA59F71A9FD0 /* Observable.swift in Sources */,
-				EED2BF29C9A9C8B0391B6111A93AAD29 /* ObservableConvertibleType.swift in Sources */,
-				826B19A12F104BCE96210377CECB1797 /* ObservableType+Extensions.swift in Sources */,
-				79F64699E911193029E1D5471ADCA488 /* ObservableType.swift in Sources */,
-				6755ED61C48BEFFAAB92F736C0118D84 /* ObserveOn.swift in Sources */,
-				9E0C80D55FB3B40455E6D85FC5543063 /* ObserverBase.swift in Sources */,
-				7017FDF93D52934C6F558DFB677FE522 /* ObserverType.swift in Sources */,
-				4458039943079C18B66FC8E07192B004 /* OperationQueueScheduler.swift in Sources */,
-				620D3D599A225398EDB5128038997704 /* Optional.swift in Sources */,
-				79F35F2B656D39743899E74A96F80CE4 /* Platform.Darwin.swift in Sources */,
-				20AD9923B7484C3062DC1782090D5CC0 /* Platform.Linux.swift in Sources */,
-				E67B1B718006058F330F898B17D8E790 /* PrimitiveSequence+Zip+arity.swift in Sources */,
-				744D8076BF0589E55B920CB1EDBAB734 /* PrimitiveSequence.swift in Sources */,
-				558E7976032468B4B3290802329281BB /* PriorityQueue.swift in Sources */,
-				AE183CF99826B88B9409460FFF6D7DA9 /* Producer.swift in Sources */,
-				18033E5B30880169F7A60CD98AE9A06B /* PublishSubject.swift in Sources */,
-				2CBFA5FE714C0F310B12B085944C58A8 /* Queue.swift in Sources */,
-				1717E048D5754063AE1315867E52EE19 /* Range.swift in Sources */,
-				8762C28B6D2F2FA712859CE216EA75AC /* Reactive.swift in Sources */,
-				50524C5E1DB23EA18A06AAECFBF0EF6F /* RecursiveLock.swift in Sources */,
-				77B7D95462F0444B51629B77F40E353A /* RecursiveScheduler.swift in Sources */,
-				8247F2627BAC72EAA0C957B8882F1E3A /* Reduce.swift in Sources */,
-				B562A927F1447725C696075D18A000E8 /* RefCountDisposable.swift in Sources */,
-				541ECA77541A6B87BEA04693733BDC6B /* Repeat.swift in Sources */,
-				44722D2979B06E2738E4247E124C0D71 /* ReplaySubject.swift in Sources */,
-				DFDFDB3E1FC7EA20EDD5BD50F3FD8982 /* RetryWhen.swift in Sources */,
-				7D6CCE326AAA99B1A2DA9C84E72C2ED6 /* Rx.swift in Sources */,
-				8E2EFD0C6CDAF463C86336664605F955 /* RxMutableBox.swift in Sources */,
-				84DC86DC08E5E56C379AF890D699F00D /* RxSwift-dummy.m in Sources */,
-				14ED92A114891418E3C30810DCE5CD53 /* Sample.swift in Sources */,
-				34EFD0CA858F154A1A07FD30FC4E7D6D /* Scan.swift in Sources */,
-				388A3818CA2462513CBD366E481EB479 /* ScheduledDisposable.swift in Sources */,
-				27203A3E758C690E81BFA192020F8CD4 /* ScheduledItem.swift in Sources */,
-				00C50CA5DCB5BA090375BB3B524C50E6 /* ScheduledItemType.swift in Sources */,
-				6899402E8FEA5BBBD5B4167868069E97 /* SchedulerServices+Emulation.swift in Sources */,
-				CEE7C773476EC0FD247E202637C84861 /* SchedulerType.swift in Sources */,
-				B96B42A1676C1B43E7E9D7AC8BE2B6D7 /* Sequence.swift in Sources */,
-				37A1223C80BA6EB819FFDB0DB9018565 /* SerialDispatchQueueScheduler.swift in Sources */,
-				A738D49AC9C1C91E616EBB69E90C34FE /* SerialDisposable.swift in Sources */,
-				8562F754DA6779830E215663770A8324 /* ShareReplay1.swift in Sources */,
-				5C1C84AC7009B654DE4EC1677435B429 /* ShareReplay1WhileConnected.swift in Sources */,
-				2D6753FA5CBC09FF42D12F0DB2601286 /* SingleAssignmentDisposable.swift in Sources */,
-				F35ACF9966EDC4459F3FEF1913904AF5 /* SingleAsync.swift in Sources */,
-				2E8F4D9F164ED6C8CA2089200FCDD626 /* Sink.swift in Sources */,
-				AE299B219B7029799F4E859488B2A65C /* Skip.swift in Sources */,
-				CE029DCA960041A2AC042F9C03FFDCB9 /* SkipUntil.swift in Sources */,
-				DE82657C3F2C8448F284C22F24ED66D5 /* SkipWhile.swift in Sources */,
-				93D8A47EB2C424AAD343C7E5C3A5C93F /* StartWith.swift in Sources */,
-				B49A7BC55758A8FD4C1B6C0D1E6BD5E4 /* String+Rx.swift in Sources */,
-				58268455FBFAB2C66217240430A7DF92 /* SubjectType.swift in Sources */,
-				FEDEC41FE3E34FB114D871C645951310 /* SubscribeOn.swift in Sources */,
-				2883D5F3AAAB2B6F1244E2C5AD01B7C8 /* SubscriptionDisposable.swift in Sources */,
-				B0FF886BA53B7E0856F8BE9B30B58D71 /* Switch.swift in Sources */,
-				F70C9E990861723D8B1785BD76D76353 /* SwitchIfEmpty.swift in Sources */,
-				0D452D986DA48DEAB11DECEAC1BEF52D /* SynchronizedDisposeType.swift in Sources */,
-				F49B8D0ACCA99304CA948C03F9849C4C /* SynchronizedOnType.swift in Sources */,
-				29D7DC0AA2A54C8F8F8CA0179FF7649A /* SynchronizedSubscribeType.swift in Sources */,
-				26BAE89C26DE9986FE8796564747C1FD /* SynchronizedUnsubscribeType.swift in Sources */,
-				FA7E218FB106CAAA4F223D5EAD85B651 /* TailRecursiveSink.swift in Sources */,
-				7A52D7C82439E940A3519511BB20A0C1 /* Take.swift in Sources */,
-				088619C9CB8ECAB44A0079814877AC2B /* TakeLast.swift in Sources */,
-				35E29ACA4FFE9CFE36119C2B5E6BE631 /* TakeUntil.swift in Sources */,
-				8532C2AADED94C7F02886B1B9C7B290B /* TakeWhile.swift in Sources */,
-				851B77C98ACB863EB896E1E4F2BC1837 /* Throttle.swift in Sources */,
-				A1240A21E7B537453B116F2BAD730FBB /* Timeout.swift in Sources */,
-				FD6E37C6BDBAAED7F2B7076C8DD48010 /* Timer.swift in Sources */,
-				1F1681836E1A46010E64F9F74A9688A5 /* ToArray.swift in Sources */,
-				069D8D323EA2AC0D1C41A0835C810485 /* Using.swift in Sources */,
-				89C85DE461A14206F7755EB3A32B8197 /* Variable.swift in Sources */,
-				E103DB3EB5359F4FE898B24CB6C1FCA6 /* VirtualTimeConverterType.swift in Sources */,
-				68F02607B836CA98B2E3F69A29ABE456 /* VirtualTimeScheduler.swift in Sources */,
-				6882F5FF908C82E3BC550D5EDD5DC128 /* Window.swift in Sources */,
-				C820F2E6B25335D6288388FA5FD21F39 /* WithLatestFrom.swift in Sources */,
-				2E938891BE5C8FF254F6793DD6E4ED41 /* Zip+arity.swift in Sources */,
-				6BF97EA13738721A7AB6387154BE8672 /* Zip+Collection.swift in Sources */,
-				8A58D0AAB7B9BB46909105648C10693B /* Zip.swift in Sources */,
+				9CBA62F0AFF0A5826B59553CFA6547E9 /* AddRef.swift in Sources */,
+				354836898B12CDD0AC0F178607EC60F3 /* Amb.swift in Sources */,
+				E20117C8508C1E21BF6F96D5A67430A5 /* AnonymousDisposable.swift in Sources */,
+				0701E374B489C0ABFE501E3E203BA4D2 /* AnonymousInvocable.swift in Sources */,
+				EAE0C66CFAA8E970D961796CA9E3B6A3 /* AnonymousObserver.swift in Sources */,
+				7D3FE25E621C0B5DF33BE49EC44285B6 /* AnyObserver.swift in Sources */,
+				AAD5D545A27D3235B11AB5F312D4F9CC /* AsMaybe.swift in Sources */,
+				2AE82A559BEB897CB1C17DC3F8A2D67D /* AsSingle.swift in Sources */,
+				27E65DDC557373A5BCA8ECE76305B022 /* AsyncLock.swift in Sources */,
+				53CE54C6169C04A9EC42AEFA26DBF4E7 /* AsyncSubject.swift in Sources */,
+				80A14AE8567A89125CDA2D1E9E3C9EA5 /* Bag+Rx.swift in Sources */,
+				881DF840D562167EA8BECCD4F3DE44A5 /* Bag.swift in Sources */,
+				2C684BE18659784FA9D5C18B8E2F56C4 /* BehaviorSubject.swift in Sources */,
+				701AFF28B13BC1B54B2EC0E7139296A6 /* BinaryDisposable.swift in Sources */,
+				8C391D10E5780A3AD69F0B48D81873C2 /* BooleanDisposable.swift in Sources */,
+				E646989B1C390802DE99BC11A99A6195 /* Buffer.swift in Sources */,
+				95319323AA47177F07DC434862E8786B /* Cancelable.swift in Sources */,
+				378DF713B6DCEE98B1121E1C82AA528A /* Catch.swift in Sources */,
+				814CCE747E50503E645AB6A4BEA9C3B9 /* CombineLatest+arity.swift in Sources */,
+				65DB637553156629C46FC1F02E624D9E /* CombineLatest+Collection.swift in Sources */,
+				55A0ADE7B16EF10C76A139DF785498C3 /* CombineLatest.swift in Sources */,
+				F374C9C0BBD2E98835074F1117D19025 /* Completable+AndThen.swift in Sources */,
+				D95808D482B2CCE0A57E617BBE1C24CF /* CompositeDisposable.swift in Sources */,
+				00DF0F7239A239F6EF9E06E68864C12C /* Concat.swift in Sources */,
+				9DAD079E8BFA8BB8C6270BD59F12B75A /* ConcurrentDispatchQueueScheduler.swift in Sources */,
+				288CF8B3281E9A8E196EAD966DCCCF3F /* ConcurrentMainScheduler.swift in Sources */,
+				0A53E3607BFAD28B3BDBEBD4060AF4AD /* ConnectableObservableType.swift in Sources */,
+				A461BFEA1D55600A0C20FEE62B2AC808 /* Create.swift in Sources */,
+				A8907D8BB13490C6BDDEB718A825ED3B /* CurrentThreadScheduler.swift in Sources */,
+				2B22029126CD2DB4CE15A3EE200431CD /* Debounce.swift in Sources */,
+				83A278FC1771188BF654862D87A79497 /* Debug.swift in Sources */,
+				E7CFD93574F6D9FFC1E20C79933BF9B7 /* DefaultIfEmpty.swift in Sources */,
+				B3900C161CAD5762104495FFD825D417 /* Deferred.swift in Sources */,
+				559E3223631967618E57D02F9A692AAC /* Delay.swift in Sources */,
+				63FB5F594F411D8D6BDC157C854EEE8E /* DelaySubscription.swift in Sources */,
+				A1888B4C68923F294CC00FA69C2D3FA0 /* Dematerialize.swift in Sources */,
+				92C33C8F9615FAC4C1FCE4F44F7AC373 /* Deprecated.swift in Sources */,
+				D49D0B2348D2A35E9A39124C979DFDE0 /* DispatchQueue+Extensions.swift in Sources */,
+				F4EDA8CB7455BCABFFD6992BE4D7E53A /* DispatchQueueConfiguration.swift in Sources */,
+				DFE3AC8FE52397BB76BEF114A0825E26 /* Disposable.swift in Sources */,
+				A75F3F8315F50D4FAAD79784972AEE3E /* Disposables.swift in Sources */,
+				2A9EC7B938356D259F37E64466AED071 /* DisposeBag.swift in Sources */,
+				02FD9B892BE5971F34F1F33B48259152 /* DisposeBase.swift in Sources */,
+				C88A07F5CBEECD3C3287EF230542E9BA /* DistinctUntilChanged.swift in Sources */,
+				2E6C2FC6A7E76480C639AC51CC0894C2 /* Do.swift in Sources */,
+				8D139181B7F153687292979FA042AD3B /* ElementAt.swift in Sources */,
+				613618A88EE02862BCE84869AA89E4AE /* Empty.swift in Sources */,
+				FF735B76D45E1208C767A7C01B9FEB6B /* Error.swift in Sources */,
+				E3983118B0AEF9B702F6513C8C4630B5 /* Errors.swift in Sources */,
+				42D3883B0296558083DFBE5375552905 /* Event.swift in Sources */,
+				28295BE414CF6415C641D10EEF4E144C /* Filter.swift in Sources */,
+				83ADD423F64E3EA0A04827FEDB4551F5 /* Generate.swift in Sources */,
+				C0E8935F39D43182341F9237E14FEB48 /* GroupBy.swift in Sources */,
+				7018CC80523C7192A8C6F535499F9663 /* GroupedObservable.swift in Sources */,
+				CFE18A460774777238539B6816CA0865 /* HistoricalScheduler.swift in Sources */,
+				8A7DA1410CC7793A911EFF7961D871A7 /* HistoricalSchedulerTimeConverter.swift in Sources */,
+				11BF530A4D0362FF7255073E1A86FCC4 /* ImmediateScheduler.swift in Sources */,
+				40BE340D2D8DBAC30CCB5647E07DF9B1 /* ImmediateSchedulerType.swift in Sources */,
+				1CDF8860135719D9B67BDC6453A1DB07 /* InfiniteSequence.swift in Sources */,
+				98ABF68A5893A05770B62C70FF2D9B39 /* InvocableScheduledItem.swift in Sources */,
+				3DD6224508DDC3BBF8A184D20DBD6318 /* InvocableType.swift in Sources */,
+				95F38402EDA23648E2E9643BF23B0A99 /* Just.swift in Sources */,
+				675BA3879823193A505ADA24E26A640C /* Lock.swift in Sources */,
+				780DC70EC33DBE792680FF224C6B3189 /* LockOwnerType.swift in Sources */,
+				BC6FE7B95D4381C14034EA0158A27943 /* MainScheduler.swift in Sources */,
+				32FACB02BE3AE41039792DB80AC20FB1 /* Map.swift in Sources */,
+				BA90CC03E356EC0CB00EE000FE8ED8FF /* Materialize.swift in Sources */,
+				3B5E8842032A0EC5BB4BD5F99E5C633F /* Merge.swift in Sources */,
+				3B78236E5721DF44006119A96CB2297A /* Multicast.swift in Sources */,
+				C5C72F359C98A639D16BEBC44D45AD58 /* Never.swift in Sources */,
+				18EA6C3EB4F28FABE7EAC20145C371EF /* NopDisposable.swift in Sources */,
+				7F6C06307179982AFA169539C59878A6 /* Observable.swift in Sources */,
+				0D59BBE92D161E0C5D65B3D72E32B445 /* ObservableConvertibleType.swift in Sources */,
+				3B009A721464098ABBAB99943C15E8E3 /* ObservableType+Extensions.swift in Sources */,
+				92202E005A3283B86D2FD8C13A7B6984 /* ObservableType.swift in Sources */,
+				832A38EA2BEF84AED0C1232AF683E14E /* ObserveOn.swift in Sources */,
+				35F53DFB2143E85E802BD2598B01FD42 /* ObserverBase.swift in Sources */,
+				1F0573234DBE02637E714764DD6FF78E /* ObserverType.swift in Sources */,
+				FFCEFEACA09A0AB1E772939BEE1251D0 /* OperationQueueScheduler.swift in Sources */,
+				82DCAB1B03B1FF4922EEAA7284CD8891 /* Optional.swift in Sources */,
+				C30834A9E888DC5752BB464AA4C6B583 /* Platform.Darwin.swift in Sources */,
+				E615C98E97CFD31CDC08C103E8C9AFCC /* Platform.Linux.swift in Sources */,
+				AA5924E7A2767173A488CD67448A344F /* PrimitiveSequence+Zip+arity.swift in Sources */,
+				0FEF1C28FD87288A71D6CB36C7E834F8 /* PrimitiveSequence.swift in Sources */,
+				A66D6FDA68BE83B5082CE656909F78D6 /* PriorityQueue.swift in Sources */,
+				C04E4412EE56D42C6E6E3A4A35E74916 /* Producer.swift in Sources */,
+				94A76A58C03383E6AEF5954B048EA943 /* PublishSubject.swift in Sources */,
+				31886B413F1EE6BD11B1720F62E09EB8 /* Queue.swift in Sources */,
+				4EBFA027A211DFDD7736AD31C9B28BB6 /* Range.swift in Sources */,
+				DDFBECD67E5A6A9645A66D7919513F64 /* Reactive.swift in Sources */,
+				54A23EABA7C6CA3C2761E55C832212CD /* RecursiveLock.swift in Sources */,
+				C9FEFA9F181D03BC5A33843BA80BA501 /* RecursiveScheduler.swift in Sources */,
+				7A484927B5885C32681B9C0F981164E2 /* Reduce.swift in Sources */,
+				B570FDBFFB6C8319B1822F6D1CA57618 /* RefCountDisposable.swift in Sources */,
+				9FB30BA094639E9D209E7E46ECB04873 /* Repeat.swift in Sources */,
+				2E35FF49479CD266D11B201C4F425D88 /* ReplaySubject.swift in Sources */,
+				F0724B08BA9C030769B8B071407FA875 /* RetryWhen.swift in Sources */,
+				D36500BA67AB18E64F4743796274C7F6 /* Rx.swift in Sources */,
+				FADAE4698562DB2F08EEE38B2838D7C3 /* RxMutableBox.swift in Sources */,
+				B2167A447DC5D9CC8B3194F650D3F766 /* RxSwift-dummy.m in Sources */,
+				728056B28FF21ADB01C3D4E76685D2CA /* Sample.swift in Sources */,
+				EF3864ECC6F81AA9290D334DD8958829 /* Scan.swift in Sources */,
+				FF8E2A66A632AE79D440E2492242AD5A /* ScheduledDisposable.swift in Sources */,
+				C6B6E0537CACAD67C6C53CB52D3AF430 /* ScheduledItem.swift in Sources */,
+				94EBC7DB7F9E78474473121B58017231 /* ScheduledItemType.swift in Sources */,
+				273CC6F689134C1BFA35BBA3F024FA1A /* SchedulerServices+Emulation.swift in Sources */,
+				7CDFFB7F904FAA05F2549B97F83C208B /* SchedulerType.swift in Sources */,
+				B8216658C16040E40C3121638EB83BB7 /* Sequence.swift in Sources */,
+				1F51E8FA18E73CDD1753B47BACDE8B56 /* SerialDispatchQueueScheduler.swift in Sources */,
+				C06FFF2DCFC2E38F7183A390DB548039 /* SerialDisposable.swift in Sources */,
+				883AF2FA5F21ECEFA5AA052EA2AA52D1 /* ShareReplayScope.swift in Sources */,
+				490FC3C33AC45753F2B8295D46C6C93A /* SingleAssignmentDisposable.swift in Sources */,
+				87561C5525FF161AC0D9BE8E4878B012 /* SingleAsync.swift in Sources */,
+				3016477B301E7E1F2237A46F4D040562 /* Sink.swift in Sources */,
+				5E28EE8AD40978238703E0A9D9BAC23C /* Skip.swift in Sources */,
+				65ECA0FE8FA1DB003A1C4E2F6F5068ED /* SkipUntil.swift in Sources */,
+				CD72FF21E244B422BAA707396ADD5F84 /* SkipWhile.swift in Sources */,
+				A4F3B4D94EEFE3A4C297F7D2254720A7 /* StartWith.swift in Sources */,
+				469B15AD1F6DA1B495CC2AA54B5D78B6 /* String+Rx.swift in Sources */,
+				1C9DFCC78A774BFC20D854D2876F1A55 /* SubjectType.swift in Sources */,
+				81E833CC467CE9A868C4992EED22E90B /* SubscribeOn.swift in Sources */,
+				30EE6C005A481E34141B3B582370CB49 /* SubscriptionDisposable.swift in Sources */,
+				DD7EA78A0E20276FBEA92A47B29D675B /* Switch.swift in Sources */,
+				A1156AAA078DA49A2F84A73498ACFFA8 /* SwitchIfEmpty.swift in Sources */,
+				13E8EF2C11EACF9F667BFA33DB4BE1F6 /* SynchronizedDisposeType.swift in Sources */,
+				A8F07D61BA5B044BCF2528FE814802F8 /* SynchronizedOnType.swift in Sources */,
+				AE91B9C7676BED08DD29D919667641EF /* SynchronizedSubscribeType.swift in Sources */,
+				7B1D784EEEE456BA1599F4EF2B0DEEC9 /* SynchronizedUnsubscribeType.swift in Sources */,
+				85CFCEF4B3B5D9B5782E002EBC964C07 /* TailRecursiveSink.swift in Sources */,
+				0DA16962ECAE07F74660E01B8596405D /* Take.swift in Sources */,
+				E0C3813806F9C243364888B92E3F6A58 /* TakeLast.swift in Sources */,
+				D2D8098C55A83C6090F0FED29B4CAC6A /* TakeUntil.swift in Sources */,
+				6E170ABE9ACD8548EAC55656F97F4907 /* TakeWhile.swift in Sources */,
+				E8FB135391A3DB1932525FA4C7B868D9 /* Throttle.swift in Sources */,
+				EFAE4DCFFA55CB5C8FAF4092224E67CF /* Timeout.swift in Sources */,
+				BE84A0438BB1CAC7F8B734D0071F6B5B /* Timer.swift in Sources */,
+				F5A2918BDB2BA50E47C84F9CA95ABC89 /* ToArray.swift in Sources */,
+				45B2FF4DAF9FBAB97D814EC9B3D6E1A8 /* Using.swift in Sources */,
+				BB2ADF1D564AC603088379085CBB5E00 /* Variable.swift in Sources */,
+				AD72FC77B132100856099D6BE08BA946 /* VirtualTimeConverterType.swift in Sources */,
+				B71E8D1BA38979387FB07B2DE375CC78 /* VirtualTimeScheduler.swift in Sources */,
+				8409E8357E6E556D947C0883002F14DA /* Window.swift in Sources */,
+				7E8943764477D589A4D425FEA758249A /* WithLatestFrom.swift in Sources */,
+				1A39147EC345B333F96135FEAA1EA162 /* Zip+arity.swift in Sources */,
+				AA00DE5B6E4CEB7619A109AEE765E899 /* Zip+Collection.swift in Sources */,
+				E90B654B54B4E686AABC7E1346FC99DA /* Zip.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */ = {
+		61868F2FE74A9422171483DBABE7C61F /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */,
+				80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		833629681F82DA1B06D389A5835555B6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				AAA4BB328D5B9974CAE7079EADCB55F3 /* AdditionalPropertiesClass.swift in Sources */,
+				586CD484DFDF8D1ABED25DF0BA1D6A90 /* AlamofireImplementations.swift in Sources */,
+				C02152ADEC441FFA411DE0BFB5574C6E /* Animal.swift in Sources */,
+				52944493AAD6238E0C4D4473C09F9697 /* AnimalFarm.swift in Sources */,
+				F041E9FD775EEFE794AB22C632050442 /* AnotherFakeAPI.swift in Sources */,
+				B7DCE8A53F3C2E56E4CC1EBFC51CFBBB /* APIHelper.swift in Sources */,
+				B80E85AD2BA24EF11F641050D4306011 /* ApiResponse.swift in Sources */,
+				FC5F971819DF37E080DD24B4659D292D /* APIs.swift in Sources */,
+				7E58FC0F8CEA885D0978B978C1AFDA39 /* ArrayOfArrayOfNumberOnly.swift in Sources */,
+				B1D90A96F361927E2C864B8B2E0C6998 /* ArrayOfNumberOnly.swift in Sources */,
+				3CFC78E889B5B01E41D07FA8B7D3F20F /* ArrayTest.swift in Sources */,
+				E2FCA242C2D21DEF5CF64A4948B303E5 /* Capitalization.swift in Sources */,
+				CC3D6772A375C8384DEAF649FB2E799B /* Cat.swift in Sources */,
+				AD3D283352C4C58D37373ACEAAD21CCA /* Category.swift in Sources */,
+				2E4E7221D236CDDCA9936FF409668157 /* ClassModel.swift in Sources */,
+				FC2BA04F51DF605708177391FC5CBEB1 /* Client.swift in Sources */,
+				4EC9D9884B0E59836149DE74E86ED32C /* Configuration.swift in Sources */,
+				A88687F0D5C7B8F17FE6E8C560FF27C2 /* Dog.swift in Sources */,
+				13CBC288264AB845A079CF354481902F /* EnumArrays.swift in Sources */,
+				4C85A4DF1FE85A71264C1235490B4CB8 /* EnumClass.swift in Sources */,
+				2CB87E8301D75048872CC80AF0F39191 /* EnumTest.swift in Sources */,
+				36C597BA9BB747DA51B85ED0CC4C5380 /* Extensions.swift in Sources */,
+				EB02B86DAE80B2F604DFF745291CD97E /* FakeAPI.swift in Sources */,
+				A4D75955E70AE28814436BFD3A667877 /* FakeClassnameTags123API.swift in Sources */,
+				2BCF537D3707AE25F5CE467E30423CCE /* FormatTest.swift in Sources */,
+				8EE6CAA016BB77D98A94C6A8A6035B5C /* HasOnlyReadOnly.swift in Sources */,
+				AC84DFF4BBABCF4F8DA619E8E0A71770 /* List.swift in Sources */,
+				E4B4E729EF665FA241A3CAAB77622D12 /* MapTest.swift in Sources */,
+				CD7F8A63D0F72B0A4F515C63433BC805 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
+				DE983659BDB585F117E8D5A6035691EC /* Model200Response.swift in Sources */,
+				AF8F5FE11B128B96067030DD9FC7B9C3 /* Models.swift in Sources */,
+				078B39669CAE5CAA0B4F881A1D953831 /* Name.swift in Sources */,
+				F5D7352A8D14A89B873F35F23953495F /* NumberOnly.swift in Sources */,
+				D5F12C5EFF4CA158297A1BDE3788B931 /* Order.swift in Sources */,
+				1CEB283CB5C6161FD3079564C416F582 /* OuterComposite.swift in Sources */,
+				F5267C956BA9631B2CBDB207340F3C31 /* OuterEnum.swift in Sources */,
+				206834A2D53A2C0E3ECE945C768B8EB8 /* Pet.swift in Sources */,
+				4D4420A3806244A28021BAC382499B98 /* PetAPI.swift in Sources */,
+				AAC833250183E5D26197A6A7FBDDBE31 /* PetstoreClient-dummy.m in Sources */,
+				236550E146C48E5FCAB68D8C6368D92B /* ReadOnlyFirst.swift in Sources */,
+				AAAFD62D4E1F93C4EC939BDE9AE36B40 /* Return.swift in Sources */,
+				66390F82F9F5412C64A7C24D8016A73F /* SpecialModelName.swift in Sources */,
+				30DDFCEDA0032F625237387B44E122D3 /* StoreAPI.swift in Sources */,
+				C614A64F12B85A30B4E179111161A4F2 /* Tag.swift in Sources */,
+				59C6B968D13835981B5EDABB8BE4852A /* User.swift in Sources */,
+				E25F484C36B0BD9B3AF5F671766A362E /* UserAPI.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1343,86 +1404,31 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		F894D75CBDE6A4F9B7DA28460CF690AB /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DB1674B5221497F0781506BC3D3DB14D /* AdditionalPropertiesClass.swift in Sources */,
-				DECDCFF8F77B285B8E565E1F3D759D86 /* AlamofireImplementations.swift in Sources */,
-				5640D4D6568ED402D0789D4CE76CA707 /* Animal.swift in Sources */,
-				A95E05FA3760CAA9BD09D1DA2E63C1C7 /* AnimalFarm.swift in Sources */,
-				C93468AFEE47CED3CF2C9EE43647369E /* APIHelper.swift in Sources */,
-				41D7E74614B7E7289F55DC3C2C5E1BC7 /* ApiResponse.swift in Sources */,
-				7E3483337526BAB8F018A0D3F4AB3301 /* APIs.swift in Sources */,
-				C58B42EA7B120CFDA0D45ED69CC347FD /* ArrayOfArrayOfNumberOnly.swift in Sources */,
-				537747BEC46420B59A6E6404B55519E0 /* ArrayOfNumberOnly.swift in Sources */,
-				C7EBEDBD417428925528DC9BE13C3CD5 /* ArrayTest.swift in Sources */,
-				609D36645D868B8D4B2175FF76785490 /* Capitalization.swift in Sources */,
-				A26C90236BB15DB7900521CC97C4F1D6 /* Cat.swift in Sources */,
-				6A366BBAFAD2E0C249DF77A193516D52 /* Category.swift in Sources */,
-				71AA7E64651C50855F1E8D6672A92A97 /* ClassModel.swift in Sources */,
-				07538F6EF28CF0D537B45B6210077B6F /* Client.swift in Sources */,
-				B55EB691D0BA0B3A7B30B397735B8C45 /* Configuration.swift in Sources */,
-				FE117050A9DD8D8B7B10768B97070C9F /* Dog.swift in Sources */,
-				6C7806F381D2AC4D92A3C93986F18F82 /* EnumArrays.swift in Sources */,
-				F03314F98A25C519B11F849BC7A325D0 /* EnumClass.swift in Sources */,
-				386F9A49ADAB8E03CE41B6EC146B5FA2 /* EnumTest.swift in Sources */,
-				4FE4C667BB96C218E29D53392D21AEC9 /* Extensions.swift in Sources */,
-				8F82AE7F51351B9E13D405006482FEE6 /* Fake_classname_tags123API.swift in Sources */,
-				860E77C38C6A9E6F9C6DD4457119C4CE /* FakeAPI.swift in Sources */,
-				6B266E73D0D76B5DFF4900963F3561FC /* FormatTest.swift in Sources */,
-				22EE4A36063EC92A1E44595D3CA1285E /* HasOnlyReadOnly.swift in Sources */,
-				AC5EA05CC3AB722B8FAFA500AE9AE14D /* List.swift in Sources */,
-				2528BD9FDA9E26A202E8A8AB6DEFFB0F /* MapTest.swift in Sources */,
-				9BB27EC494EC7A1DE605C2F9C651EAC8 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
-				0D5164E0905ADFD6E8801868FF767491 /* Model200Response.swift in Sources */,
-				0E06A7A24FEC623CCD59A64464FA0F4B /* Models.swift in Sources */,
-				1A54AFBFE909D0F2608D4F47C52ED045 /* Name.swift in Sources */,
-				D285D4EB606DA906E58F886325157E7A /* NumberOnly.swift in Sources */,
-				B7E707ED3304DC2880A70A648405C3F4 /* Order.swift in Sources */,
-				C88D778A956F43A56BA03D6D8CBFDCE5 /* OuterBoolean.swift in Sources */,
-				4417ABCFF958D02DF8E985AF534F7BCC /* OuterComposite.swift in Sources */,
-				7A2028722035DA3B8440147EE06D9F10 /* OuterEnum.swift in Sources */,
-				670915CFD068A67AA6C01E7596315E4D /* OuterNumber.swift in Sources */,
-				B8B06AE345D2EDFAADBA24DE5B9F9E8F /* OuterString.swift in Sources */,
-				371D450E9B85ACBA18E949DEEC06DAE3 /* Pet.swift in Sources */,
-				5D4EE628D324BC4A7EF5878364796DED /* PetAPI.swift in Sources */,
-				058099234763329A48424C8A10C5824E /* PetstoreClient-dummy.m in Sources */,
-				0CAD756A07CDD3214A87984F53D2D553 /* ReadOnlyFirst.swift in Sources */,
-				0588C627138A5FC717BE474F7F6099F4 /* Return.swift in Sources */,
-				A56413C6A12B1D2F50BF5461C2849DB9 /* SpecialModelName.swift in Sources */,
-				9C5C95CBEBBF8ADB142C102234C396EC /* StoreAPI.swift in Sources */,
-				C18B62BC2701E2D05B1352515F91A5C1 /* Tag.swift in Sources */,
-				79FE0B73A3F9EE4A7E0CACBB97650798 /* User.swift in Sources */,
-				7B3A68DD690D4DC76D988FFDABA3A53C /* UserAPI.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		0190C78B4796D5AC8B02F78A3E131553 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = RxSwift;
-			target = 66B5B8B6B5FC2686D07D242FFA858CEA /* RxSwift */;
-			targetProxy = 1B7FB01D467CF11D5941EEAF91C410DF /* PBXContainerItemProxy */;
-		};
-		02544073B35237E87A44684627876383 /* PBXTargetDependency */ = {
+		376A429C878F8646399C6B23BCE58F2F /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = Alamofire;
 			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
-			targetProxy = 5C3F762558DC2D7B716E03DF2DDBDF45 /* PBXContainerItemProxy */;
+			targetProxy = 75C5BB87F29EE0C4D5C19FF05D2AEF02 /* PBXContainerItemProxy */;
 		};
 		4DAA97CFDA7F8099D3A7AFC561A555B9 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = RxSwift;
-			target = 66B5B8B6B5FC2686D07D242FFA858CEA /* RxSwift */;
+			target = E4538CBB68117C90F63369F02EAEEE96 /* RxSwift */;
 			targetProxy = A50F0C9B9BA00FA72637B7EE5F05D32C /* PBXContainerItemProxy */;
 		};
+		5B0F04B9B75692629053A2F9356FF2EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = RxSwift;
+			target = E4538CBB68117C90F63369F02EAEEE96 /* RxSwift */;
+			targetProxy = 00C0A2B6414C2055A4C6AAB9D0425884 /* PBXContainerItemProxy */;
+		};
 		9188E15F2308611275AADD534748A210 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PetstoreClient;
-			target = EF06448C65A1D8090D2CD44AAE4AD621 /* PetstoreClient */;
+			target = 9D0BAE1F914D3BCB466ABD23C347B5CF /* PetstoreClient */;
 			targetProxy = 2B4A36E763D78D2BA39A638AF167D81A /* PBXContainerItemProxy */;
 		};
 		AF4FFAE64524D9270D895911B9A3ABB3 /* PBXTargetDependency */ = {
@@ -1431,153 +1437,76 @@
 			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
 			targetProxy = 0B2AA791B256C6F1530511EEF7AB4A24 /* PBXContainerItemProxy */;
 		};
+		CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "Pods-SwaggerClient";
+			target = 136F0A318F13DF38351AC0F2E6934563 /* Pods-SwaggerClient */;
+			targetProxy = 39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		077C4BB7DBEAA715DED46C057DC8051C /* Release */ = {
+		11BD519A449A78231BB165A846BE1EFA /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C0141EB6EAA64B81BBA6C558E75FE6A3 /* Alamofire.xcconfig */;
+			baseConfigurationReference = F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_NAME = Alamofire;
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		157AF0CD5E5AB2A2E74D3B8ECD865185 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGNING_REQUIRED = NO;
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"POD_CONFIGURATION_RELEASE=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
-				STRIP_INSTALLED_PRODUCT = NO;
-				SYMROOT = "${SRCROOT}/../build";
 				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		1713B0CEBD1F85062687B67D4C05B369 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
 			name = Release;
 		};
-		225CFF6825EFDC3BC5E0BD17DB796AD3 /* Debug */ = {
+		2F11B524CBA83FDA4505AFC60245EBDC /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */;
+			baseConfigurationReference = 1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
 				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 3.0;
@@ -1587,29 +1516,94 @@
 			};
 			name = Debug;
 		};
-		4637BF406E4C4B9FD8F323E585FCAD4F /* Debug */ = {
+		4E42BE31906A6664C5897CACAD3CE7B9 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9B9FC0446DF4BE1DB94CBC0AB085954E /* PetstoreClient.xcconfig */;
+			baseConfigurationReference = FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		5FC364C7697C3765B8268B5EED1F6263 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4244ABA189342D2269E1D874A6A8F286 /* RxSwift.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/RxSwift/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap";
+				PRODUCT_MODULE_NAME = RxSwift;
+				PRODUCT_NAME = RxSwift;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		624A19756388ECE410F22C4B5DFF991E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
 				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_MODULE_NAME = PetstoreClient;
 				PRODUCT_NAME = PetstoreClient;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -1622,99 +1616,26 @@
 			};
 			name = Debug;
 		};
-		6DE21489DDEB128A7B20C23FD2CF9D36 /* Release */ = {
+		7B0415700290D1DEBAB6B173951CC0C7 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FB65A0C0C98ACB27CAE43B38C6B4A9FC /* RxSwift.xcconfig */;
+			baseConfigurationReference = 32CAA23B558D5641EE6320708FECD03E /* Alamofire.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/RxSwift/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_NAME = RxSwift;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		7DB6F1AE8E8584FBAA1F2DC4EAB7F4A1 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = FB65A0C0C98ACB27CAE43B38C6B4A9FC /* RxSwift.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/RxSwift/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_NAME = RxSwift;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		D60F8C4DE6B0D221A33959774DA3DAFF /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = C0141EB6EAA64B81BBA6C558E75FE6A3 /* Alamofire.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
 				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_MODULE_NAME = Alamofire;
 				PRODUCT_NAME = Alamofire;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -1727,155 +1648,248 @@
 			};
 			name = Debug;
 		};
-		E55DEB5F7A7C75B015C79914E39D8028 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		EADCEA8D9D624267A5AE96B0C0D68BCB /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = YES;
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		EED546DBB23FC32035C9BDC4E22B30BD /* Debug */ = {
+		8B33C5230DE4A9DFA6D8F46505DD7AF7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
 				CODE_SIGNING_REQUIRED = NO;
 				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"POD_CONFIGURATION_DEBUG=1",
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SYMROOT = "${SRCROOT}/../build";
 			};
 			name = Debug;
 		};
-		FE0340FD75EFCA060255E9DA84041497 /* Release */ = {
+		95DBEF0AB0B74932A7CEF4BB6099470D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9B9FC0446DF4BE1DB94CBC0AB085954E /* PetstoreClient.xcconfig */;
+			baseConfigurationReference = 32CAA23B558D5641EE6320708FECD03E /* Alamofire.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				PRODUCT_MODULE_NAME = Alamofire;
+				PRODUCT_NAME = Alamofire;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		B42B54097A876E8A982CBF5DAA91B1AB /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
+				CODE_SIGNING_REQUIRED = NO;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"POD_CONFIGURATION_RELEASE=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+			};
+			name = Release;
+		};
+		C84E1756C3377D7B88CC2826853F5568 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4244ABA189342D2269E1D874A6A8F286 /* RxSwift.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/RxSwift/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap";
+				PRODUCT_MODULE_NAME = RxSwift;
+				PRODUCT_NAME = RxSwift;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		DD78D13A72BF1F11E565676C842BA56B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		E3DA782422BB1CD900FA13060729E250 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = AF7F50D7DC87ED26D982E8316A24852B /* PetstoreClient.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
 				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
-				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_MODULE_NAME = PetstoreClient;
 				PRODUCT_NAME = PetstoreClient;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -1883,6 +1897,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1894,8 +1909,8 @@
 		2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				EED546DBB23FC32035C9BDC4E22B30BD /* Debug */,
-				157AF0CD5E5AB2A2E74D3B8ECD865185 /* Release */,
+				8B33C5230DE4A9DFA6D8F46505DD7AF7 /* Debug */,
+				B42B54097A876E8A982CBF5DAA91B1AB /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1903,35 +1918,35 @@
 		419E5D95491847CD79841B971A8A3277 /* Build configuration list for PBXNativeTarget "Alamofire" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D60F8C4DE6B0D221A33959774DA3DAFF /* Debug */,
-				077C4BB7DBEAA715DED46C057DC8051C /* Release */,
+				7B0415700290D1DEBAB6B173951CC0C7 /* Debug */,
+				95DBEF0AB0B74932A7CEF4BB6099470D /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		571608A4767C3A782EB9F4C0D6CE6BAF /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+		6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				4637BF406E4C4B9FD8F323E585FCAD4F /* Debug */,
-				FE0340FD75EFCA060255E9DA84041497 /* Release */,
+				2F11B524CBA83FDA4505AFC60245EBDC /* Debug */,
+				4E42BE31906A6664C5897CACAD3CE7B9 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
+		C3A6EBAD4C0AFB16D6AAA10AADD98D05 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				225CFF6825EFDC3BC5E0BD17DB796AD3 /* Debug */,
-				1713B0CEBD1F85062687B67D4C05B369 /* Release */,
+				624A19756388ECE410F22C4B5DFF991E /* Debug */,
+				E3DA782422BB1CD900FA13060729E250 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		DB44D5A97F47588D95DEAB88B712FB63 /* Build configuration list for PBXNativeTarget "RxSwift" */ = {
+		D3C420C0DF364B7B39CC6B7B86AF9FEA /* Build configuration list for PBXNativeTarget "RxSwift" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				7DB6F1AE8E8584FBAA1F2DC4EAB7F4A1 /* Debug */,
-				6DE21489DDEB128A7B20C23FD2CF9D36 /* Release */,
+				C84E1756C3377D7B88CC2826853F5568 /* Debug */,
+				5FC364C7697C3765B8268B5EED1F6263 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1939,8 +1954,8 @@
 		F74B56615E0AC0F998019998CF3D73B7 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClient" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				EADCEA8D9D624267A5AE96B0C0D68BCB /* Debug */,
-				E55DEB5F7A7C75B015C79914E39D8028 /* Release */,
+				DD78D13A72BF1F11E565676C842BA56B /* Debug */,
+				11BD519A449A78231BB165A846BE1EFA /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/README.md b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/README.md
index 463aefa8ea1..bdf8a2ba3c8 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/README.md
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/README.md
@@ -3,12 +3,6 @@
 
 [![Travis CI](https://travis-ci.org/ReactiveX/RxSwift.svg?branch=master)](https://travis-ci.org/ReactiveX/RxSwift) ![platforms](https://img.shields.io/badge/platforms-iOS%20%7C%20macOS%20%7C%20tvOS%20%7C%20watchOS%20%7C%20Linux-333333.svg) ![pod](https://img.shields.io/cocoapods/v/RxSwift.svg) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
 
-## About Rx
-
-**:warning: This readme describes RxSwift 3.0 version that requires Swift 3.0.**
-
-**:warning: If you are looking for Swift 2.3 compatible version, please take a look at RxSwift ~> 2.0 versions and [swift-2.3](https://github.com/ReactiveX/RxSwift/tree/rxswift-2.0) branch.**
-
 Rx is a [generic abstraction of computation](https://youtu.be/looJcaeboBY) expressed through `Observable<Element>` interface.
 
 This is a Swift version of [Rx](https://github.com/Reactive-Extensions/Rx.NET).
@@ -110,6 +104,7 @@ searchResults
 
 * Xcode 8.0
 * Swift 3.0
+* Swift 2.3 ([use `rxswift-2.0` branch](https://github.com/ReactiveX/RxSwift/tree/rxswift-2.0) instead)
 
 ## Installation
 
@@ -183,6 +178,12 @@ let package = Package(
 $ swift build
 ```
 
+To build or test a module with RxTest dependency, set `TEST=1`. ([RxSwift >= 3.4.2](https://github.com/ReactiveX/RxSwift/releases/tag/3.4.2))
+
+```bash
+$ TEST=1 swift test
+```
+
 ### Manually using git submodules
 
 * Add RxSwift as a submodule
@@ -199,6 +200,8 @@ $ git submodule add git@github.com:ReactiveX/RxSwift.git
 
 * [http://reactivex.io/](http://reactivex.io/)
 * [Reactive Extensions GitHub (GitHub)](https://github.com/Reactive-Extensions)
+* [RxSwift RayWenderlich.com Book](https://store.raywenderlich.com/products/rxswift)
+* [Boxue.io RxSwift Online Course](https://boxueio.com/series/rxswift-101) (Chinese 🇨🇳)
 * [Erik Meijer (Wikipedia)](http://en.wikipedia.org/wiki/Erik_Meijer_%28computer_scientist%29)
 * [Expert to Expert: Brian Beckman and Erik Meijer - Inside the .NET Reactive Framework (Rx) (video)](https://youtu.be/looJcaeboBY)
 * [Reactive Programming Overview (Jafar Husain from Netflix)](https://www.youtube.com/watch?v=dwP1TNXE6fc)
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Errors.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Errors.swift
index a00a3dea4e9..f17b52d882a 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Errors.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Errors.swift
@@ -13,7 +13,7 @@ let RxCompositeFailures = "RxCompositeFailures"
 public enum RxError
     : Swift.Error
     , CustomDebugStringConvertible {
-    /// Unknown error occured.
+    /// Unknown error occurred.
     case unknown
     /// Performing an action on disposed object.
     case disposed(object: AnyObject)
@@ -34,11 +34,11 @@ extension RxError {
     public var debugDescription: String {
         switch self {
         case .unknown:
-            return "Unknown error occured."
+            return "Unknown error occurred."
         case .disposed(let object):
             return "Object `\(object)` was already disposed."
         case .overflow:
-            return "Arithmetic overflow occured."
+            return "Arithmetic overflow occurred."
         case .argumentOutOfRange:
             return "Argument out of range."
         case .noElements:
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
index 0c5418f50d4..8dc2a85c497 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
@@ -9,7 +9,7 @@
 /// Represents an object that immediately schedules units of work.
 public protocol ImmediateSchedulerType {
     /**
-    Schedules an action to be executed immediatelly.
+    Schedules an action to be executed immediately.
     
     - parameter state: State passed to the action to be executed.
     - parameter action: Action to be executed.
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift
index 72cfb1ac3fb..d89c5aa70b9 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableConvertibleType.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-/// Type that can be converted to observable sequence (`Observer<E>`).
+/// Type that can be converted to observable sequence (`Observable<E>`).
 public protocol ObservableConvertibleType {
     /// Type of elements in sequence.
     associatedtype E
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
index 1603d39a67d..ad6fed65d2a 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
@@ -22,90 +22,99 @@ extension ObservableType {
     }
 
     #if DEBUG
-    /**
-    Subscribes an element handler, an error handler, a completion handler and disposed handler to an observable sequence.
+        /**
+        Subscribes an element handler, an error handler, a completion handler and disposed handler to an observable sequence.
 
-    - parameter onNext: Action to invoke for each element in the observable sequence.
-    - parameter onError: Action to invoke upon errored termination of the observable sequence.
-    - parameter onCompleted: Action to invoke upon graceful termination of the observable sequence.
-    - parameter onDisposed: Action to invoke upon any type of termination of sequence (if the sequence has
-        gracefully completed, errored, or if the generation is cancelled by disposing subscription).
-    - returns: Subscription object used to unsubscribe from the observable sequence.
-    */
-    public func subscribe(file: String = #file, line: UInt = #line, function: String = #function, onNext: ((E) -> Void)? = nil, onError: ((Swift.Error) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil)
-        -> Disposable {
+        - parameter onNext: Action to invoke for each element in the observable sequence.
+        - parameter onError: Action to invoke upon errored termination of the observable sequence.
+        - parameter onCompleted: Action to invoke upon graceful termination of the observable sequence.
+        - parameter onDisposed: Action to invoke upon any type of termination of sequence (if the sequence has
+            gracefully completed, errored, or if the generation is canceled by disposing subscription).
+        - returns: Subscription object used to unsubscribe from the observable sequence.
+        */
+        public func subscribe(file: String = #file, line: UInt = #line, function: String = #function, onNext: ((E) -> Void)? = nil, onError: ((Swift.Error) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil)
+            -> Disposable {
 
-        let disposable: Disposable
+            let disposable: Disposable
 
-        if let disposed = onDisposed {
-            disposable = Disposables.create(with: disposed)
-        }
-        else {
-            disposable = Disposables.create()
-        }
-
-        let observer = AnonymousObserver<E> { e in
-            switch e {
-            case .next(let value):
-                onNext?(value)
-            case .error(let e):
-                if let onError = onError {
-                    onError(e)
-                }
-                else {
-                    print("Received unhandled error: \(file):\(line):\(function) -> \(e)")
-                }
-                disposable.dispose()
-            case .completed:
-                onCompleted?()
-                disposable.dispose()
+            if let disposed = onDisposed {
+                disposable = Disposables.create(with: disposed)
             }
+            else {
+                disposable = Disposables.create()
+            }
+
+            #if DEBUG
+                let _synchronizationTracker = SynchronizationTracker()
+            #endif
+
+            let observer = AnonymousObserver<E> { e in
+                #if DEBUG
+                    _synchronizationTracker.register(synchronizationErrorMessage: .default)
+                    defer { _synchronizationTracker.unregister() }
+                #endif
+
+                switch e {
+                case .next(let value):
+                    onNext?(value)
+                case .error(let e):
+                    if let onError = onError {
+                        onError(e)
+                    }
+                    else {
+                        print("Received unhandled error: \(file):\(line):\(function) -> \(e)")
+                    }
+                    disposable.dispose()
+                case .completed:
+                    onCompleted?()
+                    disposable.dispose()
+                }
+            }
+            return Disposables.create(
+                self.subscribeSafe(observer),
+                disposable
+            )
         }
-        return Disposables.create(
-            self.subscribeSafe(observer),
-            disposable
-        )
-    }
     #else
-    /**
-    Subscribes an element handler, an error handler, a completion handler and disposed handler to an observable sequence.
+        /**
+        Subscribes an element handler, an error handler, a completion handler and disposed handler to an observable sequence.
 
-    - parameter onNext: Action to invoke for each element in the observable sequence.
-    - parameter onError: Action to invoke upon errored termination of the observable sequence.
-    - parameter onCompleted: Action to invoke upon graceful termination of the observable sequence.
-    - parameter onDisposed: Action to invoke upon any type of termination of sequence (if the sequence has
-        gracefully completed, errored, or if the generation is cancelled by disposing subscription).
-    - returns: Subscription object used to unsubscribe from the observable sequence.
-    */
-    public func subscribe(onNext: ((E) -> Void)? = nil, onError: ((Swift.Error) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil)
-        -> Disposable {
+        - parameter onNext: Action to invoke for each element in the observable sequence.
+        - parameter onError: Action to invoke upon errored termination of the observable sequence.
+        - parameter onCompleted: Action to invoke upon graceful termination of the observable sequence.
+        - parameter onDisposed: Action to invoke upon any type of termination of sequence (if the sequence has
+            gracefully completed, errored, or if the generation is canceled by disposing subscription).
+        - returns: Subscription object used to unsubscribe from the observable sequence.
+        */
+        public func subscribe(onNext: ((E) -> Void)? = nil, onError: ((Swift.Error) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil)
+            -> Disposable {
 
-        let disposable: Disposable
+            let disposable: Disposable
 
-        if let disposed = onDisposed {
-            disposable = Disposables.create(with: disposed)
-        }
-        else {
-            disposable = Disposables.create()
-        }
-
-        let observer = AnonymousObserver<E> { e in
-            switch e {
-            case .next(let value):
-                onNext?(value)
-            case .error(let e):
-                onError?(e)
-                disposable.dispose()
-            case .completed:
-                onCompleted?()
-                disposable.dispose()
+            if let disposed = onDisposed {
+                disposable = Disposables.create(with: disposed)
             }
+            else {
+                disposable = Disposables.create()
+            }
+
+            let observer = AnonymousObserver<E> { e in
+                switch e {
+                case .next(let value):
+                    onNext?(value)
+                case .error(let e):
+                    onError?(e)
+                    disposable.dispose()
+                case .completed:
+                    onCompleted?()
+                    disposable.dispose()
+                }
+            }
+            return Disposables.create(
+                self.subscribeSafe(observer),
+                disposable
+            )
         }
-        return Disposables.create(
-            self.subscribeSafe(observer),
-            disposable
-        )
-    }
     #endif
 }
 
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType.swift
index 6331dc877ac..1fa3a3360bb 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType.swift
@@ -29,7 +29,7 @@ public protocol ObservableType : ObservableConvertibleType {
     When sequence sends `Complete` or `Error` event all internal resources that compute sequence elements
     will be freed.
     
-    To cancel production of sequence elements and free resources immediatelly, call `dispose` on returned
+    To cancel production of sequence elements and free resources immediately, call `dispose` on returned
     subscription.
     
     - returns: Subscription for `observer` that can be used to cancel production of sequence elements and free resources.
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Concat.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Concat.swift
index 87dbadf9a5e..cc4174b8ccb 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Concat.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Concat.swift
@@ -128,3 +128,4 @@ final fileprivate class Concat<S: Sequence> : Producer<S.Iterator.Element.E> whe
         return (sink: sink, subscription: subscription)
     }
 }
+
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ConnectableObservable.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ConnectableObservable.swift
deleted file mode 100644
index 7755799cd8f..00000000000
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ConnectableObservable.swift
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-//  ConnectableObservable.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 3/1/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-
-extension ObservableType {
-
-    /**
-     Multicasts the source sequence notifications through the specified subject to the resulting connectable observable.
-
-     Upon connection of the connectable observable, the subject is subscribed to the source exactly one, and messages are forwarded to the observers registered with the connectable observable.
-
-     For specializations with fixed subject types, see `publish` and `replay`.
-
-     - seealso: [multicast operator on reactivex.io](http://reactivex.io/documentation/operators/publish.html)
-
-     - parameter subject: Subject to push source elements into.
-     - returns: A connectable observable sequence that upon connection causes the source sequence to push results into the specified subject.
-     */
-    public func multicast<S: SubjectType>(_ subject: S)
-        -> ConnectableObservable<S.E> where S.SubjectObserverType.E == E {
-            return ConnectableObservableAdapter(source: self.asObservable(), subject: subject)
-    }
-}
-
-/**
- Represents an observable wrapper that can be connected and disconnected from its underlying observable sequence.
-*/
-public class ConnectableObservable<Element>
-    : Observable<Element>
-    , ConnectableObservableType {
-
-    /**
-     Connects the observable wrapper to its source. All subscribed observers will receive values from the underlying observable sequence as long as the connection is established.
-     
-     - returns: Disposable used to disconnect the observable wrapper from its source, causing subscribed observer to stop receiving values from the underlying observable sequence.
-    */
-    public func connect() -> Disposable {
-        rxAbstractMethod()
-    }
-}
-
-final class Connection<S: SubjectType> : ObserverType, Disposable {
-    typealias E = S.SubjectObserverType.E
-
-    private var _lock: RecursiveLock
-    // state
-    private var _parent: ConnectableObservableAdapter<S>?
-    private var _subscription : Disposable?
-    private var _subjectObserver: S.SubjectObserverType
-
-    private var _disposed: Bool = false
-
-    init(parent: ConnectableObservableAdapter<S>, subjectObserver: S.SubjectObserverType, lock: RecursiveLock, subscription: Disposable) {
-        _parent = parent
-        _subscription = subscription
-        _lock = lock
-        _subjectObserver = subjectObserver
-    }
-
-    func on(_ event: Event<S.SubjectObserverType.E>) {
-        if _disposed {
-            return
-        }
-        _subjectObserver.on(event)
-        if event.isStopEvent {
-            self.dispose()
-        }
-    }
-    
-    func dispose() {
-        _lock.lock(); defer { _lock.unlock() } // {
-            _disposed = true
-            guard let parent = _parent else {
-                return
-            }
-        
-            if parent._connection === self {
-                parent._connection = nil
-            }
-            _parent = nil
-
-            _subscription?.dispose()
-            _subscription = nil
-        // }
-    }
-}
-
-final class ConnectableObservableAdapter<S: SubjectType>
-    : ConnectableObservable<S.E> {
-    typealias ConnectionType = Connection<S>
-    
-    fileprivate let _subject: S
-    fileprivate let _source: Observable<S.SubjectObserverType.E>
-    
-    fileprivate let _lock = RecursiveLock()
-    
-    // state
-    fileprivate var _connection: ConnectionType?
-    
-    init(source: Observable<S.SubjectObserverType.E>, subject: S) {
-        _source = source
-        _subject = subject
-        _connection = nil
-    }
-    
-    override func connect() -> Disposable {
-        return _lock.calculateLocked {
-            if let connection = _connection {
-                return connection
-            }
-
-            let singleAssignmentDisposable = SingleAssignmentDisposable()
-            let connection = Connection(parent: self, subjectObserver: _subject.asObserver(), lock: _lock, subscription: singleAssignmentDisposable)
-            _connection = connection
-            let subscription = _source.subscribe(connection)
-            singleAssignmentDisposable.setDisposable(subscription)
-            return connection
-        }
-    }
-    
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == S.E {
-        return _subject.subscribe(observer)
-    }
-}
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Create.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Create.swift
index 1dc66efdcfa..664daa1e02f 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Create.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Create.swift
@@ -30,7 +30,7 @@ final fileprivate class AnonymousObservableSink<O: ObserverType> : Sink<O>, Obse
     private var _isStopped: AtomicInt = 0
 
     #if DEBUG
-        fileprivate var _numberOfConcurrentCalls: AtomicInt = 0
+        fileprivate let _synchronizationTracker = SynchronizationTracker()
     #endif
 
     override init(observer: O, cancel: Cancelable) {
@@ -39,13 +39,8 @@ final fileprivate class AnonymousObservableSink<O: ObserverType> : Sink<O>, Obse
 
     func on(_ event: Event<E>) {
         #if DEBUG
-            if AtomicIncrement(&_numberOfConcurrentCalls) > 1 {
-                rxFatalError("Warning: Recursive call or synchronization error!")
-            }
-
-            defer {
-                _ = AtomicDecrement(&_numberOfConcurrentCalls)
-        }
+            _synchronizationTracker.register(synchronizationErrorMessage: .default)
+            defer { _synchronizationTracker.unregister() }
         #endif
         switch event {
         case .next:
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Delay.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Delay.swift
index 6972b845f0c..b13ee9cc403 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Delay.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Delay.swift
@@ -57,7 +57,7 @@ final fileprivate class DelaySink<O: ObserverType>
     }
 
     // All of these complications in this method are caused by the fact that 
-    // error should be propagated immediatelly. Error can bepotentially received on different
+    // error should be propagated immediately. Error can be potentially received on different
     // scheduler so this process needs to be synchronized somehow.
     //
     // Another complication is that scheduler is potentially concurrent so internal queue is used.
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Do.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Do.swift
index 4ee88419180..2be6d58328d 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Do.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Do.swift
@@ -37,18 +37,18 @@ extension ObservableType {
 
 final fileprivate class DoSink<O: ObserverType> : Sink<O>, ObserverType {
     typealias Element = O.E
-    typealias Parent = Do<Element>
+    typealias EventHandler = (Event<Element>) throws -> Void
     
-    private let _parent: Parent
+    private let _eventHandler: EventHandler
     
-    init(parent: Parent, observer: O, cancel: Cancelable) {
-        _parent = parent
+    init(eventHandler: @escaping EventHandler, observer: O, cancel: Cancelable) {
+        _eventHandler = eventHandler
         super.init(observer: observer, cancel: cancel)
     }
     
     func on(_ event: Event<Element>) {
         do {
-            try _parent._eventHandler(event)
+            try _eventHandler(event)
             forwardOn(event)
             if event.isStopEvent {
                 dispose()
@@ -80,7 +80,7 @@ final fileprivate class Do<Element> : Producer<Element> {
     
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         _onSubscribe?()
-        let sink = DoSink(parent: self, observer: observer, cancel: cancel)
+        let sink = DoSink(eventHandler: _eventHandler, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
         _onSubscribed?()
         let onDispose = _onDispose
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Merge.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Merge.swift
index 91996860de5..317babc7e3f 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Merge.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Merge.swift
@@ -131,13 +131,30 @@ extension Observable {
     }
 }
 
-fileprivate final class MergeLimitedSinkIter<S: ObservableConvertibleType, O: ObserverType>
+// MARK: concatMap
+
+extension ObservableType {
+    /**
+     Projects each element of an observable sequence to an observable sequence and concatenates the resulting observable sequences into one observable sequence.
+     
+     - seealso: [concat operator on reactivex.io](http://reactivex.io/documentation/operators/concat.html)
+     
+     - returns: An observable sequence that contains the elements of each observed inner sequence, in sequential order.
+     */
+    
+    public func concatMap<O: ObservableConvertibleType>(_ selector: @escaping (E) throws -> O)
+        -> Observable<O.E> {
+            return ConcatMap(source: asObservable(), selector: selector)
+    }
+}
+
+fileprivate final class MergeLimitedSinkIter<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType>
     : ObserverType
     , LockOwnerType
-    , SynchronizedOnType where S.E == O.E {
-    typealias E = O.E
+    , SynchronizedOnType where SourceSequence.E == Observer.E {
+    typealias E = Observer.E
     typealias DisposeKey = CompositeDisposable.DisposeKey
-    typealias Parent = MergeLimitedSink<S, O>
+    typealias Parent = MergeLimitedSink<SourceElement, SourceSequence, Observer>
     
     private let _parent: Parent
     private let _disposeKey: DisposeKey
@@ -179,13 +196,32 @@ fileprivate final class MergeLimitedSinkIter<S: ObservableConvertibleType, O: Ob
     }
 }
 
-fileprivate final class MergeLimitedSink<S: ObservableConvertibleType, O: ObserverType>
-    : Sink<O>
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType where S.E == O.E {
-    typealias E = S
-    typealias QueueType = Queue<S>
+fileprivate final class ConcatMapSink<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType>: MergeLimitedSink<SourceElement, SourceSequence, Observer> where Observer.E == SourceSequence.E {
+    typealias Selector = (SourceElement) throws -> SourceSequence
+    
+    private let _selector: Selector
+    
+    init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
+        _selector = selector
+        super.init(maxConcurrent: 1, observer: observer, cancel: cancel)
+    }
+    
+    override func performMap(_ element: SourceElement) throws -> SourceSequence {
+        return try _selector(element)
+    }
+}
+
+fileprivate final class MergeLimitedBasicSink<SourceSequence: ObservableConvertibleType, Observer: ObserverType>: MergeLimitedSink<SourceSequence, SourceSequence, Observer> where Observer.E == SourceSequence.E {
+    
+    override func performMap(_ element: SourceSequence) throws -> SourceSequence {
+        return element
+    }
+}
+
+fileprivate class MergeLimitedSink<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType>
+    : Sink<Observer>
+    , ObserverType where Observer.E == SourceSequence.E  {
+    typealias QueueType = Queue<SourceSequence>
 
     let _maxConcurrent: Int
 
@@ -199,14 +235,14 @@ fileprivate final class MergeLimitedSink<S: ObservableConvertibleType, O: Observ
     let _sourceSubscription = SingleAssignmentDisposable()
     let _group = CompositeDisposable()
     
-    init(maxConcurrent: Int, observer: O, cancel: Cancelable) {
+    init(maxConcurrent: Int, observer: Observer, cancel: Cancelable) {
         _maxConcurrent = maxConcurrent
         
         let _ = _group.insert(_sourceSubscription)
         super.init(observer: observer, cancel: cancel)
     }
     
-    func run(_ source: Observable<S>) -> Disposable {
+    func run(_ source: Observable<SourceElement>) -> Disposable {
         let _ = _group.insert(_sourceSubscription)
         
         let disposable = source.subscribe(self)
@@ -214,7 +250,7 @@ fileprivate final class MergeLimitedSink<S: ObservableConvertibleType, O: Observ
         return _group
     }
     
-    func subscribe(_ innerSource: E, group: CompositeDisposable) {
+    func subscribe(_ innerSource: SourceSequence, group: CompositeDisposable) {
         let subscription = SingleAssignmentDisposable()
         
         let key = group.insert(subscription)
@@ -227,30 +263,56 @@ fileprivate final class MergeLimitedSink<S: ObservableConvertibleType, O: Observ
         }
     }
     
-    func on(_ event: Event<E>) {
-        synchronizedOn(event)
+    func performMap(_ element: SourceElement) throws -> SourceSequence {
+        rxAbstractMethod()
     }
 
-    func _synchronized_on(_ event: Event<E>) {
-        switch event {
-        case .next(let value):
+    @inline(__always)
+    final private func nextElementArrived(element: SourceElement) -> SourceSequence? {
+        _lock.lock(); defer { _lock.unlock() } // {
             let subscribe: Bool
             if _activeCount < _maxConcurrent {
                 _activeCount += 1
                 subscribe = true
             }
             else {
-                _queue.enqueue(value)
+                do {
+                    let value = try performMap(element)
+                    _queue.enqueue(value)
+                } catch {
+                    forwardOn(.error(error))
+                    dispose()
+                }
                 subscribe = false
             }
 
             if subscribe {
-                self.subscribe(value, group: _group)
+                do {
+                    return try performMap(element)
+                } catch {
+                    forwardOn(.error(error))
+                    dispose()
+                }
+            }
+
+            return nil
+        // }
+    }
+
+    func on(_ event: Event<SourceElement>) {
+        switch event {
+        case .next(let element):
+            if let sequence = self.nextElementArrived(element: element) {
+                self.subscribe(sequence, group: _group)
             }
         case .error(let error):
+            _lock.lock(); defer { _lock.unlock() }
+
             forwardOn(.error(error))
             dispose()
         case .completed:
+            _lock.lock(); defer { _lock.unlock() }
+
             if _activeCount == 0 {
                 forwardOn(.completed)
                 dispose()
@@ -264,17 +326,17 @@ fileprivate final class MergeLimitedSink<S: ObservableConvertibleType, O: Observ
     }
 }
 
-final fileprivate class MergeLimited<S: ObservableConvertibleType> : Producer<S.E> {
-    private let _source: Observable<S>
+final fileprivate class MergeLimited<SourceSequence: ObservableConvertibleType> : Producer<SourceSequence.E> {
+    private let _source: Observable<SourceSequence>
     private let _maxConcurrent: Int
     
-    init(source: Observable<S>, maxConcurrent: Int) {
+    init(source: Observable<SourceSequence>, maxConcurrent: Int) {
         _source = source
         _maxConcurrent = maxConcurrent
     }
     
-    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
-        let sink = MergeLimitedSink<S, O>(maxConcurrent: _maxConcurrent, observer: observer, cancel: cancel)
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
+        let sink = MergeLimitedBasicSink<SourceSequence, O>(maxConcurrent: _maxConcurrent, observer: observer, cancel: cancel)
         let subscription = sink.run(_source)
         return (sink: sink, subscription: subscription)
     }
@@ -283,10 +345,6 @@ final fileprivate class MergeLimited<S: ObservableConvertibleType> : Producer<S.
 // MARK: Merge
 
 fileprivate final class MergeBasicSink<S: ObservableConvertibleType, O: ObserverType> : MergeSink<S, S, O> where O.E == S.E {
-    override init(observer: O, cancel: Cancelable) {
-        super.init(observer: observer, cancel: cancel)
-    }
-
     override func performMap(_ element: S) throws -> S {
         return element
     }
@@ -294,41 +352,41 @@ fileprivate final class MergeBasicSink<S: ObservableConvertibleType, O: Observer
 
 // MARK: flatMap
 
-fileprivate final class FlatMapSink<SourceType, S: ObservableConvertibleType, O: ObserverType> : MergeSink<SourceType, S, O> where O.E == S.E {
-    typealias Selector = (SourceType) throws -> S
+fileprivate final class FlatMapSink<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType> : MergeSink<SourceElement, SourceSequence, Observer> where Observer.E == SourceSequence.E {
+    typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _selector: Selector
 
-    init(selector: @escaping Selector, observer: O, cancel: Cancelable) {
+    init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
         _selector = selector
         super.init(observer: observer, cancel: cancel)
     }
 
-    override func performMap(_ element: SourceType) throws -> S {
+    override func performMap(_ element: SourceElement) throws -> SourceSequence {
         return try _selector(element)
     }
 }
 
-fileprivate final class FlatMapWithIndexSink<SourceType, S: ObservableConvertibleType, O: ObserverType> : MergeSink<SourceType, S, O> where O.E == S.E {
-    typealias Selector = (SourceType, Int) throws -> S
+fileprivate final class FlatMapWithIndexSink<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType> : MergeSink<SourceElement, SourceSequence, Observer> where Observer.E == SourceSequence.E {
+    typealias Selector = (SourceElement, Int) throws -> SourceSequence
 
     private var _index = 0
     private let _selector: Selector
 
-    init(selector: @escaping Selector, observer: O, cancel: Cancelable) {
+    init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
         _selector = selector
         super.init(observer: observer, cancel: cancel)
     }
 
-    override func performMap(_ element: SourceType) throws -> S {
+    override func performMap(_ element: SourceElement) throws -> SourceSequence {
         return try _selector(element, try incrementChecked(&_index))
     }
 }
 
 // MARK: FlatMapFirst
 
-fileprivate final class FlatMapFirstSink<SourceType, S: ObservableConvertibleType, O: ObserverType> : MergeSink<SourceType, S, O> where O.E == S.E {
-    typealias Selector = (SourceType) throws -> S
+fileprivate final class FlatMapFirstSink<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType> : MergeSink<SourceElement, SourceSequence, Observer> where Observer.E == SourceSequence.E {
+    typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _selector: Selector
 
@@ -336,20 +394,20 @@ fileprivate final class FlatMapFirstSink<SourceType, S: ObservableConvertibleTyp
         return _activeCount == 0
     }
 
-    init(selector: @escaping Selector, observer: O, cancel: Cancelable) {
+    init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
         _selector = selector
         super.init(observer: observer, cancel: cancel)
     }
 
-    override func performMap(_ element: SourceType) throws -> S {
+    override func performMap(_ element: SourceElement) throws -> SourceSequence {
         return try _selector(element)
     }
 }
 
-fileprivate final class MergeSinkIter<SourceType, S: ObservableConvertibleType, O: ObserverType> : ObserverType where O.E == S.E {
-    typealias Parent = MergeSink<SourceType, S, O>
+fileprivate final class MergeSinkIter<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType> : ObserverType where Observer.E == SourceSequence.E {
+    typealias Parent = MergeSink<SourceElement, SourceSequence, Observer>
     typealias DisposeKey = CompositeDisposable.DisposeKey
-    typealias E = O.E
+    typealias E = Observer.E
     
     private let _parent: Parent
     private let _disposeKey: DisposeKey
@@ -377,11 +435,11 @@ fileprivate final class MergeSinkIter<SourceType, S: ObservableConvertibleType,
 }
 
 
-fileprivate class MergeSink<SourceType, S: ObservableConvertibleType, O: ObserverType>
-    : Sink<O>
-    , ObserverType where O.E == S.E {
-    typealias ResultType = O.E
-    typealias Element = SourceType
+fileprivate class MergeSink<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType>
+    : Sink<Observer>
+    , ObserverType where Observer.E == SourceSequence.E {
+    typealias ResultType = Observer.E
+    typealias Element = SourceElement
 
     let _lock = RecursiveLock()
 
@@ -396,55 +454,66 @@ fileprivate class MergeSink<SourceType, S: ObservableConvertibleType, O: Observe
     var _activeCount = 0
     var _stopped = false
 
-    override init(observer: O, cancel: Cancelable) {
+    override init(observer: Observer, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
 
-    func performMap(_ element: SourceType) throws -> S {
+    func performMap(_ element: SourceElement) throws -> SourceSequence {
         rxAbstractMethod()
     }
-    
-    func on(_ event: Event<SourceType>) {
-        _lock.lock(); defer { _lock.unlock() } // lock {
-            switch event {
-            case .next(let element):
-                if !subscribeNext {
-                    return
-                }
-                do {
-                    let value = try performMap(element)
-                    subscribeInner(value.asObservable())
-                }
-                catch let e {
-                    forwardOn(.error(e))
-                    dispose()
-                }
-            case .error(let error):
-                forwardOn(.error(error))
-                dispose()
-            case .completed:
-                _stopped = true
-                _sourceSubscription.dispose()
-                checkCompleted()
+
+    @inline(__always)
+    final private func nextElementArrived(element: SourceElement) -> SourceSequence? {
+        _lock.lock(); defer { _lock.unlock() } // {
+            if !subscribeNext {
+                return nil
             }
-        //}
+
+            do {
+                let value = try performMap(element)
+                _activeCount += 1
+                return value
+            }
+            catch let e {
+                forwardOn(.error(e))
+                dispose()
+                return nil
+            }
+        // }
+    }
+    
+    func on(_ event: Event<SourceElement>) {
+        switch event {
+        case .next(let element):
+            if let value = nextElementArrived(element: element) {
+                subscribeInner(value.asObservable())
+            }
+        case .error(let error):
+            _lock.lock(); defer { _lock.unlock() }
+            forwardOn(.error(error))
+            dispose()
+        case .completed:
+            _lock.lock(); defer { _lock.unlock() }
+            _stopped = true
+            _sourceSubscription.dispose()
+            checkCompleted()
+        }
     }
 
-    func subscribeInner(_ source: Observable<O.E>) {
+    func subscribeInner(_ source: Observable<Observer.E>) {
         let iterDisposable = SingleAssignmentDisposable()
         if let disposeKey = _group.insert(iterDisposable) {
-            _activeCount += 1
             let iter = MergeSinkIter(parent: self, disposeKey: disposeKey)
             let subscription = source.subscribe(iter)
             iterDisposable.setDisposable(subscription)
         }
     }
 
-    func run(_ sources: [SourceType]) -> Disposable {
-        let _ = _group.insert(_sourceSubscription)
+    func run(_ sources: [Observable<Observer.E>]) -> Disposable {
+        _activeCount += sources.count
 
         for source in sources {
-            self.on(.next(source))
+            subscribeInner(source)
         }
 
         _stopped = true
@@ -462,7 +531,7 @@ fileprivate class MergeSink<SourceType, S: ObservableConvertibleType, O: Observe
         }
     }
     
-    func run(_ source: Observable<SourceType>) -> Disposable {
+    func run(_ source: Observable<SourceElement>) -> Disposable {
         let _ = _group.insert(_sourceSubscription)
 
         let subscription = source.subscribe(self)
@@ -474,82 +543,100 @@ fileprivate class MergeSink<SourceType, S: ObservableConvertibleType, O: Observe
 
 // MARK: Producers
 
-final fileprivate class FlatMap<SourceType, S: ObservableConvertibleType>: Producer<S.E> {
-    typealias Selector = (SourceType) throws -> S
+final fileprivate class FlatMap<SourceElement, SourceSequence: ObservableConvertibleType>: Producer<SourceSequence.E> {
+    typealias Selector = (SourceElement) throws -> SourceSequence
 
-    private let _source: Observable<SourceType>
+    private let _source: Observable<SourceElement>
     
     private let _selector: Selector
 
-    init(source: Observable<SourceType>, selector: @escaping Selector) {
+    init(source: Observable<SourceElement>, selector: @escaping Selector) {
         _source = source
         _selector = selector
     }
     
-    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
         let sink = FlatMapSink(selector: _selector, observer: observer, cancel: cancel)
         let subscription = sink.run(_source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class FlatMapWithIndex<SourceType, S: ObservableConvertibleType>: Producer<S.E> {
-    typealias Selector = (SourceType, Int) throws -> S
+final fileprivate class FlatMapWithIndex<SourceElement, SourceSequence: ObservableConvertibleType>: Producer<SourceSequence.E> {
+    typealias Selector = (SourceElement, Int) throws -> SourceSequence
 
-    private let _source: Observable<SourceType>
+    private let _source: Observable<SourceElement>
     
     private let _selector: Selector
 
-    init(source: Observable<SourceType>, selector: @escaping Selector) {
+    init(source: Observable<SourceElement>, selector: @escaping Selector) {
         _source = source
         _selector = selector
     }
     
-    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
-        let sink = FlatMapWithIndexSink<SourceType, S, O>(selector: _selector, observer: observer, cancel: cancel)
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
+        let sink = FlatMapWithIndexSink<SourceElement, SourceSequence, O>(selector: _selector, observer: observer, cancel: cancel)
         let subscription = sink.run(_source)
         return (sink: sink, subscription: subscription)
     }
 
 }
 
-final fileprivate class FlatMapFirst<SourceType, S: ObservableConvertibleType>: Producer<S.E> {
-    typealias Selector = (SourceType) throws -> S
+final fileprivate class FlatMapFirst<SourceElement, SourceSequence: ObservableConvertibleType>: Producer<SourceSequence.E> {
+    typealias Selector = (SourceElement) throws -> SourceSequence
 
-    private let _source: Observable<SourceType>
+    private let _source: Observable<SourceElement>
 
     private let _selector: Selector
 
-    init(source: Observable<SourceType>, selector: @escaping Selector) {
+    init(source: Observable<SourceElement>, selector: @escaping Selector) {
         _source = source
         _selector = selector
     }
 
-    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
-        let sink = FlatMapFirstSink<SourceType, S, O>(selector: _selector, observer: observer, cancel: cancel)
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
+        let sink = FlatMapFirstSink<SourceElement, SourceSequence, O>(selector: _selector, observer: observer, cancel: cancel)
         let subscription = sink.run(_source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class Merge<S: ObservableConvertibleType> : Producer<S.E> {
-    private let _source: Observable<S>
+final class ConcatMap<SourceElement, SourceSequence: ObservableConvertibleType>: Producer<SourceSequence.E> {
+    typealias Selector = (SourceElement) throws -> SourceSequence
+    
+    private let _source: Observable<SourceElement>
+    private let _selector: Selector
+    
+    init(source: Observable<SourceElement>, selector: @escaping Selector) {
+        _source = source
+        _selector = selector
+    }
+    
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
+        let sink = ConcatMapSink<SourceElement, SourceSequence, O>(selector: _selector, observer: observer, cancel: cancel)
+        let subscription = sink.run(_source)
+        return (sink: sink, subscription: subscription)
+    }
+}
 
-    init(source: Observable<S>) {
+final class Merge<SourceSequence: ObservableConvertibleType> : Producer<SourceSequence.E> {
+    private let _source: Observable<SourceSequence>
+
+    init(source: Observable<SourceSequence>) {
         _source = source
     }
     
-    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
-        let sink = MergeBasicSink<S, O>(observer: observer, cancel: cancel)
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
+        let sink = MergeBasicSink<SourceSequence, O>(observer: observer, cancel: cancel)
         let subscription = sink.run(_source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class MergeArray<E> : Producer<E> {
-    private let _sources: [Observable<E>]
+final fileprivate class MergeArray<Element> : Producer<Element> {
+    private let _sources: [Observable<Element>]
 
-    init(sources: [Observable<E>]) {
+    init(sources: [Observable<Element>]) {
         _sources = sources
     }
 
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Multicast.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Multicast.swift
index 279291c4b8c..525f24eff31 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Multicast.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Multicast.swift
@@ -6,6 +6,23 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
+/**
+ Represents an observable wrapper that can be connected and disconnected from its underlying observable sequence.
+ */
+public class ConnectableObservable<Element>
+    : Observable<Element>
+    , ConnectableObservableType {
+
+    /**
+     Connects the observable wrapper to its source. All subscribed observers will receive values from the underlying observable sequence as long as the connection is established.
+
+     - returns: Disposable used to disconnect the observable wrapper from its source, causing subscribed observer to stop receiving values from the underlying observable sequence.
+     */
+    public func connect() -> Disposable {
+        rxAbstractMethod()
+    }
+}
+
 extension ObservableType {
     
     /**
@@ -109,6 +126,140 @@ extension ObservableType {
     }
 }
 
+extension ObservableType {
+
+    /**
+     Multicasts the source sequence notifications through the specified subject to the resulting connectable observable.
+
+     Upon connection of the connectable observable, the subject is subscribed to the source exactly one, and messages are forwarded to the observers registered with the connectable observable.
+
+     For specializations with fixed subject types, see `publish` and `replay`.
+
+     - seealso: [multicast operator on reactivex.io](http://reactivex.io/documentation/operators/publish.html)
+
+     - parameter subject: Subject to push source elements into.
+     - returns: A connectable observable sequence that upon connection causes the source sequence to push results into the specified subject.
+     */
+    public func multicast<S: SubjectType>(_ subject: S)
+        -> ConnectableObservable<S.E> where S.SubjectObserverType.E == E {
+        return ConnectableObservableAdapter(source: self.asObservable(), makeSubject: { subject })
+    }
+
+    /**
+     Multicasts the source sequence notifications through an instantiated subject to the resulting connectable observable.
+
+     Upon connection of the connectable observable, the subject is subscribed to the source exactly one, and messages are forwarded to the observers registered with the connectable observable.
+     
+     Subject is cleared on connection disposal or in case source sequence produces terminal event.
+
+     - seealso: [multicast operator on reactivex.io](http://reactivex.io/documentation/operators/publish.html)
+
+     - parameter makeSubject: Factory function used to instantiate a subject for each connection.
+     - returns: A connectable observable sequence that upon connection causes the source sequence to push results into the specified subject.
+     */
+    public func multicast<S: SubjectType>(makeSubject: @escaping () -> S)
+        -> ConnectableObservable<S.E> where S.SubjectObserverType.E == E {
+        return ConnectableObservableAdapter(source: self.asObservable(), makeSubject: makeSubject)
+    }
+}
+
+final fileprivate class Connection<S: SubjectType> : ObserverType, Disposable {
+    typealias E = S.SubjectObserverType.E
+
+    private var _lock: RecursiveLock
+    // state
+    private var _parent: ConnectableObservableAdapter<S>?
+    private var _subscription : Disposable?
+    private var _subjectObserver: S.SubjectObserverType
+
+    private var _disposed: Bool = false
+
+    init(parent: ConnectableObservableAdapter<S>, subjectObserver: S.SubjectObserverType, lock: RecursiveLock, subscription: Disposable) {
+        _parent = parent
+        _subscription = subscription
+        _lock = lock
+        _subjectObserver = subjectObserver
+    }
+
+    func on(_ event: Event<S.SubjectObserverType.E>) {
+        if _disposed {
+            return
+        }
+        if event.isStopEvent {
+            self.dispose()
+        }
+        _subjectObserver.on(event)
+    }
+
+    func dispose() {
+        _lock.lock(); defer { _lock.unlock() } // {
+        _disposed = true
+        guard let parent = _parent else {
+            return
+        }
+
+        if parent._connection === self {
+            parent._connection = nil
+            parent._subject = nil
+        }
+        _parent = nil
+
+        _subscription?.dispose()
+        _subscription = nil
+        // }
+    }
+}
+
+final fileprivate class ConnectableObservableAdapter<S: SubjectType>
+    : ConnectableObservable<S.E> {
+    typealias ConnectionType = Connection<S>
+
+    fileprivate let _source: Observable<S.SubjectObserverType.E>
+    fileprivate let _makeSubject: () -> S
+
+    fileprivate let _lock = RecursiveLock()
+    fileprivate var _subject: S?
+
+    // state
+    fileprivate var _connection: ConnectionType?
+
+    init(source: Observable<S.SubjectObserverType.E>, makeSubject: @escaping () -> S) {
+        _source = source
+        _makeSubject = makeSubject
+        _subject = nil
+        _connection = nil
+    }
+
+    override func connect() -> Disposable {
+        return _lock.calculateLocked {
+            if let connection = _connection {
+                return connection
+            }
+
+            let singleAssignmentDisposable = SingleAssignmentDisposable()
+            let connection = Connection(parent: self, subjectObserver: self.lazySubject.asObserver(), lock: _lock, subscription: singleAssignmentDisposable)
+            _connection = connection
+            let subscription = _source.subscribe(connection)
+            singleAssignmentDisposable.setDisposable(subscription)
+            return connection
+        }
+    }
+
+    fileprivate var lazySubject: S {
+        if let subject = self._subject {
+            return subject
+        }
+
+        let subject = _makeSubject()
+        self._subject = subject
+        return subject
+    }
+
+    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == S.E {
+        return self.lazySubject.subscribe(observer)
+    }
+}
+
 final fileprivate class RefCountSink<CO: ConnectableObservableType, O: ObserverType>
     : Sink<O>
     , ObserverType where CO.E == O.E {
@@ -117,6 +268,8 @@ final fileprivate class RefCountSink<CO: ConnectableObservableType, O: ObserverT
 
     private let _parent: Parent
 
+    private var _connectionIdSnapshot: Int64 = -1
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
@@ -124,8 +277,14 @@ final fileprivate class RefCountSink<CO: ConnectableObservableType, O: ObserverT
 
     func run() -> Disposable {
         let subscription = _parent._source.subscribe(self)
-
         _parent._lock.lock(); defer { _parent._lock.unlock() } // {
+
+        _connectionIdSnapshot = _parent._connectionId
+
+        if self.disposed {
+            return Disposables.create()
+        }
+
         if _parent._count == 0 {
             _parent._count = 1
             _parent._connectableSubscription = _parent._source.connect()
@@ -138,6 +297,9 @@ final fileprivate class RefCountSink<CO: ConnectableObservableType, O: ObserverT
         return Disposables.create {
             subscription.dispose()
             self._parent._lock.lock(); defer { self._parent._lock.unlock() } // {
+            if self._parent._connectionId != self._connectionIdSnapshot {
+                return
+            }
             if self._parent._count == 1 {
                 self._parent._count = 0
                 guard let connectableSubscription = self._parent._connectableSubscription else {
@@ -162,6 +324,16 @@ final fileprivate class RefCountSink<CO: ConnectableObservableType, O: ObserverT
         case .next:
             forwardOn(event)
         case .error, .completed:
+            _parent._lock.lock() // {
+                if _parent._connectionId == self._connectionIdSnapshot {
+                    let connection = _parent._connectableSubscription
+                    defer { connection?.dispose() }
+                    _parent._count = 0
+                    _parent._connectionId = _parent._connectionId &+ 1
+                    _parent._connectableSubscription = nil
+                }
+            // }
+            _parent._lock.unlock()
             forwardOn(event)
             dispose()
         }
@@ -173,6 +345,7 @@ final fileprivate class RefCount<CO: ConnectableObservableType>: Producer<CO.E>
 
     // state
     fileprivate var _count = 0
+    fileprivate var _connectionId: Int64 = 0
     fileprivate var _connectableSubscription = nil as Disposable?
 
     fileprivate let _source: CO
@@ -203,7 +376,7 @@ final fileprivate class MulticastSink<S: SubjectType, O: ObserverType>: Sink<O>,
     func run() -> Disposable {
         do {
             let subject = try _parent._subjectSelector()
-            let connectable = ConnectableObservableAdapter(source: _parent._source, subject: subject)
+            let connectable = ConnectableObservableAdapter(source: _parent._source, makeSubject: { subject })
             
             let observable = try _parent._selector(connectable)
             
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sequence.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sequence.swift
index 1e9afe1c404..eb4daed130f 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sequence.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sequence.swift
@@ -15,7 +15,7 @@ extension Observable {
      - seealso: [from operator on reactivex.io](http://reactivex.io/documentation/operators/from.html)
 
      - parameter elements: Elements to generate.
-     - parameter scheduler: Scheduler to send elements on. If `nil`, elements are sent immediatelly on subscription.
+     - parameter scheduler: Scheduler to send elements on. If `nil`, elements are sent immediately on subscription.
      - returns: The observable sequence whose elements are pulled from the given arguments.
      */
     public static func of(_ elements: E ..., scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable<E> {
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplay1.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplay1.swift
deleted file mode 100644
index 53810342001..00000000000
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplay1.swift
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-//  ShareReplay1.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 10/10/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns an observable sequence that shares a single subscription to the underlying sequence, and immediately upon subscription replays maximum number of elements in buffer.
-
-     This operator is a specialization of replay which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
-
-     - seealso: [shareReplay operator on reactivex.io](http://reactivex.io/documentation/operators/replay.html)
-
-     - parameter bufferSize: Maximum element count of the replay buffer.
-     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
-     */
-    public func shareReplay(_ bufferSize: Int)
-        -> Observable<E> {
-            if bufferSize == 1 {
-                return ShareReplay1(source: self.asObservable())
-            }
-            else {
-                return self.replay(bufferSize).refCount()
-            }
-    }
-}
-
-// optimized version of share replay for most common case
-final fileprivate class ShareReplay1<Element>
-    : Observable<Element>
-    , ObserverType
-    , SynchronizedUnsubscribeType {
-
-    typealias Observers = AnyObserver<Element>.s
-    typealias DisposeKey = Observers.KeyType
-
-    private let _source: Observable<Element>
-
-    private let _lock = RecursiveLock()
-
-    private var _connection: SingleAssignmentDisposable?
-    private var _element: Element?
-    private var _stopped = false
-    private var _stopEvent = nil as Event<Element>?
-    private var _observers = Observers()
-
-    init(source: Observable<Element>) {
-        self._source = source
-    }
-
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
-        _lock.lock()
-        let result = _synchronized_subscribe(observer)
-        _lock.unlock()
-        return result
-    }
-
-    func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
-        if let element = self._element {
-            observer.on(.next(element))
-        }
-
-        if let stopEvent = self._stopEvent {
-            observer.on(stopEvent)
-            return Disposables.create()
-        }
-
-        let initialCount = self._observers.count
-
-        let disposeKey = self._observers.insert(observer.on)
-
-        if initialCount == 0 {
-            let connection = SingleAssignmentDisposable()
-            _connection = connection
-
-            connection.setDisposable(self._source.subscribe(self))
-        }
-
-        return SubscriptionDisposable(owner: self, key: disposeKey)
-    }
-
-    func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
-        _lock.lock()
-        _synchronized_unsubscribe(disposeKey)
-        _lock.unlock()
-    }
-
-    func _synchronized_unsubscribe(_ disposeKey: DisposeKey) {
-        // if already unsubscribed, just return
-        if self._observers.removeKey(disposeKey) == nil {
-            return
-        }
-
-        if _observers.count == 0 {
-            _connection?.dispose()
-            _connection = nil
-        }
-    }
-
-    func on(_ event: Event<E>) {
-        dispatch(_synchronized_on(event), event)
-    }
-
-    func _synchronized_on(_ event: Event<E>) -> Observers {
-        _lock.lock(); defer { _lock.unlock() }
-        if _stopped {
-            return Observers()
-        }
-
-        switch event {
-        case .next(let element):
-            _element = element
-        case .error, .completed:
-            _stopEvent = event
-            _stopped = true
-            _connection?.dispose()
-            _connection = nil
-        }
-        
-        return _observers
-    }
-    
-}
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplay1WhileConnected.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplay1WhileConnected.swift
deleted file mode 100644
index fc490ec10e2..00000000000
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplay1WhileConnected.swift
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-//  ShareReplay1WhileConnected.swift
-//  RxSwift
-//
-//  Created by Krunoslav Zaher on 12/6/15.
-//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
-//
-
-extension ObservableType {
-
-    /**
-     Returns an observable sequence that shares a single subscription to the underlying sequence, and immediately upon subscription replays latest element in buffer.
-
-     This operator is a specialization of replay which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
-
-     Unlike `shareReplay(bufferSize: Int)`, this operator will clear latest element from replay buffer in case number of subscribers drops from one to zero. In case sequence
-     completes or errors out replay buffer is also cleared.
-
-     - seealso: [shareReplay operator on reactivex.io](http://reactivex.io/documentation/operators/replay.html)
-
-     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
-     */
-    public func shareReplayLatestWhileConnected()
-        -> Observable<E> {
-            return ShareReplay1WhileConnected(source: self.asObservable())
-    }
-}
-
-fileprivate final class ShareReplay1WhileConnectedConnection<Element>
-    : ObserverType
-    , SynchronizedUnsubscribeType {
-    typealias E = Element
-    typealias Observers = AnyObserver<Element>.s
-    typealias DisposeKey = Observers.KeyType
-
-    typealias Parent = ShareReplay1WhileConnected<Element>
-    private let _parent: Parent
-    private let _subscription = SingleAssignmentDisposable()
-
-    private let _lock: RecursiveLock
-    private var _disposed: Bool = false
-    fileprivate var _observers = Observers()
-    fileprivate var _element: Element?
-
-    init(parent: Parent, lock: RecursiveLock) {
-        _parent = parent
-        _lock = lock
-
-        #if TRACE_RESOURCES
-            _ = Resources.incrementTotal()
-        #endif
-    }
-
-    final func on(_ event: Event<E>) {
-        _lock.lock()
-        let observers = _synchronized_on(event)
-        _lock.unlock()
-        dispatch(observers, event)
-    }
-
-    final private func _synchronized_on(_ event: Event<E>) -> Observers {
-        if _disposed {
-            return Observers()
-        }
-
-        switch event {
-        case .next(let element):
-            _element = element
-            return _observers
-        case .error, .completed:
-            let observers = _observers
-            self._synchronized_dispose()
-            return observers
-        }
-    }
-
-    final func connect() {
-        _subscription.setDisposable(_parent._source.subscribe(self))
-    }
-
-    final func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
-        _lock.lock(); defer { _lock.unlock() }
-        if let element = _element {
-            observer.on(.next(element))
-        }
-
-        let disposeKey = _observers.insert(observer.on)
-
-        return SubscriptionDisposable(owner: self, key: disposeKey)
-    }
-
-    final private func _synchronized_dispose() {
-        _disposed = true
-        if _parent._connection === self {
-            _parent._connection = nil
-        }
-        _observers = Observers()
-        _subscription.dispose()
-    }
-
-    final func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
-        _lock.lock()
-        _synchronized_unsubscribe(disposeKey)
-        _lock.unlock()
-    }
-
-    @inline(__always)
-    final private func _synchronized_unsubscribe(_ disposeKey: DisposeKey) {
-        // if already unsubscribed, just return
-        if self._observers.removeKey(disposeKey) == nil {
-            return
-        }
-
-        if _observers.count == 0 {
-            _synchronized_dispose()
-        }
-    }
-
-    #if TRACE_RESOURCES
-        deinit {
-            _ = Resources.decrementTotal()
-        }
-    #endif
-}
-
-// optimized version of share replay for most common case
-final fileprivate class ShareReplay1WhileConnected<Element>
-    : Observable<Element> {
-
-    fileprivate typealias Connection = ShareReplay1WhileConnectedConnection<Element>
-
-    fileprivate let _source: Observable<Element>
-
-    fileprivate let _lock = RecursiveLock()
-
-    fileprivate var _connection: Connection?
-
-    init(source: Observable<Element>) {
-        self._source = source
-    }
-
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
-        _lock.lock()
-
-        let connection = _synchronized_subscribe(observer)
-        let count = connection._observers.count
-
-        let disposable = connection._synchronized_subscribe(observer)
-        
-        if count == 0 {
-            connection.connect()
-        }
-
-        _lock.unlock()
-
-        return disposable
-    }
-
-    @inline(__always)
-    private func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Connection where O.E == E {
-        let connection: Connection
-
-        if let existingConnection = _connection {
-            connection = existingConnection
-        }
-        else {
-            connection = ShareReplay1WhileConnectedConnection<Element>(
-                parent: self,
-                lock: _lock)
-            _connection = connection
-        }
-
-        return connection
-    }
-}
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
new file mode 100644
index 00000000000..ee5e8f89931
--- /dev/null
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
@@ -0,0 +1,496 @@
+//
+//  ShareReplayScope.swift
+//  RxSwift
+//
+//  Created by Krunoslav Zaher on 5/28/17.
+//  Copyright © 2017 Krunoslav Zaher. All rights reserved.
+//
+
+/// Subject lifetime scope
+public enum SubjectLifetimeScope {
+    /**
+     **Each connection will have it's own subject instance to store replay events.**
+     **Connections will be isolated from each another.**
+
+     Configures the underlying implementation to behave equivalent to.
+     
+     ```
+     source.multicast(makeSubject: { MySubject() }).refCount()
+     ```
+
+     **This is the recommended default.**
+
+     This has the following consequences:
+     * `retry` or `concat` operators will function as expected because terminating the sequence will clear internal state.
+     * Each connection to source observable sequence will use it's own subject.
+     * When the number of subscribers drops from 1 to 0 and connection to source sequence is disposed, subject will be cleared.
+
+     
+     ```
+     let xs = Observable.deferred { () -> Observable<TimeInterval> in
+             print("Performing work ...")
+             return Observable.just(Date().timeIntervalSince1970)
+         }
+         .share(replay: 1, scope: .whileConnected)
+
+     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
+     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
+     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
+
+     ```
+
+     Notice how time interval is different and `Performing work ...` is printed each time)
+     
+     ```
+     Performing work ...
+     next 1495998900.82141
+     completed
+
+     Performing work ...
+     next 1495998900.82359
+     completed
+
+     Performing work ...
+     next 1495998900.82444
+     completed
+
+
+     ```
+     
+     */
+    case whileConnected
+
+    /**
+     **One subject will store replay events for all connections to source.**
+     **Connections won't be isolated from each another.**
+
+     Configures the underlying implementation behave equivalent to.
+
+     ```
+     source.multicast(MySubject()).refCount()
+     ```
+     
+     This has the following consequences:
+     * Using `retry` or `concat` operators after this operator usually isn't advised.
+     * Each connection to source observable sequence will share the same subject.
+     * After number of subscribers drops from 1 to 0 and connection to source observable sequence is dispose, this operator will 
+       continue holding a reference to the same subject.
+       If at some later moment a new observer initiates a new connection to source it can potentially receive
+       some of the stale events received during previous connection.
+     * After source sequence terminates any new observer will always immediatelly receive replayed elements and terminal event.
+       No new subscriptions to source observable sequence will be attempted.
+
+     ```
+     let xs = Observable.deferred { () -> Observable<TimeInterval> in
+             print("Performing work ...")
+             return Observable.just(Date().timeIntervalSince1970)
+         }
+         .share(replay: 1, scope: .forever)
+
+     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
+     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
+     _ = xs.subscribe(onNext: { print("next \($0)") }, onCompleted: { print("completed\n") })
+     ```
+     
+     Notice how time interval is the same, replayed, and `Performing work ...` is printed only once
+     
+     ```
+     Performing work ...
+     next 1495999013.76356
+     completed
+
+     next 1495999013.76356
+     completed
+
+     next 1495999013.76356
+     completed
+     ```
+     
+    */
+    case forever
+}
+
+extension ObservableType {
+
+    /**
+     Returns an observable sequence that **shares a single subscription to the underlying sequence**, and immediately upon subscription replays  elements in buffer.
+     
+     This operator is equivalent to:
+     * `.whileConnected`
+     ```
+     // Each connection will have it's own subject instance to store replay events.
+     // Connections will be isolated from each another.
+     source.multicast(makeSubject: { Replay.create(bufferSize: replay) }).refCount()
+     ```
+     * `.forever`
+     ```
+     // One subject will store replay events for all connections to source.
+     // Connections won't be isolated from each another.
+     source.multicast(Replay.create(bufferSize: replay)).refCount()
+     ```
+     
+     It uses optimized versions of the operators for most common operations.
+
+     - parameter replay: Maximum element count of the replay buffer.
+     - parameter scope: Lifetime scope of sharing subject. For more information see `SubjectLifetimeScope` enum.
+
+     - seealso: [shareReplay operator on reactivex.io](http://reactivex.io/documentation/operators/replay.html)
+
+     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
+     */
+    public func share(replay: Int = 0, scope: SubjectLifetimeScope)
+        -> Observable<E> {
+        switch scope {
+        case .forever:
+            switch replay {
+            case 0: return self.multicast(PublishSubject()).refCount()
+            default: return shareReplay(replay)
+            }
+        case .whileConnected:
+            switch replay {
+            case 0: return ShareWhileConnected(source: self.asObservable())
+            case 1: return ShareReplay1WhileConnected(source: self.asObservable())
+            default: return self.multicast(makeSubject: { ReplaySubject.create(bufferSize: replay) }).refCount()
+            }
+        }
+    }
+}
+
+extension ObservableType {
+
+    /**
+     Returns an observable sequence that shares a single subscription to the underlying sequence, and immediately upon subscription replays latest element in buffer.
+
+     This operator is a specialization of replay which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
+
+     Unlike `shareReplay(bufferSize: Int)`, this operator will clear latest element from replay buffer in case number of subscribers drops from one to zero. In case sequence
+     completes or errors out replay buffer is also cleared.
+
+     - seealso: [shareReplay operator on reactivex.io](http://reactivex.io/documentation/operators/replay.html)
+
+     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
+     */
+    public func shareReplayLatestWhileConnected()
+        -> Observable<E> {
+        return ShareReplay1WhileConnected(source: self.asObservable())
+    }
+}
+
+extension ObservableType {
+
+    /**
+     Returns an observable sequence that shares a single subscription to the underlying sequence, and immediately upon subscription replays maximum number of elements in buffer.
+
+     This operator is a specialization of replay which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
+
+     - seealso: [shareReplay operator on reactivex.io](http://reactivex.io/documentation/operators/replay.html)
+
+     - parameter bufferSize: Maximum element count of the replay buffer.
+     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
+     */
+    public func shareReplay(_ bufferSize: Int)
+        -> Observable<E> {
+        return self.replay(bufferSize).refCount()
+    }
+}
+
+fileprivate final class ShareReplay1WhileConnectedConnection<Element>
+    : ObserverType
+    , SynchronizedUnsubscribeType {
+    typealias E = Element
+    typealias Observers = AnyObserver<Element>.s
+    typealias DisposeKey = Observers.KeyType
+
+    typealias Parent = ShareReplay1WhileConnected<Element>
+    private let _parent: Parent
+    private let _subscription = SingleAssignmentDisposable()
+
+    private let _lock: RecursiveLock
+    private var _disposed: Bool = false
+    fileprivate var _observers = Observers()
+    fileprivate var _element: Element?
+
+    init(parent: Parent, lock: RecursiveLock) {
+        _parent = parent
+        _lock = lock
+
+        #if TRACE_RESOURCES
+            _ = Resources.incrementTotal()
+        #endif
+    }
+
+    final func on(_ event: Event<E>) {
+        _lock.lock()
+        let observers = _synchronized_on(event)
+        _lock.unlock()
+        dispatch(observers, event)
+    }
+
+    final private func _synchronized_on(_ event: Event<E>) -> Observers {
+        if _disposed {
+            return Observers()
+        }
+
+        switch event {
+        case .next(let element):
+            _element = element
+            return _observers
+        case .error, .completed:
+            let observers = _observers
+            self._synchronized_dispose()
+            return observers
+        }
+    }
+
+    final func connect() {
+        _subscription.setDisposable(_parent._source.subscribe(self))
+    }
+
+    final func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+        _lock.lock(); defer { _lock.unlock() }
+        if let element = _element {
+            observer.on(.next(element))
+        }
+
+        let disposeKey = _observers.insert(observer.on)
+
+        return SubscriptionDisposable(owner: self, key: disposeKey)
+    }
+
+    final private func _synchronized_dispose() {
+        _disposed = true
+        if _parent._connection === self {
+            _parent._connection = nil
+        }
+        _observers = Observers()
+    }
+
+    final func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
+        _lock.lock()
+        let shouldDisconnect = _synchronized_unsubscribe(disposeKey)
+        _lock.unlock()
+        if shouldDisconnect {
+            _subscription.dispose()
+        }
+    }
+
+    @inline(__always)
+    final private func _synchronized_unsubscribe(_ disposeKey: DisposeKey) -> Bool {
+        // if already unsubscribed, just return
+        if self._observers.removeKey(disposeKey) == nil {
+            return false
+        }
+
+        if _observers.count == 0 {
+            _synchronized_dispose()
+            return true
+        }
+
+        return false
+    }
+
+    #if TRACE_RESOURCES
+        deinit {
+            _ = Resources.decrementTotal()
+        }
+    #endif
+}
+
+// optimized version of share replay for most common case
+final fileprivate class ShareReplay1WhileConnected<Element>
+    : Observable<Element> {
+
+    fileprivate typealias Connection = ShareReplay1WhileConnectedConnection<Element>
+
+    fileprivate let _source: Observable<Element>
+
+    fileprivate let _lock = RecursiveLock()
+
+    fileprivate var _connection: Connection?
+
+    init(source: Observable<Element>) {
+        self._source = source
+    }
+
+    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
+        _lock.lock()
+
+        let connection = _synchronized_subscribe(observer)
+        let count = connection._observers.count
+
+        let disposable = connection._synchronized_subscribe(observer)
+
+        _lock.unlock()
+        
+        if count == 0 {
+            connection.connect()
+        }
+
+        return disposable
+    }
+
+    @inline(__always)
+    private func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Connection where O.E == E {
+        let connection: Connection
+
+        if let existingConnection = _connection {
+            connection = existingConnection
+        }
+        else {
+            connection = ShareReplay1WhileConnectedConnection<Element>(
+                parent: self,
+                lock: _lock)
+            _connection = connection
+        }
+
+        return connection
+    }
+}
+
+fileprivate final class ShareWhileConnectedConnection<Element>
+    : ObserverType
+    , SynchronizedUnsubscribeType {
+    typealias E = Element
+    typealias Observers = AnyObserver<Element>.s
+    typealias DisposeKey = Observers.KeyType
+
+    typealias Parent = ShareWhileConnected<Element>
+    private let _parent: Parent
+    private let _subscription = SingleAssignmentDisposable()
+
+    private let _lock: RecursiveLock
+    private var _disposed: Bool = false
+    fileprivate var _observers = Observers()
+
+    init(parent: Parent, lock: RecursiveLock) {
+        _parent = parent
+        _lock = lock
+
+        #if TRACE_RESOURCES
+            _ = Resources.incrementTotal()
+        #endif
+    }
+
+    final func on(_ event: Event<E>) {
+        _lock.lock()
+        let observers = _synchronized_on(event)
+        _lock.unlock()
+        dispatch(observers, event)
+    }
+
+    final private func _synchronized_on(_ event: Event<E>) -> Observers {
+        if _disposed {
+            return Observers()
+        }
+
+        switch event {
+        case .next:
+            return _observers
+        case .error, .completed:
+            let observers = _observers
+            self._synchronized_dispose()
+            return observers
+        }
+    }
+
+    final func connect() {
+        _subscription.setDisposable(_parent._source.subscribe(self))
+    }
+
+    final func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+        _lock.lock(); defer { _lock.unlock() }
+
+        let disposeKey = _observers.insert(observer.on)
+
+        return SubscriptionDisposable(owner: self, key: disposeKey)
+    }
+
+    final private func _synchronized_dispose() {
+        _disposed = true
+        if _parent._connection === self {
+            _parent._connection = nil
+        }
+        _observers = Observers()
+    }
+
+    final func synchronizedUnsubscribe(_ disposeKey: DisposeKey) {
+        _lock.lock()
+        let shouldDisconnect = _synchronized_unsubscribe(disposeKey)
+        _lock.unlock()
+        if shouldDisconnect {
+            _subscription.dispose()
+        }
+    }
+
+    @inline(__always)
+    final private func _synchronized_unsubscribe(_ disposeKey: DisposeKey) -> Bool {
+        // if already unsubscribed, just return
+        if self._observers.removeKey(disposeKey) == nil {
+            return false
+        }
+
+        if _observers.count == 0 {
+            _synchronized_dispose()
+            return true
+        }
+
+        return false
+    }
+
+    #if TRACE_RESOURCES
+    deinit {
+        _ = Resources.decrementTotal()
+    }
+    #endif
+}
+
+// optimized version of share replay for most common case
+final fileprivate class ShareWhileConnected<Element>
+    : Observable<Element> {
+
+    fileprivate typealias Connection = ShareWhileConnectedConnection<Element>
+
+    fileprivate let _source: Observable<Element>
+
+    fileprivate let _lock = RecursiveLock()
+
+    fileprivate var _connection: Connection?
+
+    init(source: Observable<Element>) {
+        self._source = source
+    }
+
+    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
+        _lock.lock()
+
+        let connection = _synchronized_subscribe(observer)
+        let count = connection._observers.count
+
+        let disposable = connection._synchronized_subscribe(observer)
+
+        _lock.unlock()
+
+        if count == 0 {
+            connection.connect()
+        }
+
+        return disposable
+    }
+
+    @inline(__always)
+    private func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Connection where O.E == E {
+        let connection: Connection
+
+        if let existingConnection = _connection {
+            connection = existingConnection
+        }
+        else {
+            connection = ShareWhileConnectedConnection<Element>(
+                parent: self,
+                lock: _lock)
+            _connection = connection
+        }
+        
+        return connection
+    }
+}
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sink.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sink.swift
index bd65cc932ac..214cfda3260 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sink.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sink.swift
@@ -12,7 +12,7 @@ class Sink<O : ObserverType> : Disposable {
     fileprivate var _disposed: Bool
 
     #if DEBUG
-        fileprivate var _numberOfConcurrentCalls: AtomicInt = 0
+        fileprivate let _synchronizationTracker = SynchronizationTracker()
     #endif
 
     init(observer: O, cancel: Cancelable) {
@@ -26,13 +26,8 @@ class Sink<O : ObserverType> : Disposable {
     
     final func forwardOn(_ event: Event<O.E>) {
         #if DEBUG
-            if AtomicIncrement(&_numberOfConcurrentCalls) > 1 {
-                rxFatalError("Warning: Recursive call or synchronization error!")
-            }
-
-            defer {
-                _ = AtomicDecrement(&_numberOfConcurrentCalls)
-            }
+            _synchronizationTracker.register(synchronizationErrorMessage: .default)
+            defer { _synchronizationTracker.unregister() }
         #endif
         if _disposed {
             return
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Switch.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Switch.swift
index cc7cf6d1ea4..2da100053eb 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Switch.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Switch.swift
@@ -45,9 +45,7 @@ extension ObservableType where E : ObservableConvertibleType {
 
 fileprivate class SwitchSink<SourceType, S: ObservableConvertibleType, O: ObserverType>
     : Sink<O>
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType where S.E == O.E {
+    , ObserverType where S.E == O.E {
     typealias E = SourceType
 
     fileprivate let _subscriptions: SingleAssignmentDisposable = SingleAssignmentDisposable()
@@ -69,24 +67,33 @@ fileprivate class SwitchSink<SourceType, S: ObservableConvertibleType, O: Observ
         _subscriptions.setDisposable(subscription)
         return Disposables.create(_subscriptions, _innerSubscription)
     }
-    
-    func on(_ event: Event<E>) {
-        synchronizedOn(event)
-    }
 
     func performMap(_ element: SourceType) throws -> S {
         rxAbstractMethod()
     }
 
-    func _synchronized_on(_ event: Event<E>) {
-        switch event {
-        case .next(let element):
+    @inline(__always)
+    final private func nextElementArrived(element: E) -> (Int, Observable<S.E>)? {
+        _lock.lock(); defer { _lock.unlock() } // {
             do {
                 let observable = try performMap(element).asObservable()
                 _hasLatest = true
                 _latest = _latest &+ 1
-                let latest = _latest
+                return (_latest, observable)
+            }
+            catch let error {
+                forwardOn(.error(error))
+                dispose()
+            }
 
+            return nil
+        // }
+    }
+
+    func on(_ event: Event<E>) {
+        switch event {
+        case .next(let element):
+            if let (latest, observable) = nextElementArrived(element: element) {
                 let d = SingleAssignmentDisposable()
                 _innerSubscription.disposable = d
                    
@@ -94,14 +101,12 @@ fileprivate class SwitchSink<SourceType, S: ObservableConvertibleType, O: Observ
                 let disposable = observable.subscribe(observer)
                 d.setDisposable(disposable)
             }
-            catch let error {
-                forwardOn(.error(error))
-                dispose()
-            }
         case .error(let error):
+            _lock.lock(); defer { _lock.unlock() }
             forwardOn(.error(error))
             dispose()
         case .completed:
+            _lock.lock(); defer { _lock.unlock() }
             _stopped = true
             
             _subscriptions.dispose()
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Using.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Using.swift
index 2f772101d28..6c32a98b5a9 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Using.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Using.swift
@@ -16,7 +16,7 @@ extension Observable {
      - parameter observableFactory: Factory function to obtain an observable sequence that depends on the obtained resource.
      - returns: An observable sequence whose lifetime controls the lifetime of the dependent resource object.
      */
-    public static func using<R: Disposable>(_ resourceFactory: @escaping () throws -> R, observableFactory: @escaping (R) throws -> Observable<E>) -> Observable<E> {
+    public static func using<Resource: Disposable>(_ resourceFactory: @escaping () throws -> Resource, observableFactory: @escaping (Resource) throws -> Observable<E>) -> Observable<E> {
         return Using(resourceFactory: resourceFactory, observableFactory: observableFactory)
     }
 }
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObserverType.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObserverType.swift
index b024b0fb7af..21a5722c691 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObserverType.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObserverType.swift
@@ -13,7 +13,7 @@ public protocol ObserverType {
 
     /// Notify observer about sequence event.
     ///
-    /// - parameter event: Event that occured.
+    /// - parameter event: Event that occurred.
     func on(_ event: Event<E>)
 }
 
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Rx.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Rx.swift
index 93b066e76dc..cda826cf3b8 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Rx.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Rx.swift
@@ -65,3 +65,70 @@ func decrementChecked(_ i: inout Int) throws -> Int {
     defer { i -= 1 }
     return i
 }
+
+#if DEBUG
+    import class Foundation.Thread
+    final class SynchronizationTracker {
+        private let _lock = RecursiveLock()
+
+        public enum SychronizationErrorMessages: String {
+            case variable = "Two different threads are trying to assign the same `Variable.value` unsynchronized.\n    This is undefined behavior because the end result (variable value) is nondeterministic and depends on the \n    operating system thread scheduler. This will cause random behavior of your program.\n"
+            case `default` = "Two different unsynchronized threads are trying to send some event simultaneously.\n    This is undefined behavior because the ordering of the effects caused by these events is nondeterministic and depends on the \n    operating system thread scheduler. This will result in a random behavior of your program.\n"
+        }
+
+        private var _threads = Dictionary<UnsafeMutableRawPointer, Int>()
+
+        private func synchronizationError(_ message: String) {
+            #if FATAL_SYNCHRONIZATION
+                rxFatalError(message)
+            #else
+                print(message)
+            #endif
+        }
+        
+        func register(synchronizationErrorMessage: SychronizationErrorMessages) {
+            _lock.lock(); defer { _lock.unlock() }
+            let pointer = Unmanaged.passUnretained(Thread.current).toOpaque()
+            let count = (_threads[pointer] ?? 0) + 1
+
+            if count > 1 {
+                synchronizationError(
+                    "⚠️ Reentrancy anomaly was detected. ⚠️\n" +
+                    "  > Debugging: To debug this issue you can set a breakpoint in \(#file):\(#line) and observe the call stack.\n" +
+                    "  > Problem: This behavior is breaking the observable sequence grammar. `next (error | completed)?`\n" +
+                    "    This behavior breaks the grammar because there is overlapping between sequence events.\n" +
+                    "    Observable sequence is trying to send an event before sending of previous event has finished.\n" +
+                    "  > Interpretation: This could mean that there is some kind of unexpected cyclic dependency in your code,\n" +
+                    "    or that the system is not behaving in the expected way.\n" +
+                    "  > Remedy: If this is the expected behavior this message can be suppressed by adding `.observeOn(MainScheduler.asyncInstance)`\n" +
+                    "    or by enqueing sequence events in some other way.\n"
+                )
+            }
+            
+            _threads[pointer] = count
+
+            if _threads.count > 1 {
+                synchronizationError(
+                    "⚠️ Synchronization anomaly was detected. ⚠️\n" +
+                    "  > Debugging: To debug this issue you can set a breakpoint in \(#file):\(#line) and observe the call stack.\n" +
+                    "  > Problem: This behavior is breaking the observable sequence grammar. `next (error | completed)?`\n" +
+                    "    This behavior breaks the grammar because there is overlapping between sequence events.\n" +
+                    "    Observable sequence is trying to send an event before sending of previous event has finished.\n" +
+                    "  > Interpretation: " + synchronizationErrorMessage.rawValue +
+                    "  > Remedy: If this is the expected behavior this message can be suppressed by adding `.observeOn(MainScheduler.asyncInstance)`\n" +
+                    "    or by synchronizing sequence events in some other way.\n"
+                )
+            }
+        }
+
+        func unregister() {
+            _lock.lock(); defer { _lock.unlock() }
+            let pointer = Unmanaged.passUnretained(Thread.current).toOpaque()
+            _threads[pointer] = (_threads[pointer] ?? 1) - 1
+            if _threads[pointer] == 0 {
+                _threads[pointer] = nil
+            }
+        }
+    }
+
+#endif
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
index d7ec3d88e87..c6acaa19d95 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
@@ -45,7 +45,7 @@ public class ConcurrentDispatchQueueScheduler: SchedulerType {
     }
 
     /**
-    Schedules an action to be executed immediatelly.
+    Schedules an action to be executed immediately.
     
     - parameter state: State passed to the action to be executed.
     - parameter action: Action to be executed.
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
index 92028b1787e..a98ad218a08 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
@@ -37,7 +37,7 @@ public final class ConcurrentMainScheduler : SchedulerType {
     public static let instance = ConcurrentMainScheduler(mainScheduler: MainScheduler.instance)
 
     /**
-    Schedules an action to be executed immediatelly.
+    Schedules an action to be executed immediately.
 
     - parameter state: State passed to the action to be executed.
     - parameter action: Action to be executed.
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ImmediateScheduler.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ImmediateScheduler.swift
index d411dac7ee6..f6b5db941b2 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ImmediateScheduler.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ImmediateScheduler.swift
@@ -12,7 +12,7 @@ private final class ImmediateScheduler : ImmediateSchedulerType {
     private let _asyncLock = AsyncLock<AnonymousInvocable>()
 
     /**
-    Schedules an action to be executed immediatelly.
+    Schedules an action to be executed immediately.
 
     In case `schedule` is called recursively from inside of `action` callback, scheduled `action` will be enqueued
     and executed after current `action`. (`AsyncLock` behavior)
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
index 1d224775bec..41f2947a683 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
@@ -43,7 +43,7 @@ final class SchedulePeriodicRecursive<State> {
         case .tick:
             scheduler.schedule(.tick, dueTime: _period)
 
-            // The idea is that if on tick there wasn't any item enqueued, schedule to perform work immediatelly.
+            // The idea is that if on tick there wasn't any item enqueued, schedule to perform work immediately.
             // Else work will be scheduled after previous enqueued work completes.
             if AtomicIncrement(&_pendingTickCount) == 1 {
                 self.tick(.dispatchStart, scheduler: scheduler)
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
index a163406cb9b..71733d39782 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
@@ -82,7 +82,7 @@ public class SerialDispatchQueueScheduler : SchedulerType {
     }
     
     /**
-    Schedules an action to be executed immediatelly.
+    Schedules an action to be executed immediately.
     
     - parameter state: State passed to the action to be executed.
     - parameter action: Action to be executed.
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
index 0e650c602a8..c0e1aa56240 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
@@ -55,7 +55,7 @@ open class VirtualTimeScheduler<Converter: VirtualTimeConverterType>
     }
 
     /**
-    Schedules an action to be executed immediatelly.
+    Schedules an action to be executed immediately.
 
     - parameter state: State passed to the action to be executed.
     - parameter action: Action to be executed.
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/AsyncSubject.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/AsyncSubject.swift
index 3e8985903ce..520207d8794 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/AsyncSubject.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/AsyncSubject.swift
@@ -38,6 +38,11 @@ public final class AsyncSubject<Element>
     }
     private var _lastElement: Element?
 
+    #if DEBUG
+        fileprivate let _synchronizationTracker = SynchronizationTracker()
+    #endif
+
+
     /// Creates a subject.
     public override init() {
         #if TRACE_RESOURCES
@@ -50,6 +55,10 @@ public final class AsyncSubject<Element>
     ///
     /// - parameter event: Event to send to the observers.
     public func on(_ event: Event<E>) {
+        #if DEBUG
+            _synchronizationTracker.register(synchronizationErrorMessage: .default)
+            defer { _synchronizationTracker.unregister() }
+        #endif
         let (observers, event) = _synchronized_on(event)
         switch event {
         case .next:
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/BehaviorSubject.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/BehaviorSubject.swift
index 4c6df6258ef..f2de851a7c3 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/BehaviorSubject.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/BehaviorSubject.swift
@@ -36,6 +36,10 @@ public final class BehaviorSubject<Element>
     private var _observers = Observers()
     private var _stoppedEvent: Event<Element>?
 
+    #if DEBUG
+        fileprivate let _synchronizationTracker = SynchronizationTracker()
+    #endif
+
     /// Indicates whether the subject has been disposed.
     public var isDisposed: Bool {
         return _isDisposed
@@ -75,12 +79,15 @@ public final class BehaviorSubject<Element>
     ///
     /// - parameter event: Event to send to the observers.
     public func on(_ event: Event<E>) {
-        _lock.lock()
+        #if DEBUG
+            _synchronizationTracker.register(synchronizationErrorMessage: .default)
+            defer { _synchronizationTracker.unregister() }
+        #endif
         dispatch(_synchronized_on(event), event)
-        _lock.unlock()
     }
 
     func _synchronized_on(_ event: Event<E>) -> Observers {
+        _lock.lock(); defer { _lock.unlock() }
         if _stoppedEvent != nil || _isDisposed {
             return Observers()
         }
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/PublishSubject.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/PublishSubject.swift
index 0097fd1e1b0..d847ce86983 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/PublishSubject.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/PublishSubject.swift
@@ -35,7 +35,11 @@ public final class PublishSubject<Element>
     private var _observers = Observers()
     private var _stopped = false
     private var _stoppedEvent = nil as Event<Element>?
-    
+
+    #if DEBUG
+        fileprivate let _synchronizationTracker = SynchronizationTracker()
+    #endif
+
     /// Indicates whether the subject has been isDisposed.
     public var isDisposed: Bool {
         return _isDisposed
@@ -53,6 +57,10 @@ public final class PublishSubject<Element>
     ///
     /// - parameter event: Event to send to the observers.
     public func on(_ event: Event<Element>) {
+        #if DEBUG
+            _synchronizationTracker.register(synchronizationErrorMessage: .default)
+            defer { _synchronizationTracker.unregister() }
+        #endif
         dispatch(_synchronized_on(event), event)
     }
 
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/ReplaySubject.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/ReplaySubject.swift
index 250439a3e22..54abc35b24f 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/ReplaySubject.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/ReplaySubject.swift
@@ -39,6 +39,10 @@ public class ReplaySubject<Element>
     }
     fileprivate var _observers = Observers()
 
+    #if DEBUG
+        fileprivate let _synchronizationTracker = SynchronizationTracker()
+    #endif
+
     func unsubscribe(_ key: DisposeKey) {
         rxAbstractMethod()
     }
@@ -111,6 +115,10 @@ fileprivate class ReplayBufferBase<Element>
     }
     
     override func on(_ event: Event<Element>) {
+        #if DEBUG
+            _synchronizationTracker.register(synchronizationErrorMessage: .default)
+            defer { _synchronizationTracker.unregister() }
+        #endif
         dispatch(_synchronized_on(event), event)
     }
 
@@ -196,7 +204,7 @@ fileprivate class ReplayBufferBase<Element>
     }
 }
 
-final class ReplayOne<Element> : ReplayBufferBase<Element> {
+fileprivate final class ReplayOne<Element> : ReplayBufferBase<Element> {
     private var _value: Element?
     
     override init() {
@@ -223,7 +231,7 @@ final class ReplayOne<Element> : ReplayBufferBase<Element> {
     }
 }
 
-class ReplayManyBase<Element> : ReplayBufferBase<Element> {
+fileprivate class ReplayManyBase<Element> : ReplayBufferBase<Element> {
     fileprivate var _queue: Queue<Element>
     
     init(queueSize: Int) {
@@ -246,7 +254,7 @@ class ReplayManyBase<Element> : ReplayBufferBase<Element> {
     }
 }
 
-final class ReplayMany<Element> : ReplayManyBase<Element> {
+fileprivate final class ReplayMany<Element> : ReplayManyBase<Element> {
     private let _bufferSize: Int
     
     init(bufferSize: Int) {
@@ -262,7 +270,7 @@ final class ReplayMany<Element> : ReplayManyBase<Element> {
     }
 }
 
-final class ReplayAll<Element> : ReplayManyBase<Element> {
+fileprivate final class ReplayAll<Element> : ReplayManyBase<Element> {
     init() {
         super.init(queueSize: 0)
     }
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/Variable.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/Variable.swift
index 0c08f8e5b95..ba058f87ea1 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/Variable.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/Variable.swift
@@ -17,12 +17,12 @@ public final class Variable<Element> {
     private let _subject: BehaviorSubject<Element>
     
     private var _lock = SpinLock()
- 
+
     // state
     private var _value: E
 
     #if DEBUG
-        fileprivate var _numberOfConcurrentCalls: AtomicInt = 0
+        fileprivate let _synchronizationTracker = SynchronizationTracker()
     #endif
 
     /// Gets or sets current value of variable.
@@ -37,13 +37,8 @@ public final class Variable<Element> {
         }
         set(newValue) {
             #if DEBUG
-                if AtomicIncrement(&_numberOfConcurrentCalls) > 1 {
-                    rxFatalError("Warning: Recursive call or synchronization error!")
-                }
-
-                defer {
-                    _ = AtomicDecrement(&_numberOfConcurrentCalls)
-                }
+                _synchronizationTracker.register(synchronizationErrorMessage: .variable)
+                defer { _synchronizationTracker.unregister() }
             #endif
             _lock.lock()
             _value = newValue
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Completable+AndThen.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Completable+AndThen.swift
new file mode 100644
index 00000000000..c02c9e5147e
--- /dev/null
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Completable+AndThen.swift
@@ -0,0 +1,132 @@
+//
+//  Completable+AndThen.swift
+//  RxSwift
+//
+//  Created by Krunoslav Zaher on 7/2/17.
+//  Copyright © 2017 Krunoslav Zaher. All rights reserved.
+//
+
+extension PrimitiveSequenceType where TraitType == CompletableTrait, ElementType == Never {
+    /**
+     Concatenates the second observable sequence to `self` upon successful termination of `self`.
+
+     - seealso: [concat operator on reactivex.io](http://reactivex.io/documentation/operators/concat.html)
+
+     - parameter second: Second observable sequence.
+     - returns: An observable sequence that contains the elements of `self`, followed by those of the second sequence.
+     */
+    public func andThen<E>(_ second: Single<E>) -> Single<E> {
+        let completable = self.primitiveSequence.asObservable()
+        return Single(raw: ConcatCompletable(completable: completable, second: second.asObservable()))
+    }
+
+    /**
+     Concatenates the second observable sequence to `self` upon successful termination of `self`.
+
+     - seealso: [concat operator on reactivex.io](http://reactivex.io/documentation/operators/concat.html)
+
+     - parameter second: Second observable sequence.
+     - returns: An observable sequence that contains the elements of `self`, followed by those of the second sequence.
+     */
+    public func andThen<E>(_ second: Maybe<E>) -> Maybe<E> {
+        let completable = self.primitiveSequence.asObservable()
+        return Maybe(raw: ConcatCompletable(completable: completable, second: second.asObservable()))
+    }
+
+    /**
+     Concatenates the second observable sequence to `self` upon successful termination of `self`.
+
+     - seealso: [concat operator on reactivex.io](http://reactivex.io/documentation/operators/concat.html)
+
+     - parameter second: Second observable sequence.
+     - returns: An observable sequence that contains the elements of `self`, followed by those of the second sequence.
+     */
+    public func andThen(_ second: Completable) -> Completable {
+        let completable = self.primitiveSequence.asObservable()
+        return Completable(raw: ConcatCompletable(completable: completable, second: second.asObservable()))
+    }
+
+    /**
+     Concatenates the second observable sequence to `self` upon successful termination of `self`.
+
+     - seealso: [concat operator on reactivex.io](http://reactivex.io/documentation/operators/concat.html)
+
+     - parameter second: Second observable sequence.
+     - returns: An observable sequence that contains the elements of `self`, followed by those of the second sequence.
+     */
+    public func andThen<E>(_ second: Observable<E>) -> Observable<E> {
+        let completable = self.primitiveSequence.asObservable()
+        return ConcatCompletable(completable: completable, second: second.asObservable())
+    }
+}
+
+final fileprivate class ConcatCompletable<Element> : Producer<Element> {
+    fileprivate let _completable: Observable<Never>
+    fileprivate let _second: Observable<Element>
+
+    init(completable: Observable<Never>, second: Observable<Element>) {
+        self._completable = completable
+        self._second = second
+    }
+
+    override func run<O>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O : ObserverType, O.E == Element {
+        let sink = ConcatCompletableSink(parent: self, observer: observer, cancel: cancel)
+        let subscription = sink.run()
+        return (sink: sink, subscription: subscription)
+    }
+}
+
+final fileprivate class ConcatCompletableSink<O: ObserverType>
+    : Sink<O>
+    , ObserverType {
+    typealias E = Never
+    typealias Parent = ConcatCompletable<O.E>
+
+    private let _parent: Parent
+    private let _subscription = SerialDisposable()
+    
+    init(parent: Parent, observer: O, cancel: Cancelable) {
+        self._parent = parent
+        super.init(observer: observer, cancel: cancel)
+    }
+
+    func on(_ event: Event<E>) {
+        switch event {
+        case .error(let error):
+            self.forwardOn(.error(error))
+            self.dispose()
+        case .next:
+            break
+        case .completed:
+            let otherSink = ConcatCompletableSinkOther(parent: self)
+            _subscription.disposable = _parent._second.subscribe(otherSink)
+        }
+    }
+
+    func run() -> Disposable {
+        let subscription = SingleAssignmentDisposable()
+        _subscription.disposable = subscription
+        subscription.setDisposable(_parent._completable.subscribe(self))
+        return _subscription
+    }
+}
+
+final fileprivate class ConcatCompletableSinkOther<O: ObserverType>
+    : ObserverType {
+    typealias E = O.E
+
+    typealias Parent = ConcatCompletableSink<O>
+    
+    private let _parent: Parent
+
+    init(parent: Parent) {
+        self._parent = parent
+    }
+
+    func on(_ event: Event<O.E>) {
+        _parent.forwardOn(event)
+        if event.isStopEvent {
+            _parent.dispose()
+        }
+    }
+}
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence.swift b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence.swift
index bf129d529c4..3261e420984 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence.swift
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence.swift
@@ -579,6 +579,51 @@ extension PrimitiveSequence {
         -> PrimitiveSequence<Trait, Element> {
             return PrimitiveSequence(raw: source.debug(identifier, trimOutput: trimOutput, file: file, line: line, function: function))
     }
+    
+    /**
+     Constructs an observable sequence that depends on a resource object, whose lifetime is tied to the resulting observable sequence's lifetime.
+     
+     - seealso: [using operator on reactivex.io](http://reactivex.io/documentation/operators/using.html)
+     
+     - parameter resourceFactory: Factory function to obtain a resource object.
+     - parameter primitiveSequenceFactory: Factory function to obtain an observable sequence that depends on the obtained resource.
+     - returns: An observable sequence whose lifetime controls the lifetime of the dependent resource object.
+     */
+    public static func using<Resource: Disposable>(_ resourceFactory: @escaping () throws -> Resource, primitiveSequenceFactory: @escaping (Resource) throws -> PrimitiveSequence<Trait, Element>)
+        -> PrimitiveSequence<Trait, Element> {
+            return PrimitiveSequence(raw: Observable.using(resourceFactory, observableFactory: { (resource: Resource) throws -> Observable<E> in
+                return try primitiveSequenceFactory(resource).asObservable()
+            }))
+    }
+
+    /**
+     Applies a timeout policy for each element in the observable sequence. If the next element isn't received within the specified timeout duration starting from its predecessor, a TimeoutError is propagated to the observer.
+
+     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
+
+     - parameter dueTime: Maximum duration between values before a timeout occurs.
+     - parameter scheduler: Scheduler to run the timeout timer on.
+     - returns: An observable sequence with a `RxError.timeout` in case of a timeout.
+     */
+    public func timeout(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
+        -> PrimitiveSequence<Trait, Element> {
+        return PrimitiveSequence(raw: source.timeout(dueTime, scheduler: scheduler))
+    }
+
+    /**
+     Applies a timeout policy for each element in the observable sequence, using the specified scheduler to run timeout timers. If the next element isn't received within the specified timeout duration starting from its predecessor, the other observable sequence is used to produce future messages from that point on.
+
+     - seealso: [timeout operator on reactivex.io](http://reactivex.io/documentation/operators/timeout.html)
+
+     - parameter dueTime: Maximum duration between values before a timeout occurs.
+     - parameter other: Sequence to return in case of a timeout.
+     - parameter scheduler: Scheduler to run the timeout timer on.
+     - returns: The source sequence switching to the other sequence in case of a timeout.
+     */
+    public func timeout(_ dueTime: RxTimeInterval, other: PrimitiveSequence<Trait, Element>, scheduler: SchedulerType)
+        -> PrimitiveSequence<Trait, Element> {
+        return PrimitiveSequence(raw: source.timeout(dueTime, other: other.source, scheduler: scheduler))
+    }
 }
 
 extension PrimitiveSequenceType where ElementType: SignedInteger
@@ -622,6 +667,96 @@ extension PrimitiveSequenceType where TraitType == CompletableTrait, ElementType
     public static func empty() -> PrimitiveSequence<CompletableTrait, Never> {
         return PrimitiveSequence(raw: Observable.empty())
     }
+    
+    /**
+     Concatenates the second observable sequence to `self` upon successful termination of `self`.
+     
+     - seealso: [concat operator on reactivex.io](http://reactivex.io/documentation/operators/concat.html)
+     
+     - parameter second: Second observable sequence.
+     - returns: An observable sequence that contains the elements of `self`, followed by those of the second sequence.
+     */
+    public func concat(_ second: PrimitiveSequence<CompletableTrait, Never>) -> PrimitiveSequence<CompletableTrait, Never> {
+        return Completable.concat(primitiveSequence, second)
+    }
+    
+    /**
+     Concatenates all observable sequences in the given sequence, as long as the previous observable sequence terminated successfully.
+     
+     - seealso: [concat operator on reactivex.io](http://reactivex.io/documentation/operators/concat.html)
+     
+     - returns: An observable sequence that contains the elements of each given sequence, in sequential order.
+     */
+    public static func concat<S: Sequence>(_ sequence: S) -> PrimitiveSequence<CompletableTrait, Never>
+        where S.Iterator.Element == PrimitiveSequence<CompletableTrait, Never> {
+            let source = Observable.concat(sequence.lazy.map { $0.asObservable() })
+            return PrimitiveSequence<CompletableTrait, Never>(raw: source)
+    }
+    
+    /**
+     Concatenates all observable sequences in the given sequence, as long as the previous observable sequence terminated successfully.
+     
+     - seealso: [concat operator on reactivex.io](http://reactivex.io/documentation/operators/concat.html)
+     
+     - returns: An observable sequence that contains the elements of each given sequence, in sequential order.
+     */
+    public static func concat<C: Collection>(_ collection: C) -> PrimitiveSequence<CompletableTrait, Never>
+        where C.Iterator.Element == PrimitiveSequence<CompletableTrait, Never> {
+            let source = Observable.concat(collection.map { $0.asObservable() })
+            return PrimitiveSequence<CompletableTrait, Never>(raw: source)
+    }
+    
+    /**
+     Concatenates all observable sequences in the given sequence, as long as the previous observable sequence terminated successfully.
+     
+     - seealso: [concat operator on reactivex.io](http://reactivex.io/documentation/operators/concat.html)
+     
+     - returns: An observable sequence that contains the elements of each given sequence, in sequential order.
+     */
+    public static func concat(_ sources: PrimitiveSequence<CompletableTrait, Never> ...) -> PrimitiveSequence<CompletableTrait, Never> {
+        let source = Observable.concat(sources.map { $0.asObservable() })
+        return PrimitiveSequence<CompletableTrait, Never>(raw: source)
+    }
+    
+    /**
+     Merges elements from all observable sequences from collection into a single observable sequence.
+     
+     - seealso: [merge operator on reactivex.io](http://reactivex.io/documentation/operators/merge.html)
+     
+     - parameter sources: Collection of observable sequences to merge.
+     - returns: The observable sequence that merges the elements of the observable sequences.
+     */
+    public static func merge<C: Collection>(_ sources: C) -> PrimitiveSequence<CompletableTrait, Never>
+        where C.Iterator.Element == PrimitiveSequence<CompletableTrait, Never> {
+            let source = Observable.merge(sources.map { $0.asObservable() })
+            return PrimitiveSequence<CompletableTrait, Never>(raw: source)
+    }
+    
+    /**
+     Merges elements from all observable sequences from array into a single observable sequence.
+     
+     - seealso: [merge operator on reactivex.io](http://reactivex.io/documentation/operators/merge.html)
+     
+     - parameter sources: Array of observable sequences to merge.
+     - returns: The observable sequence that merges the elements of the observable sequences.
+     */
+    public static func merge(_ sources: [PrimitiveSequence<CompletableTrait, Never>]) -> PrimitiveSequence<CompletableTrait, Never> {
+        let source = Observable.merge(sources.map { $0.asObservable() })
+        return PrimitiveSequence<CompletableTrait, Never>(raw: source)
+    }
+    
+    /**
+     Merges elements from all observable sequences into a single observable sequence.
+     
+     - seealso: [merge operator on reactivex.io](http://reactivex.io/documentation/operators/merge.html)
+     
+     - parameter sources: Collection of observable sequences to merge.
+     - returns: The observable sequence that merges the elements of the observable sequences.
+     */
+    public static func merge(_ sources: PrimitiveSequence<CompletableTrait, Never>...) -> PrimitiveSequence<CompletableTrait, Never> {
+        let source = Observable.merge(sources.map { $0.asObservable() })
+        return PrimitiveSequence<CompletableTrait, Never>(raw: source)
+    }
 }
 
 extension ObservableType {
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
index 619e5f4acef..6b8baab300a 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
@@ -1,9 +1,8 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Alamofire
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Alamofire
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/Alamofire
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
index 0b6473e99b9..97e02319e76 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
@@ -1,10 +1,9 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/PetstoreClient
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/RxSwift"
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
index def160388eb..c1c9203b646 100755
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
@@ -1,15 +1,28 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+# Used as a return value for each invocation of `strip_invalid_archs` function.
+STRIP_BINARY_RETVAL=0
+
 # This protects against multiple targets copying the same framework dependency at the same time. The solution
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
+# Copies and strips a vendored framework
 install_framework()
 {
   if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -58,21 +71,40 @@ install_framework()
   fi
 }
 
-# Copies the dSYM of a vendored framework
+# Copies and strips a vendored dSYM
 install_dsym() {
   local source="$1"
   if [ -r "$source" ]; then
-    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\""
-    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
+    # Copy the dSYM into a the targets temp dir.
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
+
+    local basename
+    basename="$(basename -s .framework.dSYM "$source")"
+    binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+    # Strip invalid architectures so "fat" simulator / device frameworks work on device
+    if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+      strip_invalid_archs "$binary"
+    fi
+
+    if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
+      # Move the stripped file into its final destination.
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+    else
+      # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
+    fi
   fi
 }
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
@@ -85,10 +117,18 @@ code_sign_if_enabled() {
 # Strip invalid architectures
 strip_invalid_archs() {
   binary="$1"
-  # Get architectures for current file
-  archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+  # Get architectures for current target binary
+  binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+  # Intersect them with the architectures we are building for
+  intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
+  # If there are no archs supported by this binary then warn the user
+  if [[ -z "$intersected_archs" ]]; then
+    echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+    STRIP_BINARY_RETVAL=0
+    return
+  fi
   stripped=""
-  for arch in $archs; do
+  for arch in $binary_archs; do
     if ! [[ "${ARCHS}" == *"$arch"* ]]; then
       # Strip non-valid architectures in-place
       lipo -remove "$arch" -output "$binary" "$binary" || exit 1
@@ -98,6 +138,7 @@ strip_invalid_archs() {
   if [[ "$stripped" ]]; then
     echo "Stripped $binary of architectures:$stripped"
   fi
+  STRIP_BINARY_RETVAL=1
 }
 
 
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig
index b86868ff727..e9c582e16a6 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig	
@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/RxSwift"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/RxSwift/RxSwift.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift/RxSwift.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "PetstoreClient" -framework "RxSwift"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig
index b86868ff727..e9c582e16a6 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig	
@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/RxSwift"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/RxSwift/RxSwift.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift/RxSwift.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "PetstoreClient" -framework "RxSwift"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
index 88dd5379907..08e3eaaca45 100755
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
@@ -1,15 +1,28 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+# Used as a return value for each invocation of `strip_invalid_archs` function.
+STRIP_BINARY_RETVAL=0
+
 # This protects against multiple targets copying the same framework dependency at the same time. The solution
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
+# Copies and strips a vendored framework
 install_framework()
 {
   if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -58,21 +71,40 @@ install_framework()
   fi
 }
 
-# Copies the dSYM of a vendored framework
+# Copies and strips a vendored dSYM
 install_dsym() {
   local source="$1"
   if [ -r "$source" ]; then
-    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\""
-    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
+    # Copy the dSYM into a the targets temp dir.
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
+
+    local basename
+    basename="$(basename -s .framework.dSYM "$source")"
+    binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+    # Strip invalid architectures so "fat" simulator / device frameworks work on device
+    if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+      strip_invalid_archs "$binary"
+    fi
+
+    if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
+      # Move the stripped file into its final destination.
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+    else
+      # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
+    fi
   fi
 }
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
@@ -85,10 +117,18 @@ code_sign_if_enabled() {
 # Strip invalid architectures
 strip_invalid_archs() {
   binary="$1"
-  # Get architectures for current file
-  archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+  # Get architectures for current target binary
+  binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+  # Intersect them with the architectures we are building for
+  intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
+  # If there are no archs supported by this binary then warn the user
+  if [[ -z "$intersected_archs" ]]; then
+    echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+    STRIP_BINARY_RETVAL=0
+    return
+  fi
   stripped=""
-  for arch in $archs; do
+  for arch in $binary_archs; do
     if ! [[ "${ARCHS}" == *"$arch"* ]]; then
       # Strip non-valid architectures in-place
       lipo -remove "$arch" -output "$binary" "$binary" || exit 1
@@ -98,6 +138,7 @@ strip_invalid_archs() {
   if [[ "$stripped" ]]; then
     echo "Stripped $binary of architectures:$stripped"
   fi
+  STRIP_BINARY_RETVAL=1
 }
 
 if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig
index 740c74ce0dc..7629eed9e69 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig	
@@ -1,8 +1,8 @@
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/RxSwift"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/RxSwift/RxSwift.framework/Headers"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift/RxSwift.framework/Headers"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig
index 740c74ce0dc..7629eed9e69 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig	
@@ -1,8 +1,8 @@
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/RxSwift"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/RxSwift/RxSwift.framework/Headers"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift/RxSwift.framework/Headers"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/Info.plist b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/Info.plist
index 7694605fe7a..646f73cab55 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/Info.plist	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/Info.plist	
@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>3.4.1</string>
+  <string>3.6.1</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/RxSwift.xcconfig b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/RxSwift.xcconfig
index 8b032eddccb..b6cce651c27 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/RxSwift.xcconfig	
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/RxSwift.xcconfig	
@@ -1,9 +1,8 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/RxSwift
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/RxSwift
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/RxSwift
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
diff --git a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
index 7c3242275ff..1db674bd3aa 100644
--- a/samples/client/petstore/swift3/rxswift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift3/rxswift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
@@ -146,7 +146,6 @@
 				EAEC0BBB1D4E30CE00C908A3 /* Frameworks */,
 				EAEC0BBC1D4E30CE00C908A3 /* Resources */,
 				8A7961360961F06AADAF17C9 /* [CP] Embed Pods Frameworks */,
-				E008DDC7FA2126F111F972F5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -165,8 +164,6 @@
 				EAEC0BCE1D4E30CE00C908A3 /* Sources */,
 				EAEC0BCF1D4E30CE00C908A3 /* Frameworks */,
 				EAEC0BD01D4E30CE00C908A3 /* Resources */,
-				3920D9C143B997879E5A5B9C /* [CP] Embed Pods Frameworks */,
-				60E7B02FBDEB028CCE7CCCC5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -239,36 +236,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3920D9C143B997879E5A5B9C /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		60E7B02FBDEB028CCE7CCCC5 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		82CB35D52E274C6177DAC0DD /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -327,21 +294,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E008DDC7FA2126F111F972F5 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/samples/client/petstore/swift3/unwraprequired/.openapi-generator/VERSION b/samples/client/petstore/swift3/unwraprequired/.openapi-generator/VERSION
index ad121e8340e..4395ff59232 100644
--- a/samples/client/petstore/swift3/unwraprequired/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift3/unwraprequired/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.1-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index 3ed9e7cfddf..e44709f2459 100644
--- a/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -239,8 +239,8 @@ open class FakeAPI: APIBase {
      * enum for parameter enumHeaderStringArray
      */
     public enum EnumHeaderStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
+        case greaterThan = "">""
+        case dollar = ""$""
     }
 
     /**
@@ -256,8 +256,8 @@ open class FakeAPI: APIBase {
      * enum for parameter enumQueryStringArray
      */
     public enum EnumQueryStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
+        case greaterThan = "">""
+        case dollar = ""$""
     }
 
     /**
diff --git a/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index a54e0ff03f4..20514a3b6e6 100644
--- a/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -25,6 +25,7 @@ open class FakeClassnameTags123API: APIBase {
     /**
      To test class name in snake case
      - PATCH /fake_classname_test
+     - To test class name in snake case
      - API Key:
        - type: apiKey api_key_query (QUERY)
        - name: api_key_query
diff --git a/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 1460cbe2955..8648214c730 100644
--- a/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -89,9 +89,9 @@ open class PetAPI: APIBase {
      * enum for parameter status
      */
     public enum Status_findPetsByStatus: String { 
-        case available = "available"
-        case pending = "pending"
-        case sold = "sold"
+        case available = ""available""
+        case pending = ""pending""
+        case sold = ""sold""
     }
 
     /**
diff --git a/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index f1a9924c8e5..09995b1c727 100644
--- a/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -15,8 +15,8 @@ open class EnumArrays: JSONEncodable {
         case dollar = "$"
     }
     public enum ArrayEnum: String { 
-        case fish = "fish"
-        case crab = "crab"
+        case fish = ""fish""
+        case crab = ""crab""
     }
     public var justSymbol: JustSymbol?
     public var arrayEnum: [ArrayEnum]?
diff --git a/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 8e8ff89249a..b1f04aad6ce 100644
--- a/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift3/unwraprequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -11,8 +11,8 @@ import Foundation
 open class MapTest: JSONEncodable {
 
     public enum MapOfEnumString: String { 
-        case upper = "UPPER"
-        case lower = "lower"
+        case upper = ""UPPER""
+        case lower = ""lower""
     }
     public var mapMapOfString: [String:[String:String]]?
     public var mapOfEnumString: [String:String]?
diff --git a/samples/client/petstore/swift4/default/.openapi-generator/VERSION b/samples/client/petstore/swift4/default/.openapi-generator/VERSION
index ad121e8340e..4395ff59232 100644
--- a/samples/client/petstore/swift4/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift4/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.1-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index f8313034a66..a31864437b1 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -17,8 +17,8 @@ open class AnotherFakeAPI {
      - parameter client: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
+    open class func call123testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+        call123testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -27,11 +27,11 @@ open class AnotherFakeAPI {
     /**
      To test special tags
      - PATCH /another-fake/dummy
-     - To test special tags
+     - To test special tags and operation ID starting with number
      - parameter client: (body) client model 
      - returns: RequestBuilder<Client> 
      */
-    open class func testSpecialTagsWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
+    open class func call123testSpecialTagsWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
         let path = "/another-fake/dummy"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: client)
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index d22ed47557e..00f689db519 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -131,6 +131,40 @@ open class FakeAPI {
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
     }
 
+    /**
+
+     - parameter fileSchemaTestClass: (body)  
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testBodyWithFileSchema(fileSchemaTestClass: FileSchemaTestClass, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        testBodyWithFileSchemaWithRequestBuilder(fileSchemaTestClass: fileSchemaTestClass).execute { (response, error) -> Void in
+            if error == nil {
+                completion((), error)
+            } else {
+                completion(nil, error)
+            }
+        }
+    }
+
+
+    /**
+     - PUT /fake/body-with-file-schema
+     - For this test, the body for this request much reference a schema named `File`.
+     - parameter fileSchemaTestClass: (body)  
+     - returns: RequestBuilder<Void> 
+     */
+    open class func testBodyWithFileSchemaWithRequestBuilder(fileSchemaTestClass: FileSchemaTestClass) -> RequestBuilder<Void> {
+        let path = "/fake/body-with-file-schema"
+        let URLString = PetstoreClientAPI.basePath + path
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: fileSchemaTestClass)
+
+        let url = URLComponents(string: URLString)
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
+
+        return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
+    }
+
     /**
 
      - parameter query: (query)  
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index c525e66cce5..266ac7c402b 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -355,4 +355,51 @@ open class PetAPI {
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
 
+    /**
+     uploads an image (required)
+     
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+        uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute { (response, error) -> Void in
+            completion(response?.body, error)
+        }
+    }
+
+
+    /**
+     uploads an image (required)
+     - POST /fake/{petId}/uploadImageWithRequiredFile
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - returns: RequestBuilder<ApiResponse> 
+     */
+    open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder<ApiResponse> {
+        var path = "/fake/{petId}/uploadImageWithRequiredFile"
+        let petIdPreEscape = "\(petId)"
+        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
+        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        let formParams: [String:Any?] = [
+            "additionalMetadata": additionalMetadata,
+            "requiredFile": requiredFile
+        ]
+
+        let nonNullParameters = APIHelper.rejectNil(formParams)
+        let parameters = APIHelper.convertBoolToString(nonNullParameters)
+        
+        let url = URLComponents(string: URLString)
+
+        let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
index 280b4e53389..2ade78f5a61 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -17,8 +17,37 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
     }
 }
 
+private struct SynchronizedDictionary<K: Hashable, V> {
+
+     private var dictionary = [K: V]()
+     private let queue = DispatchQueue(
+         label: "SynchronizedDictionary",
+         qos: DispatchQoS.userInitiated,
+         attributes: [DispatchQueue.Attributes.concurrent],
+         autoreleaseFrequency: DispatchQueue.AutoreleaseFrequency.inherit,
+         target: nil
+     )
+
+     public subscript(key: K) -> V? {
+         get {
+             var value: V?
+
+             queue.sync {
+                 value = self.dictionary[key]
+             }
+
+             return value
+         }
+         set {
+             queue.sync(flags: DispatchWorkItemFlags.barrier) {
+                 self.dictionary[key] = newValue
+             }
+         }
+     }
+ }
+
 // Store manager to retain its reference
-private var managerStore: [String: Alamofire.SessionManager] = [:]
+private var managerStore = SynchronizedDictionary<String, Alamofire.SessionManager>()
 
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
     required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
@@ -112,7 +141,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         }
 
         let cleanupRequest = {
-            _ = managerStore.removeValue(forKey: managerId)
+            managerStore[managerId] = nil
         }
 
         let validatedRequest = request.validate()
@@ -314,7 +343,7 @@ open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilde
         }
 
         let cleanupRequest = {
-            _ = managerStore.removeValue(forKey: managerId)
+            managerStore[managerId] = nil
         }
 
         let validatedRequest = request.validate()
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift
new file mode 100644
index 00000000000..c8bd1f19589
--- /dev/null
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -0,0 +1,24 @@
+//
+// File.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** Must be named &#x60;File&#x60; for test. */
+
+public struct File: Codable {
+
+    /** Test capitalization */
+    public var sourceURI: String?
+
+    public init(sourceURI: String?) {
+        self.sourceURI = sourceURI
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
new file mode 100644
index 00000000000..64d02506802
--- /dev/null
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -0,0 +1,24 @@
+//
+// FileSchemaTestClass.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+
+public struct FileSchemaTestClass: Codable {
+
+    public var file: File?
+    public var files: [File]?
+
+    public init(file: File?, files: [File]?) {
+        self.file = file
+        self.files = files
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index dfbbee8428e..2d3a45d35a0 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -17,15 +17,21 @@ public struct MapTest: Codable {
     }
     public var mapMapOfString: [String:[String:String]]?
     public var mapOfEnumString: [String:String]?
+    public var directMap: [String:Bool]?
+    public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?) {
+    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
+        self.directMap = directMap
+        self.indirectMap = indirectMap
     }
 
     public enum CodingKeys: String, CodingKey { 
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
+        case directMap = "direct_map"
+        case indirectMap = "indirect_map"
     }
 
 
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
new file mode 100644
index 00000000000..ae15e87d94b
--- /dev/null
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -0,0 +1,51 @@
+//
+// StringBooleanMap.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+
+public struct StringBooleanMap: Codable {
+
+
+    public var additionalProperties: [String:Bool] = [:]
+
+    public subscript(key: String) -> Bool? {
+        get {
+            if let value = additionalProperties[key] {
+                return value
+            }
+            return nil
+        }
+
+        set {
+            additionalProperties[key] = newValue
+        }
+    }
+
+    // Encodable protocol methods
+
+    public func encode(to encoder: Encoder) throws {
+
+        var container = encoder.container(keyedBy: String.self)
+
+        try container.encodeMap(additionalProperties)
+    }
+
+    // Decodable protocol methods
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: String.self)
+
+        var nonAdditionalPropertyKeys = Set<String>()
+        additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
+    }
+
+
+
+}
+
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Podfile.lock b/samples/client/petstore/swift4/default/SwaggerClientTests/Podfile.lock
index 2136cf45f3b..cd2b8ac82ec 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Podfile.lock
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Podfile.lock
@@ -6,14 +6,18 @@ PODS:
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: fef7934ac90bd28c2b81cc5234615112f9ace5f5
+  PetstoreClient: a9f241d378687facad5c691a1747b21f64b405fa
 
 PODFILE CHECKSUM: 417049e9ed0e4680602b34d838294778389bd418
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
index ef3562909be..22dee1089b3 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
@@ -7,12 +7,12 @@
   },
   "version": "0.0.1",
   "source": {
-    "git": "git@github.com:swagger-api/swagger-mustache.git",
+    "git": "git@github.com:openapitools/openapi-generator.git",
     "tag": "v1.0.0"
   },
   "authors": "",
   "license": "Proprietary",
-  "homepage": "https://github.com/swagger-api/swagger-codegen",
+  "homepage": "https://github.com/openapitools/openapi-generator",
   "summary": "PetstoreClient",
   "source_files": "PetstoreClient/Classes/**/*.swift",
   "dependencies": {
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Manifest.lock b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Manifest.lock
index 2136cf45f3b..cd2b8ac82ec 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Manifest.lock
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Manifest.lock
@@ -6,14 +6,18 @@ PODS:
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: fef7934ac90bd28c2b81cc5234615112f9ace5f5
+  PetstoreClient: a9f241d378687facad5c691a1747b21f64b405fa
 
 PODFILE CHECKSUM: 417049e9ed0e4680602b34d838294778389bd418
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
index c54f9d52164..b5a99a656c1 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
@@ -7,88 +7,87 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		04B6872F088373A5D9622389D44ABFA7 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C78CDA7E4BB301D917FE7CFBD2457EF /* APIHelper.swift */; };
-		07EEC7822D7CB95755A6BB464B2BF1D1 /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 697B1649F70C9355E6ED995300DBBA28 /* APIs.swift */; };
-		0D2084CADDB0230A4CAF2C0605F828DF /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CAF4F2E2C16A07E038AAA59349BBCD9 /* AlamofireImplementations.swift */; };
+		04A493BFE713CB2C25015D433167E9E1 /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40D76A0512402285DC5FCF2795D7926 /* APIs.swift */; };
+		056050D902E31AF7B4EBC6098550BCA2 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B30B9F0FA3EB01FFACD8AF1A5E3C02A /* Client.swift */; };
+		06AC740732140244366858BEA4D9ACF4 /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = D822C4C7D3E161B2623D9538CFB3993E /* Dog.swift */; };
+		096C60FF50C33735E9D78F212FE80527 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F66D63E8AA66846EDB3A12966E6951E /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		0C61CBCFF130BC4A193B5ED8F5304DE0 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C030C0F6BD877478B1CA4BC8BFBAD057 /* Pet.swift */; };
+		101C5C88A6A00D14238897CBCE3CF9F1 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7898EEC6A565DE133438C48988478954 /* Extensions.swift */; };
 		10EB23E9ECC4B33E16933BB1EA560B6A /* Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87882A1F5A92C8138D54545E51D51E6F /* Timeline.swift */; };
-		1271FFC6225DD34662309214506624E3 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD9B6C73F406E259D12AAD66EB86E3A /* HasOnlyReadOnly.swift */; };
-		12E1368A8649F7ABCA22122BB086A9A4 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32EFBC701E63AE331BC0BF170B2C1E2B /* User.swift */; };
+		18BE122C0726D1D086F21215CD596F77 /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42AA25A3EEB248D295081E15036472FA /* FakeAPI.swift */; };
+		1A3C191B1C5ACF0651E6F047DDB95817 /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE0EE75A3806EB2BA0C9EEF687CE2B93 /* Cat.swift */; };
+		1AD5D3AD9CDD183A2942AD6B276954D2 /* StringBooleanMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2990DE0BC65EFC8D04E0FE470B40D295 /* StringBooleanMap.swift */; };
 		1B9EDEDC964E6B08F78920B4F4B9DB84 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 03DECE84DC850B04690604AB7C521277 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		229E82D3A37D202BFF958E8278C2E5D0 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EF8BA4CB172F8F6925C18B674169419 /* Pet.swift */; };
-		2361B453C0E27F769982D2E157DFD27B /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF4FEED941249256FD7E23C19D4567AC /* EnumClass.swift */; };
-		27AFC4AEBB1B56DD719675A2118CCB8D /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F46B1129B323D17632F7089F71632F60 /* JSONEncodingHelper.swift */; };
-		28832E8D2FFAF4A8A372893866A96CD3 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD18CDAD22507BB2C69589FD60138F66 /* Capitalization.swift */; };
-		3185145561047965FB52DD80ED69B7C8 /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = A145777600D2D0E2B9427EEE317DF443 /* FakeClassnameTags123API.swift */; };
-		31B8C21D76FE98AE41B88A44169ECE84 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3036A4C6739CD7F9D802133405FB095 /* NumberOnly.swift */; };
-		31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3322B46E9D9AFB13466804547F6404A4 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E5EF70E686134181F06537A75BA0FD2 /* OuterEnum.swift */; };
+		2511466FA5C5BD5373BBC96056C5E400 /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18B675845795AE8F97C41BFE1B734DF3 /* EnumArrays.swift */; };
+		265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		27931C1C73F0C9977FE6A0D0838064D5 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A6821DE25768EABE3B84E13AA2767AA /* UserAPI.swift */; };
+		347C378BE9CF50C4346AD266481E1BFF /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2002E2C081EDBF95460841AEE40A1F /* AlamofireImplementations.swift */; };
 		3626B94094672CB1C9DEA32B9F9502E1 /* TaskDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A01C037B4034EDA3D7955BC5E4E9D9D6 /* TaskDelegate.swift */; };
-		36505FE5A99837291C843D5627689950 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896B006368E7DC47A51391033A97C2EE /* ReadOnlyFirst.swift */; };
-		36E58F38207F15EBD91ADCEF62C7C85E /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DEE2B177461F2E7FC327D113FEC55D4 /* List.swift */; };
-		3EDE1BCF1CAE7C657EA278797CA70181 /* Fake_classname_tags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49BB1DA804C4AA7D9FEF0DC43604CCCE /* Fake_classname_tags123API.swift */; };
+		37CA5A16E0AE88E5122E71B2B487BA07 /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7304FCBBF3A1E3E5A44C2B06C880606 /* JSONEncodableEncoding.swift */; };
+		39A24748F1D5A740A33ACD6D0543DEAB /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53DCDFCEE59497257D4D8E5C61AC1BF6 /* APIHelper.swift */; };
+		3CEAC3DC1787B17D6C07FA3382B0C44E /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B3C282191A88FADAB9CC2C684F72AA /* SpecialModelName.swift */; };
 		3F3B788CC8A53F01CE6A1B33D4052D80 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
+		40901EF8400D1BE154AFBEAF78E56720 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEB048F7684923FC8C99614FB91CDE30 /* Models.swift */; };
 		424F25F3C040D2362DD353C82A86740B /* Pods-SwaggerClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		450A1F9D9F0C0316DC5571EAD3C7FFB6 /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 456356DFF7271B4F562B7F04E03E3CA8 /* FakeAPI.swift */; };
-		46899B04EA5D619054AACDD9C5F2F7B5 /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374D32747BDC0BDD7ACFF23F5BF910C3 /* AdditionalPropertiesClass.swift */; };
-		52661A921B6F46145CE16E108CA3C1CD /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36EB25B2EACD40B282A658DA456B0FED /* Cat.swift */; };
+		45459F9D3EA34D3DF1F3D26F0E45A105 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A9361010C64B5A1F7A9DF65338A4060 /* HasOnlyReadOnly.swift */; };
+		478CD0CAFF593CBC0F12DF1DBAD758CB /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61179CE650778B2A5C39664F0A792B5C /* List.swift */; };
+		4C7E90F5FD1C5A8766EB2A9D249BB114 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 776D2DC046923CE3DDE934FF73659587 /* PetstoreClient-dummy.m */; };
+		4FF0508C97CCBFD9DFAE65EADC87EAF3 /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FF19147CE4412D2804D578DF81FA6E6 /* Animal.swift */; };
 		5387216E723A3C68E851CA15573CDD71 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E230A0448B394DE26E688DAC8E6201E /* Request.swift */; };
-		55013BF8F5D5A6B238473A65819BA91E /* AnotherfakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51830C53E0E76A54309CE2137E716625 /* AnotherfakeAPI.swift */; };
-		5C76B11759683109F447BA67F28F83DC /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30C1E56142D8B120BDDE2AF5CA160E22 /* EnumArrays.swift */; };
-		5F18574D9A8C0B088105A657C4EBFE8A /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38F502D93EB2D1D9C2A1283F96BFF4D2 /* MapTest.swift */; };
+		557E3BD0A0303B41AA699A0D80EDCD8B /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = FECB278917C7651872C44FB1C0B6E620 /* Category.swift */; };
 		61200D01A1855D7920CEF835C8BE00B0 /* DispatchQueue+Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FCBF1EED873F61C6D46CE37FA5C39D3 /* DispatchQueue+Alamofire.swift */; };
 		62F65AD8DC4F0F9610F4B8B4738EC094 /* ServerTrustPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B030D27CAC730C5EB0F22390645310 /* ServerTrustPolicy.swift */; };
-		6FD39FEAAFE27DBC3EC0F11B20D97734 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AEE7AA4D6A19965503F1889B1F44B1D /* Models.swift */; };
+		6404E7A2DAD47C9C78DF3D877ECA35B1 /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C7066E86827634F5A961005F5CDA325 /* CodableHelper.swift */; };
+		679C125D81FA92B98E3BEDE017693A1F /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAFFDA41414FACE0139A3B1F22FB6717 /* EnumTest.swift */; };
+		6FEAF139ED75FFEF6BBF120E3AA45766 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39CFCEF99F7C460D0F08FDCCF1457477 /* File.swift */; };
+		72ACA4A1BCE46F860C41BA6999D99201 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 246C4149EB1F7D2CF07D83FD3B4A7683 /* ArrayOfNumberOnly.swift */; };
+		735CE1951121B575B6FB10F2D8CB7C4D /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A4D6098BB7067FA34B381F4446DDB10 /* PetAPI.swift */; };
 		73B9C996AED49ED7CF8EC2A6F1738059 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
-		749396546BA912EA0DD0A0A38FDEDAA4 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E3B882B966B7AF813A56A7DA9DA1F1C /* Name.swift */; };
+		73BF6D173C637DEE9571E96E19EADABD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
 		7B5FE28C7EA4122B0598738E54DBEBD8 /* SessionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195D73DD9EF275A3C56569E2B1CA8026 /* SessionDelegate.swift */; };
 		7D8CC01E8C9EFFF9F4D65406CDE0AB66 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D60BC9955B4F7FFA62D7440CB385C11 /* Result.swift */; };
-		802D6A4D73A1A03F0F30D814126EC859 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98A8E010F6244706560DDC29B122EBAF /* StoreAPI.swift */; };
-		8106FA532C222AE698AF0D473D8C9160 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC6A834DBFB72DAA5CF0C32268CDF605 /* Configuration.swift */; };
-		84FCC3BCB6219E32B67168629345B43F /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 828ED4B097AAB98D5568D37B8AECAFD0 /* ClassModel.swift */; };
-		862F16E17E79FAA53D395CE275546D28 /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB0F6DF945AB4286D73C45A2139ED7B3 /* Return.swift */; };
-		897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */; };
-		9BD5D264F2B563611262E196A5961066 /* OuterString.swift in Sources */ = {isa = PBXBuildFile; fileRef = D752057107F19596D3B8EA574206B2F2 /* OuterString.swift */; };
-		9D4858FD9A6340A4609BEBDF00C382F9 /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = A08C7F48AC7ABF4E88804808C4EB68F1 /* ArrayOfArrayOfNumberOnly.swift */; };
+		80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */; };
+		894AE698ECB3F226B0727A49F38524F1 /* AnotherFakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF33FE500328600F30A0008C612F377 /* AnotherFakeAPI.swift */; };
+		8B0CA21F4E3303601A992514378D11D5 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23810842569AE35D0E94BB511DF8A4FC /* Order.swift */; };
+		8D061B18978E5EB2B9DBF2192903329B /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF5D23F22EEE2FBFA826151A4E186DE3 /* ApiResponse.swift */; };
+		9067B627206EA4FFE8E94388031FBB70 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 974697BA63D3232B3CBCF781253D6FD8 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		90A64C8835D24ACAA61B2A7F12826AF2 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2DDAE4995DB14893EA47ED21E6742BA /* ReadOnlyFirst.swift */; };
+		95E7C04B9A7E7619B66A399FB17CE775 /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E06E455867386B3481EDF14972006E /* JSONEncodingHelper.swift */; };
+		96179D2776662CFF1D8CD2BA7599E165 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 706C7AFFE37BA158C3553250F4B5FAED /* Alamofire.framework */; };
+		96F7D2A8807BE58A6457771A390A3150 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4B75FFB3C6B26ACDD73938BF18310B /* Configuration.swift */; };
+		9CF332792BE5A785DEEF978163E2832F /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A917A61915DC34D93F7CA22E9FEEAB8 /* MapTest.swift */; };
+		9E862158C7BF3A5600BB52374630C160 /* FileSchemaTestClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE2FEBAD4A5F085054978914D2BAD7F /* FileSchemaTestClass.swift */; };
 		9ED2BB2981896E0A39EFA365503F58CE /* AFError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AF006B0AD5765D1BFA8253C2DCBB126 /* AFError.swift */; };
-		A0AD98559666C4BA8E74CA46211B44F2 /* OuterNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC665263E59F937C09C52DBC4851F44F /* OuterNumber.swift */; };
+		A0FF74E69342AC2FD587E1096EEA421C /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7FFC55F1307BC98855D3D546660D4F2 /* OuterComposite.swift */; };
 		A2A6F71B727312BD45CC7A4AAD7B0AB7 /* NetworkReachabilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5A8AA5F9EDED0A0BDDE7E830BF4AEE0 /* NetworkReachabilityManager.swift */; };
-		A57FEBD11E8DC63EF939F8183779BECA /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 712969C66751DDCC0D484F06819ADFAF /* PetAPI.swift */; };
+		A7C44D981CEDA4D93A4C9B2A2A2FDD87 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C249F0D3A4AFFFC155DEC2FBB68F0CC /* Capitalization.swift */; };
 		A9EEEA7477981DEEBC72432DE9990A4B /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D1F50F37DFB6DC0B7B9D8C373E5A3EAE /* Alamofire-dummy.m */; };
 		AE1EF48399533730D0066E04B22CA2D6 /* SessionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46CDAC6C1187C5467E576980E1062C8B /* SessionManager.swift */; };
-		B116548930626181CC1301D0ADE31720 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = C26CC9E49237A04F52DC71125A1756AB /* Client.swift */; };
-		B13CE8FE8573C0FB07C97D0C34DD9CF4 /* OuterBoolean.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD15E529B026F88FF8EAE32BD84D468D /* OuterBoolean.swift */; };
+		B0679E75901BBEC098D38E894F733D9E /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5A46D45023C6CBF06AA36844D59C59E /* User.swift */; };
+		B3CF227B76973EE03E0F705E09052FCF /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D9E3149DFEE7783ACEC1596236B2268 /* Return.swift */; };
 		B65FCF589DA398C3EFE0128064E510EC /* MultipartFormData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 155538D91ACEEEDF82069ACF6C1A02E7 /* MultipartFormData.swift */; };
+		B8B97820FF69F393D03CC3E5E683E0AC /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399E6B8FE158024592ED8B770864696C /* AdditionalPropertiesClass.swift */; };
 		BBEFE2F9CEB73DC7BD97FFA66A0D9D4F /* Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B029DBC43E49A740F12B5E4D2E6DD452 /* Validation.swift */; };
-		BCBC0EA84005299246354BB70B11301B /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = E28B79A691A2192E2A8595ACB60CC54C /* Dog.swift */; };
-		BCFCE38A7F2EBB043C581F2A24947FEA /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B5DCFB56EC99326DEBD055A032458E /* Category.swift */; };
-		BD15F885C0DB08C2BA875B3A36DFD778 /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF3A2EA92DAC72BC0CED7B12F16198BD /* Model200Response.swift */; };
 		BE5C67A07E289FE1F9BE27335B159997 /* ParameterEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6639346628280A0D0FAD35196BF56108 /* ParameterEncoding.swift */; };
-		BF7DF71571E51EBF9CF76436ADA68ACA /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 987E88064EF735B91468D5018C18E261 /* Extensions.swift */; };
-		C40D07E49370F6A2B17F2AA7D8B5B8A5 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 55CCB86279C9704891B8B855CA6380F6 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C7DAA30310B69C6742610B5EBC23B328 /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9F529192DED719D7A55A3E804866F26 /* OuterComposite.swift */; };
+		C76D1978F361E771A4145F7DC9919521 /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41E52FC18B43257D6D924850398E9AE /* ArrayOfArrayOfNumberOnly.swift */; };
+		CA4CC3FEE40E53A6EDD3C528E225FE00 /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6E49082BB281EDC5D7B6E76772E87CF /* FormatTest.swift */; };
 		CB6D60925223897FFA2662667DF83E8A /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F47F5C9CDB035C5AFADEBA5BF44F1C /* Response.swift */; };
-		CB9A39C25CA7ED02B7E02B5AA1354911 /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 171602313BBD5AE0D5F50FFB70A96CED /* Animal.swift */; };
-		CC1ABC7D57D24128BCE892C928EB155D /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5EB60B9D147E1DCD36D55283254A515 /* JSONEncodableEncoding.swift */; };
-		D0FD45C03A13220C2DEC62BE2330FC92 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB94F5F2FE938ECEA46481E25FFA28F /* Order.swift */; };
-		D0FF9ABBD288F188E54D3CAB5208202B /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B99164AE8FDE28FAD698B280AC716F77 /* ArrayOfNumberOnly.swift */; };
+		D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
+		D3F6723167B5420422A9C14B2BF234DE /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1D16F98B0546986ED64CD76F6678480 /* Model200Response.swift */; };
+		D4E49332E21E60A07C2E800332679223 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B5354642428AF26C69F2155FEBFA4B /* OuterEnum.swift */; };
+		D4E932DF17365BCFC8515B5227D89F48 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E81223B1EAA15A1063FABA2C1F83FD46 /* NumberOnly.swift */; };
+		D4EA838C54E069F53942C8D1A2B2DE82 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDAB71F06CE94B9B9AD9438DAC00B6D2 /* AnimalFarm.swift */; };
+		D5C17277903A084B17EF424CC33FE6D6 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392B0EBFD414446E3C9A271B38B72DA0 /* EnumClass.swift */; };
 		D5F1BBD60108412FD5C8B320D20B2993 /* Pods-SwaggerClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */; };
-		DA774D60BA836CC50DCEF3F0402A0D25 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 584CE59DFDF2D30A308478C17A426ADA /* ArrayTest.swift */; };
-		DD24D51FC8B3C4AE95827418EC5D5EF3 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 706C7AFFE37BA158C3553250F4B5FAED /* Alamofire.framework */; };
-		E0559707E3DAE5B759A2570EE64AEF37 /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06D5E6CDDEE294F817C22C521B562508 /* CodableHelper.swift */; };
-		E0FC0F7FCAAFB628D17EB6277E6384D0 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 670103307A767288F991B17974F3E258 /* ApiResponse.swift */; };
-		E24BD2C6E31CACD58555DB8044F7EFE4 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 364DFA113368D39E8F9FF776C3C78B11 /* UserAPI.swift */; };
-		E661B7CF775527BE72A5B2D4EB5F73E8 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F80C8976AE5FBE0927AD59150439B97 /* AnimalFarm.swift */; };
-		E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
-		E7ADAAB656F28A756189B278B28D0099 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791E26F1F38D683DDDDF5B5A4B3D6607 /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		DABC129EE746385E5316235D774B47C7 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FB2BB634F7165B7E02CB903C153DD5F /* StoreAPI.swift */; };
+		DB0575284198BED1F158BC48C05C5B3F /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49A545F954B2A10B0D26618084D1FF73 /* Tag.swift */; };
+		E613B6050F23E50C44494323ECACA5CC /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D0A663A60EBEDC85D7204FF294D7A8E /* FakeClassnameTags123API.swift */; };
+		ED50C1AEECCAE2CD6E6985C8B64D3913 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EE661EFEC3A229F1219958C4244153F /* ArrayTest.swift */; };
 		EFD264FC408EBF3BA2528E70B08DDD94 /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66A46F517F0AF7E85A16D723F6406896 /* Notifications.swift */; };
-		F3728DB3E73B9E46DCCD1FBB17888A31 /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4F28D074D15DD5B49DC39B3706C7C87 /* FormatTest.swift */; };
-		F4749A9FA396C6C94CF4F4D16897A60C /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F72B7A542B1D04D38B262F407D0F92F /* SpecialModelName.swift */; };
+		F105EEC427CEBD9DD3074EBE06346205 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 405921FE252DC3DC1087DA4217236D81 /* Name.swift */; };
+		F3BD21AC343763BE84F89442247F5621 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA70EA7732BDFFE905C353D9709B2AD /* ClassModel.swift */; };
 		F6BECD98B97CBFEBE2C96F0E9E72A6C0 /* ResponseSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F9510473F6FFD7AA66524DB16C2263 /* ResponseSerialization.swift */; };
-		F7D10D5D6C92E40C736C597872B7F9BD /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = B988BD8876FEE563F8D7A6E2534BA48B /* Tag.swift */; };
-		F88A1839757ADAA76A5A40A3149E5B45 /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 289EF031EA3B2CA318F7EACE05641165 /* EnumTest.swift */; };
 		F8B3D3092ED0417E8CDF32033F6122F5 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFCB8C44DE758E906C0BCDA455937B85 /* Alamofire.swift */; };
-		F8CBD4B50C45BCC72F66D919E4E37F6A /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 0467D138A3101545CABA11DDD745B87B /* PetstoreClient-dummy.m */; };
-		F8D1A2541DD038CBD649F825DBD1DF63 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -96,17 +95,24 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 691AAEA1153824FE132C368C2B9D4ECF;
+			remoteGlobalIDString = F273DBB2E19E2286018971F2B25DEB52;
 			remoteInfo = PetstoreClient;
 		};
-		F9E1549CFEDAD61BECA92DB5B12B4019 /* PBXContainerItemProxy */ = {
+		39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 41903051A113E887E262FB29130EB187;
+			remoteInfo = "Pods-SwaggerClient";
+		};
+		53846F4D999F8096A92BE0AB60034710 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 88E9EC28B8B46C3631E6B242B50F4442;
 			remoteInfo = Alamofire;
 		};
-		FAEF364FCCB241333BC2531394A7BC5A /* PBXContainerItemProxy */ = {
+		F9E1549CFEDAD61BECA92DB5B12B4019 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
@@ -116,132 +122,131 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		0075000FF9024228C130ADDA9B81114E /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
 		03DECE84DC850B04690604AB7C521277 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
-		0467D138A3101545CABA11DDD745B87B /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
 		04F47F5C9CDB035C5AFADEBA5BF44F1C /* Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Response.swift; path = Source/Response.swift; sourceTree = "<group>"; };
-		06D5E6CDDEE294F817C22C521B562508 /* CodableHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CodableHelper.swift; path = PetstoreClient/Classes/Swaggers/CodableHelper.swift; sourceTree = "<group>"; };
 		08BDFE9C9E9365771FF2D47928E3E79A /* Pods-SwaggerClient-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClient-acknowledgements.plist"; sourceTree = "<group>"; };
 		0AD61F8554C909A3AFA66AD9ECCB5F23 /* Pods-SwaggerClient-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-frameworks.sh"; sourceTree = "<group>"; };
+		0B30B9F0FA3EB01FFACD8AF1A5E3C02A /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
 		0D0533E4EC2277AAAC8888328EC5A64B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		0FCBF1EED873F61C6D46CE37FA5C39D3 /* DispatchQueue+Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Alamofire.swift"; path = "Source/DispatchQueue+Alamofire.swift"; sourceTree = "<group>"; };
 		117EFB31D9AD9673BAF51B48596F19E2 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		14B3C282191A88FADAB9CC2C684F72AA /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
 		155538D91ACEEEDF82069ACF6C1A02E7 /* MultipartFormData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MultipartFormData.swift; path = Source/MultipartFormData.swift; sourceTree = "<group>"; };
-		171602313BBD5AE0D5F50FFB70A96CED /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
+		18B675845795AE8F97C41BFE1B734DF3 /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
 		195D73DD9EF275A3C56569E2B1CA8026 /* SessionDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionDelegate.swift; path = Source/SessionDelegate.swift; sourceTree = "<group>"; };
-		19CFD6BC7040A5BC22831D4B5EB7F793 /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
 		1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.debug.xcconfig"; sourceTree = "<group>"; };
+		1C4B75FFB3C6B26ACDD73938BF18310B /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/OpenAPIs/Configuration.swift; sourceTree = "<group>"; };
 		1E230A0448B394DE26E688DAC8E6201E /* Request.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Request.swift; path = Source/Request.swift; sourceTree = "<group>"; };
-		1E9A49B1D85B7A38F2CAD05F245B27C3 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		1FF33FE500328600F30A0008C612F377 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = "<group>"; };
 		210971763CB2FC0DC4E378271A37BE32 /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Alamofire.modulemap; sourceTree = "<group>"; };
-		289EF031EA3B2CA318F7EACE05641165 /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
-		2AEE7AA4D6A19965503F1889B1F44B1D /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/Swaggers/Models.swift; sourceTree = "<group>"; };
-		30C1E56142D8B120BDDE2AF5CA160E22 /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
+		23810842569AE35D0E94BB511DF8A4FC /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		246C4149EB1F7D2CF07D83FD3B4A7683 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		2990DE0BC65EFC8D04E0FE470B40D295 /* StringBooleanMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StringBooleanMap.swift; sourceTree = "<group>"; };
+		2BB1D491A4C824A6BFA9C0C35E36BD85 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		2C2002E2C081EDBF95460841AEE40A1F /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift; sourceTree = "<group>"; };
+		2C7066E86827634F5A961005F5CDA325 /* CodableHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CodableHelper.swift; path = PetstoreClient/Classes/OpenAPIs/CodableHelper.swift; sourceTree = "<group>"; };
 		32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClient-umbrella.h"; sourceTree = "<group>"; };
 		32B030D27CAC730C5EB0F22390645310 /* ServerTrustPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ServerTrustPolicy.swift; path = Source/ServerTrustPolicy.swift; sourceTree = "<group>"; };
-		32EFBC701E63AE331BC0BF170B2C1E2B /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
 		33A04B5D27E86AF4B84D95E21CF3F452 /* Alamofire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Alamofire.xcconfig; sourceTree = "<group>"; };
-		364DFA113368D39E8F9FF776C3C78B11 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
-		36EB25B2EACD40B282A658DA456B0FED /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
-		374D32747BDC0BDD7ACFF23F5BF910C3 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
-		38F502D93EB2D1D9C2A1283F96BFF4D2 /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
+		37E06E455867386B3481EDF14972006E /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodingHelper.swift; path = PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift; sourceTree = "<group>"; };
+		392B0EBFD414446E3C9A271B38B72DA0 /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		399E6B8FE158024592ED8B770864696C /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		39CFCEF99F7C460D0F08FDCCF1457477 /* File.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
+		3A917A61915DC34D93F7CA22E9FEEAB8 /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
 		3D60BC9955B4F7FFA62D7440CB385C11 /* Result.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Result.swift; path = Source/Result.swift; sourceTree = "<group>"; };
-		3E5EF70E686134181F06537A75BA0FD2 /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
+		405921FE252DC3DC1087DA4217236D81 /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
 		419496CDDD7E7536CBEA02BAEE2C7C21 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		456356DFF7271B4F562B7F04E03E3CA8 /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
+		42AA25A3EEB248D295081E15036472FA /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
 		46CDAC6C1187C5467E576980E1062C8B /* SessionManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionManager.swift; path = Source/SessionManager.swift; sourceTree = "<group>"; };
+		49A545F954B2A10B0D26618084D1FF73 /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
 		49A9B3BBFEA1CFFC48229E438EA64F9E /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Alamofire.framework; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		49BB1DA804C4AA7D9FEF0DC43604CCCE /* Fake_classname_tags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Fake_classname_tags123API.swift; sourceTree = "<group>"; };
 		4AF006B0AD5765D1BFA8253C2DCBB126 /* AFError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AFError.swift; path = Source/AFError.swift; sourceTree = "<group>"; };
-		4EB94F5F2FE938ECEA46481E25FFA28F /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
-		4F72B7A542B1D04D38B262F407D0F92F /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
-		51830C53E0E76A54309CE2137E716625 /* AnotherfakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnotherfakeAPI.swift; sourceTree = "<group>"; };
-		55CCB86279C9704891B8B855CA6380F6 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
-		584CE59DFDF2D30A308478C17A426ADA /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
-		5EF8BA4CB172F8F6925C18B674169419 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		4EB7BF4F57FA381E9DA7A1AA9B04857D /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
+		501C268D3DC431E81C876F4F7EE389C6 /* PetstoreClient.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = PetstoreClient.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		53DCDFCEE59497257D4D8E5C61AC1BF6 /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/OpenAPIs/APIHelper.swift; sourceTree = "<group>"; };
+		5D9E3149DFEE7783ACEC1596236B2268 /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		5EE661EFEC3A229F1219958C4244153F /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
+		5F66D63E8AA66846EDB3A12966E6951E /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		61179CE650778B2A5C39664F0A792B5C /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
 		61D920D6E48023BCBF18CD83450D05F5 /* Alamofire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-prefix.pch"; sourceTree = "<group>"; };
 		6639346628280A0D0FAD35196BF56108 /* ParameterEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ParameterEncoding.swift; path = Source/ParameterEncoding.swift; sourceTree = "<group>"; };
 		66A46F517F0AF7E85A16D723F6406896 /* Notifications.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Notifications.swift; path = Source/Notifications.swift; sourceTree = "<group>"; };
-		670103307A767288F991B17974F3E258 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
-		697B1649F70C9355E6ED995300DBBA28 /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/Swaggers/APIs.swift; sourceTree = "<group>"; };
 		6C0ACB269F0C836F1865A56C4AF7A07E /* Pods_SwaggerClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClient.framework; path = "Pods-SwaggerClient.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
-		6CAF4F2E2C16A07E038AAA59349BBCD9 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift; sourceTree = "<group>"; };
-		6F80C8976AE5FBE0927AD59150439B97 /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
+		6FF19147CE4412D2804D578DF81FA6E6 /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
 		706C7AFFE37BA158C3553250F4B5FAED /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		712969C66751DDCC0D484F06819ADFAF /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
 		721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClientTests-dummy.m"; sourceTree = "<group>"; };
 		76645699475D3AB6EB5242AC4D0CEFAE /* Pods-SwaggerClient-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClient-acknowledgements.markdown"; sourceTree = "<group>"; };
-		791E26F1F38D683DDDDF5B5A4B3D6607 /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
-		7DEE2B177461F2E7FC327D113FEC55D4 /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		776D2DC046923CE3DDE934FF73659587 /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
+		7898EEC6A565DE133438C48988478954 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/OpenAPIs/Extensions.swift; sourceTree = "<group>"; };
+		7A4D6098BB7067FA34B381F4446DDB10 /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		7A9361010C64B5A1F7A9DF65338A4060 /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
 		814471C0F27B39D751143F0CD53670BD /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		828ED4B097AAB98D5568D37B8AECAFD0 /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
-		84B5DCFB56EC99326DEBD055A032458E /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
 		87882A1F5A92C8138D54545E51D51E6F /* Timeline.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeline.swift; path = Source/Timeline.swift; sourceTree = "<group>"; };
-		896B006368E7DC47A51391033A97C2EE /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
+		88B5354642428AF26C69F2155FEBFA4B /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
 		897F0C201C5E0C66A1F1E359AECF4C9C /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = PetstoreClient.framework; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		8C78CDA7E4BB301D917FE7CFBD2457EF /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/Swaggers/APIHelper.swift; sourceTree = "<group>"; };
-		8E3B882B966B7AF813A56A7DA9DA1F1C /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
+		8C249F0D3A4AFFFC155DEC2FBB68F0CC /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		8FB2BB634F7165B7E02CB903C153DD5F /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
 		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
-		987E88064EF735B91468D5018C18E261 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/Swaggers/Extensions.swift; sourceTree = "<group>"; };
-		98A8E010F6244706560DDC29B122EBAF /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		974697BA63D3232B3CBCF781253D6FD8 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
+		9A6821DE25768EABE3B84E13AA2767AA /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
 		9D08EC9B39FEBA43A5B55DAF97AAEBE9 /* Pods-SwaggerClientTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClientTests.modulemap"; sourceTree = "<group>"; };
+		9D0A663A60EBEDC85D7204FF294D7A8E /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
 		9D780FDAD16A03CC25F4D6F3317B9423 /* Pods-SwaggerClientTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClientTests-acknowledgements.plist"; sourceTree = "<group>"; };
+		9DE2FEBAD4A5F085054978914D2BAD7F /* FileSchemaTestClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FileSchemaTestClass.swift; sourceTree = "<group>"; };
 		A01C037B4034EDA3D7955BC5E4E9D9D6 /* TaskDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TaskDelegate.swift; path = Source/TaskDelegate.swift; sourceTree = "<group>"; };
-		A08C7F48AC7ABF4E88804808C4EB68F1 /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
-		A145777600D2D0E2B9427EEE317DF443 /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
-		AC665263E59F937C09C52DBC4851F44F /* OuterNumber.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterNumber.swift; sourceTree = "<group>"; };
-		AD15E529B026F88FF8EAE32BD84D468D /* OuterBoolean.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterBoolean.swift; sourceTree = "<group>"; };
+		AAFFDA41414FACE0139A3B1F22FB6717 /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
 		AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.debug.xcconfig"; sourceTree = "<group>"; };
-		AF3A2EA92DAC72BC0CED7B12F16198BD /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
 		B029DBC43E49A740F12B5E4D2E6DD452 /* Validation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Validation.swift; path = Source/Validation.swift; sourceTree = "<group>"; };
-		B28DC9FF9278F92F178AC7F416FBEF3E /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
-		B4F28D074D15DD5B49DC39B3706C7C87 /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
-		B988BD8876FEE563F8D7A6E2534BA48B /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
-		B99164AE8FDE28FAD698B280AC716F77 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
-		BFD9B6C73F406E259D12AAD66EB86E3A /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
-		C26CC9E49237A04F52DC71125A1756AB /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
-		C3036A4C6739CD7F9D802133405FB095 /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
-		C9F529192DED719D7A55A3E804866F26 /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
+		B40D76A0512402285DC5FCF2795D7926 /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/OpenAPIs/APIs.swift; sourceTree = "<group>"; };
+		B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
+		B7304FCBBF3A1E3E5A44C2B06C880606 /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodableEncoding.swift; path = PetstoreClient/Classes/OpenAPIs/JSONEncodableEncoding.swift; sourceTree = "<group>"; };
+		C030C0F6BD877478B1CA4BC8BFBAD057 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		C6E49082BB281EDC5D7B6E76772E87CF /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
 		CAF6F32F117197F6F08B477687F09728 /* Pods-SwaggerClientTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-frameworks.sh"; sourceTree = "<group>"; };
 		CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClientTests-umbrella.h"; sourceTree = "<group>"; };
 		CFA4F581E074596AB5C3DAF3D9C39F17 /* Pods-SwaggerClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClient.modulemap"; sourceTree = "<group>"; };
 		D1F50F37DFB6DC0B7B9D8C373E5A3EAE /* Alamofire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Alamofire-dummy.m"; sourceTree = "<group>"; };
+		D2DDAE4995DB14893EA47ED21E6742BA /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
 		D47B812D78D0AE64D85D16A96840F8C4 /* Pods-SwaggerClientTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClientTests-acknowledgements.markdown"; sourceTree = "<group>"; };
-		D752057107F19596D3B8EA574206B2F2 /* OuterString.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterString.swift; sourceTree = "<group>"; };
+		D822C4C7D3E161B2623D9538CFB3993E /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		DE0EE75A3806EB2BA0C9EEF687CE2B93 /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
+		DEA70EA7732BDFFE905C353D9709B2AD /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
 		DFCB8C44DE758E906C0BCDA455937B85 /* Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Alamofire.swift; path = Source/Alamofire.swift; sourceTree = "<group>"; };
-		E28B79A691A2192E2A8595ACB60CC54C /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		E1D16F98B0546986ED64CD76F6678480 /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
 		E2F9510473F6FFD7AA66524DB16C2263 /* ResponseSerialization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResponseSerialization.swift; path = Source/ResponseSerialization.swift; sourceTree = "<group>"; };
+		E41E52FC18B43257D6D924850398E9AE /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		E5A46D45023C6CBF06AA36844D59C59E /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
 		E5A8AA5F9EDED0A0BDDE7E830BF4AEE0 /* NetworkReachabilityManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NetworkReachabilityManager.swift; path = Source/NetworkReachabilityManager.swift; sourceTree = "<group>"; };
-		E5EB60B9D147E1DCD36D55283254A515 /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodableEncoding.swift; path = PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift; sourceTree = "<group>"; };
+		E7FFC55F1307BC98855D3D546660D4F2 /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
+		E81223B1EAA15A1063FABA2C1F83FD46 /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
 		EA3FFA48FB4D08FC02C47F71C0089CD9 /* Pods_SwaggerClientTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClientTests.framework; path = "Pods-SwaggerClientTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
-		EC6A834DBFB72DAA5CF0C32268CDF605 /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/Swaggers/Configuration.swift; sourceTree = "<group>"; };
-		F1ED5AD8A7A28479CDC87C72B75010ED /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
 		F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.release.xcconfig"; sourceTree = "<group>"; };
 		F3E1116FA9F9F3AFD9332B7236F6E711 /* Pods-SwaggerClientTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-resources.sh"; sourceTree = "<group>"; };
-		F46B1129B323D17632F7089F71632F60 /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodingHelper.swift; path = PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift; sourceTree = "<group>"; };
 		F4BB3B2146310CA18C30F145BFF15BD9 /* Pods-SwaggerClient-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-resources.sh"; sourceTree = "<group>"; };
 		F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClient-dummy.m"; sourceTree = "<group>"; };
-		FB0F6DF945AB4286D73C45A2139ED7B3 /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
-		FC15A6FFC961DC8B56D9DD9150014C38 /* PetstoreClient.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = PetstoreClient.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
-		FD18CDAD22507BB2C69589FD60138F66 /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		FDAB71F06CE94B9B9AD9438DAC00B6D2 /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
 		FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.release.xcconfig"; sourceTree = "<group>"; };
-		FF4FEED941249256FD7E23C19D4567AC /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		FEB048F7684923FC8C99614FB91CDE30 /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/OpenAPIs/Models.swift; sourceTree = "<group>"; };
+		FECB278917C7651872C44FB1C0B6E620 /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		FF5D23F22EEE2FBFA826151A4E186DE3 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */ = {
+		2D7583F1D86C34DDA26383E3BD322469 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */,
+				96179D2776662CFF1D8CD2BA7599E165 /* Alamofire.framework in Frameworks */,
+				73BF6D173C637DEE9571E96E19EADABD /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		8F986B6660A23551BF1713A47F9B5752 /* Frameworks */ = {
+		7139BF778844E2A9E420524D8146ECD8 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DD24D51FC8B3C4AE95827418EC5D5EF3 /* Alamofire.framework in Frameworks */,
-				F8D1A2541DD038CBD649F825DBD1DF63 /* Foundation.framework in Frameworks */,
+				D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -264,20 +269,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		1638B55794AEC03168E0A73BFA054478 /* Support Files */ = {
-			isa = PBXGroup;
-			children = (
-				1E9A49B1D85B7A38F2CAD05F245B27C3 /* Info.plist */,
-				19CFD6BC7040A5BC22831D4B5EB7F793 /* PetstoreClient.modulemap */,
-				F1ED5AD8A7A28479CDC87C72B75010ED /* PetstoreClient.xcconfig */,
-				0467D138A3101545CABA11DDD745B87B /* PetstoreClient-dummy.m */,
-				B28DC9FF9278F92F178AC7F416FBEF3E /* PetstoreClient-prefix.pch */,
-				55CCB86279C9704891B8B855CA6380F6 /* PetstoreClient-umbrella.h */,
-			);
-			name = "Support Files";
-			path = "SwaggerClientTests/Pods/Target Support Files/PetstoreClient";
-			sourceTree = "<group>";
-		};
 		200D10EB20F0397D47F022B50CF0433F /* Alamofire */ = {
 			isa = PBXGroup;
 			children = (
@@ -318,50 +309,6 @@
 			path = "../Target Support Files/Alamofire";
 			sourceTree = "<group>";
 		};
-		325E314AD76E8F3FF0B03E2401003FC5 /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				374D32747BDC0BDD7ACFF23F5BF910C3 /* AdditionalPropertiesClass.swift */,
-				171602313BBD5AE0D5F50FFB70A96CED /* Animal.swift */,
-				6F80C8976AE5FBE0927AD59150439B97 /* AnimalFarm.swift */,
-				670103307A767288F991B17974F3E258 /* ApiResponse.swift */,
-				A08C7F48AC7ABF4E88804808C4EB68F1 /* ArrayOfArrayOfNumberOnly.swift */,
-				B99164AE8FDE28FAD698B280AC716F77 /* ArrayOfNumberOnly.swift */,
-				584CE59DFDF2D30A308478C17A426ADA /* ArrayTest.swift */,
-				FD18CDAD22507BB2C69589FD60138F66 /* Capitalization.swift */,
-				36EB25B2EACD40B282A658DA456B0FED /* Cat.swift */,
-				84B5DCFB56EC99326DEBD055A032458E /* Category.swift */,
-				828ED4B097AAB98D5568D37B8AECAFD0 /* ClassModel.swift */,
-				C26CC9E49237A04F52DC71125A1756AB /* Client.swift */,
-				E28B79A691A2192E2A8595ACB60CC54C /* Dog.swift */,
-				30C1E56142D8B120BDDE2AF5CA160E22 /* EnumArrays.swift */,
-				FF4FEED941249256FD7E23C19D4567AC /* EnumClass.swift */,
-				289EF031EA3B2CA318F7EACE05641165 /* EnumTest.swift */,
-				B4F28D074D15DD5B49DC39B3706C7C87 /* FormatTest.swift */,
-				BFD9B6C73F406E259D12AAD66EB86E3A /* HasOnlyReadOnly.swift */,
-				7DEE2B177461F2E7FC327D113FEC55D4 /* List.swift */,
-				38F502D93EB2D1D9C2A1283F96BFF4D2 /* MapTest.swift */,
-				791E26F1F38D683DDDDF5B5A4B3D6607 /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
-				AF3A2EA92DAC72BC0CED7B12F16198BD /* Model200Response.swift */,
-				8E3B882B966B7AF813A56A7DA9DA1F1C /* Name.swift */,
-				C3036A4C6739CD7F9D802133405FB095 /* NumberOnly.swift */,
-				4EB94F5F2FE938ECEA46481E25FFA28F /* Order.swift */,
-				AD15E529B026F88FF8EAE32BD84D468D /* OuterBoolean.swift */,
-				C9F529192DED719D7A55A3E804866F26 /* OuterComposite.swift */,
-				3E5EF70E686134181F06537A75BA0FD2 /* OuterEnum.swift */,
-				AC665263E59F937C09C52DBC4851F44F /* OuterNumber.swift */,
-				D752057107F19596D3B8EA574206B2F2 /* OuterString.swift */,
-				5EF8BA4CB172F8F6925C18B674169419 /* Pet.swift */,
-				896B006368E7DC47A51391033A97C2EE /* ReadOnlyFirst.swift */,
-				FB0F6DF945AB4286D73C45A2139ED7B3 /* Return.swift */,
-				4F72B7A542B1D04D38B262F407D0F92F /* SpecialModelName.swift */,
-				B988BD8876FEE563F8D7A6E2534BA48B /* Tag.swift */,
-				32EFBC701E63AE331BC0BF170B2C1E2B /* User.swift */,
-			);
-			name = Models;
-			path = PetstoreClient/Classes/Swaggers/Models;
-			sourceTree = "<group>";
-		};
 		35F128EB69B6F7FB7DA93BBF6C130FAE /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -387,6 +334,34 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		606EAF5FBC9930BD9D22CDECD222A32A /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				1FF33FE500328600F30A0008C612F377 /* AnotherFakeAPI.swift */,
+				42AA25A3EEB248D295081E15036472FA /* FakeAPI.swift */,
+				9D0A663A60EBEDC85D7204FF294D7A8E /* FakeClassnameTags123API.swift */,
+				7A4D6098BB7067FA34B381F4446DDB10 /* PetAPI.swift */,
+				8FB2BB634F7165B7E02CB903C153DD5F /* StoreAPI.swift */,
+				9A6821DE25768EABE3B84E13AA2767AA /* UserAPI.swift */,
+			);
+			name = APIs;
+			path = PetstoreClient/Classes/OpenAPIs/APIs;
+			sourceTree = "<group>";
+		};
+		6D4B4C422937D815279D2A96BCCE2815 /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				2BB1D491A4C824A6BFA9C0C35E36BD85 /* Info.plist */,
+				4EB7BF4F57FA381E9DA7A1AA9B04857D /* PetstoreClient.modulemap */,
+				B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */,
+				776D2DC046923CE3DDE934FF73659587 /* PetstoreClient-dummy.m */,
+				0075000FF9024228C130ADDA9B81114E /* PetstoreClient-prefix.pch */,
+				974697BA63D3232B3CBCF781253D6FD8 /* PetstoreClient-umbrella.h */,
+			);
+			name = "Support Files";
+			path = "SwaggerClientTests/Pods/Target Support Files/PetstoreClient";
+			sourceTree = "<group>";
+		};
 		7DB346D0F39D3F0E887471402A8071AB = {
 			isa = PBXGroup;
 			children = (
@@ -399,27 +374,35 @@
 			);
 			sourceTree = "<group>";
 		};
-		9552BC9D547079722BECEF69D39F81A1 /* PetstoreClient */ = {
+		894E625B654BBE2FB6E8E88AA51D3E5A /* PetstoreClient */ = {
 			isa = PBXGroup;
 			children = (
-				6CAF4F2E2C16A07E038AAA59349BBCD9 /* AlamofireImplementations.swift */,
-				8C78CDA7E4BB301D917FE7CFBD2457EF /* APIHelper.swift */,
-				697B1649F70C9355E6ED995300DBBA28 /* APIs.swift */,
-				06D5E6CDDEE294F817C22C521B562508 /* CodableHelper.swift */,
-				EC6A834DBFB72DAA5CF0C32268CDF605 /* Configuration.swift */,
-				987E88064EF735B91468D5018C18E261 /* Extensions.swift */,
-				E5EB60B9D147E1DCD36D55283254A515 /* JSONEncodableEncoding.swift */,
-				F46B1129B323D17632F7089F71632F60 /* JSONEncodingHelper.swift */,
-				2AEE7AA4D6A19965503F1889B1F44B1D /* Models.swift */,
-				C6898391DC18DA3449C18CD93A69078D /* APIs */,
-				325E314AD76E8F3FF0B03E2401003FC5 /* Models */,
-				D313744EEA7BEA6ED6344DEF771433F5 /* Pod */,
-				1638B55794AEC03168E0A73BFA054478 /* Support Files */,
+				2C2002E2C081EDBF95460841AEE40A1F /* AlamofireImplementations.swift */,
+				53DCDFCEE59497257D4D8E5C61AC1BF6 /* APIHelper.swift */,
+				B40D76A0512402285DC5FCF2795D7926 /* APIs.swift */,
+				2C7066E86827634F5A961005F5CDA325 /* CodableHelper.swift */,
+				1C4B75FFB3C6B26ACDD73938BF18310B /* Configuration.swift */,
+				7898EEC6A565DE133438C48988478954 /* Extensions.swift */,
+				B7304FCBBF3A1E3E5A44C2B06C880606 /* JSONEncodableEncoding.swift */,
+				37E06E455867386B3481EDF14972006E /* JSONEncodingHelper.swift */,
+				FEB048F7684923FC8C99614FB91CDE30 /* Models.swift */,
+				606EAF5FBC9930BD9D22CDECD222A32A /* APIs */,
+				A3225C42DC72DA2FDCC24B1154D893D9 /* Models */,
+				8B703AC5760FFB3F3A475448C3FD2DD8 /* Pod */,
+				6D4B4C422937D815279D2A96BCCE2815 /* Support Files */,
 			);
 			name = PetstoreClient;
 			path = ../..;
 			sourceTree = "<group>";
 		};
+		8B703AC5760FFB3F3A475448C3FD2DD8 /* Pod */ = {
+			isa = PBXGroup;
+			children = (
+				501C268D3DC431E81C876F4F7EE389C6 /* PetstoreClient.podspec */,
+			);
+			name = Pod;
+			sourceTree = "<group>";
+		};
 		9BBD96A0F02B8F92DD3659B2DCDF1A8C /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -431,6 +414,50 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		A3225C42DC72DA2FDCC24B1154D893D9 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				399E6B8FE158024592ED8B770864696C /* AdditionalPropertiesClass.swift */,
+				6FF19147CE4412D2804D578DF81FA6E6 /* Animal.swift */,
+				FDAB71F06CE94B9B9AD9438DAC00B6D2 /* AnimalFarm.swift */,
+				FF5D23F22EEE2FBFA826151A4E186DE3 /* ApiResponse.swift */,
+				E41E52FC18B43257D6D924850398E9AE /* ArrayOfArrayOfNumberOnly.swift */,
+				246C4149EB1F7D2CF07D83FD3B4A7683 /* ArrayOfNumberOnly.swift */,
+				5EE661EFEC3A229F1219958C4244153F /* ArrayTest.swift */,
+				8C249F0D3A4AFFFC155DEC2FBB68F0CC /* Capitalization.swift */,
+				DE0EE75A3806EB2BA0C9EEF687CE2B93 /* Cat.swift */,
+				FECB278917C7651872C44FB1C0B6E620 /* Category.swift */,
+				DEA70EA7732BDFFE905C353D9709B2AD /* ClassModel.swift */,
+				0B30B9F0FA3EB01FFACD8AF1A5E3C02A /* Client.swift */,
+				D822C4C7D3E161B2623D9538CFB3993E /* Dog.swift */,
+				18B675845795AE8F97C41BFE1B734DF3 /* EnumArrays.swift */,
+				392B0EBFD414446E3C9A271B38B72DA0 /* EnumClass.swift */,
+				AAFFDA41414FACE0139A3B1F22FB6717 /* EnumTest.swift */,
+				39CFCEF99F7C460D0F08FDCCF1457477 /* File.swift */,
+				9DE2FEBAD4A5F085054978914D2BAD7F /* FileSchemaTestClass.swift */,
+				C6E49082BB281EDC5D7B6E76772E87CF /* FormatTest.swift */,
+				7A9361010C64B5A1F7A9DF65338A4060 /* HasOnlyReadOnly.swift */,
+				61179CE650778B2A5C39664F0A792B5C /* List.swift */,
+				3A917A61915DC34D93F7CA22E9FEEAB8 /* MapTest.swift */,
+				5F66D63E8AA66846EDB3A12966E6951E /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
+				E1D16F98B0546986ED64CD76F6678480 /* Model200Response.swift */,
+				405921FE252DC3DC1087DA4217236D81 /* Name.swift */,
+				E81223B1EAA15A1063FABA2C1F83FD46 /* NumberOnly.swift */,
+				23810842569AE35D0E94BB511DF8A4FC /* Order.swift */,
+				E7FFC55F1307BC98855D3D546660D4F2 /* OuterComposite.swift */,
+				88B5354642428AF26C69F2155FEBFA4B /* OuterEnum.swift */,
+				C030C0F6BD877478B1CA4BC8BFBAD057 /* Pet.swift */,
+				D2DDAE4995DB14893EA47ED21E6742BA /* ReadOnlyFirst.swift */,
+				5D9E3149DFEE7783ACEC1596236B2268 /* Return.swift */,
+				14B3C282191A88FADAB9CC2C684F72AA /* SpecialModelName.swift */,
+				2990DE0BC65EFC8D04E0FE470B40D295 /* StringBooleanMap.swift */,
+				49A545F954B2A10B0D26618084D1FF73 /* Tag.swift */,
+				E5A46D45023C6CBF06AA36844D59C59E /* User.swift */,
+			);
+			name = Models;
+			path = PetstoreClient/Classes/OpenAPIs/Models;
+			sourceTree = "<group>";
+		};
 		C1A60D10CED0E61146591438999C7502 /* Targets Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -440,29 +467,6 @@
 			name = "Targets Support Files";
 			sourceTree = "<group>";
 		};
-		C6898391DC18DA3449C18CD93A69078D /* APIs */ = {
-			isa = PBXGroup;
-			children = (
-				51830C53E0E76A54309CE2137E716625 /* AnotherfakeAPI.swift */,
-				49BB1DA804C4AA7D9FEF0DC43604CCCE /* Fake_classname_tags123API.swift */,
-				456356DFF7271B4F562B7F04E03E3CA8 /* FakeAPI.swift */,
-				A145777600D2D0E2B9427EEE317DF443 /* FakeClassnameTags123API.swift */,
-				712969C66751DDCC0D484F06819ADFAF /* PetAPI.swift */,
-				98A8E010F6244706560DDC29B122EBAF /* StoreAPI.swift */,
-				364DFA113368D39E8F9FF776C3C78B11 /* UserAPI.swift */,
-			);
-			name = APIs;
-			path = PetstoreClient/Classes/Swaggers/APIs;
-			sourceTree = "<group>";
-		};
-		D313744EEA7BEA6ED6344DEF771433F5 /* Pod */ = {
-			isa = PBXGroup;
-			children = (
-				FC15A6FFC961DC8B56D9DD9150014C38 /* PetstoreClient.podspec */,
-			);
-			name = Pod;
-			sourceTree = "<group>";
-		};
 		DE503BFFEBBF78BDC743C8A6A50DFF47 /* Pods-SwaggerClient */ = {
 			isa = PBXGroup;
 			children = (
@@ -502,7 +506,7 @@
 		EC52080E65FE34CBDE5F694B08BA9836 /* Development Pods */ = {
 			isa = PBXGroup;
 			children = (
-				9552BC9D547079722BECEF69D39F81A1 /* PetstoreClient */,
+				894E625B654BBE2FB6E8E88AA51D3E5A /* PetstoreClient */,
 			);
 			name = "Development Pods";
 			sourceTree = "<group>";
@@ -510,11 +514,11 @@
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		1353AC7A6419F876B294A55E5550D1E4 /* Headers */ = {
+		977FD2449A760A426BC92AD40BF0FAE9 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */,
+				9067B627206EA4FFE8E94388031FBB70 /* PetstoreClient-umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -526,11 +530,11 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		BD12918CEA9299E11B49061B4FC1F33A /* Headers */ = {
+		C19E54C800095CFA2457EC19C7C2E974 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C40D07E49370F6A2B17F2AA7D8B5B8A5 /* PetstoreClient-umbrella.h in Headers */,
+				265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -564,24 +568,6 @@
 			productReference = 6C0ACB269F0C836F1865A56C4AF7A07E /* Pods_SwaggerClient.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		691AAEA1153824FE132C368C2B9D4ECF /* PetstoreClient */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = C82540F432F75C90F90C570A5CBBF5CA /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
-			buildPhases = (
-				CAF46E0F878E8B81DD1A04BCA960D71B /* Sources */,
-				8F986B6660A23551BF1713A47F9B5752 /* Frameworks */,
-				BD12918CEA9299E11B49061B4FC1F33A /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				F4B10CB4F7BF2C0DF6CDAFF8DA9F03B4 /* PBXTargetDependency */,
-			);
-			name = PetstoreClient;
-			productName = PetstoreClient;
-			productReference = 897F0C201C5E0C66A1F1E359AECF4C9C /* PetstoreClient.framework */;
-			productType = "com.apple.product-type.framework";
-		};
 		88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 419E5D95491847CD79841B971A8A3277 /* Build configuration list for PBXNativeTarget "Alamofire" */;
@@ -599,23 +585,42 @@
 			productReference = 49A9B3BBFEA1CFFC48229E438EA64F9E /* Alamofire.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */ = {
+		BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
+			buildConfigurationList = 6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
 			buildPhases = (
-				BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */,
-				87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */,
-				1353AC7A6419F876B294A55E5550D1E4 /* Headers */,
+				61868F2FE74A9422171483DBABE7C61F /* Sources */,
+				7139BF778844E2A9E420524D8146ECD8 /* Frameworks */,
+				C19E54C800095CFA2457EC19C7C2E974 /* Headers */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */,
 			);
 			name = "Pods-SwaggerClientTests";
 			productName = "Pods-SwaggerClientTests";
 			productReference = EA3FFA48FB4D08FC02C47F71C0089CD9 /* Pods_SwaggerClientTests.framework */;
 			productType = "com.apple.product-type.framework";
 		};
+		F273DBB2E19E2286018971F2B25DEB52 /* PetstoreClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 0E45B203539274106092021633F5C54E /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildPhases = (
+				4AA1A5462692BF0F60F69D529052033A /* Sources */,
+				2D7583F1D86C34DDA26383E3BD322469 /* Frameworks */,
+				977FD2449A760A426BC92AD40BF0FAE9 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				14D50D2534F42D5E57F9341C234C9364 /* PBXTargetDependency */,
+			);
+			name = PetstoreClient;
+			productName = PetstoreClient;
+			productReference = 897F0C201C5E0C66A1F1E359AECF4C9C /* PetstoreClient.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -638,9 +643,9 @@
 			projectRoot = "";
 			targets = (
 				88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */,
-				691AAEA1153824FE132C368C2B9D4ECF /* PetstoreClient */,
+				F273DBB2E19E2286018971F2B25DEB52 /* PetstoreClient */,
 				41903051A113E887E262FB29130EB187 /* Pods-SwaggerClient */,
-				F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */,
+				BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */,
 			);
 		};
 /* End PBXProject section */
@@ -671,6 +676,73 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4AA1A5462692BF0F60F69D529052033A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B8B97820FF69F393D03CC3E5E683E0AC /* AdditionalPropertiesClass.swift in Sources */,
+				347C378BE9CF50C4346AD266481E1BFF /* AlamofireImplementations.swift in Sources */,
+				4FF0508C97CCBFD9DFAE65EADC87EAF3 /* Animal.swift in Sources */,
+				D4EA838C54E069F53942C8D1A2B2DE82 /* AnimalFarm.swift in Sources */,
+				894AE698ECB3F226B0727A49F38524F1 /* AnotherFakeAPI.swift in Sources */,
+				39A24748F1D5A740A33ACD6D0543DEAB /* APIHelper.swift in Sources */,
+				8D061B18978E5EB2B9DBF2192903329B /* ApiResponse.swift in Sources */,
+				04A493BFE713CB2C25015D433167E9E1 /* APIs.swift in Sources */,
+				C76D1978F361E771A4145F7DC9919521 /* ArrayOfArrayOfNumberOnly.swift in Sources */,
+				72ACA4A1BCE46F860C41BA6999D99201 /* ArrayOfNumberOnly.swift in Sources */,
+				ED50C1AEECCAE2CD6E6985C8B64D3913 /* ArrayTest.swift in Sources */,
+				A7C44D981CEDA4D93A4C9B2A2A2FDD87 /* Capitalization.swift in Sources */,
+				1A3C191B1C5ACF0651E6F047DDB95817 /* Cat.swift in Sources */,
+				557E3BD0A0303B41AA699A0D80EDCD8B /* Category.swift in Sources */,
+				F3BD21AC343763BE84F89442247F5621 /* ClassModel.swift in Sources */,
+				056050D902E31AF7B4EBC6098550BCA2 /* Client.swift in Sources */,
+				6404E7A2DAD47C9C78DF3D877ECA35B1 /* CodableHelper.swift in Sources */,
+				96F7D2A8807BE58A6457771A390A3150 /* Configuration.swift in Sources */,
+				06AC740732140244366858BEA4D9ACF4 /* Dog.swift in Sources */,
+				2511466FA5C5BD5373BBC96056C5E400 /* EnumArrays.swift in Sources */,
+				D5C17277903A084B17EF424CC33FE6D6 /* EnumClass.swift in Sources */,
+				679C125D81FA92B98E3BEDE017693A1F /* EnumTest.swift in Sources */,
+				101C5C88A6A00D14238897CBCE3CF9F1 /* Extensions.swift in Sources */,
+				18BE122C0726D1D086F21215CD596F77 /* FakeAPI.swift in Sources */,
+				E613B6050F23E50C44494323ECACA5CC /* FakeClassnameTags123API.swift in Sources */,
+				6FEAF139ED75FFEF6BBF120E3AA45766 /* File.swift in Sources */,
+				9E862158C7BF3A5600BB52374630C160 /* FileSchemaTestClass.swift in Sources */,
+				CA4CC3FEE40E53A6EDD3C528E225FE00 /* FormatTest.swift in Sources */,
+				45459F9D3EA34D3DF1F3D26F0E45A105 /* HasOnlyReadOnly.swift in Sources */,
+				37CA5A16E0AE88E5122E71B2B487BA07 /* JSONEncodableEncoding.swift in Sources */,
+				95E7C04B9A7E7619B66A399FB17CE775 /* JSONEncodingHelper.swift in Sources */,
+				478CD0CAFF593CBC0F12DF1DBAD758CB /* List.swift in Sources */,
+				9CF332792BE5A785DEEF978163E2832F /* MapTest.swift in Sources */,
+				096C60FF50C33735E9D78F212FE80527 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
+				D3F6723167B5420422A9C14B2BF234DE /* Model200Response.swift in Sources */,
+				40901EF8400D1BE154AFBEAF78E56720 /* Models.swift in Sources */,
+				F105EEC427CEBD9DD3074EBE06346205 /* Name.swift in Sources */,
+				D4E932DF17365BCFC8515B5227D89F48 /* NumberOnly.swift in Sources */,
+				8B0CA21F4E3303601A992514378D11D5 /* Order.swift in Sources */,
+				A0FF74E69342AC2FD587E1096EEA421C /* OuterComposite.swift in Sources */,
+				D4E49332E21E60A07C2E800332679223 /* OuterEnum.swift in Sources */,
+				0C61CBCFF130BC4A193B5ED8F5304DE0 /* Pet.swift in Sources */,
+				735CE1951121B575B6FB10F2D8CB7C4D /* PetAPI.swift in Sources */,
+				4C7E90F5FD1C5A8766EB2A9D249BB114 /* PetstoreClient-dummy.m in Sources */,
+				90A64C8835D24ACAA61B2A7F12826AF2 /* ReadOnlyFirst.swift in Sources */,
+				B3CF227B76973EE03E0F705E09052FCF /* Return.swift in Sources */,
+				3CEAC3DC1787B17D6C07FA3382B0C44E /* SpecialModelName.swift in Sources */,
+				DABC129EE746385E5316235D774B47C7 /* StoreAPI.swift in Sources */,
+				1AD5D3AD9CDD183A2942AD6B276954D2 /* StringBooleanMap.swift in Sources */,
+				DB0575284198BED1F158BC48C05C5B3F /* Tag.swift in Sources */,
+				B0679E75901BBEC098D38E894F733D9E /* User.swift in Sources */,
+				27931C1C73F0C9977FE6A0D0838064D5 /* UserAPI.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		61868F2FE74A9422171483DBABE7C61F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		9A1B5AE4D97D5E0097B7054904D06663 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -679,81 +751,19 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CAF46E0F878E8B81DD1A04BCA960D71B /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				46899B04EA5D619054AACDD9C5F2F7B5 /* AdditionalPropertiesClass.swift in Sources */,
-				0D2084CADDB0230A4CAF2C0605F828DF /* AlamofireImplementations.swift in Sources */,
-				CB9A39C25CA7ED02B7E02B5AA1354911 /* Animal.swift in Sources */,
-				E661B7CF775527BE72A5B2D4EB5F73E8 /* AnimalFarm.swift in Sources */,
-				55013BF8F5D5A6B238473A65819BA91E /* AnotherfakeAPI.swift in Sources */,
-				04B6872F088373A5D9622389D44ABFA7 /* APIHelper.swift in Sources */,
-				E0FC0F7FCAAFB628D17EB6277E6384D0 /* ApiResponse.swift in Sources */,
-				07EEC7822D7CB95755A6BB464B2BF1D1 /* APIs.swift in Sources */,
-				9D4858FD9A6340A4609BEBDF00C382F9 /* ArrayOfArrayOfNumberOnly.swift in Sources */,
-				D0FF9ABBD288F188E54D3CAB5208202B /* ArrayOfNumberOnly.swift in Sources */,
-				DA774D60BA836CC50DCEF3F0402A0D25 /* ArrayTest.swift in Sources */,
-				28832E8D2FFAF4A8A372893866A96CD3 /* Capitalization.swift in Sources */,
-				52661A921B6F46145CE16E108CA3C1CD /* Cat.swift in Sources */,
-				BCFCE38A7F2EBB043C581F2A24947FEA /* Category.swift in Sources */,
-				84FCC3BCB6219E32B67168629345B43F /* ClassModel.swift in Sources */,
-				B116548930626181CC1301D0ADE31720 /* Client.swift in Sources */,
-				E0559707E3DAE5B759A2570EE64AEF37 /* CodableHelper.swift in Sources */,
-				8106FA532C222AE698AF0D473D8C9160 /* Configuration.swift in Sources */,
-				BCBC0EA84005299246354BB70B11301B /* Dog.swift in Sources */,
-				5C76B11759683109F447BA67F28F83DC /* EnumArrays.swift in Sources */,
-				2361B453C0E27F769982D2E157DFD27B /* EnumClass.swift in Sources */,
-				F88A1839757ADAA76A5A40A3149E5B45 /* EnumTest.swift in Sources */,
-				BF7DF71571E51EBF9CF76436ADA68ACA /* Extensions.swift in Sources */,
-				3EDE1BCF1CAE7C657EA278797CA70181 /* Fake_classname_tags123API.swift in Sources */,
-				450A1F9D9F0C0316DC5571EAD3C7FFB6 /* FakeAPI.swift in Sources */,
-				3185145561047965FB52DD80ED69B7C8 /* FakeClassnameTags123API.swift in Sources */,
-				F3728DB3E73B9E46DCCD1FBB17888A31 /* FormatTest.swift in Sources */,
-				1271FFC6225DD34662309214506624E3 /* HasOnlyReadOnly.swift in Sources */,
-				CC1ABC7D57D24128BCE892C928EB155D /* JSONEncodableEncoding.swift in Sources */,
-				27AFC4AEBB1B56DD719675A2118CCB8D /* JSONEncodingHelper.swift in Sources */,
-				36E58F38207F15EBD91ADCEF62C7C85E /* List.swift in Sources */,
-				5F18574D9A8C0B088105A657C4EBFE8A /* MapTest.swift in Sources */,
-				E7ADAAB656F28A756189B278B28D0099 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
-				BD15F885C0DB08C2BA875B3A36DFD778 /* Model200Response.swift in Sources */,
-				6FD39FEAAFE27DBC3EC0F11B20D97734 /* Models.swift in Sources */,
-				749396546BA912EA0DD0A0A38FDEDAA4 /* Name.swift in Sources */,
-				31B8C21D76FE98AE41B88A44169ECE84 /* NumberOnly.swift in Sources */,
-				D0FD45C03A13220C2DEC62BE2330FC92 /* Order.swift in Sources */,
-				B13CE8FE8573C0FB07C97D0C34DD9CF4 /* OuterBoolean.swift in Sources */,
-				C7DAA30310B69C6742610B5EBC23B328 /* OuterComposite.swift in Sources */,
-				3322B46E9D9AFB13466804547F6404A4 /* OuterEnum.swift in Sources */,
-				A0AD98559666C4BA8E74CA46211B44F2 /* OuterNumber.swift in Sources */,
-				9BD5D264F2B563611262E196A5961066 /* OuterString.swift in Sources */,
-				229E82D3A37D202BFF958E8278C2E5D0 /* Pet.swift in Sources */,
-				A57FEBD11E8DC63EF939F8183779BECA /* PetAPI.swift in Sources */,
-				F8CBD4B50C45BCC72F66D919E4E37F6A /* PetstoreClient-dummy.m in Sources */,
-				36505FE5A99837291C843D5627689950 /* ReadOnlyFirst.swift in Sources */,
-				862F16E17E79FAA53D395CE275546D28 /* Return.swift in Sources */,
-				F4749A9FA396C6C94CF4F4D16897A60C /* SpecialModelName.swift in Sources */,
-				802D6A4D73A1A03F0F30D814126EC859 /* StoreAPI.swift in Sources */,
-				F7D10D5D6C92E40C736C597872B7F9BD /* Tag.swift in Sources */,
-				12E1368A8649F7ABCA22122BB086A9A4 /* User.swift in Sources */,
-				E24BD2C6E31CACD58555DB8044F7EFE4 /* UserAPI.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		14D50D2534F42D5E57F9341C234C9364 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Alamofire;
+			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
+			targetProxy = 53846F4D999F8096A92BE0AB60034710 /* PBXContainerItemProxy */;
+		};
 		374AD22F26F7E9801AB27C2FCBBF4EC9 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PetstoreClient;
-			target = 691AAEA1153824FE132C368C2B9D4ECF /* PetstoreClient */;
+			target = F273DBB2E19E2286018971F2B25DEB52 /* PetstoreClient */;
 			targetProxy = 398B30E9B8AE28E1BDA1C6D292107659 /* PBXContainerItemProxy */;
 		};
 		AC31F7EF81A7A1C4862B1BA6879CEC1C /* PBXTargetDependency */ = {
@@ -762,143 +772,20 @@
 			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
 			targetProxy = F9E1549CFEDAD61BECA92DB5B12B4019 /* PBXContainerItemProxy */;
 		};
-		F4B10CB4F7BF2C0DF6CDAFF8DA9F03B4 /* PBXTargetDependency */ = {
+		CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			name = Alamofire;
-			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
-			targetProxy = FAEF364FCCB241333BC2531394A7BC5A /* PBXContainerItemProxy */;
+			name = "Pods-SwaggerClient";
+			target = 41903051A113E887E262FB29130EB187 /* Pods-SwaggerClient */;
+			targetProxy = 39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		1928FD2BA1177E86A2DAF2641C8755AA /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		4F1AB8279A7C4737EB15C9417B058BCA /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGNING_REQUIRED = NO;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"POD_CONFIGURATION_RELEASE=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
-				STRIP_INSTALLED_PRODUCT = NO;
-				SYMROOT = "${SRCROOT}/../build";
-			};
-			name = Release;
-		};
-		6CD2CF3CB56F8D2390B8CD744515AD17 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 33A04B5D27E86AF4B84D95E21CF3F452 /* Alamofire.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				PRODUCT_NAME = Alamofire;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		7B847FB9B14D62B0E406B600F7ECF9C5 /* Release */ = {
+		1061787EE37EF1635F9DDF717212E04E /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -918,7 +805,7 @@
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -930,137 +817,7 @@
 			};
 			name = Release;
 		};
-		7C46BC4305EA8CA938060BF349566A75 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		972BD31D68F98035DE59A64D32AC1F3A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 33A04B5D27E86AF4B84D95E21CF3F452 /* Alamofire.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				PRODUCT_NAME = Alamofire;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		CA2D1D2252D9383E5D37145848E5CA14 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = F1ED5AD8A7A28479CDC87C72B75010ED /* PetstoreClient.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
-				PRODUCT_NAME = PetstoreClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		E5AEBAF82849035F9A9CD1F299E57E07 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		E95097900ACBDB730939D23AFE3D24CD /* Debug */ = {
+		1FE3B4CE8C074CE87C18B26C91020E15 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -1092,6 +849,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
 				CODE_SIGNING_REQUIRED = NO;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1116,16 +874,82 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
 				STRIP_INSTALLED_PRODUCT = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SYMROOT = "${SRCROOT}/../build";
 			};
 			name = Debug;
 		};
-		F821909927065327473AE031ADA63E79 /* Release */ = {
+		5E110A36DB7BF1BF01973770C95C3047 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = F1ED5AD8A7A28479CDC87C72B75010ED /* PetstoreClient.xcconfig */;
+			baseConfigurationReference = FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		7B0415700290D1DEBAB6B173951CC0C7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 33A04B5D27E86AF4B84D95E21CF3F452 /* Alamofire.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				PRODUCT_MODULE_NAME = Alamofire;
+				PRODUCT_NAME = Alamofire;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		83A1AE816DA453F2F4BBC1D88BB05EC1 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -1142,6 +966,164 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				PRODUCT_MODULE_NAME = PetstoreClient;
+				PRODUCT_NAME = PetstoreClient;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		89C68177307D3F04B055FD0AA2FC173A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
+				CODE_SIGNING_REQUIRED = NO;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"POD_CONFIGURATION_RELEASE=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+			};
+			name = Release;
+		};
+		95DBEF0AB0B74932A7CEF4BB6099470D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 33A04B5D27E86AF4B84D95E21CF3F452 /* Alamofire.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				PRODUCT_MODULE_NAME = Alamofire;
+				PRODUCT_NAME = Alamofire;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		AA44C748B579D9822A4F1DA83E57D74C /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		E0250AF5A4EC20E3DC14D879F15A95A8 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				PRODUCT_MODULE_NAME = PetstoreClient;
 				PRODUCT_NAME = PetstoreClient;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -1155,14 +1137,59 @@
 			};
 			name = Release;
 		};
+		E944E2E9660E4E16301165EDE14498C3 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		0E45B203539274106092021633F5C54E /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				83A1AE816DA453F2F4BBC1D88BB05EC1 /* Debug */,
+				E0250AF5A4EC20E3DC14D879F15A95A8 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				E95097900ACBDB730939D23AFE3D24CD /* Debug */,
-				4F1AB8279A7C4737EB15C9417B058BCA /* Release */,
+				1FE3B4CE8C074CE87C18B26C91020E15 /* Debug */,
+				89C68177307D3F04B055FD0AA2FC173A /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1170,8 +1197,8 @@
 		419E5D95491847CD79841B971A8A3277 /* Build configuration list for PBXNativeTarget "Alamofire" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				972BD31D68F98035DE59A64D32AC1F3A /* Debug */,
-				6CD2CF3CB56F8D2390B8CD744515AD17 /* Release */,
+				7B0415700290D1DEBAB6B173951CC0C7 /* Debug */,
+				95DBEF0AB0B74932A7CEF4BB6099470D /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1179,26 +1206,17 @@
 		5DE561894A3D2FE43769BF10CB87D407 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClient" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				7C46BC4305EA8CA938060BF349566A75 /* Debug */,
-				7B847FB9B14D62B0E406B600F7ECF9C5 /* Release */,
+				E944E2E9660E4E16301165EDE14498C3 /* Debug */,
+				1061787EE37EF1635F9DDF717212E04E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
+		6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				E5AEBAF82849035F9A9CD1F299E57E07 /* Debug */,
-				1928FD2BA1177E86A2DAF2641C8755AA /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		C82540F432F75C90F90C570A5CBBF5CA /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CA2D1D2252D9383E5D37145848E5CA14 /* Debug */,
-				F821909927065327473AE031ADA63E79 /* Release */,
+				AA44C748B579D9822A4F1DA83E57D74C /* Debug */,
+				5E110A36DB7BF1BF01973770C95C3047 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
index 881c8cade67..6b8baab300a 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
@@ -1,6 +1,5 @@
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Alamofire
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
index 98aa9b0cc5a..c24f97366d1 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
@@ -1,7 +1,6 @@
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient
 FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
index 2eccc456916..3680284d666 100755
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
@@ -1,9 +1,18 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
 # Used as a return value for each invocation of `strip_invalid_archs` function.
@@ -92,10 +101,10 @@ install_dsym() {
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
index 881cbaed324..08e3eaaca45 100755
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
@@ -1,9 +1,18 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
 # Used as a return value for each invocation of `strip_invalid_archs` function.
@@ -92,10 +101,10 @@ install_dsym() {
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
index 1406071ba7e..583e008421f 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
@@ -149,9 +149,7 @@
 				6D4EFB8E1C692C6300B96B06 /* Frameworks */,
 				6D4EFB8F1C692C6300B96B06 /* Resources */,
 				4485A75250058E2D5BBDF63F /* [CP] Embed Pods Frameworks */,
-				808CE4A0CE801CAC5ABF5B08 /* [CP] Copy Pods Resources */,
 				3D9471620628F03313096EB2 /* 📦 Embed Pods Frameworks */,
-				EEEC2B2D0497D38CEAD2DB24 /* 📦 Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -171,10 +169,6 @@
 				6D4EFBA11C692C6300B96B06 /* Sources */,
 				6D4EFBA21C692C6300B96B06 /* Frameworks */,
 				6D4EFBA31C692C6300B96B06 /* Resources */,
-				796EAD48F1BCCDAA291CD963 /* [CP] Embed Pods Frameworks */,
-				1652CB1A246A4689869E442D /* [CP] Copy Pods Resources */,
-				ECE47F6BF90C3848F6E94AFF /* 📦 Embed Pods Frameworks */,
-				1494090872F3F18E536E8902 /* 📦 Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -247,36 +241,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		1494090872F3F18E536E8902 /* 📦 Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "📦 Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		1652CB1A246A4689869E442D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		1F03F780DC2D9727E5E64BA9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -327,21 +291,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		796EAD48F1BCCDAA291CD963 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		79FE27B09B2DD354C831BD49 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -357,21 +306,6 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		808CE4A0CE801CAC5ABF5B08 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		B4DB169E5F018305D6759D34 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -408,36 +342,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		ECE47F6BF90C3848F6E94AFF /* 📦 Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "📦 Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		EEEC2B2D0497D38CEAD2DB24 /* 📦 Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "📦 Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 00000000000..18d981003d6
--- /dev/null
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
index f8c903f1f36..83948695fac 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
@@ -30,7 +30,7 @@ class PetAPITests: XCTestCase {
         let tags = [Tag(_id: 1234, name: "New York"), Tag(_id: 124321, name: "Jose")]
         let newPet = Pet(_id: 1000, category: category, name: "Fluffy", photoUrls: ["https://petstore.com/sample/photo1.jpg", "https://petstore.com/sample/photo2.jpg"], tags: tags, status: .available)
 
-        PetAPI.addPet(body: newPet) { (response, error) in
+        PetAPI.addPet(pet: newPet) { (response, error) in
             guard error == nil else {
                 XCTFail("error creating pet")
                 return
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
index 5bc1a975645..943c5a8f018 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
@@ -22,7 +22,7 @@ class StoreAPITests: XCTestCase {
         let order = Order(_id: 1000, petId: 1000, quantity: 10, shipDate: shipDate, status: .placed, complete: true)
         let expectation = self.expectation(description: "testPlaceOrder")
 
-        StoreAPI.placeOrder(body: order) { (order, error) in
+        StoreAPI.placeOrder(order: order) { (order, error) in
             guard error == nil else {
                 XCTFail("error placing order: \(error.debugDescription)")
                 return
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
index e0bc86f58c2..686bebec0ae 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
@@ -53,62 +53,7 @@ class UserAPITests: XCTestCase {
         
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
-    func test1CreateUser() {
-        let expectation = self.expectation(description: "testCreateUser")
-        let newUser = User(_id: 1000, username: "test@test.com", firstName: "Test", lastName: "Tester", email: "test@test.com", password: "test!", phone: "867-5309", userStatus: 0)
 
-        UserAPI.createUser(body: newUser) { (response, error) in
-            guard error == nil else {
-                XCTFail("error creating user")
-                return
-            }
-
-            expectation.fulfill()
-        }
-        
-        self.waitForExpectations(timeout: testTimeout, handler: nil)
-    }
-    
-    func test2GetUser() {
-        let expectation = self.expectation(description: "testGetUser")
-        
-        UserAPI.getUserByName(username: "test@test.com") { (user, error) in
-            guard error == nil else {
-                XCTFail("error getting user")
-                return
-            }
-            
-            if let user = user {
-                XCTAssert(user.userStatus == 0, "invalid userStatus")
-                XCTAssert(user.email == "test@test.com", "invalid email")
-                XCTAssert(user.firstName == "Test", "invalid firstName")
-                XCTAssert(user.lastName == "Tester", "invalid lastName")
-                XCTAssert(user.password == "test!", "invalid password")
-                XCTAssert(user.phone == "867-5309", "invalid phone")
-                
-                expectation.fulfill()
-            }
-        }
-        
-        self.waitForExpectations(timeout: testTimeout, handler: nil)
-    }
-    
-    func test3DeleteUser() {
-        let expectation = self.expectation(description: "testDeleteUser")
-        
-        UserAPI.deleteUser(username: "test@test.com") { (response, error) in
-            guard error == nil else {
-                XCTFail("error deleting user")
-                return
-            }
-
-            expectation.fulfill()
-        }
-        
-        self.waitForExpectations(timeout: testTimeout, handler: nil)
-    }
-    
     func testPathParamsAreEscaped() {
         // The path for this operation is /user/{userId}. In order to make a usable path,
         // then we must make sure that {userId} is percent-escaped when it is substituted
diff --git a/samples/client/petstore/swift4/objcCompatible/.openapi-generator/VERSION b/samples/client/petstore/swift4/objcCompatible/.openapi-generator/VERSION
index ad121e8340e..4395ff59232 100644
--- a/samples/client/petstore/swift4/objcCompatible/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift4/objcCompatible/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.1-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index f8313034a66..a31864437b1 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -17,8 +17,8 @@ open class AnotherFakeAPI {
      - parameter client: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
+    open class func call123testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+        call123testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -27,11 +27,11 @@ open class AnotherFakeAPI {
     /**
      To test special tags
      - PATCH /another-fake/dummy
-     - To test special tags
+     - To test special tags and operation ID starting with number
      - parameter client: (body) client model 
      - returns: RequestBuilder<Client> 
      */
-    open class func testSpecialTagsWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
+    open class func call123testSpecialTagsWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
         let path = "/another-fake/dummy"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: client)
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index d22ed47557e..00f689db519 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -131,6 +131,40 @@ open class FakeAPI {
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
     }
 
+    /**
+
+     - parameter fileSchemaTestClass: (body)  
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testBodyWithFileSchema(fileSchemaTestClass: FileSchemaTestClass, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        testBodyWithFileSchemaWithRequestBuilder(fileSchemaTestClass: fileSchemaTestClass).execute { (response, error) -> Void in
+            if error == nil {
+                completion((), error)
+            } else {
+                completion(nil, error)
+            }
+        }
+    }
+
+
+    /**
+     - PUT /fake/body-with-file-schema
+     - For this test, the body for this request much reference a schema named `File`.
+     - parameter fileSchemaTestClass: (body)  
+     - returns: RequestBuilder<Void> 
+     */
+    open class func testBodyWithFileSchemaWithRequestBuilder(fileSchemaTestClass: FileSchemaTestClass) -> RequestBuilder<Void> {
+        let path = "/fake/body-with-file-schema"
+        let URLString = PetstoreClientAPI.basePath + path
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: fileSchemaTestClass)
+
+        let url = URLComponents(string: URLString)
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
+
+        return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
+    }
+
     /**
 
      - parameter query: (query)  
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index c525e66cce5..266ac7c402b 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -355,4 +355,51 @@ open class PetAPI {
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
 
+    /**
+     uploads an image (required)
+     
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+        uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute { (response, error) -> Void in
+            completion(response?.body, error)
+        }
+    }
+
+
+    /**
+     uploads an image (required)
+     - POST /fake/{petId}/uploadImageWithRequiredFile
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - returns: RequestBuilder<ApiResponse> 
+     */
+    open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder<ApiResponse> {
+        var path = "/fake/{petId}/uploadImageWithRequiredFile"
+        let petIdPreEscape = "\(petId)"
+        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
+        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        let formParams: [String:Any?] = [
+            "additionalMetadata": additionalMetadata,
+            "requiredFile": requiredFile
+        ]
+
+        let nonNullParameters = APIHelper.rejectNil(formParams)
+        let parameters = APIHelper.convertBoolToString(nonNullParameters)
+        
+        let url = URLComponents(string: URLString)
+
+        let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
 }
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift
new file mode 100644
index 00000000000..c8bd1f19589
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -0,0 +1,24 @@
+//
+// File.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** Must be named &#x60;File&#x60; for test. */
+
+public struct File: Codable {
+
+    /** Test capitalization */
+    public var sourceURI: String?
+
+    public init(sourceURI: String?) {
+        self.sourceURI = sourceURI
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
new file mode 100644
index 00000000000..64d02506802
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -0,0 +1,24 @@
+//
+// FileSchemaTestClass.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+
+public struct FileSchemaTestClass: Codable {
+
+    public var file: File?
+    public var files: [File]?
+
+    public init(file: File?, files: [File]?) {
+        self.file = file
+        self.files = files
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index dfbbee8428e..2d3a45d35a0 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -17,15 +17,21 @@ public struct MapTest: Codable {
     }
     public var mapMapOfString: [String:[String:String]]?
     public var mapOfEnumString: [String:String]?
+    public var directMap: [String:Bool]?
+    public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?) {
+    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
+        self.directMap = directMap
+        self.indirectMap = indirectMap
     }
 
     public enum CodingKeys: String, CodingKey { 
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
+        case directMap = "direct_map"
+        case indirectMap = "indirect_map"
     }
 
 
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index edc4523d9f0..fbf937057e3 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -12,8 +12,18 @@ import Foundation
 public struct OuterComposite: Codable {
 
     public var myNumber: Double?
+    public var myNumberNum: NSNumber? {
+        get {
+            return myNumber.map({ return NSNumber(value: $0) })
+        }
+    }
     public var myString: String?
     public var myBoolean: Bool?
+    public var myBooleanNum: NSNumber? {
+        get {
+            return myBoolean.map({ return NSNumber(value: $0) })
+        }
+    }
 
     public init(myNumber: Double?, myString: String?, myBoolean: Bool?) {
         self.myNumber = myNumber
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
new file mode 100644
index 00000000000..ae15e87d94b
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -0,0 +1,51 @@
+//
+// StringBooleanMap.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+
+public struct StringBooleanMap: Codable {
+
+
+    public var additionalProperties: [String:Bool] = [:]
+
+    public subscript(key: String) -> Bool? {
+        get {
+            if let value = additionalProperties[key] {
+                return value
+            }
+            return nil
+        }
+
+        set {
+            additionalProperties[key] = newValue
+        }
+    }
+
+    // Encodable protocol methods
+
+    public func encode(to encoder: Encoder) throws {
+
+        var container = encoder.container(keyedBy: String.self)
+
+        try container.encodeMap(additionalProperties)
+    }
+
+    // Decodable protocol methods
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: String.self)
+
+        var nonAdditionalPropertyKeys = Set<String>()
+        additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
+    }
+
+
+
+}
+
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIHelper.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIHelper.swift
deleted file mode 100644
index 81e7286d6d4..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIHelper.swift
+++ /dev/null
@@ -1,65 +0,0 @@
-// APIHelper.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
-        let destination = source.reduce(into: [String: Any]()) { (result, item) in
-            if let value = item.value {
-                result[item.key] = value
-            }
-        }
-
-        if destination.isEmpty {
-            return nil
-        }
-        return destination
-    }
-
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
-        return source.reduce(into: [String: String]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
-            } else if let value: Any = item.value {
-                result[item.key] = "\(value)"
-            }
-        }
-    }
-
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
-        guard let source = source else {
-            return nil
-        }
-
-        return source.reduce(into: [String: Any](), { (result, item) in
-            switch item.value {
-            case let x as Bool:
-                result[item.key] = x.description
-            default:
-                result[item.key] = item.value
-            }
-        })
-    }
-
-
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
-        let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
-            if let collection = item.value as? Array<Any?> {
-                let value = collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
-                result.append(URLQueryItem(name: item.key, value: value))
-            } else if let value = item.value {
-                result.append(URLQueryItem(name: item.key, value: "\(value)"))
-            }
-        }
-
-        if destination.isEmpty {
-            return nil
-        }
-        return destination
-    }
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/AnotherfakeAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/AnotherfakeAPI.swift
deleted file mode 100644
index 63377bce998..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/AnotherfakeAPI.swift
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// AnotherFakeAPI.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-
-
-
-open class AnotherFakeAPI {
-    /**
-     To test special tags
-     
-     - parameter body: (body) client model 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testSpecialTags(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testSpecialTagsWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     To test special tags
-     - PATCH /another-fake/dummy
-     - To test special tags
-     - examples: [{contentType=application/json, example={
-  "client" : "client"
-}}]
-     
-     - parameter body: (body) client model 
-
-     - returns: RequestBuilder<Client> 
-     */
-    open class func testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
-        let path = "/another-fake/dummy"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
deleted file mode 100644
index da291a94de4..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
+++ /dev/null
@@ -1,492 +0,0 @@
-//
-// FakeAPI.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-
-
-
-open class FakeAPI {
-    /**
-
-     - parameter body: (body) Input boolean as post body (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func fakeOuterBooleanSerialize(body: OuterBoolean? = nil, completion: @escaping ((_ data: OuterBoolean?,_ error: Error?) -> Void)) {
-        fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     - POST /fake/outer/boolean
-     - Test serialization of outer boolean types
-     - examples: [{contentType=application/json, example={ }}]
-     
-     - parameter body: (body) Input boolean as post body (optional)
-
-     - returns: RequestBuilder<OuterBoolean> 
-     */
-    open class func fakeOuterBooleanSerializeWithRequestBuilder(body: OuterBoolean? = nil) -> RequestBuilder<OuterBoolean> {
-        let path = "/fake/outer/boolean"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<OuterBoolean>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-
-     - parameter body: (body) Input composite as post body (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
-        fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     - POST /fake/outer/composite
-     - Test serialization of object with outer number type
-     - examples: [{contentType=application/json, example={
-  "my_string" : { },
-  "my_number" : { },
-  "my_boolean" : { }
-}}]
-     
-     - parameter body: (body) Input composite as post body (optional)
-
-     - returns: RequestBuilder<OuterComposite> 
-     */
-    open class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder<OuterComposite> {
-        let path = "/fake/outer/composite"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<OuterComposite>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-
-     - parameter body: (body) Input number as post body (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func fakeOuterNumberSerialize(body: OuterNumber? = nil, completion: @escaping ((_ data: OuterNumber?,_ error: Error?) -> Void)) {
-        fakeOuterNumberSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     - POST /fake/outer/number
-     - Test serialization of outer number types
-     - examples: [{contentType=application/json, example={ }}]
-     
-     - parameter body: (body) Input number as post body (optional)
-
-     - returns: RequestBuilder<OuterNumber> 
-     */
-    open class func fakeOuterNumberSerializeWithRequestBuilder(body: OuterNumber? = nil) -> RequestBuilder<OuterNumber> {
-        let path = "/fake/outer/number"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<OuterNumber>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-
-     - parameter body: (body) Input string as post body (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func fakeOuterStringSerialize(body: OuterString? = nil, completion: @escaping ((_ data: OuterString?,_ error: Error?) -> Void)) {
-        fakeOuterStringSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     - POST /fake/outer/string
-     - Test serialization of outer string types
-     - examples: [{contentType=application/json, example={ }}]
-     
-     - parameter body: (body) Input string as post body (optional)
-
-     - returns: RequestBuilder<OuterString> 
-     */
-    open class func fakeOuterStringSerializeWithRequestBuilder(body: OuterString? = nil) -> RequestBuilder<OuterString> {
-        let path = "/fake/outer/string"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<OuterString>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     To test \"client\" model
-     
-     - parameter body: (body) client model 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testClientModel(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testClientModelWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     To test \"client\" model
-     - PATCH /fake
-     - To test \"client\" model
-     - examples: [{contentType=application/json, example={
-  "client" : "client"
-}}]
-     
-     - parameter body: (body) client model 
-
-     - returns: RequestBuilder<Client> 
-     */
-    open class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
-        let path = "/fake"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     
-     - parameter number: (form) None 
-     - parameter double: (form) None 
-     - parameter patternWithoutDelimiter: (form) None 
-     - parameter byte: (form) None 
-     - parameter integer: (form) None (optional)
-     - parameter int32: (form) None (optional)
-     - parameter int64: (form) None (optional)
-     - parameter float: (form) None (optional)
-     - parameter string: (form) None (optional)
-     - parameter binary: (form) None (optional)
-     - parameter date: (form) None (optional)
-     - parameter dateTime: (form) None (optional)
-     - parameter password: (form) None (optional)
-     - parameter callback: (form) None (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     - POST /fake
-     - Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     - BASIC:
-       - type: basic
-       - name: http_basic_test
-     
-     - parameter number: (form) None 
-     - parameter double: (form) None 
-     - parameter patternWithoutDelimiter: (form) None 
-     - parameter byte: (form) None 
-     - parameter integer: (form) None (optional)
-     - parameter int32: (form) None (optional)
-     - parameter int64: (form) None (optional)
-     - parameter float: (form) None (optional)
-     - parameter string: (form) None (optional)
-     - parameter binary: (form) None (optional)
-     - parameter date: (form) None (optional)
-     - parameter dateTime: (form) None (optional)
-     - parameter password: (form) None (optional)
-     - parameter callback: (form) None (optional)
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
-        let path = "/fake"
-        let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
-            "integer": integer?.encodeToJSON(),
-            "int32": int32?.encodeToJSON(),
-            "int64": int64?.encodeToJSON(),
-            "number": number,
-            "float": float,
-            "double": double,
-            "string": string,
-            "pattern_without_delimiter": patternWithoutDelimiter,
-            "byte": byte,
-            "binary": binary,
-            "date": date?.encodeToJSON(),
-            "dateTime": dateTime?.encodeToJSON(),
-            "password": password,
-            "callback": callback
-        ]
-
-        let nonNullParameters = APIHelper.rejectNil(formParams)
-        let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     * enum for parameter enumFormStringArray
-     */
-    public enum EnumFormStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
-    }
-
-    /**
-     * enum for parameter enumFormString
-     */
-    public enum EnumFormString_testEnumParameters: String { 
-        case abc = "_abc"
-        case efg = "-efg"
-        case xyz = "(xyz)"
-    }
-
-    /**
-     * enum for parameter enumHeaderStringArray
-     */
-    public enum EnumHeaderStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
-    }
-
-    /**
-     * enum for parameter enumHeaderString
-     */
-    public enum EnumHeaderString_testEnumParameters: String { 
-        case abc = "_abc"
-        case efg = "-efg"
-        case xyz = "(xyz)"
-    }
-
-    /**
-     * enum for parameter enumQueryStringArray
-     */
-    public enum EnumQueryStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
-    }
-
-    /**
-     * enum for parameter enumQueryString
-     */
-    public enum EnumQueryString_testEnumParameters: String { 
-        case abc = "_abc"
-        case efg = "-efg"
-        case xyz = "(xyz)"
-    }
-
-    /**
-     * enum for parameter enumQueryInteger
-     */
-    public enum EnumQueryInteger_testEnumParameters: Int { 
-        case _1 = 1
-        case number2 = -2
-    }
-
-    /**
-     * enum for parameter enumQueryDouble
-     */
-    public enum EnumQueryDouble_testEnumParameters: Double { 
-        case _11 = 1.1
-        case number12 = -1.2
-    }
-
-    /**
-     To test enum parameters
-     
-     - parameter enumFormStringArray: (form) Form parameter enum test (string array) (optional)
-     - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to -efg)
-     - parameter enumHeaderStringArray: (header) Header parameter enum test (string array) (optional)
-     - parameter enumHeaderString: (header) Header parameter enum test (string) (optional, default to -efg)
-     - parameter enumQueryStringArray: (query) Query parameter enum test (string array) (optional)
-     - parameter enumQueryString: (query) Query parameter enum test (string) (optional, default to -efg)
-     - parameter enumQueryInteger: (query) Query parameter enum test (double) (optional)
-     - parameter enumQueryDouble: (form) Query parameter enum test (double) (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testEnumParameters(enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testEnumParametersWithRequestBuilder(enumFormStringArray: enumFormStringArray, enumFormString: enumFormString, enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     To test enum parameters
-     - GET /fake
-     - To test enum parameters
-     
-     - parameter enumFormStringArray: (form) Form parameter enum test (string array) (optional)
-     - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to -efg)
-     - parameter enumHeaderStringArray: (header) Header parameter enum test (string array) (optional)
-     - parameter enumHeaderString: (header) Header parameter enum test (string) (optional, default to -efg)
-     - parameter enumQueryStringArray: (query) Query parameter enum test (string array) (optional)
-     - parameter enumQueryString: (query) Query parameter enum test (string) (optional, default to -efg)
-     - parameter enumQueryInteger: (query) Query parameter enum test (double) (optional)
-     - parameter enumQueryDouble: (form) Query parameter enum test (double) (optional)
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func testEnumParametersWithRequestBuilder(enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil) -> RequestBuilder<Void> {
-        let path = "/fake"
-        let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
-            "enum_form_string_array": enumFormStringArray,
-            "enum_form_string": enumFormString?.rawValue,
-            "enum_query_double": enumQueryDouble?.rawValue
-        ]
-
-        let nonNullParameters = APIHelper.rejectNil(formParams)
-        let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
-        var url = URLComponents(string: URLString)
-        url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray, 
-            "enum_query_string": enumQueryString?.rawValue, 
-            "enum_query_integer": enumQueryInteger?.rawValue
-        ])
-        let nillableHeaders: [String: Any?] = [
-            "enum_header_string_array": enumHeaderStringArray,
-            "enum_header_string": enumHeaderString?.rawValue
-        ]
-        let headerParameters = APIHelper.rejectNilHeaders(nillableHeaders)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false, headers: headerParameters)
-    }
-
-    /**
-     test inline additionalProperties
-     
-     - parameter param: (body) request body 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testInlineAdditionalProperties(param: Any, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     test inline additionalProperties
-     - POST /fake/inline-additionalProperties
-     - 
-     
-     - parameter param: (body) request body 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: Any) -> RequestBuilder<Void> {
-        let path = "/fake/inline-additionalProperties"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     test json serialization of form data
-     
-     - parameter param: (form) field1 
-     - parameter param2: (form) field2 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     test json serialization of form data
-     - GET /fake/jsonFormData
-     - 
-     
-     - parameter param: (form) field1 
-     - parameter param2: (form) field2 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
-        let path = "/fake/jsonFormData"
-        let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
-            "param": param,
-            "param2": param2
-        ]
-
-        let nonNullParameters = APIHelper.rejectNil(formParams)
-        let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/FakeClassnameTags123API.swift
deleted file mode 100644
index 0e2a5670a8b..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/FakeClassnameTags123API.swift
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// FakeClassnameTags123API.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-
-
-
-open class FakeClassnameTags123API {
-    /**
-     To test class name in snake case
-     
-     - parameter body: (body) client model 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testClassnameWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     To test class name in snake case
-     - PATCH /fake_classname_test
-     - To test class name in snake case
-     - API Key:
-       - type: apiKey api_key_query (QUERY)
-       - name: api_key_query
-     - examples: [{contentType=application/json, example={
-  "client" : "client"
-}}]
-     
-     - parameter body: (body) client model 
-
-     - returns: RequestBuilder<Client> 
-     */
-    open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
-        let path = "/fake_classname_test"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift
deleted file mode 100644
index 35c9e383fa2..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// Fake_classname_tags123API.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-
-
-
-open class Fake_classname_tags123API {
-    /**
-     To test class name in snake case
-     
-     - parameter body: (body) client model 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testClassnameWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error);
-        }
-    }
-
-
-    /**
-     To test class name in snake case
-     - PATCH /fake_classname_test
-     - API Key:
-       - type: apiKey api_key_query (QUERY)
-       - name: api_key_query
-     - examples: [{contentType=application/json, example={
-  "client" : "client"
-}}]
-     
-     - parameter body: (body) client model 
-
-     - returns: RequestBuilder<Client> 
-     */
-    open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
-        let path = "/fake_classname_test"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = NSURLComponents(string: URLString)
-
-
-        let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
deleted file mode 100644
index 421bbe8e9d7..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
+++ /dev/null
@@ -1,604 +0,0 @@
-//
-// PetAPI.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-
-
-
-open class PetAPI {
-    /**
-     Add a new pet to the store
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func addPet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        addPetWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Add a new pet to the store
-     - POST /pet
-     - 
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder<Void> {
-        let path = "/pet"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Deletes a pet
-     
-     - parameter petId: (path) Pet id to delete 
-     - parameter apiKey: (header)  (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Deletes a pet
-     - DELETE /pet/{petId}
-     - 
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     
-     - parameter petId: (path) Pet id to delete 
-     - parameter apiKey: (header)  (optional)
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder<Void> {
-        var path = "/pet/{petId}"
-        let petIdPreEscape = "\(petId)"
-        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-        let nillableHeaders: [String: Any?] = [
-            "api_key": apiKey
-        ]
-        let headerParameters = APIHelper.rejectNilHeaders(nillableHeaders)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "DELETE", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false, headers: headerParameters)
-    }
-
-    /**
-     * enum for parameter status
-     */
-    public enum Status_findPetsByStatus: String { 
-        case available = "available"
-        case pending = "pending"
-        case sold = "sold"
-    }
-
-    /**
-     Finds Pets by status
-     
-     - parameter status: (query) Status values that need to be considered for filter 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func findPetsByStatus(status: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
-        findPetsByStatusWithRequestBuilder(status: status).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     Finds Pets by status
-     - GET /pet/findByStatus
-     - Multiple status values can be provided with comma separated strings
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     
-     - parameter status: (query) Status values that need to be considered for filter 
-
-     - returns: RequestBuilder<[Pet]> 
-     */
-    open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
-        let path = "/pet/findByStatus"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        var url = URLComponents(string: URLString)
-        url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "status": status
-        ])
-
-        let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Finds Pets by tags
-     
-     - parameter tags: (query) Tags to filter by 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func findPetsByTags(tags: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
-        findPetsByTagsWithRequestBuilder(tags: tags).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     Finds Pets by tags
-     - GET /pet/findByTags
-     - Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     
-     - parameter tags: (query) Tags to filter by 
-
-     - returns: RequestBuilder<[Pet]> 
-     */
-    open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
-        let path = "/pet/findByTags"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        var url = URLComponents(string: URLString)
-        url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "tags": tags
-        ])
-
-        let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Find pet by ID
-     
-     - parameter petId: (path) ID of pet to return 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func getPetById(petId: Int64, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
-        getPetByIdWithRequestBuilder(petId: petId).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     Find pet by ID
-     - GET /pet/{petId}
-     - Returns a single pet
-     - API Key:
-       - type: apiKey api_key 
-       - name: api_key
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example={
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}}]
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example={
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}}]
-     
-     - parameter petId: (path) ID of pet to return 
-
-     - returns: RequestBuilder<Pet> 
-     */
-    open class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder<Pet> {
-        var path = "/pet/{petId}"
-        let petIdPreEscape = "\(petId)"
-        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Update an existing pet
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func updatePet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        updatePetWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Update an existing pet
-     - PUT /pet
-     - 
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder<Void> {
-        let path = "/pet"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Updates a pet in the store with form data
-     
-     - parameter petId: (path) ID of pet that needs to be updated 
-     - parameter name: (form) Updated name of the pet (optional)
-     - parameter status: (form) Updated status of the pet (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Updates a pet in the store with form data
-     - POST /pet/{petId}
-     - 
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     
-     - parameter petId: (path) ID of pet that needs to be updated 
-     - parameter name: (form) Updated name of the pet (optional)
-     - parameter status: (form) Updated status of the pet (optional)
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder<Void> {
-        var path = "/pet/{petId}"
-        let petIdPreEscape = "\(petId)"
-        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
-            "name": name,
-            "status": status
-        ]
-
-        let nonNullParameters = APIHelper.rejectNil(formParams)
-        let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     uploads an image
-     
-     - parameter petId: (path) ID of pet to update 
-     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
-     - parameter file: (form) file to upload (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
-        uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     uploads an image
-     - POST /pet/{petId}/uploadImage
-     - 
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     - examples: [{contentType=application/json, example={
-  "code" : 0,
-  "type" : "type",
-  "message" : "message"
-}}]
-     
-     - parameter petId: (path) ID of pet to update 
-     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
-     - parameter file: (form) file to upload (optional)
-
-     - returns: RequestBuilder<ApiResponse> 
-     */
-    open class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder<ApiResponse> {
-        var path = "/pet/{petId}/uploadImage"
-        let petIdPreEscape = "\(petId)"
-        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
-            "additionalMetadata": additionalMetadata,
-            "file": file
-        ]
-
-        let nonNullParameters = APIHelper.rejectNil(formParams)
-        let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
deleted file mode 100644
index 571f4ef4e1e..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
+++ /dev/null
@@ -1,223 +0,0 @@
-//
-// StoreAPI.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-
-
-
-open class StoreAPI {
-    /**
-     Delete purchase order by ID
-     
-     - parameter orderId: (path) ID of the order that needs to be deleted 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func deleteOrder(orderId: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        deleteOrderWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Delete purchase order by ID
-     - DELETE /store/order/{order_id}
-     - For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     
-     - parameter orderId: (path) ID of the order that needs to be deleted 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder<Void> {
-        var path = "/store/order/{order_id}"
-        let orderIdPreEscape = "\(orderId)"
-        let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "DELETE", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Returns pet inventories by status
-     
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func getInventory(completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
-        getInventoryWithRequestBuilder().execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     Returns pet inventories by status
-     - GET /store/inventory
-     - Returns a map of status codes to quantities
-     - API Key:
-       - type: apiKey api_key 
-       - name: api_key
-     - examples: [{contentType=application/json, example={
-  "key" : 0
-}}]
-
-     - returns: RequestBuilder<[String:Int]> 
-     */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
-        let path = "/store/inventory"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Find purchase order by ID
-     
-     - parameter orderId: (path) ID of pet that needs to be fetched 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func getOrderById(orderId: Int64, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
-        getOrderByIdWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     Find purchase order by ID
-     - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     - examples: [{contentType=application/xml, example=<Order>
-  <id>123456789</id>
-  <petId>123456789</petId>
-  <quantity>123</quantity>
-  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
-  <status>aeiou</status>
-  <complete>true</complete>
-</Order>}, {contentType=application/json, example={
-  "petId" : 6,
-  "quantity" : 1,
-  "id" : 0,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
-}}]
-     - examples: [{contentType=application/xml, example=<Order>
-  <id>123456789</id>
-  <petId>123456789</petId>
-  <quantity>123</quantity>
-  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
-  <status>aeiou</status>
-  <complete>true</complete>
-</Order>}, {contentType=application/json, example={
-  "petId" : 6,
-  "quantity" : 1,
-  "id" : 0,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
-}}]
-     
-     - parameter orderId: (path) ID of pet that needs to be fetched 
-
-     - returns: RequestBuilder<Order> 
-     */
-    open class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder<Order> {
-        var path = "/store/order/{order_id}"
-        let orderIdPreEscape = "\(orderId)"
-        let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Place an order for a pet
-     
-     - parameter body: (body) order placed for purchasing the pet 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func placeOrder(body: Order, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
-        placeOrderWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     Place an order for a pet
-     - POST /store/order
-     - 
-     - examples: [{contentType=application/xml, example=<Order>
-  <id>123456789</id>
-  <petId>123456789</petId>
-  <quantity>123</quantity>
-  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
-  <status>aeiou</status>
-  <complete>true</complete>
-</Order>}, {contentType=application/json, example={
-  "petId" : 6,
-  "quantity" : 1,
-  "id" : 0,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
-}}]
-     - examples: [{contentType=application/xml, example=<Order>
-  <id>123456789</id>
-  <petId>123456789</petId>
-  <quantity>123</quantity>
-  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
-  <status>aeiou</status>
-  <complete>true</complete>
-</Order>}, {contentType=application/json, example={
-  "petId" : 6,
-  "quantity" : 1,
-  "id" : 0,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
-}}]
-     
-     - parameter body: (body) order placed for purchasing the pet 
-
-     - returns: RequestBuilder<Order> 
-     */
-    open class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder<Order> {
-        let path = "/store/order"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
deleted file mode 100644
index 028c5db34c3..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
+++ /dev/null
@@ -1,366 +0,0 @@
-//
-// UserAPI.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-
-
-
-open class UserAPI {
-    /**
-     Create user
-     
-     - parameter body: (body) Created user object 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func createUser(body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUserWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Create user
-     - POST /user
-     - This can only be done by the logged in user.
-     
-     - parameter body: (body) Created user object 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func createUserWithRequestBuilder(body: User) -> RequestBuilder<Void> {
-        let path = "/user"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Creates list of users with given input array
-     
-     - parameter body: (body) List of user object 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func createUsersWithArrayInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUsersWithArrayInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Creates list of users with given input array
-     - POST /user/createWithArray
-     - 
-     
-     - parameter body: (body) List of user object 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder<Void> {
-        let path = "/user/createWithArray"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Creates list of users with given input array
-     
-     - parameter body: (body) List of user object 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func createUsersWithListInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUsersWithListInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Creates list of users with given input array
-     - POST /user/createWithList
-     - 
-     
-     - parameter body: (body) List of user object 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder<Void> {
-        let path = "/user/createWithList"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Delete user
-     
-     - parameter username: (path) The name that needs to be deleted 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func deleteUser(username: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        deleteUserWithRequestBuilder(username: username).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Delete user
-     - DELETE /user/{username}
-     - This can only be done by the logged in user.
-     
-     - parameter username: (path) The name that needs to be deleted 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder<Void> {
-        var path = "/user/{username}"
-        let usernamePreEscape = "\(username)"
-        let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "DELETE", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Get user by user name
-     
-     - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func getUserByName(username: String, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
-        getUserByNameWithRequestBuilder(username: username).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     Get user by user name
-     - GET /user/{username}
-     - 
-     - examples: [{contentType=application/xml, example=<User>
-  <id>123456789</id>
-  <username>aeiou</username>
-  <firstName>aeiou</firstName>
-  <lastName>aeiou</lastName>
-  <email>aeiou</email>
-  <password>aeiou</password>
-  <phone>aeiou</phone>
-  <userStatus>123</userStatus>
-</User>}, {contentType=application/json, example={
-  "firstName" : "firstName",
-  "lastName" : "lastName",
-  "password" : "password",
-  "userStatus" : 6,
-  "phone" : "phone",
-  "id" : 0,
-  "email" : "email",
-  "username" : "username"
-}}]
-     - examples: [{contentType=application/xml, example=<User>
-  <id>123456789</id>
-  <username>aeiou</username>
-  <firstName>aeiou</firstName>
-  <lastName>aeiou</lastName>
-  <email>aeiou</email>
-  <password>aeiou</password>
-  <phone>aeiou</phone>
-  <userStatus>123</userStatus>
-</User>}, {contentType=application/json, example={
-  "firstName" : "firstName",
-  "lastName" : "lastName",
-  "password" : "password",
-  "userStatus" : 6,
-  "phone" : "phone",
-  "id" : 0,
-  "email" : "email",
-  "username" : "username"
-}}]
-     
-     - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
-
-     - returns: RequestBuilder<User> 
-     */
-    open class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder<User> {
-        var path = "/user/{username}"
-        let usernamePreEscape = "\(username)"
-        let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Logs user into the system
-     
-     - parameter username: (query) The user name for login 
-     - parameter password: (query) The password for login in clear text 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func loginUser(username: String, password: String, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
-        loginUserWithRequestBuilder(username: username, password: password).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-
-    /**
-     Logs user into the system
-     - GET /user/login
-     - 
-     - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
-     - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
-     - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example=""}]
-     - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example=""}]
-     
-     - parameter username: (query) The user name for login 
-     - parameter password: (query) The password for login in clear text 
-
-     - returns: RequestBuilder<String> 
-     */
-    open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
-        let path = "/user/login"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        var url = URLComponents(string: URLString)
-        url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username, 
-            "password": password
-        ])
-
-        let requestBuilder: RequestBuilder<String>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Logs out current logged in user session
-     
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func logoutUser(completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        logoutUserWithRequestBuilder().execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Logs out current logged in user session
-     - GET /user/logout
-     - 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
-        let path = "/user/logout"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Updated user
-     
-     - parameter username: (path) name that need to be deleted 
-     - parameter body: (body) Updated user object 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func updateUser(username: String, body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        updateUserWithRequestBuilder(username: username, body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-
-    /**
-     Updated user
-     - PUT /user/{username}
-     - This can only be done by the logged in user.
-     
-     - parameter username: (path) name that need to be deleted 
-     - parameter body: (body) Updated user object 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder<Void> {
-        var path = "/user/{username}"
-        let usernamePreEscape = "\(username)"
-        let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
deleted file mode 100644
index 381fddcc81f..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
+++ /dev/null
@@ -1,413 +0,0 @@
-// AlamofireImplementations.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-
-class AlamofireRequestBuilderFactory: RequestBuilderFactory {
-    func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type {
-        return AlamofireRequestBuilder<T>.self
-    }
-
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
-        return AlamofireDecodableRequestBuilder<T>.self
-    }
-}
-
-// Store manager to retain its reference
-private var managerStore: [String: Alamofire.SessionManager] = [:]
-
-open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
-        super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
-    }
-
-    /**
-     May be overridden by a subclass if you want to control the session
-     configuration.
-     */
-    open func createSessionManager() -> Alamofire.SessionManager {
-        let configuration = URLSessionConfiguration.default
-        configuration.httpAdditionalHeaders = buildHeaders()
-        return Alamofire.SessionManager(configuration: configuration)
-    }
-
-    /**
-     May be overridden by a subclass if you want to control the Content-Type
-     that is given to an uploaded form part.
-
-     Return nil to use the default behavior (inferring the Content-Type from
-     the file extension).  Return the desired Content-Type otherwise.
-     */
-    open func contentTypeForFormPart(fileURL: URL) -> String? {
-        return nil
-    }
-
-    /**
-     May be overridden by a subclass if you want to control the request
-     configuration (e.g. to override the cache policy).
-     */
-    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
-        return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
-    }
-
-    override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
-        let managerId:String = UUID().uuidString
-        // Create a new manager for each request to customize its request header
-        let manager = createSessionManager()
-        managerStore[managerId] = manager
-
-        let encoding:ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
-
-        let xMethod = Alamofire.HTTPMethod(rawValue: method)
-        let fileKeys = parameters == nil ? [] : parameters!.filter { $1 is NSURL }
-                                                           .map { $0.0 }
-
-        if fileKeys.count > 0 {
-            manager.upload(multipartFormData: { mpForm in
-                for (k, v) in self.parameters! {
-                    switch v {
-                    case let fileURL as URL:
-                        if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
-                            mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
-                        }
-                        else {
-                            mpForm.append(fileURL, withName: k)
-                        }
-                    case let string as String:
-                        mpForm.append(string.data(using: String.Encoding.utf8)!, withName: k)
-                    case let number as NSNumber:
-                        mpForm.append(number.stringValue.data(using: String.Encoding.utf8)!, withName: k)
-                    default:
-                        fatalError("Unprocessable value \(v) with key \(k)")
-                    }
-                }
-                }, to: URLString, method: xMethod!, headers: nil, encodingCompletion: { encodingResult in
-                switch encodingResult {
-                case .success(let upload, _, _):
-                    if let onProgressReady = self.onProgressReady {
-                        onProgressReady(upload.uploadProgress)
-                    }
-                    self.processRequest(request: upload, managerId, completion)
-                case .failure(let encodingError):
-                    completion(nil, ErrorResponse.error(415, nil, encodingError))
-                }
-            })
-        } else {
-            let request = makeRequest(manager: manager, method: xMethod!, encoding: encoding, headers: headers)
-            if let onProgressReady = self.onProgressReady {
-                onProgressReady(request.progress)
-            }
-            processRequest(request: request, managerId, completion)
-        }
-
-    }
-
-    fileprivate func processRequest(request: DataRequest, _ managerId: String, _ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
-        if let credential = self.credential {
-            request.authenticate(usingCredential: credential)
-        }
-
-        let cleanupRequest = {
-            _ = managerStore.removeValue(forKey: managerId)
-        }
-
-        let validatedRequest = request.validate()
-
-        switch T.self {
-        case is String.Type:
-            validatedRequest.responseString(completionHandler: { (stringResponse) in
-                cleanupRequest()
-
-                if stringResponse.result.isFailure {
-                    completion(
-                        nil,
-                        ErrorResponse.error(stringResponse.response?.statusCode ?? 500, stringResponse.data, stringResponse.result.error as Error!)
-                    )
-                    return
-                }
-
-                completion(
-                    Response(
-                        response: stringResponse.response!,
-                        body: ((stringResponse.result.value ?? "") as! T)
-                    ),
-                    nil
-                )
-            })
-        case is URL.Type:
-            validatedRequest.responseData(completionHandler: { (dataResponse) in
-                cleanupRequest()
-
-                do {
-
-                    guard !dataResponse.result.isFailure else {
-                        throw DownloadException.responseFailed
-                    }
-
-                    guard let data = dataResponse.data else {
-                        throw DownloadException.responseDataMissing
-                    }
-
-                    guard let request = request.request else {
-                        throw DownloadException.requestMissing
-                    }
-
-                    let fileManager = FileManager.default
-                    let urlRequest = try request.asURLRequest()
-                    let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
-                    let requestURL = try self.getURL(from: urlRequest)
-
-                    var requestPath = try self.getPath(from: requestURL)
-
-                    if let headerFileName = self.getFileName(fromContentDisposition: dataResponse.response?.allHeaderFields["Content-Disposition"] as? String) {
-                        requestPath = requestPath.appending("/\(headerFileName)")
-                    }
-
-                    let filePath = documentsDirectory.appendingPathComponent(requestPath)
-                    let directoryPath = filePath.deletingLastPathComponent().path
-
-                    try fileManager.createDirectory(atPath: directoryPath, withIntermediateDirectories: true, attributes: nil)
-                    try data.write(to: filePath, options: .atomic)
-
-                    completion(
-                        Response(
-                            response: dataResponse.response!,
-                            body: (filePath as! T)
-                        ),
-                        nil
-                    )
-
-                } catch let requestParserError as DownloadException {
-                    completion(nil, ErrorResponse.error(400, dataResponse.data, requestParserError))
-                } catch let error {
-                    completion(nil, ErrorResponse.error(400, dataResponse.data, error))
-                }
-                return
-            })
-        case is Void.Type:
-            validatedRequest.responseData(completionHandler: { (voidResponse) in
-                cleanupRequest()
-
-                if voidResponse.result.isFailure {
-                    completion(
-                        nil,
-                        ErrorResponse.error(voidResponse.response?.statusCode ?? 500, voidResponse.data, voidResponse.result.error!)
-                    )
-                    return
-                }
-
-                completion(
-                    Response(
-                        response: voidResponse.response!,
-                        body: nil),
-                    nil
-                )
-            })
-        default:
-            validatedRequest.responseData(completionHandler: { (dataResponse) in
-                cleanupRequest()
-
-                if dataResponse.result.isFailure {
-                    completion(
-                        nil,
-                        ErrorResponse.error(dataResponse.response?.statusCode ?? 500, dataResponse.data, dataResponse.result.error!)
-                    )
-                    return
-                }
-
-                completion(
-                    Response(
-                        response: dataResponse.response!,
-                        body: (dataResponse.data as! T)
-                    ),
-                    nil
-                )
-            })
-        }
-    }
-
-    open func buildHeaders() -> [String: String] {
-        var httpHeaders = SessionManager.defaultHTTPHeaders
-        for (key, value) in self.headers {
-            httpHeaders[key] = value
-        }
-        return httpHeaders
-    }
-
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
-
-        guard let contentDisposition = contentDisposition else {
-            return nil
-        }
-
-        let items = contentDisposition.components(separatedBy: ";")
-
-        var filename : String? = nil
-
-        for contentItem in items {
-
-            let filenameKey = "filename="
-            guard let range = contentItem.range(of: filenameKey) else {
-                break
-            }
-
-            filename = contentItem
-            return filename?
-                .replacingCharacters(in: range, with:"")
-                .replacingOccurrences(of: "\"", with: "")
-                .trimmingCharacters(in: .whitespacesAndNewlines)
-        }
-
-        return filename
-
-    }
-
-    fileprivate func getPath(from url : URL) throws -> String {
-
-        guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
-            throw DownloadException.requestMissingPath
-        }
-
-        if path.hasPrefix("/") {
-            path.remove(at: path.startIndex)
-        }
-
-        return path
-
-    }
-
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
-
-        guard let url = urlRequest.url else {
-            throw DownloadException.requestMissingURL
-        }
-
-        return url
-    }
-
-}
-
-fileprivate enum DownloadException : Error {
-    case responseDataMissing
-    case responseFailed
-    case requestMissing
-    case requestMissingPath
-    case requestMissingURL
-}
-
-public enum AlamofireDecodableRequestBuilderError: Error {
-    case emptyDataResponse
-    case nilHTTPResponse
-    case jsonDecoding(DecodingError)
-    case generalError(Error)
-}
-
-open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilder<T> {
-
-    override fileprivate func processRequest(request: DataRequest, _ managerId: String, _ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
-        if let credential = self.credential {
-            request.authenticate(usingCredential: credential)
-        }
-
-        let cleanupRequest = {
-            _ = managerStore.removeValue(forKey: managerId)
-        }
-
-        let validatedRequest = request.validate()
-
-        switch T.self {
-        case is String.Type:
-            validatedRequest.responseString(completionHandler: { (stringResponse) in
-                cleanupRequest()
-
-                if stringResponse.result.isFailure {
-                    completion(
-                        nil,
-                        ErrorResponse.error(stringResponse.response?.statusCode ?? 500, stringResponse.data, stringResponse.result.error as Error!)
-                    )
-                    return
-                }
-
-                completion(
-                    Response(
-                        response: stringResponse.response!,
-                        body: ((stringResponse.result.value ?? "") as! T)
-                    ),
-                    nil
-                )
-            })
-        case is Void.Type:
-            validatedRequest.responseData(completionHandler: { (voidResponse) in
-                cleanupRequest()
-
-                if voidResponse.result.isFailure {
-                    completion(
-                        nil,
-                        ErrorResponse.error(voidResponse.response?.statusCode ?? 500, voidResponse.data, voidResponse.result.error!)
-                    )
-                    return
-                }
-
-                completion(
-                    Response(
-                        response: voidResponse.response!,
-                        body: nil),
-                    nil
-                )
-            })
-        case is Data.Type:
-            validatedRequest.responseData(completionHandler: { (dataResponse) in
-                cleanupRequest()
-
-                if dataResponse.result.isFailure {
-                    completion(
-                        nil,
-                        ErrorResponse.error(dataResponse.response?.statusCode ?? 500, dataResponse.data, dataResponse.result.error!)
-                    )
-                    return
-                }
-
-                completion(
-                    Response(
-                        response: dataResponse.response!,
-                        body: (dataResponse.data as! T)
-                    ),
-                    nil
-                )
-            })
-        default:
-            validatedRequest.responseData(completionHandler: { (dataResponse: DataResponse<Data>) in
-                cleanupRequest()
-
-                guard dataResponse.result.isSuccess else {
-                    completion(nil, ErrorResponse.error(dataResponse.response?.statusCode ?? 500, dataResponse.data, dataResponse.result.error!))
-                    return
-                }
-
-                guard let data = dataResponse.data, !data.isEmpty else {
-                    completion(nil, ErrorResponse.error(-1, nil, AlamofireDecodableRequestBuilderError.emptyDataResponse))
-                    return
-                }
-
-                guard let httpResponse = dataResponse.response else {
-                    completion(nil, ErrorResponse.error(-2, nil, AlamofireDecodableRequestBuilderError.nilHTTPResponse))
-                    return
-                }
-
-                var responseObj: Response<T>? = nil
-
-                let decodeResult: (decodableObj: T?, error: Error?) = CodableHelper.decode(T.self, from: data)
-                if decodeResult.error == nil {
-                    responseObj = Response(response: httpResponse, body: decodeResult.decodableObj)
-                }
-
-                completion(responseObj, decodeResult.error)
-            })
-        }
-    }
-
-}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
deleted file mode 100644
index 6c1e6653b6f..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// AdditionalPropertiesClass.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct AdditionalPropertiesClass: Codable {
-
-    public var mapProperty: [String:String]?
-    public var mapOfMapProperty: [String:[String:String]]?
-
-    public init(mapProperty: [String:String]?, mapOfMapProperty: [String:[String:String]]?) {
-        self.mapProperty = mapProperty
-        self.mapOfMapProperty = mapOfMapProperty
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case mapProperty = "map_property"
-        case mapOfMapProperty = "map_of_map_property"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Animal.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Animal.swift
deleted file mode 100644
index ba2da30fedd..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Animal.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Animal.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Animal: Codable {
-
-    public var className: String
-    public var color: String?
-
-    public init(className: String, color: String?) {
-        self.className = className
-        self.color = color
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
deleted file mode 100644
index e04761ad122..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// ApiResponse.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct ApiResponse: Codable {
-
-    public var code: Int?
-    public var codeNum: NSNumber? {
-        get {
-            return code.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var type: String?
-    public var message: String?
-
-    public init(code: Int?, type: String?, message: String?) {
-        self.code = code
-        self.type = type
-        self.message = message
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
deleted file mode 100644
index 1132638458f..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// ArrayOfNumberOnly.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct ArrayOfNumberOnly: Codable {
-
-    public var arrayNumber: [Double]?
-
-    public init(arrayNumber: [Double]?) {
-        self.arrayNumber = arrayNumber
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case arrayNumber = "ArrayNumber"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
deleted file mode 100644
index 71ba400a9d7..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Capitalization.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Capitalization: Codable {
-
-    public var smallCamel: String?
-    public var capitalCamel: String?
-    public var smallSnake: String?
-    public var capitalSnake: String?
-    public var sCAETHFlowPoints: String?
-    /** Name of the pet  */
-    public var ATT_NAME: String?
-
-    public init(smallCamel: String?, capitalCamel: String?, smallSnake: String?, capitalSnake: String?, sCAETHFlowPoints: String?, ATT_NAME: String?) {
-        self.smallCamel = smallCamel
-        self.capitalCamel = capitalCamel
-        self.smallSnake = smallSnake
-        self.capitalSnake = capitalSnake
-        self.sCAETHFlowPoints = sCAETHFlowPoints
-        self.ATT_NAME = ATT_NAME
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case smallCamel
-        case capitalCamel = "CapitalCamel"
-        case smallSnake = "small_Snake"
-        case capitalSnake = "Capital_Snake"
-        case sCAETHFlowPoints = "SCA_ETH_Flow_Points"
-        case ATT_NAME
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Cat.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Cat.swift
deleted file mode 100644
index 0394e377ed8..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Cat.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Cat.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Cat: Codable {
-
-    public var className: String
-    public var color: String?
-    public var declawed: Bool?
-    public var declawedNum: NSNumber? {
-        get {
-            return declawed.map({ return NSNumber(value: $0) })
-        }
-    }
-
-    public init(className: String, color: String?, declawed: Bool?) {
-        self.className = className
-        self.color = color
-        self.declawed = declawed
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Category.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Category.swift
deleted file mode 100644
index a92890874d8..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Category.swift
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Category.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Category: Codable {
-
-    public var _id: Int64?
-    public var _idNum: NSNumber? {
-        get {
-            return _id.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var name: String?
-
-    public init(_id: Int64?, name: String?) {
-        self._id = _id
-        self.name = name
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _id = "id"
-        case name
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
deleted file mode 100644
index 3a38128215a..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// ClassModel.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-/** Model for testing model with \&quot;_class\&quot; property */
-
-public struct ClassModel: Codable {
-
-    public var _class: String?
-
-    public init(_class: String?) {
-        self._class = _class
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
deleted file mode 100644
index 084a9ab8383..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// EnumArrays.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct EnumArrays: Codable {
-
-    public enum JustSymbol: String, Codable { 
-        case greaterThanOrEqualTo = ">="
-        case dollar = "$"
-    }
-    public enum ArrayEnum: String, Codable { 
-        case fish = "fish"
-        case crab = "crab"
-    }
-    public var justSymbol: JustSymbol?
-    public var arrayEnum: [ArrayEnum]?
-
-    public init(justSymbol: JustSymbol?, arrayEnum: [ArrayEnum]?) {
-        self.justSymbol = justSymbol
-        self.arrayEnum = arrayEnum
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case justSymbol = "just_symbol"
-        case arrayEnum = "array_enum"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/EnumClass.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/EnumClass.swift
deleted file mode 100644
index d0889a3520a..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/EnumClass.swift
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// EnumClass.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-public enum EnumClass: String, Codable {
-    case abc = "_abc"
-    case efg = "-efg"
-    case xyz = "(xyz)"
-
-}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
deleted file mode 100644
index 6374df494a3..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// EnumTest.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct EnumTest: Codable {
-
-    public enum EnumString: String, Codable { 
-        case upper = "UPPER"
-        case lower = "lower"
-        case empty = ""
-    }
-    public enum EnumStringRequired: String, Codable { 
-        case upper = "UPPER"
-        case lower = "lower"
-        case empty = ""
-    }
-    public enum EnumInteger: Int, Codable { 
-        case _1 = 1
-        case number1 = -1
-    }
-    public enum EnumNumber: Double, Codable { 
-        case _11 = 1.1
-        case number12 = -1.2
-    }
-    public var enumString: EnumString?
-    public var enumStringRequired: EnumStringRequired
-    public var enumInteger: EnumInteger?
-    public var enumNumber: EnumNumber?
-    public var outerEnum: OuterEnum?
-
-    public init(enumString: EnumString?, enumStringRequired: EnumStringRequired, enumInteger: EnumInteger?, enumNumber: EnumNumber?, outerEnum: OuterEnum?) {
-        self.enumString = enumString
-        self.enumStringRequired = enumStringRequired
-        self.enumInteger = enumInteger
-        self.enumNumber = enumNumber
-        self.outerEnum = outerEnum
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case enumString = "enum_string"
-        case enumStringRequired = "enum_string_required"
-        case enumInteger = "enum_integer"
-        case enumNumber = "enum_number"
-        case outerEnum
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
deleted file mode 100644
index 123546f6317..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// FormatTest.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct FormatTest: Codable {
-
-    public var integer: Int?
-    public var integerNum: NSNumber? {
-        get {
-            return integer.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var int32: Int?
-    public var int32Num: NSNumber? {
-        get {
-            return int32.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var int64: Int64?
-    public var int64Num: NSNumber? {
-        get {
-            return int64.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var number: Double
-    public var float: Float?
-    public var floatNum: NSNumber? {
-        get {
-            return float.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var double: Double?
-    public var doubleNum: NSNumber? {
-        get {
-            return double.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var string: String?
-    public var byte: Data
-    public var binary: Data?
-    public var date: Date
-    public var dateTime: Date?
-    public var uuid: UUID?
-    public var password: String
-
-    public init(integer: Int?, int32: Int?, int64: Int64?, number: Double, float: Float?, double: Double?, string: String?, byte: Data, binary: Data?, date: Date, dateTime: Date?, uuid: UUID?, password: String) {
-        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.dateTime = dateTime
-        self.uuid = uuid
-        self.password = password
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/List.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/List.swift
deleted file mode 100644
index fe11bfce840..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/List.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// List.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct List: Codable {
-
-    public var _123List: String?
-
-    public init(_123List: String?) {
-        self._123List = _123List
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _123List = "123-list"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/MapTest.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
deleted file mode 100644
index ded3f7b1dde..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// MapTest.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct MapTest: Codable {
-
-    public enum MapOfEnumString: String, Codable { 
-        case upper = "UPPER"
-        case lower = "lower"
-    }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?) {
-        self.mapMapOfString = mapMapOfString
-        self.mapOfEnumString = mapOfEnumString
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case mapMapOfString = "map_map_of_string"
-        case mapOfEnumString = "map_of_enum_string"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
deleted file mode 100644
index c1a61cbbee7..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// Model200Response.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-/** Model for testing model name starting with number */
-
-public struct Model200Response: Codable {
-
-    public var name: Int?
-    public var nameNum: NSNumber? {
-        get {
-            return name.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var _class: String?
-
-    public init(name: Int?, _class: String?) {
-        self.name = name
-        self._class = _class
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case name
-        case _class = "class"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Name.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Name.swift
deleted file mode 100644
index f013b02f16e..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Name.swift
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Name.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-/** Model for testing model name same as property name */
-
-public struct Name: Codable {
-
-    public var name: Int
-    public var nameNum: NSNumber? {
-        get {
-            return name.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var snakeCase: Int?
-    public var snakeCaseNum: NSNumber? {
-        get {
-            return snakeCase.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var property: String?
-    public var _123Number: Int?
-    public var _123NumberNum: NSNumber? {
-        get {
-            return _123Number.map({ return NSNumber(value: $0) })
-        }
-    }
-
-    public init(name: Int, snakeCase: Int?, property: String?, _123Number: Int?) {
-        self.name = name
-        self.snakeCase = snakeCase
-        self.property = property
-        self._123Number = _123Number
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case name
-        case snakeCase = "snake_case"
-        case property
-        case _123Number = "123Number"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
deleted file mode 100644
index 06db22e9c3a..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// NumberOnly.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct NumberOnly: Codable {
-
-    public var justNumber: Double?
-
-    public init(justNumber: Double?) {
-        self.justNumber = justNumber
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case justNumber = "JustNumber"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Order.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Order.swift
deleted file mode 100644
index 48564f3ef60..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Order.swift
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Order.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Order: Codable {
-
-    public enum Status: String, Codable { 
-        case placed = "placed"
-        case approved = "approved"
-        case delivered = "delivered"
-    }
-    public var _id: Int64?
-    public var _idNum: NSNumber? {
-        get {
-            return _id.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var petId: Int64?
-    public var petIdNum: NSNumber? {
-        get {
-            return petId.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var quantity: Int?
-    public var quantityNum: NSNumber? {
-        get {
-            return quantity.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var shipDate: Date?
-    /** Order Status */
-    public var status: Status?
-    public var complete: Bool?
-    public var completeNum: NSNumber? {
-        get {
-            return complete.map({ return NSNumber(value: $0) })
-        }
-    }
-
-    public init(_id: Int64?, petId: Int64?, quantity: Int?, shipDate: Date?, status: Status?, complete: Bool?) {
-        self._id = _id
-        self.petId = petId
-        self.quantity = quantity
-        self.shipDate = shipDate
-        self.status = status
-        self.complete = complete
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _id = "id"
-        case petId
-        case quantity
-        case shipDate
-        case status
-        case complete
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterBoolean.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterBoolean.swift
deleted file mode 100644
index 204acfe70c3..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterBoolean.swift
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// OuterBoolean.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct OuterBoolean: Codable {
-
-
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterNumber.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterNumber.swift
deleted file mode 100644
index 3e3a6775a6c..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterNumber.swift
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// OuterNumber.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct OuterNumber: Codable {
-
-
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterString.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterString.swift
deleted file mode 100644
index 06ff5ccef4b..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterString.swift
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// OuterString.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct OuterString: Codable {
-
-
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Pet.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Pet.swift
deleted file mode 100644
index ac59ab68292..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Pet.swift
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Pet.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Pet: Codable {
-
-    public enum Status: String, Codable { 
-        case available = "available"
-        case pending = "pending"
-        case sold = "sold"
-    }
-    public var _id: Int64?
-    public var _idNum: NSNumber? {
-        get {
-            return _id.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var category: Category?
-    public var name: String
-    public var photoUrls: [String]
-    public var tags: [Tag]?
-    /** pet status in the store */
-    public var status: Status?
-
-    public init(_id: Int64?, category: Category?, name: String, photoUrls: [String], tags: [Tag]?, status: Status?) {
-        self._id = _id
-        self.category = category
-        self.name = name
-        self.photoUrls = photoUrls
-        self.tags = tags
-        self.status = status
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _id = "id"
-        case category
-        case name
-        case photoUrls
-        case tags
-        case status
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
deleted file mode 100644
index 6e984760cd6..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// ReadOnlyFirst.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct ReadOnlyFirst: Codable {
-
-    public var bar: String?
-    public var baz: String?
-
-    public init(bar: String?, baz: String?) {
-        self.bar = bar
-        self.baz = baz
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Return.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Return.swift
deleted file mode 100644
index 18dca782e1b..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Return.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Return.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-/** Model for testing reserved words */
-
-public struct Return: Codable {
-
-    public var _return: Int?
-    public var _returnNum: NSNumber? {
-        get {
-            return _return.map({ return NSNumber(value: $0) })
-        }
-    }
-
-    public init(_return: Int?) {
-        self._return = _return
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _return = "return"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
deleted file mode 100644
index ee5a48dce69..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// SpecialModelName.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct SpecialModelName: Codable {
-
-    public var specialPropertyName: Int64?
-    public var specialPropertyNameNum: NSNumber? {
-        get {
-            return specialPropertyName.map({ return NSNumber(value: $0) })
-        }
-    }
-
-    public init(specialPropertyName: Int64?) {
-        self.specialPropertyName = specialPropertyName
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case specialPropertyName = "$special[property.name]"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Tag.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Tag.swift
deleted file mode 100644
index 834e0c9a985..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Tag.swift
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Tag.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Tag: Codable {
-
-    public var _id: Int64?
-    public var _idNum: NSNumber? {
-        get {
-            return _id.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var name: String?
-
-    public init(_id: Int64?, name: String?) {
-        self._id = _id
-        self.name = name
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _id = "id"
-        case name
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/User.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/User.swift
deleted file mode 100644
index b6b144a5b45..00000000000
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/User.swift
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// User.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct User: Codable {
-
-    public var _id: Int64?
-    public var _idNum: NSNumber? {
-        get {
-            return _id.map({ return NSNumber(value: $0) })
-        }
-    }
-    public var username: String?
-    public var firstName: String?
-    public var lastName: String?
-    public var email: String?
-    public var password: String?
-    public var phone: String?
-    /** User Status */
-    public var userStatus: Int?
-    public var userStatusNum: NSNumber? {
-        get {
-            return userStatus.map({ return NSNumber(value: $0) })
-        }
-    }
-
-    public init(_id: Int64?, username: String?, firstName: String?, lastName: String?, email: String?, password: String?, phone: String?, userStatus: Int?) {
-        self._id = _id
-        self.username = username
-        self.firstName = firstName
-        self.lastName = lastName
-        self.email = email
-        self.password = password
-        self.phone = phone
-        self.userStatus = userStatus
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _id = "id"
-        case username
-        case firstName
-        case lastName
-        case email
-        case password
-        case phone
-        case userStatus
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/.openapi-generator/VERSION b/samples/client/petstore/swift4/promisekit/.openapi-generator/VERSION
index ad121e8340e..4395ff59232 100644
--- a/samples/client/petstore/swift4/promisekit/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift4/promisekit/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.1-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index 3a1ec7b161b..eb9c0b056f3 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -18,8 +18,8 @@ open class AnotherFakeAPI {
      - parameter client: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
+    open class func call123testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+        call123testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -30,9 +30,9 @@ open class AnotherFakeAPI {
      - parameter client: (body) client model 
      - returns: Promise<Client>
      */
-    open class func testSpecialTags( client: Client) -> Promise<Client> {
+    open class func call123testSpecialTags( client: Client) -> Promise<Client> {
         let deferred = Promise<Client>.pending()
-        testSpecialTags(client: client) { data, error in
+        call123testSpecialTags(client: client) { data, error in
             if let error = error {
                 deferred.reject(error)
             } else {
@@ -45,11 +45,11 @@ open class AnotherFakeAPI {
     /**
      To test special tags
      - PATCH /another-fake/dummy
-     - To test special tags
+     - To test special tags and operation ID starting with number
      - parameter client: (body) client model 
      - returns: RequestBuilder<Client> 
      */
-    open class func testSpecialTagsWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
+    open class func call123testSpecialTagsWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
         let path = "/another-fake/dummy"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: client)
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index f98db8cfd2b..b2cc5551ce0 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -196,6 +196,56 @@ open class FakeAPI {
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
     }
 
+    /**
+
+     - parameter fileSchemaTestClass: (body)  
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testBodyWithFileSchema(fileSchemaTestClass: FileSchemaTestClass, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        testBodyWithFileSchemaWithRequestBuilder(fileSchemaTestClass: fileSchemaTestClass).execute { (response, error) -> Void in
+            if error == nil {
+                completion((), error)
+            } else {
+                completion(nil, error)
+            }
+        }
+    }
+
+    /**
+
+     - parameter fileSchemaTestClass: (body)  
+     - returns: Promise<Void>
+     */
+    open class func testBodyWithFileSchema( fileSchemaTestClass: FileSchemaTestClass) -> Promise<Void> {
+        let deferred = Promise<Void>.pending()
+        testBodyWithFileSchema(fileSchemaTestClass: fileSchemaTestClass) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     - PUT /fake/body-with-file-schema
+     - For this test, the body for this request much reference a schema named `File`.
+     - parameter fileSchemaTestClass: (body)  
+     - returns: RequestBuilder<Void> 
+     */
+    open class func testBodyWithFileSchemaWithRequestBuilder(fileSchemaTestClass: FileSchemaTestClass) -> RequestBuilder<Void> {
+        let path = "/fake/body-with-file-schema"
+        let URLString = PetstoreClientAPI.basePath + path
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: fileSchemaTestClass)
+
+        let url = URLComponents(string: URLString)
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
+
+        return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
+    }
+
     /**
 
      - parameter query: (query)  
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 6cab307e02b..d4a83e7d6f9 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -497,4 +497,70 @@ open class PetAPI {
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
 
+    /**
+     uploads an image (required)
+     
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+        uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute { (response, error) -> Void in
+            completion(response?.body, error)
+        }
+    }
+
+    /**
+     uploads an image (required)
+     
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - returns: Promise<ApiResponse>
+     */
+    open class func uploadFileWithRequiredFile( petId: Int64,  requiredFile: URL,  additionalMetadata: String? = nil) -> Promise<ApiResponse> {
+        let deferred = Promise<ApiResponse>.pending()
+        uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     uploads an image (required)
+     - POST /fake/{petId}/uploadImageWithRequiredFile
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - returns: RequestBuilder<ApiResponse> 
+     */
+    open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder<ApiResponse> {
+        var path = "/fake/{petId}/uploadImageWithRequiredFile"
+        let petIdPreEscape = "\(petId)"
+        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
+        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        let formParams: [String:Any?] = [
+            "additionalMetadata": additionalMetadata,
+            "requiredFile": requiredFile
+        ]
+
+        let nonNullParameters = APIHelper.rejectNil(formParams)
+        let parameters = APIHelper.convertBoolToString(nonNullParameters)
+        
+        let url = URLComponents(string: URLString)
+
+        let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/File.swift
new file mode 100644
index 00000000000..c8bd1f19589
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -0,0 +1,24 @@
+//
+// File.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** Must be named &#x60;File&#x60; for test. */
+
+public struct File: Codable {
+
+    /** Test capitalization */
+    public var sourceURI: String?
+
+    public init(sourceURI: String?) {
+        self.sourceURI = sourceURI
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
new file mode 100644
index 00000000000..64d02506802
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -0,0 +1,24 @@
+//
+// FileSchemaTestClass.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+
+public struct FileSchemaTestClass: Codable {
+
+    public var file: File?
+    public var files: [File]?
+
+    public init(file: File?, files: [File]?) {
+        self.file = file
+        self.files = files
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index dfbbee8428e..2d3a45d35a0 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -17,15 +17,21 @@ public struct MapTest: Codable {
     }
     public var mapMapOfString: [String:[String:String]]?
     public var mapOfEnumString: [String:String]?
+    public var directMap: [String:Bool]?
+    public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?) {
+    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
+        self.directMap = directMap
+        self.indirectMap = indirectMap
     }
 
     public enum CodingKeys: String, CodingKey { 
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
+        case directMap = "direct_map"
+        case indirectMap = "indirect_map"
     }
 
 
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
new file mode 100644
index 00000000000..ae15e87d94b
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -0,0 +1,51 @@
+//
+// StringBooleanMap.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+
+public struct StringBooleanMap: Codable {
+
+
+    public var additionalProperties: [String:Bool] = [:]
+
+    public subscript(key: String) -> Bool? {
+        get {
+            if let value = additionalProperties[key] {
+                return value
+            }
+            return nil
+        }
+
+        set {
+            additionalProperties[key] = newValue
+        }
+    }
+
+    // Encodable protocol methods
+
+    public func encode(to encoder: Encoder) throws {
+
+        var container = encoder.container(keyedBy: String.self)
+
+        try container.encodeMap(additionalProperties)
+    }
+
+    // Decodable protocol methods
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: String.self)
+
+        var nonAdditionalPropertyKeys = Set<String>()
+        additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
+    }
+
+
+
+}
+
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/AnotherfakeAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/AnotherfakeAPI.swift
deleted file mode 100644
index df4fef717b7..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/AnotherfakeAPI.swift
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// AnotherFakeAPI.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-import PromiseKit
-
-
-
-open class AnotherFakeAPI {
-    /**
-     To test special tags
-     
-     - parameter body: (body) client model 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testSpecialTags(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testSpecialTagsWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     To test special tags
-     
-     - parameter body: (body) client model 
-     - returns: Promise<Client>
-     */
-    open class func testSpecialTags( body: Client) -> Promise<Client> {
-        let deferred = Promise<Client>.pending()
-        testSpecialTags(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     To test special tags
-     - PATCH /another-fake/dummy
-     - To test special tags
-     - examples: [{contentType=application/json, example={
-  "client" : "client"
-}}]
-     
-     - parameter body: (body) client model 
-
-     - returns: RequestBuilder<Client> 
-     */
-    open class func testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
-        let path = "/another-fake/dummy"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
deleted file mode 100644
index 5787b881851..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
+++ /dev/null
@@ -1,663 +0,0 @@
-//
-// FakeAPI.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-import PromiseKit
-
-
-
-open class FakeAPI {
-    /**
-
-     - parameter body: (body) Input boolean as post body (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func fakeOuterBooleanSerialize(body: OuterBoolean? = nil, completion: @escaping ((_ data: OuterBoolean?,_ error: Error?) -> Void)) {
-        fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-
-     - parameter body: (body) Input boolean as post body (optional)
-     - returns: Promise<OuterBoolean>
-     */
-    open class func fakeOuterBooleanSerialize( body: OuterBoolean? = nil) -> Promise<OuterBoolean> {
-        let deferred = Promise<OuterBoolean>.pending()
-        fakeOuterBooleanSerialize(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     - POST /fake/outer/boolean
-     - Test serialization of outer boolean types
-     - examples: [{contentType=application/json, example={ }}]
-     
-     - parameter body: (body) Input boolean as post body (optional)
-
-     - returns: RequestBuilder<OuterBoolean> 
-     */
-    open class func fakeOuterBooleanSerializeWithRequestBuilder(body: OuterBoolean? = nil) -> RequestBuilder<OuterBoolean> {
-        let path = "/fake/outer/boolean"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<OuterBoolean>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-
-     - parameter body: (body) Input composite as post body (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
-        fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-
-     - parameter body: (body) Input composite as post body (optional)
-     - returns: Promise<OuterComposite>
-     */
-    open class func fakeOuterCompositeSerialize( body: OuterComposite? = nil) -> Promise<OuterComposite> {
-        let deferred = Promise<OuterComposite>.pending()
-        fakeOuterCompositeSerialize(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     - POST /fake/outer/composite
-     - Test serialization of object with outer number type
-     - examples: [{contentType=application/json, example={
-  "my_string" : { },
-  "my_number" : { },
-  "my_boolean" : { }
-}}]
-     
-     - parameter body: (body) Input composite as post body (optional)
-
-     - returns: RequestBuilder<OuterComposite> 
-     */
-    open class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder<OuterComposite> {
-        let path = "/fake/outer/composite"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<OuterComposite>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-
-     - parameter body: (body) Input number as post body (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func fakeOuterNumberSerialize(body: OuterNumber? = nil, completion: @escaping ((_ data: OuterNumber?,_ error: Error?) -> Void)) {
-        fakeOuterNumberSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-
-     - parameter body: (body) Input number as post body (optional)
-     - returns: Promise<OuterNumber>
-     */
-    open class func fakeOuterNumberSerialize( body: OuterNumber? = nil) -> Promise<OuterNumber> {
-        let deferred = Promise<OuterNumber>.pending()
-        fakeOuterNumberSerialize(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     - POST /fake/outer/number
-     - Test serialization of outer number types
-     - examples: [{contentType=application/json, example={ }}]
-     
-     - parameter body: (body) Input number as post body (optional)
-
-     - returns: RequestBuilder<OuterNumber> 
-     */
-    open class func fakeOuterNumberSerializeWithRequestBuilder(body: OuterNumber? = nil) -> RequestBuilder<OuterNumber> {
-        let path = "/fake/outer/number"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<OuterNumber>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-
-     - parameter body: (body) Input string as post body (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func fakeOuterStringSerialize(body: OuterString? = nil, completion: @escaping ((_ data: OuterString?,_ error: Error?) -> Void)) {
-        fakeOuterStringSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-
-     - parameter body: (body) Input string as post body (optional)
-     - returns: Promise<OuterString>
-     */
-    open class func fakeOuterStringSerialize( body: OuterString? = nil) -> Promise<OuterString> {
-        let deferred = Promise<OuterString>.pending()
-        fakeOuterStringSerialize(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     - POST /fake/outer/string
-     - Test serialization of outer string types
-     - examples: [{contentType=application/json, example={ }}]
-     
-     - parameter body: (body) Input string as post body (optional)
-
-     - returns: RequestBuilder<OuterString> 
-     */
-    open class func fakeOuterStringSerializeWithRequestBuilder(body: OuterString? = nil) -> RequestBuilder<OuterString> {
-        let path = "/fake/outer/string"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<OuterString>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     To test \"client\" model
-     
-     - parameter body: (body) client model 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testClientModel(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testClientModelWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     To test \"client\" model
-     
-     - parameter body: (body) client model 
-     - returns: Promise<Client>
-     */
-    open class func testClientModel( body: Client) -> Promise<Client> {
-        let deferred = Promise<Client>.pending()
-        testClientModel(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     To test \"client\" model
-     - PATCH /fake
-     - To test \"client\" model
-     - examples: [{contentType=application/json, example={
-  "client" : "client"
-}}]
-     
-     - parameter body: (body) client model 
-
-     - returns: RequestBuilder<Client> 
-     */
-    open class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
-        let path = "/fake"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     
-     - parameter number: (form) None 
-     - parameter double: (form) None 
-     - parameter patternWithoutDelimiter: (form) None 
-     - parameter byte: (form) None 
-     - parameter integer: (form) None (optional)
-     - parameter int32: (form) None (optional)
-     - parameter int64: (form) None (optional)
-     - parameter float: (form) None (optional)
-     - parameter string: (form) None (optional)
-     - parameter binary: (form) None (optional)
-     - parameter date: (form) None (optional)
-     - parameter dateTime: (form) None (optional)
-     - parameter password: (form) None (optional)
-     - parameter callback: (form) None (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     
-     - parameter number: (form) None 
-     - parameter double: (form) None 
-     - parameter patternWithoutDelimiter: (form) None 
-     - parameter byte: (form) None 
-     - parameter integer: (form) None (optional)
-     - parameter int32: (form) None (optional)
-     - parameter int64: (form) None (optional)
-     - parameter float: (form) None (optional)
-     - parameter string: (form) None (optional)
-     - parameter binary: (form) None (optional)
-     - parameter date: (form) None (optional)
-     - parameter dateTime: (form) None (optional)
-     - parameter password: (form) None (optional)
-     - parameter callback: (form) None (optional)
-     - returns: Promise<Void>
-     */
-    open class func testEndpointParameters( number: Double,  double: Double,  patternWithoutDelimiter: String,  byte: Data,  integer: Int? = nil,  int32: Int? = nil,  int64: Int64? = nil,  float: Float? = nil,  string: String? = nil,  binary: Data? = nil,  date: Date? = nil,  dateTime: Date? = nil,  password: String? = nil,  callback: String? = nil) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     - POST /fake
-     - Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     - BASIC:
-       - type: basic
-       - name: http_basic_test
-     
-     - parameter number: (form) None 
-     - parameter double: (form) None 
-     - parameter patternWithoutDelimiter: (form) None 
-     - parameter byte: (form) None 
-     - parameter integer: (form) None (optional)
-     - parameter int32: (form) None (optional)
-     - parameter int64: (form) None (optional)
-     - parameter float: (form) None (optional)
-     - parameter string: (form) None (optional)
-     - parameter binary: (form) None (optional)
-     - parameter date: (form) None (optional)
-     - parameter dateTime: (form) None (optional)
-     - parameter password: (form) None (optional)
-     - parameter callback: (form) None (optional)
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
-        let path = "/fake"
-        let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
-            "integer": integer?.encodeToJSON(),
-            "int32": int32?.encodeToJSON(),
-            "int64": int64?.encodeToJSON(),
-            "number": number,
-            "float": float,
-            "double": double,
-            "string": string,
-            "pattern_without_delimiter": patternWithoutDelimiter,
-            "byte": byte,
-            "binary": binary,
-            "date": date?.encodeToJSON(),
-            "dateTime": dateTime?.encodeToJSON(),
-            "password": password,
-            "callback": callback
-        ]
-
-        let nonNullParameters = APIHelper.rejectNil(formParams)
-        let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     * enum for parameter enumFormStringArray
-     */
-    public enum EnumFormStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
-    }
-
-    /**
-     * enum for parameter enumFormString
-     */
-    public enum EnumFormString_testEnumParameters: String { 
-        case abc = "_abc"
-        case efg = "-efg"
-        case xyz = "(xyz)"
-    }
-
-    /**
-     * enum for parameter enumHeaderStringArray
-     */
-    public enum EnumHeaderStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
-    }
-
-    /**
-     * enum for parameter enumHeaderString
-     */
-    public enum EnumHeaderString_testEnumParameters: String { 
-        case abc = "_abc"
-        case efg = "-efg"
-        case xyz = "(xyz)"
-    }
-
-    /**
-     * enum for parameter enumQueryStringArray
-     */
-    public enum EnumQueryStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
-    }
-
-    /**
-     * enum for parameter enumQueryString
-     */
-    public enum EnumQueryString_testEnumParameters: String { 
-        case abc = "_abc"
-        case efg = "-efg"
-        case xyz = "(xyz)"
-    }
-
-    /**
-     * enum for parameter enumQueryInteger
-     */
-    public enum EnumQueryInteger_testEnumParameters: Int { 
-        case _1 = 1
-        case number2 = -2
-    }
-
-    /**
-     * enum for parameter enumQueryDouble
-     */
-    public enum EnumQueryDouble_testEnumParameters: Double { 
-        case _11 = 1.1
-        case number12 = -1.2
-    }
-
-    /**
-     To test enum parameters
-     
-     - parameter enumFormStringArray: (form) Form parameter enum test (string array) (optional)
-     - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to -efg)
-     - parameter enumHeaderStringArray: (header) Header parameter enum test (string array) (optional)
-     - parameter enumHeaderString: (header) Header parameter enum test (string) (optional, default to -efg)
-     - parameter enumQueryStringArray: (query) Query parameter enum test (string array) (optional)
-     - parameter enumQueryString: (query) Query parameter enum test (string) (optional, default to -efg)
-     - parameter enumQueryInteger: (query) Query parameter enum test (double) (optional)
-     - parameter enumQueryDouble: (form) Query parameter enum test (double) (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testEnumParameters(enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testEnumParametersWithRequestBuilder(enumFormStringArray: enumFormStringArray, enumFormString: enumFormString, enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     To test enum parameters
-     
-     - parameter enumFormStringArray: (form) Form parameter enum test (string array) (optional)
-     - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to -efg)
-     - parameter enumHeaderStringArray: (header) Header parameter enum test (string array) (optional)
-     - parameter enumHeaderString: (header) Header parameter enum test (string) (optional, default to -efg)
-     - parameter enumQueryStringArray: (query) Query parameter enum test (string array) (optional)
-     - parameter enumQueryString: (query) Query parameter enum test (string) (optional, default to -efg)
-     - parameter enumQueryInteger: (query) Query parameter enum test (double) (optional)
-     - parameter enumQueryDouble: (form) Query parameter enum test (double) (optional)
-     - returns: Promise<Void>
-     */
-    open class func testEnumParameters( enumFormStringArray: [String]? = nil,  enumFormString: EnumFormString_testEnumParameters? = nil,  enumHeaderStringArray: [String]? = nil,  enumHeaderString: EnumHeaderString_testEnumParameters? = nil,  enumQueryStringArray: [String]? = nil,  enumQueryString: EnumQueryString_testEnumParameters? = nil,  enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil,  enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        testEnumParameters(enumFormStringArray: enumFormStringArray, enumFormString: enumFormString, enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     To test enum parameters
-     - GET /fake
-     - To test enum parameters
-     
-     - parameter enumFormStringArray: (form) Form parameter enum test (string array) (optional)
-     - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to -efg)
-     - parameter enumHeaderStringArray: (header) Header parameter enum test (string array) (optional)
-     - parameter enumHeaderString: (header) Header parameter enum test (string) (optional, default to -efg)
-     - parameter enumQueryStringArray: (query) Query parameter enum test (string array) (optional)
-     - parameter enumQueryString: (query) Query parameter enum test (string) (optional, default to -efg)
-     - parameter enumQueryInteger: (query) Query parameter enum test (double) (optional)
-     - parameter enumQueryDouble: (form) Query parameter enum test (double) (optional)
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func testEnumParametersWithRequestBuilder(enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil) -> RequestBuilder<Void> {
-        let path = "/fake"
-        let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
-            "enum_form_string_array": enumFormStringArray,
-            "enum_form_string": enumFormString?.rawValue,
-            "enum_query_double": enumQueryDouble?.rawValue
-        ]
-
-        let nonNullParameters = APIHelper.rejectNil(formParams)
-        let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
-        var url = URLComponents(string: URLString)
-        url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray, 
-            "enum_query_string": enumQueryString?.rawValue, 
-            "enum_query_integer": enumQueryInteger?.rawValue
-        ])
-        let nillableHeaders: [String: Any?] = [
-            "enum_header_string_array": enumHeaderStringArray,
-            "enum_header_string": enumHeaderString?.rawValue
-        ]
-        let headerParameters = APIHelper.rejectNilHeaders(nillableHeaders)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false, headers: headerParameters)
-    }
-
-    /**
-     test inline additionalProperties
-     
-     - parameter param: (body) request body 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testInlineAdditionalProperties(param: Any, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     test inline additionalProperties
-     
-     - parameter param: (body) request body 
-     - returns: Promise<Void>
-     */
-    open class func testInlineAdditionalProperties( param: Any) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        testInlineAdditionalProperties(param: param) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     test inline additionalProperties
-     - POST /fake/inline-additionalProperties
-     - 
-     
-     - parameter param: (body) request body 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: Any) -> RequestBuilder<Void> {
-        let path = "/fake/inline-additionalProperties"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     test json serialization of form data
-     
-     - parameter param: (form) field1 
-     - parameter param2: (form) field2 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     test json serialization of form data
-     
-     - parameter param: (form) field1 
-     - parameter param2: (form) field2 
-     - returns: Promise<Void>
-     */
-    open class func testJsonFormData( param: String,  param2: String) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        testJsonFormData(param: param, param2: param2) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     test json serialization of form data
-     - GET /fake/jsonFormData
-     - 
-     
-     - parameter param: (form) field1 
-     - parameter param2: (form) field2 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
-        let path = "/fake/jsonFormData"
-        let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
-            "param": param,
-            "param2": param2
-        ]
-
-        let nonNullParameters = APIHelper.rejectNil(formParams)
-        let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeClassnameTags123API.swift
deleted file mode 100644
index 45952a31909..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeClassnameTags123API.swift
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// FakeClassnameTags123API.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-import PromiseKit
-
-
-
-open class FakeClassnameTags123API {
-    /**
-     To test class name in snake case
-     
-     - parameter body: (body) client model 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testClassnameWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     To test class name in snake case
-     
-     - parameter body: (body) client model 
-     - returns: Promise<Client>
-     */
-    open class func testClassname( body: Client) -> Promise<Client> {
-        let deferred = Promise<Client>.pending()
-        testClassname(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     To test class name in snake case
-     - PATCH /fake_classname_test
-     - To test class name in snake case
-     - API Key:
-       - type: apiKey api_key_query (QUERY)
-       - name: api_key_query
-     - examples: [{contentType=application/json, example={
-  "client" : "client"
-}}]
-     
-     - parameter body: (body) client model 
-
-     - returns: RequestBuilder<Client> 
-     */
-    open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
-        let path = "/fake_classname_test"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift
deleted file mode 100644
index b86817039ed..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Fake_classname_tags123API.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-import PromiseKit
-
-
-
-open class Fake_classname_tags123API {
-    /**
-     To test class name in snake case
-     
-     - parameter body: (body) client model 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testClassnameWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error);
-        }
-    }
-
-    /**
-     To test class name in snake case
-     
-     - parameter body: (body) client model 
-     - returns: Promise<Client>
-     */
-    open class func testClassname( body: Client) -> Promise<Client> {
-        let deferred = Promise<Client>.pending()
-        testClassname(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     To test class name in snake case
-     - PATCH /fake_classname_test
-     - API Key:
-       - type: apiKey api_key_query (QUERY)
-       - name: api_key_query
-     - examples: [{contentType=application/json, example={
-  "client" : "client"
-}}]
-     
-     - parameter body: (body) client model 
-
-     - returns: RequestBuilder<Client> 
-     */
-    open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
-        let path = "/fake_classname_test"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = NSURLComponents(string: URLString)
-
-
-        let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
deleted file mode 100644
index 0aa9e65a314..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
+++ /dev/null
@@ -1,746 +0,0 @@
-//
-// PetAPI.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-import PromiseKit
-
-
-
-open class PetAPI {
-    /**
-     Add a new pet to the store
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func addPet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        addPetWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Add a new pet to the store
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-     - returns: Promise<Void>
-     */
-    open class func addPet( body: Pet) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        addPet(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Add a new pet to the store
-     - POST /pet
-     - 
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder<Void> {
-        let path = "/pet"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Deletes a pet
-     
-     - parameter petId: (path) Pet id to delete 
-     - parameter apiKey: (header)  (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Deletes a pet
-     
-     - parameter petId: (path) Pet id to delete 
-     - parameter apiKey: (header)  (optional)
-     - returns: Promise<Void>
-     */
-    open class func deletePet( petId: Int64,  apiKey: String? = nil) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        deletePet(petId: petId, apiKey: apiKey) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Deletes a pet
-     - DELETE /pet/{petId}
-     - 
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     
-     - parameter petId: (path) Pet id to delete 
-     - parameter apiKey: (header)  (optional)
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder<Void> {
-        var path = "/pet/{petId}"
-        let petIdPreEscape = "\(petId)"
-        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-        let nillableHeaders: [String: Any?] = [
-            "api_key": apiKey
-        ]
-        let headerParameters = APIHelper.rejectNilHeaders(nillableHeaders)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "DELETE", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false, headers: headerParameters)
-    }
-
-    /**
-     * enum for parameter status
-     */
-    public enum Status_findPetsByStatus: String { 
-        case available = "available"
-        case pending = "pending"
-        case sold = "sold"
-    }
-
-    /**
-     Finds Pets by status
-     
-     - parameter status: (query) Status values that need to be considered for filter 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func findPetsByStatus(status: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
-        findPetsByStatusWithRequestBuilder(status: status).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     Finds Pets by status
-     
-     - parameter status: (query) Status values that need to be considered for filter 
-     - returns: Promise<[Pet]>
-     */
-    open class func findPetsByStatus( status: [String]) -> Promise<[Pet]> {
-        let deferred = Promise<[Pet]>.pending()
-        findPetsByStatus(status: status) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Finds Pets by status
-     - GET /pet/findByStatus
-     - Multiple status values can be provided with comma separated strings
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     
-     - parameter status: (query) Status values that need to be considered for filter 
-
-     - returns: RequestBuilder<[Pet]> 
-     */
-    open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
-        let path = "/pet/findByStatus"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        var url = URLComponents(string: URLString)
-        url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "status": status
-        ])
-
-        let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Finds Pets by tags
-     
-     - parameter tags: (query) Tags to filter by 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func findPetsByTags(tags: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
-        findPetsByTagsWithRequestBuilder(tags: tags).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     Finds Pets by tags
-     
-     - parameter tags: (query) Tags to filter by 
-     - returns: Promise<[Pet]>
-     */
-    open class func findPetsByTags( tags: [String]) -> Promise<[Pet]> {
-        let deferred = Promise<[Pet]>.pending()
-        findPetsByTags(tags: tags) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Finds Pets by tags
-     - GET /pet/findByTags
-     - Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     
-     - parameter tags: (query) Tags to filter by 
-
-     - returns: RequestBuilder<[Pet]> 
-     */
-    open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
-        let path = "/pet/findByTags"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        var url = URLComponents(string: URLString)
-        url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "tags": tags
-        ])
-
-        let requestBuilder: RequestBuilder<[Pet]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Find pet by ID
-     
-     - parameter petId: (path) ID of pet to return 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func getPetById(petId: Int64, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
-        getPetByIdWithRequestBuilder(petId: petId).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     Find pet by ID
-     
-     - parameter petId: (path) ID of pet to return 
-     - returns: Promise<Pet>
-     */
-    open class func getPetById( petId: Int64) -> Promise<Pet> {
-        let deferred = Promise<Pet>.pending()
-        getPetById(petId: petId) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Find pet by ID
-     - GET /pet/{petId}
-     - Returns a single pet
-     - API Key:
-       - type: apiKey api_key 
-       - name: api_key
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example={
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}}]
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example={
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}}]
-     
-     - parameter petId: (path) ID of pet to return 
-
-     - returns: RequestBuilder<Pet> 
-     */
-    open class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder<Pet> {
-        var path = "/pet/{petId}"
-        let petIdPreEscape = "\(petId)"
-        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Update an existing pet
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func updatePet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        updatePetWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Update an existing pet
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-     - returns: Promise<Void>
-     */
-    open class func updatePet( body: Pet) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        updatePet(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Update an existing pet
-     - PUT /pet
-     - 
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder<Void> {
-        let path = "/pet"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Updates a pet in the store with form data
-     
-     - parameter petId: (path) ID of pet that needs to be updated 
-     - parameter name: (form) Updated name of the pet (optional)
-     - parameter status: (form) Updated status of the pet (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Updates a pet in the store with form data
-     
-     - parameter petId: (path) ID of pet that needs to be updated 
-     - parameter name: (form) Updated name of the pet (optional)
-     - parameter status: (form) Updated status of the pet (optional)
-     - returns: Promise<Void>
-     */
-    open class func updatePetWithForm( petId: Int64,  name: String? = nil,  status: String? = nil) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        updatePetWithForm(petId: petId, name: name, status: status) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Updates a pet in the store with form data
-     - POST /pet/{petId}
-     - 
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     
-     - parameter petId: (path) ID of pet that needs to be updated 
-     - parameter name: (form) Updated name of the pet (optional)
-     - parameter status: (form) Updated status of the pet (optional)
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder<Void> {
-        var path = "/pet/{petId}"
-        let petIdPreEscape = "\(petId)"
-        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
-            "name": name,
-            "status": status
-        ]
-
-        let nonNullParameters = APIHelper.rejectNil(formParams)
-        let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     uploads an image
-     
-     - parameter petId: (path) ID of pet to update 
-     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
-     - parameter file: (form) file to upload (optional)
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
-        uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     uploads an image
-     
-     - parameter petId: (path) ID of pet to update 
-     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
-     - parameter file: (form) file to upload (optional)
-     - returns: Promise<ApiResponse>
-     */
-    open class func uploadFile( petId: Int64,  additionalMetadata: String? = nil,  file: URL? = nil) -> Promise<ApiResponse> {
-        let deferred = Promise<ApiResponse>.pending()
-        uploadFile(petId: petId, additionalMetadata: additionalMetadata, file: file) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     uploads an image
-     - POST /pet/{petId}/uploadImage
-     - 
-     - OAuth:
-       - type: oauth2
-       - name: petstore_auth
-     - examples: [{contentType=application/json, example={
-  "code" : 0,
-  "type" : "type",
-  "message" : "message"
-}}]
-     
-     - parameter petId: (path) ID of pet to update 
-     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
-     - parameter file: (form) file to upload (optional)
-
-     - returns: RequestBuilder<ApiResponse> 
-     */
-    open class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder<ApiResponse> {
-        var path = "/pet/{petId}/uploadImage"
-        let petIdPreEscape = "\(petId)"
-        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
-            "additionalMetadata": additionalMetadata,
-            "file": file
-        ]
-
-        let nonNullParameters = APIHelper.rejectNil(formParams)
-        let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
deleted file mode 100644
index ed43f65b6a7..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
+++ /dev/null
@@ -1,291 +0,0 @@
-//
-// StoreAPI.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-import PromiseKit
-
-
-
-open class StoreAPI {
-    /**
-     Delete purchase order by ID
-     
-     - parameter orderId: (path) ID of the order that needs to be deleted 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func deleteOrder(orderId: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        deleteOrderWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Delete purchase order by ID
-     
-     - parameter orderId: (path) ID of the order that needs to be deleted 
-     - returns: Promise<Void>
-     */
-    open class func deleteOrder( orderId: String) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        deleteOrder(orderId: orderId) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Delete purchase order by ID
-     - DELETE /store/order/{order_id}
-     - For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     
-     - parameter orderId: (path) ID of the order that needs to be deleted 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder<Void> {
-        var path = "/store/order/{order_id}"
-        let orderIdPreEscape = "\(orderId)"
-        let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "DELETE", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Returns pet inventories by status
-     
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func getInventory(completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
-        getInventoryWithRequestBuilder().execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     Returns pet inventories by status
-     
-     - returns: Promise<[String:Int]>
-     */
-    open class func getInventory() -> Promise<[String:Int]> {
-        let deferred = Promise<[String:Int]>.pending()
-        getInventory() { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Returns pet inventories by status
-     - GET /store/inventory
-     - Returns a map of status codes to quantities
-     - API Key:
-       - type: apiKey api_key 
-       - name: api_key
-     - examples: [{contentType=application/json, example={
-  "key" : 0
-}}]
-
-     - returns: RequestBuilder<[String:Int]> 
-     */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
-        let path = "/store/inventory"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Find purchase order by ID
-     
-     - parameter orderId: (path) ID of pet that needs to be fetched 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func getOrderById(orderId: Int64, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
-        getOrderByIdWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     Find purchase order by ID
-     
-     - parameter orderId: (path) ID of pet that needs to be fetched 
-     - returns: Promise<Order>
-     */
-    open class func getOrderById( orderId: Int64) -> Promise<Order> {
-        let deferred = Promise<Order>.pending()
-        getOrderById(orderId: orderId) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Find purchase order by ID
-     - GET /store/order/{order_id}
-     - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     - examples: [{contentType=application/xml, example=<Order>
-  <id>123456789</id>
-  <petId>123456789</petId>
-  <quantity>123</quantity>
-  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
-  <status>aeiou</status>
-  <complete>true</complete>
-</Order>}, {contentType=application/json, example={
-  "petId" : 6,
-  "quantity" : 1,
-  "id" : 0,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
-}}]
-     - examples: [{contentType=application/xml, example=<Order>
-  <id>123456789</id>
-  <petId>123456789</petId>
-  <quantity>123</quantity>
-  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
-  <status>aeiou</status>
-  <complete>true</complete>
-</Order>}, {contentType=application/json, example={
-  "petId" : 6,
-  "quantity" : 1,
-  "id" : 0,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
-}}]
-     
-     - parameter orderId: (path) ID of pet that needs to be fetched 
-
-     - returns: RequestBuilder<Order> 
-     */
-    open class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder<Order> {
-        var path = "/store/order/{order_id}"
-        let orderIdPreEscape = "\(orderId)"
-        let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Place an order for a pet
-     
-     - parameter body: (body) order placed for purchasing the pet 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func placeOrder(body: Order, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
-        placeOrderWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     Place an order for a pet
-     
-     - parameter body: (body) order placed for purchasing the pet 
-     - returns: Promise<Order>
-     */
-    open class func placeOrder( body: Order) -> Promise<Order> {
-        let deferred = Promise<Order>.pending()
-        placeOrder(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Place an order for a pet
-     - POST /store/order
-     - 
-     - examples: [{contentType=application/xml, example=<Order>
-  <id>123456789</id>
-  <petId>123456789</petId>
-  <quantity>123</quantity>
-  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
-  <status>aeiou</status>
-  <complete>true</complete>
-</Order>}, {contentType=application/json, example={
-  "petId" : 6,
-  "quantity" : 1,
-  "id" : 0,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
-}}]
-     - examples: [{contentType=application/xml, example=<Order>
-  <id>123456789</id>
-  <petId>123456789</petId>
-  <quantity>123</quantity>
-  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
-  <status>aeiou</status>
-  <complete>true</complete>
-</Order>}, {contentType=application/json, example={
-  "petId" : 6,
-  "quantity" : 1,
-  "id" : 0,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
-}}]
-     
-     - parameter body: (body) order placed for purchasing the pet 
-
-     - returns: RequestBuilder<Order> 
-     */
-    open class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder<Order> {
-        let path = "/store/order"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
deleted file mode 100644
index b3c4f9328d6..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
+++ /dev/null
@@ -1,504 +0,0 @@
-//
-// UserAPI.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-import PromiseKit
-
-
-
-open class UserAPI {
-    /**
-     Create user
-     
-     - parameter body: (body) Created user object 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func createUser(body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUserWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Create user
-     
-     - parameter body: (body) Created user object 
-     - returns: Promise<Void>
-     */
-    open class func createUser( body: User) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        createUser(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Create user
-     - POST /user
-     - This can only be done by the logged in user.
-     
-     - parameter body: (body) Created user object 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func createUserWithRequestBuilder(body: User) -> RequestBuilder<Void> {
-        let path = "/user"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Creates list of users with given input array
-     
-     - parameter body: (body) List of user object 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func createUsersWithArrayInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUsersWithArrayInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Creates list of users with given input array
-     
-     - parameter body: (body) List of user object 
-     - returns: Promise<Void>
-     */
-    open class func createUsersWithArrayInput( body: [User]) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        createUsersWithArrayInput(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Creates list of users with given input array
-     - POST /user/createWithArray
-     - 
-     
-     - parameter body: (body) List of user object 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder<Void> {
-        let path = "/user/createWithArray"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Creates list of users with given input array
-     
-     - parameter body: (body) List of user object 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func createUsersWithListInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUsersWithListInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Creates list of users with given input array
-     
-     - parameter body: (body) List of user object 
-     - returns: Promise<Void>
-     */
-    open class func createUsersWithListInput( body: [User]) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        createUsersWithListInput(body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Creates list of users with given input array
-     - POST /user/createWithList
-     - 
-     
-     - parameter body: (body) List of user object 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder<Void> {
-        let path = "/user/createWithList"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-    /**
-     Delete user
-     
-     - parameter username: (path) The name that needs to be deleted 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func deleteUser(username: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        deleteUserWithRequestBuilder(username: username).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Delete user
-     
-     - parameter username: (path) The name that needs to be deleted 
-     - returns: Promise<Void>
-     */
-    open class func deleteUser( username: String) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        deleteUser(username: username) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Delete user
-     - DELETE /user/{username}
-     - This can only be done by the logged in user.
-     
-     - parameter username: (path) The name that needs to be deleted 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder<Void> {
-        var path = "/user/{username}"
-        let usernamePreEscape = "\(username)"
-        let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "DELETE", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Get user by user name
-     
-     - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func getUserByName(username: String, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
-        getUserByNameWithRequestBuilder(username: username).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     Get user by user name
-     
-     - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
-     - returns: Promise<User>
-     */
-    open class func getUserByName( username: String) -> Promise<User> {
-        let deferred = Promise<User>.pending()
-        getUserByName(username: username) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Get user by user name
-     - GET /user/{username}
-     - 
-     - examples: [{contentType=application/xml, example=<User>
-  <id>123456789</id>
-  <username>aeiou</username>
-  <firstName>aeiou</firstName>
-  <lastName>aeiou</lastName>
-  <email>aeiou</email>
-  <password>aeiou</password>
-  <phone>aeiou</phone>
-  <userStatus>123</userStatus>
-</User>}, {contentType=application/json, example={
-  "firstName" : "firstName",
-  "lastName" : "lastName",
-  "password" : "password",
-  "userStatus" : 6,
-  "phone" : "phone",
-  "id" : 0,
-  "email" : "email",
-  "username" : "username"
-}}]
-     - examples: [{contentType=application/xml, example=<User>
-  <id>123456789</id>
-  <username>aeiou</username>
-  <firstName>aeiou</firstName>
-  <lastName>aeiou</lastName>
-  <email>aeiou</email>
-  <password>aeiou</password>
-  <phone>aeiou</phone>
-  <userStatus>123</userStatus>
-</User>}, {contentType=application/json, example={
-  "firstName" : "firstName",
-  "lastName" : "lastName",
-  "password" : "password",
-  "userStatus" : 6,
-  "phone" : "phone",
-  "id" : 0,
-  "email" : "email",
-  "username" : "username"
-}}]
-     
-     - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
-
-     - returns: RequestBuilder<User> 
-     */
-    open class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder<User> {
-        var path = "/user/{username}"
-        let usernamePreEscape = "\(username)"
-        let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Logs user into the system
-     
-     - parameter username: (query) The user name for login 
-     - parameter password: (query) The password for login in clear text 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func loginUser(username: String, password: String, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
-        loginUserWithRequestBuilder(username: username, password: password).execute { (response, error) -> Void in
-            completion(response?.body, error)
-        }
-    }
-
-    /**
-     Logs user into the system
-     
-     - parameter username: (query) The user name for login 
-     - parameter password: (query) The password for login in clear text 
-     - returns: Promise<String>
-     */
-    open class func loginUser( username: String,  password: String) -> Promise<String> {
-        let deferred = Promise<String>.pending()
-        loginUser(username: username, password: password) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Logs user into the system
-     - GET /user/login
-     - 
-     - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
-     - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
-     - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example=""}]
-     - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example=""}]
-     
-     - parameter username: (query) The user name for login 
-     - parameter password: (query) The password for login in clear text 
-
-     - returns: RequestBuilder<String> 
-     */
-    open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
-        let path = "/user/login"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        var url = URLComponents(string: URLString)
-        url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username, 
-            "password": password
-        ])
-
-        let requestBuilder: RequestBuilder<String>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Logs out current logged in user session
-     
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func logoutUser(completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        logoutUserWithRequestBuilder().execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Logs out current logged in user session
-     
-     - returns: Promise<Void>
-     */
-    open class func logoutUser() -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        logoutUser() { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Logs out current logged in user session
-     - GET /user/logout
-     - 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
-        let path = "/user/logout"
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
-    }
-
-    /**
-     Updated user
-     
-     - parameter username: (path) name that need to be deleted 
-     - parameter body: (body) Updated user object 
-     - parameter completion: completion handler to receive the data and the error objects
-     */
-    open class func updateUser(username: String, body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        updateUserWithRequestBuilder(username: username, body: body).execute { (response, error) -> Void in
-            if error == nil {
-                completion((), error)
-            } else {
-                completion(nil, error)
-            }
-        }
-    }
-
-    /**
-     Updated user
-     
-     - parameter username: (path) name that need to be deleted 
-     - parameter body: (body) Updated user object 
-     - returns: Promise<Void>
-     */
-    open class func updateUser( username: String,  body: User) -> Promise<Void> {
-        let deferred = Promise<Void>.pending()
-        updateUser(username: username, body: body) { data, error in
-            if let error = error {
-                deferred.reject(error)
-            } else {
-                deferred.fulfill(data!)
-            }
-        }
-        return deferred.promise
-    }
-
-    /**
-     Updated user
-     - PUT /user/{username}
-     - This can only be done by the logged in user.
-     
-     - parameter username: (path) name that need to be deleted 
-     - parameter body: (body) Updated user object 
-
-     - returns: RequestBuilder<Void> 
-     */
-    open class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder<Void> {
-        var path = "/user/{username}"
-        let usernamePreEscape = "\(username)"
-        let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
-        path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
-        let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
-
-        let url = URLComponents(string: URLString)
-
-        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
-
-        return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/CodableHelper.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/CodableHelper.swift
deleted file mode 100644
index 323715c5f94..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/CodableHelper.swift
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// CodableHelper.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-public typealias EncodeResult = (data: Data?, error: Error?)
-
-open class CodableHelper {
-
-    open static var dateformatter: DateFormatter?
-
-    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
-        var returnedDecodable: T? = nil
-        var returnedError: Error? = nil
-
-        let decoder = JSONDecoder()
-        if let df = self.dateformatter {
-            decoder.dateDecodingStrategy = .formatted(df)
-        } else {
-            decoder.dataDecodingStrategy = .base64
-            let formatter = DateFormatter()
-            formatter.calendar = Calendar(identifier: .iso8601)
-            formatter.locale = Locale(identifier: "en_US_POSIX")
-            formatter.timeZone = TimeZone(secondsFromGMT: 0)
-            formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXXX"
-            decoder.dateDecodingStrategy = .formatted(formatter)
-        }
-
-        do {
-            returnedDecodable = try decoder.decode(type, from: data)
-        } catch {
-            returnedError = error
-        }
-
-        return (returnedDecodable, returnedError)
-    }
-
-    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T : Encodable {
-        var returnedData: Data?
-        var returnedError: Error? = nil
-
-        let encoder = JSONEncoder()
-        if prettyPrint {
-            encoder.outputFormatting = .prettyPrinted
-        }
-        encoder.dataEncodingStrategy = .base64
-        let formatter = DateFormatter()
-        formatter.calendar = Calendar(identifier: .iso8601)
-        formatter.locale = Locale(identifier: "en_US_POSIX")
-        formatter.timeZone = TimeZone(secondsFromGMT: 0)
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXXX"
-        encoder.dateEncodingStrategy = .formatted(formatter)
-
-        do {
-            returnedData = try encoder.encode(value)
-        } catch {
-            returnedError = error
-        }
-
-        return (returnedData, returnedError)
-    }
-
-}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Extensions.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Extensions.swift
deleted file mode 100644
index 31ef27b846f..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Extensions.swift
+++ /dev/null
@@ -1,186 +0,0 @@
-// Extensions.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-import PromiseKit
-
-extension Bool: JSONEncodable {
-    func encodeToJSON() -> Any { return self as Any }
-}
-
-extension Float: JSONEncodable {
-    func encodeToJSON() -> Any { return self as Any }
-}
-
-extension Int: JSONEncodable {
-    func encodeToJSON() -> Any { return self as Any }
-}
-
-extension Int32: JSONEncodable {
-    func encodeToJSON() -> Any { return NSNumber(value: self as Int32) }
-}
-
-extension Int64: JSONEncodable {
-    func encodeToJSON() -> Any { return NSNumber(value: self as Int64) }
-}
-
-extension Double: JSONEncodable {
-    func encodeToJSON() -> Any { return self as Any }
-}
-
-extension String: JSONEncodable {
-    func encodeToJSON() -> Any { return self as Any }
-}
-
-private func encodeIfPossible<T>(_ object: T) -> Any {
-    if let encodableObject = object as? JSONEncodable {
-        return encodableObject.encodeToJSON()
-    } else {
-        return object as Any
-    }
-}
-
-extension Array: JSONEncodable {
-    func encodeToJSON() -> Any {
-        return self.map(encodeIfPossible)
-    }
-}
-
-extension Dictionary: JSONEncodable {
-    func encodeToJSON() -> Any {
-        var dictionary = [AnyHashable: Any]()
-        for (key, value) in self {
-            dictionary[key] = encodeIfPossible(value)
-        }
-        return dictionary as Any
-    }
-}
-
-extension Data: JSONEncodable {
-    func encodeToJSON() -> Any {
-        return self.base64EncodedString(options: Data.Base64EncodingOptions())
-    }
-}
-
-private let dateFormatter: DateFormatter = {
-    let fmt = DateFormatter()
-    fmt.dateFormat = Configuration.dateFormat
-    fmt.locale = Locale(identifier: "en_US_POSIX")
-    return fmt
-}()
-
-extension Date: JSONEncodable {
-    func encodeToJSON() -> Any {
-        return dateFormatter.string(from: self) as Any
-    }
-}
-
-extension UUID: JSONEncodable {
-    func encodeToJSON() -> Any {
-        return self.uuidString
-    }
-}
-
-extension String: CodingKey {
-
-    public var stringValue: String {
-        return self
-    }
-
-    public init?(stringValue: String) {
-        self.init(stringLiteral: stringValue)
-    }
-
-    public var intValue: Int? {
-        return nil
-    }
-
-    public init?(intValue: Int) {
-        return nil
-    }
-
-}
-
-extension KeyedEncodingContainerProtocol {
-
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
-        var arrayContainer = nestedUnkeyedContainer(forKey: key)
-        try arrayContainer.encode(contentsOf: values)
-    }
-
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
-        if let values = values {
-            try encodeArray(values, forKey: key)
-        }
-    }
-
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
-        for (key, value) in pairs {
-            try encode(value, forKey: key)
-        }
-    }
-
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
-        if let pairs = pairs {
-            try encodeMap(pairs)
-        }
-    }
-
-}
-
-extension KeyedDecodingContainerProtocol {
-
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
-        var tmpArray = [T]()
-
-        var nestedContainer = try nestedUnkeyedContainer(forKey: key)
-        while !nestedContainer.isAtEnd {
-            let arrayValue = try nestedContainer.decode(T.self)
-            tmpArray.append(arrayValue)
-        }
-
-        return tmpArray
-    }
-
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
-
-        if contains(key) {
-            tmpArray = try decodeArray(T.self, forKey: key)
-        }
-
-        return tmpArray
-    }
-
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
-
-        for key in allKeys {
-            if !excludedKeys.contains(key) {
-                let value = try decode(T.self, forKey: key)
-                map[key] = value
-            }
-        }
-
-        return map
-    }
-
-}
-
-extension RequestBuilder {
-    public func execute() -> Promise<Response<T>>  {
-        let deferred = Promise<Response<T>>.pending()
-        self.execute { (response: Response<T>?, error: Error?) in
-            if let response = response {
-                deferred.fulfill(response)
-            } else {
-                deferred.reject(error!)
-            }
-        }
-        return deferred.promise
-    }
-}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift
deleted file mode 100644
index 472e955ee8e..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// JSONDataEncoding.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-
-public struct JSONDataEncoding: ParameterEncoding {
-
-    // MARK: Properties
-
-    private static let jsonDataKey = "jsonData"
-
-    // MARK: Encoding
-
-    /// Creates a URL request by encoding parameters and applying them onto an existing request.
-    ///
-    /// - parameter urlRequest: The request to have parameters applied.
-    /// - parameter parameters: The parameters to apply. This should have a single key/value
-    ///                         pair with "jsonData" as the key and a Data object as the value.
-    ///
-    /// - throws: An `Error` if the encoding process encounters an error.
-    ///
-    /// - returns: The encoded request.
-    public func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest {
-        var urlRequest = try urlRequest.asURLRequest()
-
-        guard let jsonData = parameters?[JSONDataEncoding.jsonDataKey] as? Data, !jsonData.isEmpty else {
-            return urlRequest
-        }
-
-        if urlRequest.value(forHTTPHeaderField: "Content-Type") == nil {
-            urlRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        }
-
-        urlRequest.httpBody = jsonData
-
-        return urlRequest
-    }
-
-    public static func encodingParameters(jsonData: Data?) -> Parameters? {
-        var returnedParams: Parameters? = nil
-        if let jsonData = jsonData, !jsonData.isEmpty {
-            var params = Parameters()
-            params[jsonDataKey] = jsonData
-            returnedParams = params
-        }
-        return returnedParams
-    }
-
-}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Animal.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Animal.swift
deleted file mode 100644
index ba2da30fedd..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Animal.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Animal.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Animal: Codable {
-
-    public var className: String
-    public var color: String?
-
-    public init(className: String, color: String?) {
-        self.className = className
-        self.color = color
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/AnimalFarm.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/AnimalFarm.swift
deleted file mode 100644
index 68308364894..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/AnimalFarm.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// AnimalFarm.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
deleted file mode 100644
index ac59328a279..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// ArrayOfArrayOfNumberOnly.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct ArrayOfArrayOfNumberOnly: Codable {
-
-    public var arrayArrayNumber: [[Double]]?
-
-    public init(arrayArrayNumber: [[Double]]?) {
-        self.arrayArrayNumber = arrayArrayNumber
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case arrayArrayNumber = "ArrayArrayNumber"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
deleted file mode 100644
index 14335a75053..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// ArrayTest.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct ArrayTest: Codable {
-
-    public var arrayOfString: [String]?
-    public var arrayArrayOfInteger: [[Int64]]?
-    public var arrayArrayOfModel: [[ReadOnlyFirst]]?
-
-    public init(arrayOfString: [String]?, arrayArrayOfInteger: [[Int64]]?, arrayArrayOfModel: [[ReadOnlyFirst]]?) {
-        self.arrayOfString = arrayOfString
-        self.arrayArrayOfInteger = arrayArrayOfInteger
-        self.arrayArrayOfModel = arrayArrayOfModel
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case arrayOfString = "array_of_string"
-        case arrayArrayOfInteger = "array_array_of_integer"
-        case arrayArrayOfModel = "array_array_of_model"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift
deleted file mode 100644
index fa0786832c6..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Category.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Category: Codable {
-
-    public var _id: Int64?
-    public var name: String?
-
-    public init(_id: Int64?, name: String?) {
-        self._id = _id
-        self.name = name
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _id = "id"
-        case name
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Client.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Client.swift
deleted file mode 100644
index 0c4fc0d559a..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Client.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Client.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Client: Codable {
-
-    public var client: String?
-
-    public init(client: String?) {
-        self.client = client
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Dog.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Dog.swift
deleted file mode 100644
index 9ba84f7f8cc..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Dog.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Dog.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Dog: Codable {
-
-    public var className: String
-    public var color: String?
-    public var breed: String?
-
-    public init(className: String, color: String?, breed: String?) {
-        self.className = className
-        self.color = color
-        self.breed = breed
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
deleted file mode 100644
index 6374df494a3..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// EnumTest.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct EnumTest: Codable {
-
-    public enum EnumString: String, Codable { 
-        case upper = "UPPER"
-        case lower = "lower"
-        case empty = ""
-    }
-    public enum EnumStringRequired: String, Codable { 
-        case upper = "UPPER"
-        case lower = "lower"
-        case empty = ""
-    }
-    public enum EnumInteger: Int, Codable { 
-        case _1 = 1
-        case number1 = -1
-    }
-    public enum EnumNumber: Double, Codable { 
-        case _11 = 1.1
-        case number12 = -1.2
-    }
-    public var enumString: EnumString?
-    public var enumStringRequired: EnumStringRequired
-    public var enumInteger: EnumInteger?
-    public var enumNumber: EnumNumber?
-    public var outerEnum: OuterEnum?
-
-    public init(enumString: EnumString?, enumStringRequired: EnumStringRequired, enumInteger: EnumInteger?, enumNumber: EnumNumber?, outerEnum: OuterEnum?) {
-        self.enumString = enumString
-        self.enumStringRequired = enumStringRequired
-        self.enumInteger = enumInteger
-        self.enumNumber = enumNumber
-        self.outerEnum = outerEnum
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case enumString = "enum_string"
-        case enumStringRequired = "enum_string_required"
-        case enumInteger = "enum_integer"
-        case enumNumber = "enum_number"
-        case outerEnum
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
deleted file mode 100644
index 1fc4bd362fd..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// FormatTest.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct FormatTest: Codable {
-
-    public var integer: Int?
-    public var int32: Int?
-    public var int64: Int64?
-    public var number: Double
-    public var float: Float?
-    public var double: Double?
-    public var string: String?
-    public var byte: Data
-    public var binary: Data?
-    public var date: Date
-    public var dateTime: Date?
-    public var uuid: UUID?
-    public var password: String
-
-    public init(integer: Int?, int32: Int?, int64: Int64?, number: Double, float: Float?, double: Double?, string: String?, byte: Data, binary: Data?, date: Date, dateTime: Date?, uuid: UUID?, password: String) {
-        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.dateTime = dateTime
-        self.uuid = uuid
-        self.password = password
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
deleted file mode 100644
index 3626846919f..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// HasOnlyReadOnly.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct HasOnlyReadOnly: Codable {
-
-    public var bar: String?
-    public var foo: String?
-
-    public init(bar: String?, foo: String?) {
-        self.bar = bar
-        self.foo = foo
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/List.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/List.swift
deleted file mode 100644
index fe11bfce840..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/List.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// List.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct List: Codable {
-
-    public var _123List: String?
-
-    public init(_123List: String?) {
-        self._123List = _123List
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _123List = "123-list"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
deleted file mode 100644
index 962b7fe65bc..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// MixedPropertiesAndAdditionalPropertiesClass.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
-
-    public var uuid: UUID?
-    public var dateTime: Date?
-    public var map: [String:Animal]?
-
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
-        self.uuid = uuid
-        self.dateTime = dateTime
-        self.map = map
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
deleted file mode 100644
index 06db22e9c3a..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// NumberOnly.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct NumberOnly: Codable {
-
-    public var justNumber: Double?
-
-    public init(justNumber: Double?) {
-        self.justNumber = justNumber
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case justNumber = "JustNumber"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterBoolean.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterBoolean.swift
deleted file mode 100644
index 204acfe70c3..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterBoolean.swift
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// OuterBoolean.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct OuterBoolean: Codable {
-
-
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
deleted file mode 100644
index bd1984e870d..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// OuterComposite.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct OuterComposite: Codable {
-
-    public var myNumber: OuterNumber?
-    public var myString: OuterString?
-    public var myBoolean: OuterBoolean?
-
-    public init(myNumber: OuterNumber?, myString: OuterString?, myBoolean: OuterBoolean?) {
-        self.myNumber = myNumber
-        self.myString = myString
-        self.myBoolean = myBoolean
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case myNumber = "my_number"
-        case myString = "my_string"
-        case myBoolean = "my_boolean"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterEnum.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterEnum.swift
deleted file mode 100644
index d6222d2b1c4..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterEnum.swift
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// OuterEnum.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-public enum OuterEnum: String, Codable {
-    case placed = "placed"
-    case approved = "approved"
-    case delivered = "delivered"
-
-}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterNumber.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterNumber.swift
deleted file mode 100644
index 3e3a6775a6c..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterNumber.swift
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// OuterNumber.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct OuterNumber: Codable {
-
-
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterString.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterString.swift
deleted file mode 100644
index 06ff5ccef4b..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterString.swift
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// OuterString.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct OuterString: Codable {
-
-
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
deleted file mode 100644
index 6e984760cd6..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// ReadOnlyFirst.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct ReadOnlyFirst: Codable {
-
-    public var bar: String?
-    public var baz: String?
-
-    public init(bar: String?, baz: String?) {
-        self.bar = bar
-        self.baz = baz
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Return.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Return.swift
deleted file mode 100644
index 9502f08130c..00000000000
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Return.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Return.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-/** Model for testing reserved words */
-
-public struct Return: Codable {
-
-    public var _return: Int?
-
-    public init(_return: Int?) {
-        self._return = _return
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _return = "return"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Podfile.lock b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Podfile.lock
index 817fb4412f2..5f69a517d4b 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Podfile.lock
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Podfile.lock
@@ -8,15 +8,20 @@ PODS:
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - PromiseKit
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: 9676ada4aca5ed85343879b88b00dc0cc18d605e
+  PetstoreClient: b5876a16a88cce6a4fc71443a62f9892171b48e2
   PromiseKit: ecf5fe92275d57ee77c9ede858af47a162e9b97e
 
 PODFILE CHECKSUM: da9f5a7ad6086f2c7abb73cf2c35cefce04a9a30
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
index b96a4bed0ac..95f4d993980 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
@@ -7,12 +7,12 @@
   },
   "version": "0.0.1",
   "source": {
-    "git": "git@github.com:swagger-api/swagger-mustache.git",
+    "git": "git@github.com:openapitools/openapi-generator.git",
     "tag": "v1.0.0"
   },
   "authors": "",
   "license": "Proprietary",
-  "homepage": "https://github.com/swagger-api/swagger-codegen",
+  "homepage": "https://github.com/openapitools/openapi-generator",
   "summary": "PetstoreClient",
   "source_files": "PetstoreClient/Classes/**/*.swift",
   "dependencies": {
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Manifest.lock b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Manifest.lock
index 817fb4412f2..5f69a517d4b 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Manifest.lock
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Manifest.lock
@@ -8,15 +8,20 @@ PODS:
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - PromiseKit
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: 9676ada4aca5ed85343879b88b00dc0cc18d605e
+  PetstoreClient: b5876a16a88cce6a4fc71443a62f9892171b48e2
   PromiseKit: ecf5fe92275d57ee77c9ede858af47a162e9b97e
 
 PODFILE CHECKSUM: da9f5a7ad6086f2c7abb73cf2c35cefce04a9a30
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
index b8e6f46c6d2..ce4afdbb61e 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
@@ -7,137 +7,143 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		04383899005EE36AF21F761D7DC80E95 /* DispatchQueue+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B75FBDF2B74DA3B74C5F0ADD20F42A2 /* DispatchQueue+Promise.swift */; };
-		083C731FF7E5782D19029803B9C23DE8 /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 456356DFF7271B4F562B7F04E03E3CA8 /* FakeAPI.swift */; };
-		095BBCE1E728245C9E4E162B0FE4BB6A /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AEE7AA4D6A19965503F1889B1F44B1D /* Models.swift */; };
-		0A2E76BD89D6BF6F8F889FAFEF599199 /* OuterNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC665263E59F937C09C52DBC4851F44F /* OuterNumber.swift */; };
-		0A7BAE5F9B5FF377168750D402C2D785 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 364DFA113368D39E8F9FF776C3C78B11 /* UserAPI.swift */; };
-		0AAA2459130A15FAB0A059B2C8D538A9 /* hang.m in Sources */ = {isa = PBXBuildFile; fileRef = CA6251246DA0044C165AC891CDE64344 /* hang.m */; };
-		106547F65F792529AD62ADC1AC01D58F /* AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 80933905730AC186F9CA86852B3817E6 /* AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		02650248013496C5AB857B869C562661 /* PromiseKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E63746E0EEDB9AB11F3F623A63F36BB3 /* PromiseKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		02BD805D23521EA2EDEEB4DFCD0C3B79 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A4D6098BB7067FA34B381F4446DDB10 /* PetAPI.swift */; };
+		093FE53CB3328559C65EBBAAF527D78D /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41E52FC18B43257D6D924850398E9AE /* ArrayOfArrayOfNumberOnly.swift */; };
+		096569210E560F7B547A8A778C8BEE0B /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2002E2C081EDBF95460841AEE40A1F /* AlamofireImplementations.swift */; };
+		0B974B8BCA617D23C87619DADD37D39B /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A03102A2289886143D394C1EEF173C69 /* Alamofire.framework */; };
+		0BC6EA4CC7B942917A160339B54748B6 /* join.m in Sources */ = {isa = PBXBuildFile; fileRef = 47F1D5162720B2001CA614017A1ACE90 /* join.m */; };
+		0E61AA5BD188FF3FBDD712C4F9A8D302 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEB048F7684923FC8C99614FB91CDE30 /* Models.swift */; };
 		10EB23E9ECC4B33E16933BB1EA560B6A /* Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE6E736FF5D4320FE1647DB1724C14B8 /* Timeline.swift */; };
-		1103E43C29C4C4880211E7F883882F70 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC6A834DBFB72DAA5CF0C32268CDF605 /* Configuration.swift */; };
-		18E0A0C81B42135BD9A73D1670B982D7 /* OuterString.swift in Sources */ = {isa = PBXBuildFile; fileRef = D752057107F19596D3B8EA574206B2F2 /* OuterString.swift */; };
-		1A6464D1BF86829B60AA7F767B2B6228 /* wrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B96D6AE9F0F69FC801059349B8A234 /* wrap.swift */; };
+		137DAF8FF69611F8A06C44B67CF6F6B5 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EE661EFEC3A229F1219958C4244153F /* ArrayTest.swift */; };
+		17E56B942DC1B30C84E158E47988B552 /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18B675845795AE8F97C41BFE1B734DF3 /* EnumArrays.swift */; };
+		18A18EB42890C48B481A29858B2045A0 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A6821DE25768EABE3B84E13AA2767AA /* UserAPI.swift */; };
 		1B9EDEDC964E6B08F78920B4F4B9DB84 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = A16286911EF2D17072D77A2B43E34006 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1C0634A540F1294BEFD39E8D6EC7CDDE /* PromiseKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6456A8E3DB29C967B8479EA4438C76F3 /* PromiseKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1F1E70B6B892CFE7E8D03B3890D05C5A /* when.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E9E772008F75FBB98AEE83B59F519A9 /* when.m */; };
+		1C832D0B29531429F35131FF51FFE25D /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B30B9F0FA3EB01FFACD8AF1A5E3C02A /* Client.swift */; };
+		1F2F1DCB8A4D07829345F43D3AEA848B /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2DDAE4995DB14893EA47ED21E6742BA /* ReadOnlyFirst.swift */; };
+		1F3362AD484EF46863A9BE871493099C /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7898EEC6A565DE133438C48988478954 /* Extensions.swift */; };
 		20E2CC1FD887EC3DA74724A32DDA1132 /* Pods-SwaggerClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		21D5CF155AB37729819479C01C692275 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 0467D138A3101545CABA11DDD745B87B /* PetstoreClient-dummy.m */; };
-		221F18103190719148CA55FA85959C89 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 987E88064EF735B91468D5018C18E261 /* Extensions.swift */; };
-		2613421691DFA013A440D1545EE747F9 /* Fake_classname_tags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49BB1DA804C4AA7D9FEF0DC43604CCCE /* Fake_classname_tags123API.swift */; };
-		27C0638829CB61F69ACAA8ADBEFB18F8 /* after.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AFE5B442894FF7BEA9ECAB0A39B4AD /* after.swift */; };
-		28A61491F92263C04AC52DDB7D3D7C5E /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = C26CC9E49237A04F52DC71125A1756AB /* Client.swift */; };
-		2ADC297B4E6F3FF3B8FE90461C80DC81 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F434ADE4363A510D2EFDCE14A0C5746 /* Error.swift */; };
-		2C2B0BFA01ABB26BC0961FDCEBCF9193 /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 289EF031EA3B2CA318F7EACE05641165 /* EnumTest.swift */; };
-		2CFA4F6DB943A88101EC5E33612F3D3A /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374D32747BDC0BDD7ACFF23F5BF910C3 /* AdditionalPropertiesClass.swift */; };
-		2D1EC3F916AA171A159217B17E1DC3A5 /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = E28B79A691A2192E2A8595ACB60CC54C /* Dog.swift */; };
-		30A481BDA67CB3CF0C136A908EC50D64 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A03102A2289886143D394C1EEF173C69 /* Alamofire.framework */; };
-		31582924647B36C90C9B7763F14905F8 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791E26F1F38D683DDDDF5B5A4B3D6607 /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
-		31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2763B2E6F29D7FCE40243F00A67709D0 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = FECB278917C7651872C44FB1C0B6E620 /* Category.swift */; };
+		28A121AF5001D71F5547006701441FAA /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39CFCEF99F7C460D0F08FDCCF1457477 /* File.swift */; };
+		32313FCA1392012D603D0559866DE780 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23810842569AE35D0E94BB511DF8A4FC /* Order.swift */; };
+		34C9317929C1DA5F022B5AEC56DED275 /* Zalgo.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA33807992507937BA2869E4D72BA073 /* Zalgo.swift */; };
 		3626B94094672CB1C9DEA32B9F9502E1 /* TaskDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F8D293ABA4E6DE8B257C7E9899F1B08 /* TaskDelegate.swift */; };
-		36F8AE4A7F55750F441C4EA540D1699C /* after.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDF4D8C4A3CD3A61ACE20A71F71A107 /* after.m */; };
-		3CFA2361C8B43583460324BE5C3F0AA2 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 712969C66751DDCC0D484F06819ADFAF /* PetAPI.swift */; };
-		3D7779C784C66A0C30436BD2CA2C0F40 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = B988BD8876FEE563F8D7A6E2534BA48B /* Tag.swift */; };
-		405B9F95A650E2FEC0ED1BCAE7682AA7 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F72B7A542B1D04D38B262F407D0F92F /* SpecialModelName.swift */; };
-		4818A1E024F6FAE56EFCC63F1C0F9631 /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF3A2EA92DAC72BC0CED7B12F16198BD /* Model200Response.swift */; };
-		496F991DDEDAE92703CAA24CE165B9F3 /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DD27DB5AB64425B97113FA8D5A10F19 /* PromiseKit.framework */; };
-		4D2ECA6C094192F32B0B6F65481D7E47 /* Promise+AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947066689D96D035F88E7408FA47E193 /* Promise+AnyPromise.swift */; };
-		50535053DF0B148D8D55C84AACE3E821 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 584CE59DFDF2D30A308478C17A426ADA /* ArrayTest.swift */; };
-		52D5D882F7A76CCC2E82CEC51E4C4A8F /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD18CDAD22507BB2C69589FD60138F66 /* Capitalization.swift */; };
+		3A6675715B2BD21963134EE7CB699FEE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
+		3DDAC28BB63E3CC2C35F2D0585E3F586 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 246C4149EB1F7D2CF07D83FD3B4A7683 /* ArrayOfNumberOnly.swift */; };
+		45AEF1D561D94B055F958AF6BD74A9DE /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FF19147CE4412D2804D578DF81FA6E6 /* Animal.swift */; };
+		46C3E70BD716E72351EA9828A496E59A /* hang.m in Sources */ = {isa = PBXBuildFile; fileRef = CA6251246DA0044C165AC891CDE64344 /* hang.m */; };
+		4B4BBBB2A7FDB2ABA6ABFBE5C472030D /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA70EA7732BDFFE905C353D9709B2AD /* ClassModel.swift */; };
 		5387216E723A3C68E851CA15573CDD71 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8A3F20B5239DF2DF6CB987D4827C198 /* Request.swift */; };
-		54A8DFD3F23A65EBEBEE381B8B18107A /* PromiseKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E63746E0EEDB9AB11F3F623A63F36BB3 /* PromiseKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		55692168300BC109D310F93B530B4132 /* AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CE45709BBC984B7998B833B10FC058 /* AnyPromise.swift */; };
 		5F4F4E0D84288987C470DFAE80E9C7AB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
+		5FAD2CC31374E9E7A63653EBFD331A7C /* FileSchemaTestClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE2FEBAD4A5F085054978914D2BAD7F /* FileSchemaTestClass.swift */; };
+		60E275765FC4AA45834D19BEBC4E67A5 /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7FFC55F1307BC98855D3D546660D4F2 /* OuterComposite.swift */; };
 		61200D01A1855D7920CEF835C8BE00B0 /* DispatchQueue+Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = F48DFEE4376C36D6CF4C7DBFEBF91F45 /* DispatchQueue+Alamofire.swift */; };
 		62F65AD8DC4F0F9610F4B8B4738EC094 /* ServerTrustPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 428236967C1B816363FB039AD9A0D098 /* ServerTrustPolicy.swift */; };
-		631846166C39D7961C0FC2420A814D5D /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CAF4F2E2C16A07E038AAA59349BBCD9 /* AlamofireImplementations.swift */; };
-		64FBE4A1A786C4AFE12ADD42ECD1572A /* OuterBoolean.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD15E529B026F88FF8EAE32BD84D468D /* OuterBoolean.swift */; };
-		65FFD0F2A18B865A83654491E2822133 /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB0F6DF945AB4286D73C45A2139ED7B3 /* Return.swift */; };
-		667D55108CF6FE31F77C42480691A11F /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896B006368E7DC47A51391033A97C2EE /* ReadOnlyFirst.swift */; };
-		6997A0FD680C0A48DEF678CED18DA37B /* when.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05D32F7DA10CFDD71EAA3EA19946CD1D /* when.swift */; };
-		70BFDB7E47A8CCB22B535EDCBDAABC7C /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = E775A7621846699F1A762DB966B3DC48 /* State.swift */; };
+		645744FB3E79537030B378FF01734BB0 /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1D16F98B0546986ED64CD76F6678480 /* Model200Response.swift */; };
+		669789618901F2B104F686A8A44E4F23 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F434ADE4363A510D2EFDCE14A0C5746 /* Error.swift */; };
+		6939CF29A58F770558A46D229F33CDEF /* join.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54DD29EE59FE04DF98E96700B3A276DB /* join.swift */; };
+		73B3AF4DB13BAF41132EE8B6DC750053 /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE0EE75A3806EB2BA0C9EEF687CE2B93 /* Cat.swift */; };
 		73B9C996AED49ED7CF8EC2A6F1738059 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
-		75E75F96CB55F0D28EE06BAB415C26DC /* AnotherfakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51830C53E0E76A54309CE2137E716625 /* AnotherfakeAPI.swift */; };
-		777BF05C3DD2E08DB3E3EED5F97A0CD8 /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5EB60B9D147E1DCD36D55283254A515 /* JSONEncodableEncoding.swift */; };
-		7AE27271C19BB4061041C31FCA3244D2 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C78CDA7E4BB301D917FE7CFBD2457EF /* APIHelper.swift */; };
+		7B3DA83F3B5FED00F65AB62921A01030 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF5D23F22EEE2FBFA826151A4E186DE3 /* ApiResponse.swift */; };
 		7B5FE28C7EA4122B0598738E54DBEBD8 /* SessionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64759A200040719DDE024A0F1BCDDDEE /* SessionDelegate.swift */; };
-		7BFA5408D6C0495B19C0CDDEA71474D5 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E3B882B966B7AF813A56A7DA9DA1F1C /* Name.swift */; };
 		7D8CC01E8C9EFFF9F4D65406CDE0AB66 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE689938DB1BB3BAF7C98928CB02978A /* Result.swift */; };
-		7FCA54A30C9BD117FC96CC045BBB58BE /* Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22932972F4F492160D4694C01CAF311D /* Promise.swift */; };
-		802E48AE09C6A80FD22638D72C73A747 /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F46B1129B323D17632F7089F71632F60 /* JSONEncodingHelper.swift */; };
-		80BF18A2B7CCB1144BDF94B1B9C94F4C /* dispatch_promise.m in Sources */ = {isa = PBXBuildFile; fileRef = ACDBB9A0818694ED3F5545A2102E7624 /* dispatch_promise.m */; };
-		8117E1FE605C93F0136EF1FA853AE6DD /* join.m in Sources */ = {isa = PBXBuildFile; fileRef = 47F1D5162720B2001CA614017A1ACE90 /* join.m */; };
-		84BA25DC929E84CEEA3A86A6A6168175 /* race.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2293B3E9936106C01A2A831A2C1E8AD6 /* race.swift */; };
+		80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */; };
+		814DFD9DCDBD6A458F90C8C955F1D447 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A9361010C64B5A1F7A9DF65338A4060 /* HasOnlyReadOnly.swift */; };
+		843DAE627C09DBAAAB41D5A8BC1FB0B9 /* StringBooleanMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2990DE0BC65EFC8D04E0FE470B40D295 /* StringBooleanMap.swift */; };
+		85543B6F540EED8FFF82015FED6CB68B /* AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CE45709BBC984B7998B833B10FC058 /* AnyPromise.swift */; };
+		8591B80B88C9A955D3E898EEF9DA71E1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
+		85E3539753BE81D789B84B36968D2716 /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6E49082BB281EDC5D7B6E76772E87CF /* FormatTest.swift */; };
+		85F98BB583753B1CF977D7A04D70AD3D /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDAB71F06CE94B9B9AD9438DAC00B6D2 /* AnimalFarm.swift */; };
 		8740BC8B595A54E9C973D7110740D43F /* Pods-SwaggerClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */; };
-		897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */; };
-		9394F85AA6ED6214DE27966C68945180 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 55CCB86279C9704891B8B855CA6380F6 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		98E6C302C43D21D3C7E655C6AB628229 /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06D5E6CDDEE294F817C22C521B562508 /* CodableHelper.swift */; };
+		878E6E228B4A3D2725656142AA379D7F /* Promise+Properties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24AEF2E680D3A5F36B2C7C53FA70938A /* Promise+Properties.swift */; };
+		888EF901304106608916A05E6EC6A0A0 /* PromiseKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4667C7609366DAC2FC770F6565F7F2A2 /* PromiseKit-dummy.m */; };
+		8C4014FF4F3816A66E2A54A5C6D3C3F3 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C249F0D3A4AFFFC155DEC2FBB68F0CC /* Capitalization.swift */; };
+		8E30D1FBB8F7FE6FA028ED5DA8A5AEE7 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 776D2DC046923CE3DDE934FF73659587 /* PetstoreClient-dummy.m */; };
+		8F39B17E08DFFBC12DA790278582AA8E /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C030C0F6BD877478B1CA4BC8BFBAD057 /* Pet.swift */; };
+		90EE6BEBBA73536B758D53DBC9E3C6D4 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E81223B1EAA15A1063FABA2C1F83FD46 /* NumberOnly.swift */; };
+		951884DAFB0B03C83AAFD57F81AF4CDD /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F66D63E8AA66846EDB3A12966E6951E /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		95BFB77801BE59D7EB5B793FF8F1F22B /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A917A61915DC34D93F7CA22E9FEEAB8 /* MapTest.swift */; };
+		95DD56D8244A0F779EA3D24617389DFA /* GlobalState.m in Sources */ = {isa = PBXBuildFile; fileRef = 7824BE1937712800889974B222CAB1AD /* GlobalState.m */; };
+		972BEE7DF8E16382E5D30F7A94C8A469 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B5354642428AF26C69F2155FEBFA4B /* OuterEnum.swift */; };
+		98859B984F0B8D1BA8C419626A541DDF /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = E775A7621846699F1A762DB966B3DC48 /* State.swift */; };
+		989A8D9C15575595501B0525EA04B7C4 /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DD27DB5AB64425B97113FA8D5A10F19 /* PromiseKit.framework */; };
+		9D74DAA2C9A4CB3341C267E12A7F4441 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61179CE650778B2A5C39664F0A792B5C /* List.swift */; };
+		9DCADBA52F4BA9C2BCDD2AD9FC39291E /* DispatchQueue+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B75FBDF2B74DA3B74C5F0ADD20F42A2 /* DispatchQueue+Promise.swift */; };
 		9ED2BB2981896E0A39EFA365503F58CE /* AFError.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA7D6AB49001069ED310CBCA8FCBB44 /* AFError.swift */; };
+		A1AFF1375FB497F42A3142BD20BF62E8 /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42AA25A3EEB248D295081E15036472FA /* FakeAPI.swift */; };
 		A2A6F71B727312BD45CC7A4AAD7B0AB7 /* NetworkReachabilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AE857E00E364AD3F18C2C39D49D6DDD /* NetworkReachabilityManager.swift */; };
-		A4CF090C8C8CAB1F0DA8DB338C80F144 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E5EF70E686134181F06537A75BA0FD2 /* OuterEnum.swift */; };
-		A56117A0D1F9C17CDAEC93D025808F95 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 828ED4B097AAB98D5568D37B8AECAFD0 /* ClassModel.swift */; };
-		A564637BF264BB4CFB6FEF9CB75104A1 /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 171602313BBD5AE0D5F50FFB70A96CED /* Animal.swift */; };
-		A86F3B3FE87D83AF99AB9BFC8155628B /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3036A4C6739CD7F9D802133405FB095 /* NumberOnly.swift */; };
+		A3291A5E8ED10F1803AB1F4EEA4A6445 /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D0A663A60EBEDC85D7204FF294D7A8E /* FakeClassnameTags123API.swift */; };
+		A3B4F53480EF96400D782F3507A42573 /* after.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AFE5B442894FF7BEA9ECAB0A39B4AD /* after.swift */; };
+		A6FAEDD331C7E9BD959076F2CC466B5A /* AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = CB66B121BF9B4DF48FE2F6A4D044C443 /* AnyPromise.m */; };
 		A9EEEA7477981DEEBC72432DE9990A4B /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 60347AB0041CEAF3AFE665EDD5ED3839 /* Alamofire-dummy.m */; };
-		ACB6244F92A66923FBDE06DB52FC0E58 /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = A145777600D2D0E2B9427EEE317DF443 /* FakeClassnameTags123API.swift */; };
+		AA342EBC9474FE63CCA0D61DCECDD722 /* AnotherFakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF33FE500328600F30A0008C612F377 /* AnotherFakeAPI.swift */; };
+		AAAFF9E46FF3C55A69E8761C758A48E5 /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399E6B8FE158024592ED8B770864696C /* AdditionalPropertiesClass.swift */; };
+		AC46D7B7F25929DD5ADD2ED095ACBCF3 /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7304FCBBF3A1E3E5A44C2B06C880606 /* JSONEncodableEncoding.swift */; };
 		AE1EF48399533730D0066E04B22CA2D6 /* SessionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9585493102C1567226760B6BACFDF648 /* SessionManager.swift */; };
-		B0556940CFFF7904CA9C2CAB1AF71FB3 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32EFBC701E63AE331BC0BF170B2C1E2B /* User.swift */; };
-		B084B1F97F44DD44E97DE9609E63339C /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4F28D074D15DD5B49DC39B3706C7C87 /* FormatTest.swift */; };
-		B207CF0DA3B3545959B5B95FBBB53D9B /* PromiseKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4667C7609366DAC2FC770F6565F7F2A2 /* PromiseKit-dummy.m */; };
-		B5AB1B6A32A9C6089D4C6B45C0F62908 /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 697B1649F70C9355E6ED995300DBBA28 /* APIs.swift */; };
+		B319CCF9C8F0F08FADAEA89F9655B54E /* wrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B96D6AE9F0F69FC801059349B8A234 /* wrap.swift */; };
+		B40BA9338A0622CC69161949F42E0ADE /* after.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDF4D8C4A3CD3A61ACE20A71F71A107 /* after.m */; };
+		B63172E37B27FA2FFF601A115C354752 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B3C282191A88FADAB9CC2C684F72AA /* SpecialModelName.swift */; };
+		B65BFA719D8195A2FAA0E067DE5A6DA4 /* PromiseKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6456A8E3DB29C967B8479EA4438C76F3 /* PromiseKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B65FCF589DA398C3EFE0128064E510EC /* MultipartFormData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D75CBCB14282D5EBA5A424CCF0655C2A /* MultipartFormData.swift */; };
-		BAA40BFDD985C530D27C930B3C68B1B1 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DEE2B177461F2E7FC327D113FEC55D4 /* List.swift */; };
+		BB3C554F09627EA5E6E36084E4AA5545 /* fwd.h in Headers */ = {isa = PBXBuildFile; fileRef = 645D2C8A204D8C820EEF9684DC5A65F8 /* fwd.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BBEFE2F9CEB73DC7BD97FFA66A0D9D4F /* Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A7F97EB8AC32E44E21839FA607D2CE /* Validation.swift */; };
-		BD32F9E3B06BF67B0247C821095F7247 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EF8BA4CB172F8F6925C18B674169419 /* Pet.swift */; };
+		BD97BAFECA7DEB98E8F1A2F7CB60D34D /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49A545F954B2A10B0D26618084D1FF73 /* Tag.swift */; };
+		BE111800D151B74E9EB6CFFA5375A378 /* Promise+AnyPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947066689D96D035F88E7408FA47E193 /* Promise+AnyPromise.swift */; };
 		BE5C67A07E289FE1F9BE27335B159997 /* ParameterEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D5BF61C764F8D1E7F2631DE14AC6B36 /* ParameterEncoding.swift */; };
-		BECEC463EA228A617DDC97A74DC82317 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF4FEED941249256FD7E23C19D4567AC /* EnumClass.swift */; };
-		BEEF2C5F2E966C2177FE98B2D72CF0BF /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F80C8976AE5FBE0927AD59150439B97 /* AnimalFarm.swift */; };
-		BEFC359220E7DA4FA032F4B3B1235AA7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
-		C148EBC0FC3237381FFE4C0848DCAD0B /* join.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54DD29EE59FE04DF98E96700B3A276DB /* join.swift */; };
+		C36D10DCACB58234D9ADAE75457BB1F7 /* race.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2293B3E9936106C01A2A831A2C1E8AD6 /* race.swift */; };
+		C685A44CF73B420C586417B49BBBA8A9 /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E06E455867386B3481EDF14972006E /* JSONEncodingHelper.swift */; };
+		CAA786E247A67408ED8FDDD3BD9EACC3 /* when.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E9E772008F75FBB98AEE83B59F519A9 /* when.m */; };
 		CB6D60925223897FFA2662667DF83E8A /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 714D784CFA6CB99C3B07B03487960BE0 /* Response.swift */; };
-		CE1E54F275C78733C1920B8843E0FE7F /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30C1E56142D8B120BDDE2AF5CA160E22 /* EnumArrays.swift */; };
-		CF6B474D37B11F62B01420187A4BC8E8 /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36EB25B2EACD40B282A658DA456B0FED /* Cat.swift */; };
-		D61DF6FE79C6EB404622E9BB8BA73D0E /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 670103307A767288F991B17974F3E258 /* ApiResponse.swift */; };
-		D725087C0D7C1C9A7A55AB21895AC621 /* Promise+Properties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24AEF2E680D3A5F36B2C7C53FA70938A /* Promise+Properties.swift */; };
-		D88DA7B51E85EFDE66A1E2FB8E15A961 /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = A08C7F48AC7ABF4E88804808C4EB68F1 /* ArrayOfArrayOfNumberOnly.swift */; };
-		DBD92C6CA90C0BD1C4C06C2BE18919DA /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9F529192DED719D7A55A3E804866F26 /* OuterComposite.swift */; };
-		DCA4F98E74966A61AB0694E91D2059E8 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD9B6C73F406E259D12AAD66EB86E3A /* HasOnlyReadOnly.swift */; };
-		E0D2E9BDF0D339F6DB14A81CF4BDB0CE /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B99164AE8FDE28FAD698B280AC716F77 /* ArrayOfNumberOnly.swift */; };
-		E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
-		E8381C638D5A359B3253A52097E8B36A /* AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = CB66B121BF9B4DF48FE2F6A4D044C443 /* AnyPromise.m */; };
+		CCADAFD47945929A98AD92ED9AE96FE8 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392B0EBFD414446E3C9A271B38B72DA0 /* EnumClass.swift */; };
+		D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
+		D6184AB54A12F4F580FE7766FFD1A491 /* Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22932972F4F492160D4694C01CAF311D /* Promise.swift */; };
+		D89FECF0B1C7A2D713053CAED01E6F7F /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C7066E86827634F5A961005F5CDA325 /* CodableHelper.swift */; };
+		DE4FFDE8A6E27CBC7291820581B1BD9A /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = D822C4C7D3E161B2623D9538CFB3993E /* Dog.swift */; };
+		E5016AAEA1009927B5A362E0D74AE280 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FB2BB634F7165B7E02CB903C153DD5F /* StoreAPI.swift */; };
+		E81B9022DADCB10CB8C5BF1C2737B061 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5A46D45023C6CBF06AA36844D59C59E /* User.swift */; };
+		E8AD4D7E49710B99BFD77E32C5EBFAE8 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 974697BA63D3232B3CBCF781253D6FD8 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ECA6AA2EACBD167257FBCE7FC5CD7C10 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4B75FFB3C6B26ACDD73938BF18310B /* Configuration.swift */; };
 		EFD264FC408EBF3BA2528E70B08DDD94 /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC1CEE597A54C622C960B36A5EC2FA0F /* Notifications.swift */; };
-		F149C816B083DD631AECBCADE6D525A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */; };
-		F200D84ABF9E46CE68D20FA0107CB998 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B5DCFB56EC99326DEBD055A032458E /* Category.swift */; };
-		F3365947E0B9BD60F15F14C0C2F644E8 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98A8E010F6244706560DDC29B122EBAF /* StoreAPI.swift */; };
+		F3C0FF7627AE3D02882839E52F5D64AD /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 405921FE252DC3DC1087DA4217236D81 /* Name.swift */; };
+		F5FBAECC58851B724EA306C179781810 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53DCDFCEE59497257D4D8E5C61AC1BF6 /* APIHelper.swift */; };
 		F6BECD98B97CBFEBE2C96F0E9E72A6C0 /* ResponseSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948BFEDB052F09AD8DAE3BD3CB286673 /* ResponseSerialization.swift */; };
-		F80BFCE54D77C81CA17F4CEEBEBE394D /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38F502D93EB2D1D9C2A1283F96BFF4D2 /* MapTest.swift */; };
+		F7C8625587D898907E62ACA1FFDD408B /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40D76A0512402285DC5FCF2795D7926 /* APIs.swift */; };
 		F8B3D3092ED0417E8CDF32033F6122F5 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23C4E6603FB90F49BE8906508887D859 /* Alamofire.swift */; };
-		F97FBC27216FCA32291E371DC468FCFA /* GlobalState.m in Sources */ = {isa = PBXBuildFile; fileRef = 7824BE1937712800889974B222CAB1AD /* GlobalState.m */; };
-		FC35F21E2F24A684684707DAA3745F36 /* fwd.h in Headers */ = {isa = PBXBuildFile; fileRef = 645D2C8A204D8C820EEF9684DC5A65F8 /* fwd.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		FC84AAA8BB9ED0767994FAA4FC65EE71 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB94F5F2FE938ECEA46481E25FFA28F /* Order.swift */; };
-		FCB76B4B93511BE442511A358CDA4779 /* Zalgo.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA33807992507937BA2869E4D72BA073 /* Zalgo.swift */; };
+		F9E10E625857A6FFF874C1D8AF59840A /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAFFDA41414FACE0139A3B1F22FB6717 /* EnumTest.swift */; };
+		FC0B3667BB40C86FC84990EEDF29B534 /* dispatch_promise.m in Sources */ = {isa = PBXBuildFile; fileRef = ACDBB9A0818694ED3F5545A2102E7624 /* dispatch_promise.m */; };
+		FCB75043BDF47C08F944EFD06D4636D9 /* when.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05D32F7DA10CFDD71EAA3EA19946CD1D /* when.swift */; };
+		FD55E77FA0E620CB7E618A934773CBBE /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D9E3149DFEE7783ACEC1596236B2268 /* Return.swift */; };
+		FE73D6A3B0670590535EC0D79F4F7246 /* AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 80933905730AC186F9CA86852B3817E6 /* AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		4F56515656F716821CBADACB7A9CB467 /* PBXContainerItemProxy */ = {
+		0166D6CEA46A405AF6440470518778BB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 88E9EC28B8B46C3631E6B242B50F4442;
 			remoteInfo = Alamofire;
 		};
-		8CC739769B7ED206269C0591EE53BD65 /* PBXContainerItemProxy */ = {
+		2A6F85761AF8DEABF6BBF52FD80B83C1 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 0E4534BC972F48AE7712EBE0EBE4A62A;
+			remoteGlobalIDString = 05AABECB91CEE9C8C520680DDD9BA9AB;
 			remoteInfo = PromiseKit;
 		};
+		39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = E5B96E99C219DDBC57BC27EE9DF5EC22;
+			remoteInfo = "Pods-SwaggerClient";
+		};
 		B173CFF2A1174933D7851E8CE1CA77AB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = A9570E2CBF2CCB6FF2D1D0BCBC2C1DA4;
+			remoteGlobalIDString = BEF02C72A6656158D171985B49ABDD62;
 			remoteInfo = PetstoreClient;
 		};
 		BBE116AAF20C2D98E0CC5B0D86765D22 /* PBXContainerItemProxy */ = {
@@ -151,155 +157,164 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 0E4534BC972F48AE7712EBE0EBE4A62A;
+			remoteGlobalIDString = 05AABECB91CEE9C8C520680DDD9BA9AB;
 			remoteInfo = PromiseKit;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		0467D138A3101545CABA11DDD745B87B /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
+		0075000FF9024228C130ADDA9B81114E /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
 		04B96D6AE9F0F69FC801059349B8A234 /* wrap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = wrap.swift; path = Sources/wrap.swift; sourceTree = "<group>"; };
 		05D32F7DA10CFDD71EAA3EA19946CD1D /* when.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = when.swift; path = Sources/when.swift; sourceTree = "<group>"; };
-		06D5E6CDDEE294F817C22C521B562508 /* CodableHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CodableHelper.swift; path = PetstoreClient/Classes/Swaggers/CodableHelper.swift; sourceTree = "<group>"; };
 		08A7F97EB8AC32E44E21839FA607D2CE /* Validation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Validation.swift; path = Source/Validation.swift; sourceTree = "<group>"; };
 		08BDFE9C9E9365771FF2D47928E3E79A /* Pods-SwaggerClient-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClient-acknowledgements.plist"; sourceTree = "<group>"; };
 		0AD61F8554C909A3AFA66AD9ECCB5F23 /* Pods-SwaggerClient-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-frameworks.sh"; sourceTree = "<group>"; };
+		0B30B9F0FA3EB01FFACD8AF1A5E3C02A /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
 		0B4A4A4EB2DBD6F56B1383E53763FD1B /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = PetstoreClient.framework; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0B75FBDF2B74DA3B74C5F0ADD20F42A2 /* DispatchQueue+Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Promise.swift"; path = "Sources/DispatchQueue+Promise.swift"; sourceTree = "<group>"; };
-		171602313BBD5AE0D5F50FFB70A96CED /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
-		19CFD6BC7040A5BC22831D4B5EB7F793 /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
+		14B3C282191A88FADAB9CC2C684F72AA /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
+		18B675845795AE8F97C41BFE1B734DF3 /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
 		1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.debug.xcconfig"; sourceTree = "<group>"; };
-		1E9A49B1D85B7A38F2CAD05F245B27C3 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		1C4B75FFB3C6B26ACDD73938BF18310B /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/OpenAPIs/Configuration.swift; sourceTree = "<group>"; };
+		1FF33FE500328600F30A0008C612F377 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = "<group>"; };
 		22932972F4F492160D4694C01CAF311D /* Promise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Promise.swift; path = Sources/Promise.swift; sourceTree = "<group>"; };
 		2293B3E9936106C01A2A831A2C1E8AD6 /* race.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = race.swift; path = Sources/race.swift; sourceTree = "<group>"; };
+		23810842569AE35D0E94BB511DF8A4FC /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
 		23C4E6603FB90F49BE8906508887D859 /* Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Alamofire.swift; path = Source/Alamofire.swift; sourceTree = "<group>"; };
+		246C4149EB1F7D2CF07D83FD3B4A7683 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
 		24AEF2E680D3A5F36B2C7C53FA70938A /* Promise+Properties.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Promise+Properties.swift"; path = "Sources/Promise+Properties.swift"; sourceTree = "<group>"; };
 		27E9F1130735B56DF22A1439B5BA6333 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		289EF031EA3B2CA318F7EACE05641165 /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
+		2990DE0BC65EFC8D04E0FE470B40D295 /* StringBooleanMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StringBooleanMap.swift; sourceTree = "<group>"; };
 		2A8ED560E3DF01E75E0272F7A1B911DD /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Alamofire.modulemap; sourceTree = "<group>"; };
-		2AEE7AA4D6A19965503F1889B1F44B1D /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/Swaggers/Models.swift; sourceTree = "<group>"; };
-		30C1E56142D8B120BDDE2AF5CA160E22 /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
+		2BB1D491A4C824A6BFA9C0C35E36BD85 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		2C2002E2C081EDBF95460841AEE40A1F /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift; sourceTree = "<group>"; };
+		2C7066E86827634F5A961005F5CDA325 /* CodableHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CodableHelper.swift; path = PetstoreClient/Classes/OpenAPIs/CodableHelper.swift; sourceTree = "<group>"; };
 		32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClient-umbrella.h"; sourceTree = "<group>"; };
-		32EFBC701E63AE331BC0BF170B2C1E2B /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
-		364DFA113368D39E8F9FF776C3C78B11 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
-		36EB25B2EACD40B282A658DA456B0FED /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
-		374D32747BDC0BDD7ACFF23F5BF910C3 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
-		38F502D93EB2D1D9C2A1283F96BFF4D2 /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
+		37E06E455867386B3481EDF14972006E /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodingHelper.swift; path = PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift; sourceTree = "<group>"; };
+		392B0EBFD414446E3C9A271B38B72DA0 /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		399E6B8FE158024592ED8B770864696C /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		39CFCEF99F7C460D0F08FDCCF1457477 /* File.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
+		3A917A61915DC34D93F7CA22E9FEEAB8 /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
 		3D5BF61C764F8D1E7F2631DE14AC6B36 /* ParameterEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ParameterEncoding.swift; path = Source/ParameterEncoding.swift; sourceTree = "<group>"; };
-		3E5EF70E686134181F06537A75BA0FD2 /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
 		3EDF4D8C4A3CD3A61ACE20A71F71A107 /* after.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = after.m; path = Sources/after.m; sourceTree = "<group>"; };
+		405921FE252DC3DC1087DA4217236D81 /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
 		408CD558DEC1EFB9C57002ADB50665FC /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		419496CDDD7E7536CBEA02BAEE2C7C21 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		428236967C1B816363FB039AD9A0D098 /* ServerTrustPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ServerTrustPolicy.swift; path = Source/ServerTrustPolicy.swift; sourceTree = "<group>"; };
+		42AA25A3EEB248D295081E15036472FA /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
 		451D13FDA61BDE9EB91BBC6CEA52AED4 /* PromiseKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PromiseKit.xcconfig; sourceTree = "<group>"; };
-		456356DFF7271B4F562B7F04E03E3CA8 /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
 		45FB2502919E80623D265FE19C0A8FC4 /* Alamofire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Alamofire.xcconfig; sourceTree = "<group>"; };
 		4667C7609366DAC2FC770F6565F7F2A2 /* PromiseKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PromiseKit-dummy.m"; sourceTree = "<group>"; };
 		46A00B403166BEF9EE215F6CB59BE9A6 /* Pods_SwaggerClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClient.framework; path = "Pods-SwaggerClient.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
 		47F1D5162720B2001CA614017A1ACE90 /* join.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = join.m; path = Sources/join.m; sourceTree = "<group>"; };
 		48B406C5392E8AC40762B8EDE6DF1FE8 /* PromiseKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PromiseKit-prefix.pch"; sourceTree = "<group>"; };
-		49BB1DA804C4AA7D9FEF0DC43604CCCE /* Fake_classname_tags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Fake_classname_tags123API.swift; sourceTree = "<group>"; };
+		49A545F954B2A10B0D26618084D1FF73 /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
 		4DD27DB5AB64425B97113FA8D5A10F19 /* PromiseKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PromiseKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		4EB94F5F2FE938ECEA46481E25FFA28F /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
-		4F72B7A542B1D04D38B262F407D0F92F /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
+		4EB7BF4F57FA381E9DA7A1AA9B04857D /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
 		4F8D293ABA4E6DE8B257C7E9899F1B08 /* TaskDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TaskDelegate.swift; path = Source/TaskDelegate.swift; sourceTree = "<group>"; };
-		51830C53E0E76A54309CE2137E716625 /* AnotherfakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnotherfakeAPI.swift; sourceTree = "<group>"; };
+		501C268D3DC431E81C876F4F7EE389C6 /* PetstoreClient.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = PetstoreClient.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		53DCDFCEE59497257D4D8E5C61AC1BF6 /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/OpenAPIs/APIHelper.swift; sourceTree = "<group>"; };
 		54DD29EE59FE04DF98E96700B3A276DB /* join.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = join.swift; path = Sources/join.swift; sourceTree = "<group>"; };
-		55CCB86279C9704891B8B855CA6380F6 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
-		584CE59DFDF2D30A308478C17A426ADA /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
-		5EF8BA4CB172F8F6925C18B674169419 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		5D9E3149DFEE7783ACEC1596236B2268 /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		5EE661EFEC3A229F1219958C4244153F /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
 		5F434ADE4363A510D2EFDCE14A0C5746 /* Error.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Error.swift; path = Sources/Error.swift; sourceTree = "<group>"; };
+		5F66D63E8AA66846EDB3A12966E6951E /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
 		60347AB0041CEAF3AFE665EDD5ED3839 /* Alamofire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Alamofire-dummy.m"; sourceTree = "<group>"; };
+		61179CE650778B2A5C39664F0A792B5C /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
 		6456A8E3DB29C967B8479EA4438C76F3 /* PromiseKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = PromiseKit.h; path = Sources/PromiseKit.h; sourceTree = "<group>"; };
 		645D2C8A204D8C820EEF9684DC5A65F8 /* fwd.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = fwd.h; path = Sources/fwd.h; sourceTree = "<group>"; };
 		64759A200040719DDE024A0F1BCDDDEE /* SessionDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionDelegate.swift; path = Source/SessionDelegate.swift; sourceTree = "<group>"; };
-		670103307A767288F991B17974F3E258 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
-		697B1649F70C9355E6ED995300DBBA28 /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/Swaggers/APIs.swift; sourceTree = "<group>"; };
 		6B9A5CB4B436C4A88BA49990C94DB065 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
-		6CAF4F2E2C16A07E038AAA59349BBCD9 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift; sourceTree = "<group>"; };
-		6F80C8976AE5FBE0927AD59150439B97 /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
-		712969C66751DDCC0D484F06819ADFAF /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		6FF19147CE4412D2804D578DF81FA6E6 /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
 		714D784CFA6CB99C3B07B03487960BE0 /* Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Response.swift; path = Source/Response.swift; sourceTree = "<group>"; };
 		721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClientTests-dummy.m"; sourceTree = "<group>"; };
 		76645699475D3AB6EB5242AC4D0CEFAE /* Pods-SwaggerClient-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClient-acknowledgements.markdown"; sourceTree = "<group>"; };
+		776D2DC046923CE3DDE934FF73659587 /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
 		7824BE1937712800889974B222CAB1AD /* GlobalState.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GlobalState.m; path = Sources/GlobalState.m; sourceTree = "<group>"; };
-		791E26F1F38D683DDDDF5B5A4B3D6607 /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		7898EEC6A565DE133438C48988478954 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/OpenAPIs/Extensions.swift; sourceTree = "<group>"; };
+		7A4D6098BB7067FA34B381F4446DDB10 /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		7A9361010C64B5A1F7A9DF65338A4060 /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
 		7AE857E00E364AD3F18C2C39D49D6DDD /* NetworkReachabilityManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NetworkReachabilityManager.swift; path = Source/NetworkReachabilityManager.swift; sourceTree = "<group>"; };
-		7DEE2B177461F2E7FC327D113FEC55D4 /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
 		80933905730AC186F9CA86852B3817E6 /* AnyPromise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AnyPromise.h; path = Sources/AnyPromise.h; sourceTree = "<group>"; };
 		814471C0F27B39D751143F0CD53670BD /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		828ED4B097AAB98D5568D37B8AECAFD0 /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
-		84B5DCFB56EC99326DEBD055A032458E /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
-		896B006368E7DC47A51391033A97C2EE /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
+		88B5354642428AF26C69F2155FEBFA4B /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
 		8BBF3490280C4ED53738743F84C890BC /* Pods_SwaggerClientTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClientTests.framework; path = "Pods-SwaggerClientTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
-		8C78CDA7E4BB301D917FE7CFBD2457EF /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/Swaggers/APIHelper.swift; sourceTree = "<group>"; };
-		8E3B882B966B7AF813A56A7DA9DA1F1C /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
+		8C249F0D3A4AFFFC155DEC2FBB68F0CC /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		8FB2BB634F7165B7E02CB903C153DD5F /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
 		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		947066689D96D035F88E7408FA47E193 /* Promise+AnyPromise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Promise+AnyPromise.swift"; path = "Sources/Promise+AnyPromise.swift"; sourceTree = "<group>"; };
 		948BFEDB052F09AD8DAE3BD3CB286673 /* ResponseSerialization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResponseSerialization.swift; path = Source/ResponseSerialization.swift; sourceTree = "<group>"; };
 		9585493102C1567226760B6BACFDF648 /* SessionManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionManager.swift; path = Source/SessionManager.swift; sourceTree = "<group>"; };
-		987E88064EF735B91468D5018C18E261 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/Swaggers/Extensions.swift; sourceTree = "<group>"; };
-		98A8E010F6244706560DDC29B122EBAF /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		974697BA63D3232B3CBCF781253D6FD8 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
+		9A6821DE25768EABE3B84E13AA2767AA /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
 		9D08EC9B39FEBA43A5B55DAF97AAEBE9 /* Pods-SwaggerClientTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClientTests.modulemap"; sourceTree = "<group>"; };
+		9D0A663A60EBEDC85D7204FF294D7A8E /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
 		9D780FDAD16A03CC25F4D6F3317B9423 /* Pods-SwaggerClientTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClientTests-acknowledgements.plist"; sourceTree = "<group>"; };
+		9DE2FEBAD4A5F085054978914D2BAD7F /* FileSchemaTestClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FileSchemaTestClass.swift; sourceTree = "<group>"; };
 		9E9E772008F75FBB98AEE83B59F519A9 /* when.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = when.m; path = Sources/when.m; sourceTree = "<group>"; };
 		A03102A2289886143D394C1EEF173C69 /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		A08C7F48AC7ABF4E88804808C4EB68F1 /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
-		A145777600D2D0E2B9427EEE317DF443 /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
 		A16286911EF2D17072D77A2B43E34006 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
-		AC665263E59F937C09C52DBC4851F44F /* OuterNumber.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterNumber.swift; sourceTree = "<group>"; };
+		AAFFDA41414FACE0139A3B1F22FB6717 /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
 		ACDBB9A0818694ED3F5545A2102E7624 /* dispatch_promise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = dispatch_promise.m; path = Sources/dispatch_promise.m; sourceTree = "<group>"; };
-		AD15E529B026F88FF8EAE32BD84D468D /* OuterBoolean.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterBoolean.swift; sourceTree = "<group>"; };
 		AD3B511F5C43568AAFBA2714468F9FD5 /* PromiseKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = PromiseKit.framework; path = PromiseKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		AE6E736FF5D4320FE1647DB1724C14B8 /* Timeline.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeline.swift; path = Source/Timeline.swift; sourceTree = "<group>"; };
 		AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.debug.xcconfig"; sourceTree = "<group>"; };
-		AF3A2EA92DAC72BC0CED7B12F16198BD /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
-		B28DC9FF9278F92F178AC7F416FBEF3E /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
-		B4F28D074D15DD5B49DC39B3706C7C87 /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
+		B40D76A0512402285DC5FCF2795D7926 /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/OpenAPIs/APIs.swift; sourceTree = "<group>"; };
+		B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
 		B6AFE5B442894FF7BEA9ECAB0A39B4AD /* after.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = after.swift; path = Sources/after.swift; sourceTree = "<group>"; };
-		B988BD8876FEE563F8D7A6E2534BA48B /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
-		B99164AE8FDE28FAD698B280AC716F77 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		B7304FCBBF3A1E3E5A44C2B06C880606 /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodableEncoding.swift; path = PetstoreClient/Classes/OpenAPIs/JSONEncodableEncoding.swift; sourceTree = "<group>"; };
 		BC1CEE597A54C622C960B36A5EC2FA0F /* Notifications.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Notifications.swift; path = Source/Notifications.swift; sourceTree = "<group>"; };
-		BFD9B6C73F406E259D12AAD66EB86E3A /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
-		C26CC9E49237A04F52DC71125A1756AB /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
-		C3036A4C6739CD7F9D802133405FB095 /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
+		C030C0F6BD877478B1CA4BC8BFBAD057 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		C6E49082BB281EDC5D7B6E76772E87CF /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
 		C8A3F20B5239DF2DF6CB987D4827C198 /* Request.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Request.swift; path = Source/Request.swift; sourceTree = "<group>"; };
 		C9CE45709BBC984B7998B833B10FC058 /* AnyPromise.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyPromise.swift; path = Sources/AnyPromise.swift; sourceTree = "<group>"; };
-		C9F529192DED719D7A55A3E804866F26 /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
 		CA6251246DA0044C165AC891CDE64344 /* hang.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = hang.m; path = Sources/hang.m; sourceTree = "<group>"; };
 		CAF6F32F117197F6F08B477687F09728 /* Pods-SwaggerClientTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-frameworks.sh"; sourceTree = "<group>"; };
 		CB66B121BF9B4DF48FE2F6A4D044C443 /* AnyPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AnyPromise.m; path = Sources/AnyPromise.m; sourceTree = "<group>"; };
 		CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClientTests-umbrella.h"; sourceTree = "<group>"; };
 		CFA4F581E074596AB5C3DAF3D9C39F17 /* Pods-SwaggerClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClient.modulemap"; sourceTree = "<group>"; };
+		D2DDAE4995DB14893EA47ED21E6742BA /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
 		D47B812D78D0AE64D85D16A96840F8C4 /* Pods-SwaggerClientTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClientTests-acknowledgements.markdown"; sourceTree = "<group>"; };
-		D752057107F19596D3B8EA574206B2F2 /* OuterString.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterString.swift; sourceTree = "<group>"; };
 		D75CBCB14282D5EBA5A424CCF0655C2A /* MultipartFormData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MultipartFormData.swift; path = Source/MultipartFormData.swift; sourceTree = "<group>"; };
+		D822C4C7D3E161B2623D9538CFB3993E /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
 		DA33807992507937BA2869E4D72BA073 /* Zalgo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Zalgo.swift; path = Sources/Zalgo.swift; sourceTree = "<group>"; };
+		DE0EE75A3806EB2BA0C9EEF687CE2B93 /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
 		DE689938DB1BB3BAF7C98928CB02978A /* Result.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Result.swift; path = Source/Result.swift; sourceTree = "<group>"; };
-		E28B79A691A2192E2A8595ACB60CC54C /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		DEA70EA7732BDFFE905C353D9709B2AD /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
+		E1D16F98B0546986ED64CD76F6678480 /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		E41E52FC18B43257D6D924850398E9AE /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
 		E564E86B6F817ED6259E08FB2B589CAA /* Alamofire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-prefix.pch"; sourceTree = "<group>"; };
-		E5EB60B9D147E1DCD36D55283254A515 /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodableEncoding.swift; path = PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift; sourceTree = "<group>"; };
+		E5A46D45023C6CBF06AA36844D59C59E /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
 		E63746E0EEDB9AB11F3F623A63F36BB3 /* PromiseKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PromiseKit-umbrella.h"; sourceTree = "<group>"; };
 		E708155DC6E87EA22044EC19AB55DD05 /* PromiseKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PromiseKit.modulemap; sourceTree = "<group>"; };
 		E775A7621846699F1A762DB966B3DC48 /* State.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = State.swift; path = Sources/State.swift; sourceTree = "<group>"; };
+		E7FFC55F1307BC98855D3D546660D4F2 /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
 		E80A16C989615AAE419866DB4FD10185 /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Alamofire.framework; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		EC6A834DBFB72DAA5CF0C32268CDF605 /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/Swaggers/Configuration.swift; sourceTree = "<group>"; };
+		E81223B1EAA15A1063FABA2C1F83FD46 /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
 		EEA7D6AB49001069ED310CBCA8FCBB44 /* AFError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AFError.swift; path = Source/AFError.swift; sourceTree = "<group>"; };
-		F1ED5AD8A7A28479CDC87C72B75010ED /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
 		F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.release.xcconfig"; sourceTree = "<group>"; };
 		F3E1116FA9F9F3AFD9332B7236F6E711 /* Pods-SwaggerClientTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-resources.sh"; sourceTree = "<group>"; };
-		F46B1129B323D17632F7089F71632F60 /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodingHelper.swift; path = PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift; sourceTree = "<group>"; };
 		F48DFEE4376C36D6CF4C7DBFEBF91F45 /* DispatchQueue+Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Alamofire.swift"; path = "Source/DispatchQueue+Alamofire.swift"; sourceTree = "<group>"; };
 		F4BB3B2146310CA18C30F145BFF15BD9 /* Pods-SwaggerClient-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-resources.sh"; sourceTree = "<group>"; };
 		F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClient-dummy.m"; sourceTree = "<group>"; };
-		FB0F6DF945AB4286D73C45A2139ED7B3 /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
-		FC15A6FFC961DC8B56D9DD9150014C38 /* PetstoreClient.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = PetstoreClient.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
-		FD18CDAD22507BB2C69589FD60138F66 /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		FDAB71F06CE94B9B9AD9438DAC00B6D2 /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
 		FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.release.xcconfig"; sourceTree = "<group>"; };
-		FF4FEED941249256FD7E23C19D4567AC /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		FEB048F7684923FC8C99614FB91CDE30 /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/OpenAPIs/Models.swift; sourceTree = "<group>"; };
+		FECB278917C7651872C44FB1C0B6E620 /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		FF5D23F22EEE2FBFA826151A4E186DE3 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		1B8C72E45D5881E52545540F3F4881C1 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0B974B8BCA617D23C87619DADD37D39B /* Alamofire.framework in Frameworks */,
+				3A6675715B2BD21963134EE7CB699FEE /* Foundation.framework in Frameworks */,
+				989A8D9C15575595501B0525EA04B7C4 /* PromiseKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		1D8C8B25D2467630E50174D221B39B90 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -308,19 +323,19 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		396D8A67A3003EEF737841077046D893 /* Frameworks */ = {
+		21F0744FB2561027A81E019DEB9FBE9E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEFC359220E7DA4FA032F4B3B1235AA7 /* Foundation.framework in Frameworks */,
+				8591B80B88C9A955D3E898EEF9DA71E1 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */ = {
+		7139BF778844E2A9E420524D8146ECD8 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */,
+				D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -332,16 +347,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		E1E915C3CCC361B9D8BCF1A0E4813C76 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				30A481BDA67CB3CF0C136A908EC50D64 /* Alamofire.framework in Frameworks */,
-				F149C816B083DD631AECBCADE6D525A7 /* Foundation.framework in Frameworks */,
-				496F991DDEDAE92703CAA24CE165B9F3 /* PromiseKit.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -385,64 +390,6 @@
 			name = CorePromise;
 			sourceTree = "<group>";
 		};
-		1638B55794AEC03168E0A73BFA054478 /* Support Files */ = {
-			isa = PBXGroup;
-			children = (
-				1E9A49B1D85B7A38F2CAD05F245B27C3 /* Info.plist */,
-				19CFD6BC7040A5BC22831D4B5EB7F793 /* PetstoreClient.modulemap */,
-				F1ED5AD8A7A28479CDC87C72B75010ED /* PetstoreClient.xcconfig */,
-				0467D138A3101545CABA11DDD745B87B /* PetstoreClient-dummy.m */,
-				B28DC9FF9278F92F178AC7F416FBEF3E /* PetstoreClient-prefix.pch */,
-				55CCB86279C9704891B8B855CA6380F6 /* PetstoreClient-umbrella.h */,
-			);
-			name = "Support Files";
-			path = "SwaggerClientTests/Pods/Target Support Files/PetstoreClient";
-			sourceTree = "<group>";
-		};
-		325E314AD76E8F3FF0B03E2401003FC5 /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				374D32747BDC0BDD7ACFF23F5BF910C3 /* AdditionalPropertiesClass.swift */,
-				171602313BBD5AE0D5F50FFB70A96CED /* Animal.swift */,
-				6F80C8976AE5FBE0927AD59150439B97 /* AnimalFarm.swift */,
-				670103307A767288F991B17974F3E258 /* ApiResponse.swift */,
-				A08C7F48AC7ABF4E88804808C4EB68F1 /* ArrayOfArrayOfNumberOnly.swift */,
-				B99164AE8FDE28FAD698B280AC716F77 /* ArrayOfNumberOnly.swift */,
-				584CE59DFDF2D30A308478C17A426ADA /* ArrayTest.swift */,
-				FD18CDAD22507BB2C69589FD60138F66 /* Capitalization.swift */,
-				36EB25B2EACD40B282A658DA456B0FED /* Cat.swift */,
-				84B5DCFB56EC99326DEBD055A032458E /* Category.swift */,
-				828ED4B097AAB98D5568D37B8AECAFD0 /* ClassModel.swift */,
-				C26CC9E49237A04F52DC71125A1756AB /* Client.swift */,
-				E28B79A691A2192E2A8595ACB60CC54C /* Dog.swift */,
-				30C1E56142D8B120BDDE2AF5CA160E22 /* EnumArrays.swift */,
-				FF4FEED941249256FD7E23C19D4567AC /* EnumClass.swift */,
-				289EF031EA3B2CA318F7EACE05641165 /* EnumTest.swift */,
-				B4F28D074D15DD5B49DC39B3706C7C87 /* FormatTest.swift */,
-				BFD9B6C73F406E259D12AAD66EB86E3A /* HasOnlyReadOnly.swift */,
-				7DEE2B177461F2E7FC327D113FEC55D4 /* List.swift */,
-				38F502D93EB2D1D9C2A1283F96BFF4D2 /* MapTest.swift */,
-				791E26F1F38D683DDDDF5B5A4B3D6607 /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
-				AF3A2EA92DAC72BC0CED7B12F16198BD /* Model200Response.swift */,
-				8E3B882B966B7AF813A56A7DA9DA1F1C /* Name.swift */,
-				C3036A4C6739CD7F9D802133405FB095 /* NumberOnly.swift */,
-				4EB94F5F2FE938ECEA46481E25FFA28F /* Order.swift */,
-				AD15E529B026F88FF8EAE32BD84D468D /* OuterBoolean.swift */,
-				C9F529192DED719D7A55A3E804866F26 /* OuterComposite.swift */,
-				3E5EF70E686134181F06537A75BA0FD2 /* OuterEnum.swift */,
-				AC665263E59F937C09C52DBC4851F44F /* OuterNumber.swift */,
-				D752057107F19596D3B8EA574206B2F2 /* OuterString.swift */,
-				5EF8BA4CB172F8F6925C18B674169419 /* Pet.swift */,
-				896B006368E7DC47A51391033A97C2EE /* ReadOnlyFirst.swift */,
-				FB0F6DF945AB4286D73C45A2139ED7B3 /* Return.swift */,
-				4F72B7A542B1D04D38B262F407D0F92F /* SpecialModelName.swift */,
-				B988BD8876FEE563F8D7A6E2534BA48B /* Tag.swift */,
-				32EFBC701E63AE331BC0BF170B2C1E2B /* User.swift */,
-			);
-			name = Models;
-			path = PetstoreClient/Classes/Swaggers/Models;
-			sourceTree = "<group>";
-		};
 		439566E0F816C232FEEB9A3F1FFFEF20 /* Alamofire */ = {
 			isa = PBXGroup;
 			children = (
@@ -469,6 +416,20 @@
 			path = Alamofire;
 			sourceTree = "<group>";
 		};
+		606EAF5FBC9930BD9D22CDECD222A32A /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				1FF33FE500328600F30A0008C612F377 /* AnotherFakeAPI.swift */,
+				42AA25A3EEB248D295081E15036472FA /* FakeAPI.swift */,
+				9D0A663A60EBEDC85D7204FF294D7A8E /* FakeClassnameTags123API.swift */,
+				7A4D6098BB7067FA34B381F4446DDB10 /* PetAPI.swift */,
+				8FB2BB634F7165B7E02CB903C153DD5F /* StoreAPI.swift */,
+				9A6821DE25768EABE3B84E13AA2767AA /* UserAPI.swift */,
+			);
+			name = APIs;
+			path = PetstoreClient/Classes/OpenAPIs/APIs;
+			sourceTree = "<group>";
+		};
 		63AC42361BEBCC6C083B9575B72D40DE /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -507,6 +468,20 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		6D4B4C422937D815279D2A96BCCE2815 /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				2BB1D491A4C824A6BFA9C0C35E36BD85 /* Info.plist */,
+				4EB7BF4F57FA381E9DA7A1AA9B04857D /* PetstoreClient.modulemap */,
+				B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */,
+				776D2DC046923CE3DDE934FF73659587 /* PetstoreClient-dummy.m */,
+				0075000FF9024228C130ADDA9B81114E /* PetstoreClient-prefix.pch */,
+				974697BA63D3232B3CBCF781253D6FD8 /* PetstoreClient-umbrella.h */,
+			);
+			name = "Support Files";
+			path = "SwaggerClientTests/Pods/Target Support Files/PetstoreClient";
+			sourceTree = "<group>";
+		};
 		7DB346D0F39D3F0E887471402A8071AB = {
 			isa = PBXGroup;
 			children = (
@@ -519,27 +494,35 @@
 			);
 			sourceTree = "<group>";
 		};
-		9552BC9D547079722BECEF69D39F81A1 /* PetstoreClient */ = {
+		894E625B654BBE2FB6E8E88AA51D3E5A /* PetstoreClient */ = {
 			isa = PBXGroup;
 			children = (
-				6CAF4F2E2C16A07E038AAA59349BBCD9 /* AlamofireImplementations.swift */,
-				8C78CDA7E4BB301D917FE7CFBD2457EF /* APIHelper.swift */,
-				697B1649F70C9355E6ED995300DBBA28 /* APIs.swift */,
-				06D5E6CDDEE294F817C22C521B562508 /* CodableHelper.swift */,
-				EC6A834DBFB72DAA5CF0C32268CDF605 /* Configuration.swift */,
-				987E88064EF735B91468D5018C18E261 /* Extensions.swift */,
-				E5EB60B9D147E1DCD36D55283254A515 /* JSONEncodableEncoding.swift */,
-				F46B1129B323D17632F7089F71632F60 /* JSONEncodingHelper.swift */,
-				2AEE7AA4D6A19965503F1889B1F44B1D /* Models.swift */,
-				C6898391DC18DA3449C18CD93A69078D /* APIs */,
-				325E314AD76E8F3FF0B03E2401003FC5 /* Models */,
-				D313744EEA7BEA6ED6344DEF771433F5 /* Pod */,
-				1638B55794AEC03168E0A73BFA054478 /* Support Files */,
+				2C2002E2C081EDBF95460841AEE40A1F /* AlamofireImplementations.swift */,
+				53DCDFCEE59497257D4D8E5C61AC1BF6 /* APIHelper.swift */,
+				B40D76A0512402285DC5FCF2795D7926 /* APIs.swift */,
+				2C7066E86827634F5A961005F5CDA325 /* CodableHelper.swift */,
+				1C4B75FFB3C6B26ACDD73938BF18310B /* Configuration.swift */,
+				7898EEC6A565DE133438C48988478954 /* Extensions.swift */,
+				B7304FCBBF3A1E3E5A44C2B06C880606 /* JSONEncodableEncoding.swift */,
+				37E06E455867386B3481EDF14972006E /* JSONEncodingHelper.swift */,
+				FEB048F7684923FC8C99614FB91CDE30 /* Models.swift */,
+				606EAF5FBC9930BD9D22CDECD222A32A /* APIs */,
+				A3225C42DC72DA2FDCC24B1154D893D9 /* Models */,
+				8B703AC5760FFB3F3A475448C3FD2DD8 /* Pod */,
+				6D4B4C422937D815279D2A96BCCE2815 /* Support Files */,
 			);
 			name = PetstoreClient;
 			path = ../..;
 			sourceTree = "<group>";
 		};
+		8B703AC5760FFB3F3A475448C3FD2DD8 /* Pod */ = {
+			isa = PBXGroup;
+			children = (
+				501C268D3DC431E81C876F4F7EE389C6 /* PetstoreClient.podspec */,
+			);
+			name = Pod;
+			sourceTree = "<group>";
+		};
 		A1A7A33E3B583AD8CD782AFD6B69D4A0 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -549,6 +532,50 @@
 			name = Pods;
 			sourceTree = "<group>";
 		};
+		A3225C42DC72DA2FDCC24B1154D893D9 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				399E6B8FE158024592ED8B770864696C /* AdditionalPropertiesClass.swift */,
+				6FF19147CE4412D2804D578DF81FA6E6 /* Animal.swift */,
+				FDAB71F06CE94B9B9AD9438DAC00B6D2 /* AnimalFarm.swift */,
+				FF5D23F22EEE2FBFA826151A4E186DE3 /* ApiResponse.swift */,
+				E41E52FC18B43257D6D924850398E9AE /* ArrayOfArrayOfNumberOnly.swift */,
+				246C4149EB1F7D2CF07D83FD3B4A7683 /* ArrayOfNumberOnly.swift */,
+				5EE661EFEC3A229F1219958C4244153F /* ArrayTest.swift */,
+				8C249F0D3A4AFFFC155DEC2FBB68F0CC /* Capitalization.swift */,
+				DE0EE75A3806EB2BA0C9EEF687CE2B93 /* Cat.swift */,
+				FECB278917C7651872C44FB1C0B6E620 /* Category.swift */,
+				DEA70EA7732BDFFE905C353D9709B2AD /* ClassModel.swift */,
+				0B30B9F0FA3EB01FFACD8AF1A5E3C02A /* Client.swift */,
+				D822C4C7D3E161B2623D9538CFB3993E /* Dog.swift */,
+				18B675845795AE8F97C41BFE1B734DF3 /* EnumArrays.swift */,
+				392B0EBFD414446E3C9A271B38B72DA0 /* EnumClass.swift */,
+				AAFFDA41414FACE0139A3B1F22FB6717 /* EnumTest.swift */,
+				39CFCEF99F7C460D0F08FDCCF1457477 /* File.swift */,
+				9DE2FEBAD4A5F085054978914D2BAD7F /* FileSchemaTestClass.swift */,
+				C6E49082BB281EDC5D7B6E76772E87CF /* FormatTest.swift */,
+				7A9361010C64B5A1F7A9DF65338A4060 /* HasOnlyReadOnly.swift */,
+				61179CE650778B2A5C39664F0A792B5C /* List.swift */,
+				3A917A61915DC34D93F7CA22E9FEEAB8 /* MapTest.swift */,
+				5F66D63E8AA66846EDB3A12966E6951E /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
+				E1D16F98B0546986ED64CD76F6678480 /* Model200Response.swift */,
+				405921FE252DC3DC1087DA4217236D81 /* Name.swift */,
+				E81223B1EAA15A1063FABA2C1F83FD46 /* NumberOnly.swift */,
+				23810842569AE35D0E94BB511DF8A4FC /* Order.swift */,
+				E7FFC55F1307BC98855D3D546660D4F2 /* OuterComposite.swift */,
+				88B5354642428AF26C69F2155FEBFA4B /* OuterEnum.swift */,
+				C030C0F6BD877478B1CA4BC8BFBAD057 /* Pet.swift */,
+				D2DDAE4995DB14893EA47ED21E6742BA /* ReadOnlyFirst.swift */,
+				5D9E3149DFEE7783ACEC1596236B2268 /* Return.swift */,
+				14B3C282191A88FADAB9CC2C684F72AA /* SpecialModelName.swift */,
+				2990DE0BC65EFC8D04E0FE470B40D295 /* StringBooleanMap.swift */,
+				49A545F954B2A10B0D26618084D1FF73 /* Tag.swift */,
+				E5A46D45023C6CBF06AA36844D59C59E /* User.swift */,
+			);
+			name = Models;
+			path = PetstoreClient/Classes/OpenAPIs/Models;
+			sourceTree = "<group>";
+		};
 		C1A60D10CED0E61146591438999C7502 /* Targets Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -558,21 +585,6 @@
 			name = "Targets Support Files";
 			sourceTree = "<group>";
 		};
-		C6898391DC18DA3449C18CD93A69078D /* APIs */ = {
-			isa = PBXGroup;
-			children = (
-				51830C53E0E76A54309CE2137E716625 /* AnotherfakeAPI.swift */,
-				49BB1DA804C4AA7D9FEF0DC43604CCCE /* Fake_classname_tags123API.swift */,
-				456356DFF7271B4F562B7F04E03E3CA8 /* FakeAPI.swift */,
-				A145777600D2D0E2B9427EEE317DF443 /* FakeClassnameTags123API.swift */,
-				712969C66751DDCC0D484F06819ADFAF /* PetAPI.swift */,
-				98A8E010F6244706560DDC29B122EBAF /* StoreAPI.swift */,
-				364DFA113368D39E8F9FF776C3C78B11 /* UserAPI.swift */,
-			);
-			name = APIs;
-			path = PetstoreClient/Classes/Swaggers/APIs;
-			sourceTree = "<group>";
-		};
 		D2A28169658A67F83CC3B568D7E0E6A1 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -585,14 +597,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		D313744EEA7BEA6ED6344DEF771433F5 /* Pod */ = {
-			isa = PBXGroup;
-			children = (
-				FC15A6FFC961DC8B56D9DD9150014C38 /* PetstoreClient.podspec */,
-			);
-			name = Pod;
-			sourceTree = "<group>";
-		};
 		DD9EED10DC8740383600E1BFF8D2162B /* iOS */ = {
 			isa = PBXGroup;
 			children = (
@@ -640,7 +644,7 @@
 		EC52080E65FE34CBDE5F694B08BA9836 /* Development Pods */ = {
 			isa = PBXGroup;
 			children = (
-				9552BC9D547079722BECEF69D39F81A1 /* PetstoreClient */,
+				894E625B654BBE2FB6E8E88AA51D3E5A /* PetstoreClient */,
 			);
 			name = "Development Pods";
 			sourceTree = "<group>";
@@ -648,30 +652,22 @@
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		1353AC7A6419F876B294A55E5550D1E4 /* Headers */ = {
+		247861DD0240A7F61EE9BD1526A71052 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */,
+				E8AD4D7E49710B99BFD77E32C5EBFAE8 /* PetstoreClient-umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		30A4478C9173EAE8FD13FC8118D14766 /* Headers */ = {
+		7732E969446BF18D45DF5D7762E56585 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				106547F65F792529AD62ADC1AC01D58F /* AnyPromise.h in Headers */,
-				FC35F21E2F24A684684707DAA3745F36 /* fwd.h in Headers */,
-				54A8DFD3F23A65EBEBEE381B8B18107A /* PromiseKit-umbrella.h in Headers */,
-				1C0634A540F1294BEFD39E8D6EC7CDDE /* PromiseKit.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		97C378F13A6642E2128BEDA858BE3C8F /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				9394F85AA6ED6214DE27966C68945180 /* PetstoreClient-umbrella.h in Headers */,
+				FE73D6A3B0670590535EC0D79F4F7246 /* AnyPromise.h in Headers */,
+				BB3C554F09627EA5E6E36084E4AA5545 /* fwd.h in Headers */,
+				02650248013496C5AB857B869C562661 /* PromiseKit-umbrella.h in Headers */,
+				B65BFA719D8195A2FAA0E067DE5A6DA4 /* PromiseKit.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -691,16 +687,24 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C19E54C800095CFA2457EC19C7C2E974 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		0E4534BC972F48AE7712EBE0EBE4A62A /* PromiseKit */ = {
+		05AABECB91CEE9C8C520680DDD9BA9AB /* PromiseKit */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 6DABECADE21FD2D0306FD65D1962D82C /* Build configuration list for PBXNativeTarget "PromiseKit" */;
+			buildConfigurationList = EF55B259278E6A593DF7F60BDD524C1D /* Build configuration list for PBXNativeTarget "PromiseKit" */;
 			buildPhases = (
-				5EF303B4A0E59B78FA3C6D66CAA3FEBF /* Sources */,
-				396D8A67A3003EEF737841077046D893 /* Frameworks */,
-				30A4478C9173EAE8FD13FC8118D14766 /* Headers */,
+				8E56111DCEAA0843CC2406F80FC6AC8E /* Sources */,
+				21F0744FB2561027A81E019DEB9FBE9E /* Frameworks */,
+				7732E969446BF18D45DF5D7762E56585 /* Headers */,
 			);
 			buildRules = (
 			);
@@ -728,19 +732,37 @@
 			productReference = E80A16C989615AAE419866DB4FD10185 /* Alamofire.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		A9570E2CBF2CCB6FF2D1D0BCBC2C1DA4 /* PetstoreClient */ = {
+		BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 4E531EDABB05EEFCF77F621FDF76EE61 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildConfigurationList = 6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
 			buildPhases = (
-				7C13D0A0C9E1E42C36CA621CFE601D4B /* Sources */,
-				E1E915C3CCC361B9D8BCF1A0E4813C76 /* Frameworks */,
-				97C378F13A6642E2128BEDA858BE3C8F /* Headers */,
+				61868F2FE74A9422171483DBABE7C61F /* Sources */,
+				7139BF778844E2A9E420524D8146ECD8 /* Frameworks */,
+				C19E54C800095CFA2457EC19C7C2E974 /* Headers */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				065C9E6CD63970D95C755C83B4B598AE /* PBXTargetDependency */,
-				49E753677AE8DE06E40BA119B204E0FD /* PBXTargetDependency */,
+				CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */,
+			);
+			name = "Pods-SwaggerClientTests";
+			productName = "Pods-SwaggerClientTests";
+			productReference = 8BBF3490280C4ED53738743F84C890BC /* Pods_SwaggerClientTests.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		BEF02C72A6656158D171985B49ABDD62 /* PetstoreClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 9EAF730020668F908855C7CE58AD558B /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildPhases = (
+				0A9F622E093BCAAF9C064EA97D5681E0 /* Sources */,
+				1B8C72E45D5881E52545540F3F4881C1 /* Frameworks */,
+				247861DD0240A7F61EE9BD1526A71052 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				673D77682E593868E01C5FA765287285 /* PBXTargetDependency */,
+				54BB4F0799462BDB807AAD5F3BF68BFD /* PBXTargetDependency */,
 			);
 			name = PetstoreClient;
 			productName = PetstoreClient;
@@ -767,23 +789,6 @@
 			productReference = 46A00B403166BEF9EE215F6CB59BE9A6 /* Pods_SwaggerClient.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
-			buildPhases = (
-				BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */,
-				87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */,
-				1353AC7A6419F876B294A55E5550D1E4 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "Pods-SwaggerClientTests";
-			productName = "Pods-SwaggerClientTests";
-			productReference = 8BBF3490280C4ED53738743F84C890BC /* Pods_SwaggerClientTests.framework */;
-			productType = "com.apple.product-type.framework";
-		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -806,15 +811,74 @@
 			projectRoot = "";
 			targets = (
 				88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */,
-				A9570E2CBF2CCB6FF2D1D0BCBC2C1DA4 /* PetstoreClient */,
+				BEF02C72A6656158D171985B49ABDD62 /* PetstoreClient */,
 				E5B96E99C219DDBC57BC27EE9DF5EC22 /* Pods-SwaggerClient */,
-				F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */,
-				0E4534BC972F48AE7712EBE0EBE4A62A /* PromiseKit */,
+				BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */,
+				05AABECB91CEE9C8C520680DDD9BA9AB /* PromiseKit */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXSourcesBuildPhase section */
+		0A9F622E093BCAAF9C064EA97D5681E0 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				AAAFF9E46FF3C55A69E8761C758A48E5 /* AdditionalPropertiesClass.swift in Sources */,
+				096569210E560F7B547A8A778C8BEE0B /* AlamofireImplementations.swift in Sources */,
+				45AEF1D561D94B055F958AF6BD74A9DE /* Animal.swift in Sources */,
+				85F98BB583753B1CF977D7A04D70AD3D /* AnimalFarm.swift in Sources */,
+				AA342EBC9474FE63CCA0D61DCECDD722 /* AnotherFakeAPI.swift in Sources */,
+				F5FBAECC58851B724EA306C179781810 /* APIHelper.swift in Sources */,
+				7B3DA83F3B5FED00F65AB62921A01030 /* ApiResponse.swift in Sources */,
+				F7C8625587D898907E62ACA1FFDD408B /* APIs.swift in Sources */,
+				093FE53CB3328559C65EBBAAF527D78D /* ArrayOfArrayOfNumberOnly.swift in Sources */,
+				3DDAC28BB63E3CC2C35F2D0585E3F586 /* ArrayOfNumberOnly.swift in Sources */,
+				137DAF8FF69611F8A06C44B67CF6F6B5 /* ArrayTest.swift in Sources */,
+				8C4014FF4F3816A66E2A54A5C6D3C3F3 /* Capitalization.swift in Sources */,
+				73B3AF4DB13BAF41132EE8B6DC750053 /* Cat.swift in Sources */,
+				2763B2E6F29D7FCE40243F00A67709D0 /* Category.swift in Sources */,
+				4B4BBBB2A7FDB2ABA6ABFBE5C472030D /* ClassModel.swift in Sources */,
+				1C832D0B29531429F35131FF51FFE25D /* Client.swift in Sources */,
+				D89FECF0B1C7A2D713053CAED01E6F7F /* CodableHelper.swift in Sources */,
+				ECA6AA2EACBD167257FBCE7FC5CD7C10 /* Configuration.swift in Sources */,
+				DE4FFDE8A6E27CBC7291820581B1BD9A /* Dog.swift in Sources */,
+				17E56B942DC1B30C84E158E47988B552 /* EnumArrays.swift in Sources */,
+				CCADAFD47945929A98AD92ED9AE96FE8 /* EnumClass.swift in Sources */,
+				F9E10E625857A6FFF874C1D8AF59840A /* EnumTest.swift in Sources */,
+				1F3362AD484EF46863A9BE871493099C /* Extensions.swift in Sources */,
+				A1AFF1375FB497F42A3142BD20BF62E8 /* FakeAPI.swift in Sources */,
+				A3291A5E8ED10F1803AB1F4EEA4A6445 /* FakeClassnameTags123API.swift in Sources */,
+				28A121AF5001D71F5547006701441FAA /* File.swift in Sources */,
+				5FAD2CC31374E9E7A63653EBFD331A7C /* FileSchemaTestClass.swift in Sources */,
+				85E3539753BE81D789B84B36968D2716 /* FormatTest.swift in Sources */,
+				814DFD9DCDBD6A458F90C8C955F1D447 /* HasOnlyReadOnly.swift in Sources */,
+				AC46D7B7F25929DD5ADD2ED095ACBCF3 /* JSONEncodableEncoding.swift in Sources */,
+				C685A44CF73B420C586417B49BBBA8A9 /* JSONEncodingHelper.swift in Sources */,
+				9D74DAA2C9A4CB3341C267E12A7F4441 /* List.swift in Sources */,
+				95BFB77801BE59D7EB5B793FF8F1F22B /* MapTest.swift in Sources */,
+				951884DAFB0B03C83AAFD57F81AF4CDD /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
+				645744FB3E79537030B378FF01734BB0 /* Model200Response.swift in Sources */,
+				0E61AA5BD188FF3FBDD712C4F9A8D302 /* Models.swift in Sources */,
+				F3C0FF7627AE3D02882839E52F5D64AD /* Name.swift in Sources */,
+				90EE6BEBBA73536B758D53DBC9E3C6D4 /* NumberOnly.swift in Sources */,
+				32313FCA1392012D603D0559866DE780 /* Order.swift in Sources */,
+				60E275765FC4AA45834D19BEBC4E67A5 /* OuterComposite.swift in Sources */,
+				972BEE7DF8E16382E5D30F7A94C8A469 /* OuterEnum.swift in Sources */,
+				8F39B17E08DFFBC12DA790278582AA8E /* Pet.swift in Sources */,
+				02BD805D23521EA2EDEEB4DFCD0C3B79 /* PetAPI.swift in Sources */,
+				8E30D1FBB8F7FE6FA028ED5DA8A5AEE7 /* PetstoreClient-dummy.m in Sources */,
+				1F2F1DCB8A4D07829345F43D3AEA848B /* ReadOnlyFirst.swift in Sources */,
+				FD55E77FA0E620CB7E618A934773CBBE /* Return.swift in Sources */,
+				B63172E37B27FA2FFF601A115C354752 /* SpecialModelName.swift in Sources */,
+				E5016AAEA1009927B5A362E0D74AE280 /* StoreAPI.swift in Sources */,
+				843DAE627C09DBAAAB41D5A8BC1FB0B9 /* StringBooleanMap.swift in Sources */,
+				BD97BAFECA7DEB98E8F1A2F7CB60D34D /* Tag.swift in Sources */,
+				E81B9022DADCB10CB8C5BF1C2737B061 /* User.swift in Sources */,
+				18A18EB42890C48B481A29858B2045A0 /* UserAPI.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		32B9974868188C4803318E36329C87FE /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -840,99 +904,39 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		5EF303B4A0E59B78FA3C6D66CAA3FEBF /* Sources */ = {
+		61868F2FE74A9422171483DBABE7C61F /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				36F8AE4A7F55750F441C4EA540D1699C /* after.m in Sources */,
-				27C0638829CB61F69ACAA8ADBEFB18F8 /* after.swift in Sources */,
-				E8381C638D5A359B3253A52097E8B36A /* AnyPromise.m in Sources */,
-				55692168300BC109D310F93B530B4132 /* AnyPromise.swift in Sources */,
-				80BF18A2B7CCB1144BDF94B1B9C94F4C /* dispatch_promise.m in Sources */,
-				04383899005EE36AF21F761D7DC80E95 /* DispatchQueue+Promise.swift in Sources */,
-				2ADC297B4E6F3FF3B8FE90461C80DC81 /* Error.swift in Sources */,
-				F97FBC27216FCA32291E371DC468FCFA /* GlobalState.m in Sources */,
-				0AAA2459130A15FAB0A059B2C8D538A9 /* hang.m in Sources */,
-				8117E1FE605C93F0136EF1FA853AE6DD /* join.m in Sources */,
-				C148EBC0FC3237381FFE4C0848DCAD0B /* join.swift in Sources */,
-				4D2ECA6C094192F32B0B6F65481D7E47 /* Promise+AnyPromise.swift in Sources */,
-				D725087C0D7C1C9A7A55AB21895AC621 /* Promise+Properties.swift in Sources */,
-				7FCA54A30C9BD117FC96CC045BBB58BE /* Promise.swift in Sources */,
-				B207CF0DA3B3545959B5B95FBBB53D9B /* PromiseKit-dummy.m in Sources */,
-				84BA25DC929E84CEEA3A86A6A6168175 /* race.swift in Sources */,
-				70BFDB7E47A8CCB22B535EDCBDAABC7C /* State.swift in Sources */,
-				1F1E70B6B892CFE7E8D03B3890D05C5A /* when.m in Sources */,
-				6997A0FD680C0A48DEF678CED18DA37B /* when.swift in Sources */,
-				1A6464D1BF86829B60AA7F767B2B6228 /* wrap.swift in Sources */,
-				FCB76B4B93511BE442511A358CDA4779 /* Zalgo.swift in Sources */,
+				80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		7C13D0A0C9E1E42C36CA621CFE601D4B /* Sources */ = {
+		8E56111DCEAA0843CC2406F80FC6AC8E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2CFA4F6DB943A88101EC5E33612F3D3A /* AdditionalPropertiesClass.swift in Sources */,
-				631846166C39D7961C0FC2420A814D5D /* AlamofireImplementations.swift in Sources */,
-				A564637BF264BB4CFB6FEF9CB75104A1 /* Animal.swift in Sources */,
-				BEEF2C5F2E966C2177FE98B2D72CF0BF /* AnimalFarm.swift in Sources */,
-				75E75F96CB55F0D28EE06BAB415C26DC /* AnotherfakeAPI.swift in Sources */,
-				7AE27271C19BB4061041C31FCA3244D2 /* APIHelper.swift in Sources */,
-				D61DF6FE79C6EB404622E9BB8BA73D0E /* ApiResponse.swift in Sources */,
-				B5AB1B6A32A9C6089D4C6B45C0F62908 /* APIs.swift in Sources */,
-				D88DA7B51E85EFDE66A1E2FB8E15A961 /* ArrayOfArrayOfNumberOnly.swift in Sources */,
-				E0D2E9BDF0D339F6DB14A81CF4BDB0CE /* ArrayOfNumberOnly.swift in Sources */,
-				50535053DF0B148D8D55C84AACE3E821 /* ArrayTest.swift in Sources */,
-				52D5D882F7A76CCC2E82CEC51E4C4A8F /* Capitalization.swift in Sources */,
-				CF6B474D37B11F62B01420187A4BC8E8 /* Cat.swift in Sources */,
-				F200D84ABF9E46CE68D20FA0107CB998 /* Category.swift in Sources */,
-				A56117A0D1F9C17CDAEC93D025808F95 /* ClassModel.swift in Sources */,
-				28A61491F92263C04AC52DDB7D3D7C5E /* Client.swift in Sources */,
-				98E6C302C43D21D3C7E655C6AB628229 /* CodableHelper.swift in Sources */,
-				1103E43C29C4C4880211E7F883882F70 /* Configuration.swift in Sources */,
-				2D1EC3F916AA171A159217B17E1DC3A5 /* Dog.swift in Sources */,
-				CE1E54F275C78733C1920B8843E0FE7F /* EnumArrays.swift in Sources */,
-				BECEC463EA228A617DDC97A74DC82317 /* EnumClass.swift in Sources */,
-				2C2B0BFA01ABB26BC0961FDCEBCF9193 /* EnumTest.swift in Sources */,
-				221F18103190719148CA55FA85959C89 /* Extensions.swift in Sources */,
-				2613421691DFA013A440D1545EE747F9 /* Fake_classname_tags123API.swift in Sources */,
-				083C731FF7E5782D19029803B9C23DE8 /* FakeAPI.swift in Sources */,
-				ACB6244F92A66923FBDE06DB52FC0E58 /* FakeClassnameTags123API.swift in Sources */,
-				B084B1F97F44DD44E97DE9609E63339C /* FormatTest.swift in Sources */,
-				DCA4F98E74966A61AB0694E91D2059E8 /* HasOnlyReadOnly.swift in Sources */,
-				777BF05C3DD2E08DB3E3EED5F97A0CD8 /* JSONEncodableEncoding.swift in Sources */,
-				802E48AE09C6A80FD22638D72C73A747 /* JSONEncodingHelper.swift in Sources */,
-				BAA40BFDD985C530D27C930B3C68B1B1 /* List.swift in Sources */,
-				F80BFCE54D77C81CA17F4CEEBEBE394D /* MapTest.swift in Sources */,
-				31582924647B36C90C9B7763F14905F8 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
-				4818A1E024F6FAE56EFCC63F1C0F9631 /* Model200Response.swift in Sources */,
-				095BBCE1E728245C9E4E162B0FE4BB6A /* Models.swift in Sources */,
-				7BFA5408D6C0495B19C0CDDEA71474D5 /* Name.swift in Sources */,
-				A86F3B3FE87D83AF99AB9BFC8155628B /* NumberOnly.swift in Sources */,
-				FC84AAA8BB9ED0767994FAA4FC65EE71 /* Order.swift in Sources */,
-				64FBE4A1A786C4AFE12ADD42ECD1572A /* OuterBoolean.swift in Sources */,
-				DBD92C6CA90C0BD1C4C06C2BE18919DA /* OuterComposite.swift in Sources */,
-				A4CF090C8C8CAB1F0DA8DB338C80F144 /* OuterEnum.swift in Sources */,
-				0A2E76BD89D6BF6F8F889FAFEF599199 /* OuterNumber.swift in Sources */,
-				18E0A0C81B42135BD9A73D1670B982D7 /* OuterString.swift in Sources */,
-				BD32F9E3B06BF67B0247C821095F7247 /* Pet.swift in Sources */,
-				3CFA2361C8B43583460324BE5C3F0AA2 /* PetAPI.swift in Sources */,
-				21D5CF155AB37729819479C01C692275 /* PetstoreClient-dummy.m in Sources */,
-				667D55108CF6FE31F77C42480691A11F /* ReadOnlyFirst.swift in Sources */,
-				65FFD0F2A18B865A83654491E2822133 /* Return.swift in Sources */,
-				405B9F95A650E2FEC0ED1BCAE7682AA7 /* SpecialModelName.swift in Sources */,
-				F3365947E0B9BD60F15F14C0C2F644E8 /* StoreAPI.swift in Sources */,
-				3D7779C784C66A0C30436BD2CA2C0F40 /* Tag.swift in Sources */,
-				B0556940CFFF7904CA9C2CAB1AF71FB3 /* User.swift in Sources */,
-				0A7BAE5F9B5FF377168750D402C2D785 /* UserAPI.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */,
+				B40BA9338A0622CC69161949F42E0ADE /* after.m in Sources */,
+				A3B4F53480EF96400D782F3507A42573 /* after.swift in Sources */,
+				A6FAEDD331C7E9BD959076F2CC466B5A /* AnyPromise.m in Sources */,
+				85543B6F540EED8FFF82015FED6CB68B /* AnyPromise.swift in Sources */,
+				FC0B3667BB40C86FC84990EEDF29B534 /* dispatch_promise.m in Sources */,
+				9DCADBA52F4BA9C2BCDD2AD9FC39291E /* DispatchQueue+Promise.swift in Sources */,
+				669789618901F2B104F686A8A44E4F23 /* Error.swift in Sources */,
+				95DD56D8244A0F779EA3D24617389DFA /* GlobalState.m in Sources */,
+				46C3E70BD716E72351EA9828A496E59A /* hang.m in Sources */,
+				0BC6EA4CC7B942917A160339B54748B6 /* join.m in Sources */,
+				6939CF29A58F770558A46D229F33CDEF /* join.swift in Sources */,
+				BE111800D151B74E9EB6CFFA5375A378 /* Promise+AnyPromise.swift in Sources */,
+				878E6E228B4A3D2725656142AA379D7F /* Promise+Properties.swift in Sources */,
+				D6184AB54A12F4F580FE7766FFD1A491 /* Promise.swift in Sources */,
+				888EF901304106608916A05E6EC6A0A0 /* PromiseKit-dummy.m in Sources */,
+				C36D10DCACB58234D9ADAE75457BB1F7 /* race.swift in Sources */,
+				98859B984F0B8D1BA8C419626A541DDF /* State.swift in Sources */,
+				CAA786E247A67408ED8FDDD3BD9EACC3 /* when.m in Sources */,
+				FCB75043BDF47C08F944EFD06D4636D9 /* when.swift in Sources */,
+				B319CCF9C8F0F08FADAEA89F9655B54E /* wrap.swift in Sources */,
+				34C9317929C1DA5F022B5AEC56DED275 /* Zalgo.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -947,12 +951,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		065C9E6CD63970D95C755C83B4B598AE /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = Alamofire;
-			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
-			targetProxy = 4F56515656F716821CBADACB7A9CB467 /* PBXContainerItemProxy */;
-		};
 		1C76F9E08AAB9400CF7937D3DBF4E272 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = Alamofire;
@@ -962,93 +960,41 @@
 		328C6C7DF03199CFF8F5B47C39DEE2BC /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PromiseKit;
-			target = 0E4534BC972F48AE7712EBE0EBE4A62A /* PromiseKit */;
+			target = 05AABECB91CEE9C8C520680DDD9BA9AB /* PromiseKit */;
 			targetProxy = F4F5C9A84714BE23040A5FB7588DA6BD /* PBXContainerItemProxy */;
 		};
 		405120CD9D9120CBBC452E54C91FA485 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PetstoreClient;
-			target = A9570E2CBF2CCB6FF2D1D0BCBC2C1DA4 /* PetstoreClient */;
+			target = BEF02C72A6656158D171985B49ABDD62 /* PetstoreClient */;
 			targetProxy = B173CFF2A1174933D7851E8CE1CA77AB /* PBXContainerItemProxy */;
 		};
-		49E753677AE8DE06E40BA119B204E0FD /* PBXTargetDependency */ = {
+		54BB4F0799462BDB807AAD5F3BF68BFD /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PromiseKit;
-			target = 0E4534BC972F48AE7712EBE0EBE4A62A /* PromiseKit */;
-			targetProxy = 8CC739769B7ED206269C0591EE53BD65 /* PBXContainerItemProxy */;
+			target = 05AABECB91CEE9C8C520680DDD9BA9AB /* PromiseKit */;
+			targetProxy = 2A6F85761AF8DEABF6BBF52FD80B83C1 /* PBXContainerItemProxy */;
+		};
+		673D77682E593868E01C5FA765287285 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Alamofire;
+			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
+			targetProxy = 0166D6CEA46A405AF6440470518778BB /* PBXContainerItemProxy */;
+		};
+		CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "Pods-SwaggerClient";
+			target = E5B96E99C219DDBC57BC27EE9DF5EC22 /* Pods-SwaggerClient */;
+			targetProxy = 39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		0A501A275C2C77F82FD28A347B80496E /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = F1ED5AD8A7A28479CDC87C72B75010ED /* PetstoreClient.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
-				PRODUCT_NAME = PetstoreClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		1928FD2BA1177E86A2DAF2641C8755AA /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		1DF48E764052158CE8AC40DB7B84172C /* Debug */ = {
+		0EE8843F198A5F366A4E623FAAE15059 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -1068,7 +1014,7 @@
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -1080,9 +1026,9 @@
 			};
 			name = Debug;
 		};
-		294685D76AA9795895462E2CCD32108F /* Release */ = {
+		14C7EC2F8FBE17118467A5026322FBDB /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */;
+			baseConfigurationReference = 451D13FDA61BDE9EB91BBC6CEA52AED4 /* PromiseKit.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -1093,19 +1039,17 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
+				GCC_PREFIX_HEADER = "Target Support Files/PromiseKit/PromiseKit-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PromiseKit/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
+				MODULEMAP_FILE = "Target Support Files/PromiseKit/PromiseKit.modulemap";
+				PRODUCT_MODULE_NAME = PromiseKit;
+				PRODUCT_NAME = PromiseKit;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1115,256 +1059,7 @@
 			};
 			name = Release;
 		};
-		4F1AB8279A7C4737EB15C9417B058BCA /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGNING_REQUIRED = NO;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"POD_CONFIGURATION_RELEASE=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
-				STRIP_INSTALLED_PRODUCT = NO;
-				SYMROOT = "${SRCROOT}/../build";
-			};
-			name = Release;
-		};
-		649AB76BE3F66B45FB75AF3F33BE4DE1 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 451D13FDA61BDE9EB91BBC6CEA52AED4 /* PromiseKit.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/PromiseKit/PromiseKit-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PromiseKit/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PromiseKit/PromiseKit.modulemap";
-				PRODUCT_NAME = PromiseKit;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		6CD2CF3CB56F8D2390B8CD744515AD17 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 45FB2502919E80623D265FE19C0A8FC4 /* Alamofire.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				PRODUCT_NAME = Alamofire;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		972BD31D68F98035DE59A64D32AC1F3A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 45FB2502919E80623D265FE19C0A8FC4 /* Alamofire.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				PRODUCT_NAME = Alamofire;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		A202743388C540E1DF69433359FC9B9A /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = F1ED5AD8A7A28479CDC87C72B75010ED /* PetstoreClient.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
-				PRODUCT_NAME = PetstoreClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		A93B9572FCFA5D48D91E2814712E978D /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 451D13FDA61BDE9EB91BBC6CEA52AED4 /* PromiseKit.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/PromiseKit/PromiseKit-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/PromiseKit/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/PromiseKit/PromiseKit.modulemap";
-				PRODUCT_NAME = PromiseKit;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		E5AEBAF82849035F9A9CD1F299E57E07 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		E95097900ACBDB730939D23AFE3D24CD /* Debug */ = {
+		1FE3B4CE8C074CE87C18B26C91020E15 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -1396,6 +1091,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
 				CODE_SIGNING_REQUIRED = NO;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1420,21 +1116,345 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
 				STRIP_INSTALLED_PRODUCT = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SYMROOT = "${SRCROOT}/../build";
 			};
 			name = Debug;
 		};
+		5E110A36DB7BF1BF01973770C95C3047 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		7B0415700290D1DEBAB6B173951CC0C7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 45FB2502919E80623D265FE19C0A8FC4 /* Alamofire.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				PRODUCT_MODULE_NAME = Alamofire;
+				PRODUCT_NAME = Alamofire;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		89C68177307D3F04B055FD0AA2FC173A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
+				CODE_SIGNING_REQUIRED = NO;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"POD_CONFIGURATION_RELEASE=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				STRIP_INSTALLED_PRODUCT = NO;
+				SYMROOT = "${SRCROOT}/../build";
+			};
+			name = Release;
+		};
+		95DBEF0AB0B74932A7CEF4BB6099470D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 45FB2502919E80623D265FE19C0A8FC4 /* Alamofire.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				PRODUCT_MODULE_NAME = Alamofire;
+				PRODUCT_NAME = Alamofire;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		A65986357C6AD93BD4F9431CA498E36B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 451D13FDA61BDE9EB91BBC6CEA52AED4 /* PromiseKit.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/PromiseKit/PromiseKit-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PromiseKit/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PromiseKit/PromiseKit.modulemap";
+				PRODUCT_MODULE_NAME = PromiseKit;
+				PRODUCT_NAME = PromiseKit;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		AA44C748B579D9822A4F1DA83E57D74C /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		B34B6723540350B09C31E98F485CF44D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				PRODUCT_MODULE_NAME = PetstoreClient;
+				PRODUCT_NAME = PetstoreClient;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		C6B2F4D332313254F97F583C4C1F5703 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		CB8A4FD43D40133FDFBC9396C02BDC40 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/PetstoreClient/PetstoreClient-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/PetstoreClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				PRODUCT_MODULE_NAME = PetstoreClient;
+				PRODUCT_NAME = PetstoreClient;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
 		2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				E95097900ACBDB730939D23AFE3D24CD /* Debug */,
-				4F1AB8279A7C4737EB15C9417B058BCA /* Release */,
+				1FE3B4CE8C074CE87C18B26C91020E15 /* Debug */,
+				89C68177307D3F04B055FD0AA2FC173A /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1442,17 +1462,17 @@
 		419E5D95491847CD79841B971A8A3277 /* Build configuration list for PBXNativeTarget "Alamofire" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				972BD31D68F98035DE59A64D32AC1F3A /* Debug */,
-				6CD2CF3CB56F8D2390B8CD744515AD17 /* Release */,
+				7B0415700290D1DEBAB6B173951CC0C7 /* Debug */,
+				95DBEF0AB0B74932A7CEF4BB6099470D /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		4E531EDABB05EEFCF77F621FDF76EE61 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+		6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				0A501A275C2C77F82FD28A347B80496E /* Debug */,
-				A202743388C540E1DF69433359FC9B9A /* Release */,
+				AA44C748B579D9822A4F1DA83E57D74C /* Debug */,
+				5E110A36DB7BF1BF01973770C95C3047 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1460,26 +1480,26 @@
 		607382BCFF2B60BA932C95EC3C22A69F /* Build configuration list for PBXNativeTarget "Pods-SwaggerClient" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				1DF48E764052158CE8AC40DB7B84172C /* Debug */,
-				294685D76AA9795895462E2CCD32108F /* Release */,
+				0EE8843F198A5F366A4E623FAAE15059 /* Debug */,
+				C6B2F4D332313254F97F583C4C1F5703 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		6DABECADE21FD2D0306FD65D1962D82C /* Build configuration list for PBXNativeTarget "PromiseKit" */ = {
+		9EAF730020668F908855C7CE58AD558B /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				649AB76BE3F66B45FB75AF3F33BE4DE1 /* Debug */,
-				A93B9572FCFA5D48D91E2814712E978D /* Release */,
+				CB8A4FD43D40133FDFBC9396C02BDC40 /* Debug */,
+				B34B6723540350B09C31E98F485CF44D /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
+		EF55B259278E6A593DF7F60BDD524C1D /* Build configuration list for PBXNativeTarget "PromiseKit" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				E5AEBAF82849035F9A9CD1F299E57E07 /* Debug */,
-				1928FD2BA1177E86A2DAF2641C8755AA /* Release */,
+				A65986357C6AD93BD4F9431CA498E36B /* Debug */,
+				14C7EC2F8FBE17118467A5026322FBDB /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
index 881c8cade67..6b8baab300a 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
@@ -1,6 +1,5 @@
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Alamofire
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
index 983ce31eaa7..1704e72da48 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
@@ -1,7 +1,6 @@
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient
 FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
index d5a177d2a05..9e0a7d4afaa 100755
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
@@ -1,9 +1,18 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
 # Used as a return value for each invocation of `strip_invalid_archs` function.
@@ -92,10 +101,10 @@ install_dsym() {
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
index 881cbaed324..08e3eaaca45 100755
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
@@ -1,9 +1,18 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
 # Used as a return value for each invocation of `strip_invalid_archs` function.
@@ -92,10 +101,10 @@ install_dsym() {
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig
index 0e6aad60e9c..6c47b4c1b92 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig	
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Target Support Files/PromiseKit/PromiseKit.xcconfig	
@@ -1,6 +1,5 @@
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/PromiseKit
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_LDFLAGS = -framework "Foundation"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
 PODS_BUILD_DIR = ${BUILD_DIR}
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
index a0cf7c49cf3..fafcbb55afc 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
@@ -148,7 +148,6 @@
 				6D4EFB8E1C692C6300B96B06 /* Frameworks */,
 				6D4EFB8F1C692C6300B96B06 /* Resources */,
 				4485A75250058E2D5BBDF63F /* [CP] Embed Pods Frameworks */,
-				808CE4A0CE801CAC5ABF5B08 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -167,8 +166,6 @@
 				6D4EFBA11C692C6300B96B06 /* Sources */,
 				6D4EFBA21C692C6300B96B06 /* Frameworks */,
 				6D4EFBA31C692C6300B96B06 /* Resources */,
-				796EAD48F1BCCDAA291CD963 /* [CP] Embed Pods Frameworks */,
-				1652CB1A246A4689869E442D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -241,21 +238,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		1652CB1A246A4689869E442D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		1F03F780DC2D9727E5E64BA9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -296,21 +278,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		796EAD48F1BCCDAA291CD963 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		79FE27B09B2DD354C831BD49 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -329,21 +296,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		808CE4A0CE801CAC5ABF5B08 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 00000000000..18d981003d6
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
index 05649b01abe..f32e457fa54 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
@@ -31,7 +31,7 @@ class PetAPITests: XCTestCase {
         let tags = [Tag(_id: 1234, name: "New York"), Tag(_id: 124321, name: "Jose")]
         let newPet = Pet(_id: 1000, category: category, name: "Fluffy", photoUrls: ["https://petstore.com/sample/photo1.jpg", "https://petstore.com/sample/photo2.jpg"], tags: tags, status: .available)
 
-        PetAPI.addPet(body: newPet).then {
+        PetAPI.addPet(pet: newPet).then {
                 expectation.fulfill()
             }.always {
                 // Noop for now
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
index 335b79050fc..b9fcfe2015a 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
@@ -22,7 +22,7 @@ class StoreAPITests: XCTestCase {
         let shipDate = Date()
         let order = Order(_id: 1000, petId: 1000, quantity: 10, shipDate: shipDate, status: .placed, complete: true)
         let expectation = self.expectation(description: "testPlaceOrder")
-        StoreAPI.placeOrder(body: order).then { order -> Void in
+        StoreAPI.placeOrder(order: order).then { order -> Void in
                 XCTAssert(order._id == 1000, "invalid id")
                 XCTAssert(order.quantity == 10, "invalid quantity")
                 XCTAssert(order.status == .placed, "invalid status")
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
index 159c5d8ff8a..f416f745b45 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
@@ -38,48 +38,4 @@ class UserAPITests: XCTestCase {
         }
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
-    func test1CreateUser() {
-        let expectation = self.expectation(description: "testCreateUser")
-        let newUser = User(_id: 1000, username: "test@test.com", firstName: "Test", lastName: "Tester", email: "test@test.com", password: "test!", phone: "867-5309", userStatus: 0)
-        UserAPI.createUser(body: newUser).then {
-            expectation.fulfill()
-            }.always {
-                // Noop for now
-            }.catch { (error) in
-                XCTFail("create user error")
-        }
-        self.waitForExpectations(timeout: testTimeout, handler: nil)
-    }
-    
-    func test2GetUser() {
-        let expectation = self.expectation(description: "testGetUser")
-        UserAPI.getUserByName(username: "test@test.com").then {user -> Void in
-            XCTAssert(user.userStatus == 0, "invalid userStatus")
-            XCTAssert(user.email == "test@test.com", "invalid email")
-            XCTAssert(user.firstName == "Test", "invalid firstName")
-            XCTAssert(user.lastName == "Tester", "invalid lastName")
-            XCTAssert(user.password == "test!", "invalid password")
-            XCTAssert(user.phone == "867-5309", "invalid phone")
-            expectation.fulfill()
-            }.always {
-                // Noop for now
-            }.catch { errorType in
-                XCTFail("error getting user")
-        }
-        self.waitForExpectations(timeout: testTimeout, handler: nil)
-    }
-    
-    func test3DeleteUser() {
-        let expectation = self.expectation(description: "testDeleteUser")
-        UserAPI.deleteUser(username: "test@test.com").then {
-            expectation.fulfill()
-            }.always {
-                // Noop for now
-            }.catch { (error) in
-                XCTFail("deleting user error")
-        }
-        self.waitForExpectations(timeout: testTimeout, handler: nil)
-    }
-
 }
diff --git a/samples/client/petstore/swift4/rxswift/.openapi-generator/VERSION b/samples/client/petstore/swift4/rxswift/.openapi-generator/VERSION
index ad121e8340e..4395ff59232 100644
--- a/samples/client/petstore/swift4/rxswift/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift4/rxswift/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.1-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index 9f947042e85..cdf2e1eff63 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -18,8 +18,8 @@ open class AnotherFakeAPI {
      - parameter client: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
+    open class func call123testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+        call123testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -30,9 +30,9 @@ open class AnotherFakeAPI {
      - parameter client: (body) client model 
      - returns: Observable<Client>
      */
-    open class func testSpecialTags(client: Client) -> Observable<Client> {
+    open class func call123testSpecialTags(client: Client) -> Observable<Client> {
         return Observable.create { observer -> Disposable in
-            testSpecialTags(client: client) { data, error in
+            call123testSpecialTags(client: client) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -47,11 +47,11 @@ open class AnotherFakeAPI {
     /**
      To test special tags
      - PATCH /another-fake/dummy
-     - To test special tags
+     - To test special tags and operation ID starting with number
      - parameter client: (body) client model 
      - returns: RequestBuilder<Client> 
      */
-    open class func testSpecialTagsWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
+    open class func call123testSpecialTagsWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
         let path = "/another-fake/dummy"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: client)
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index 46fad3a2768..d4253fb51d0 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -204,6 +204,58 @@ open class FakeAPI {
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
     }
 
+    /**
+
+     - parameter fileSchemaTestClass: (body)  
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testBodyWithFileSchema(fileSchemaTestClass: FileSchemaTestClass, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        testBodyWithFileSchemaWithRequestBuilder(fileSchemaTestClass: fileSchemaTestClass).execute { (response, error) -> Void in
+            if error == nil {
+                completion((), error)
+            } else {
+                completion(nil, error)
+            }
+        }
+    }
+
+    /**
+
+     - parameter fileSchemaTestClass: (body)  
+     - returns: Observable<Void>
+     */
+    open class func testBodyWithFileSchema(fileSchemaTestClass: FileSchemaTestClass) -> Observable<Void> {
+        return Observable.create { observer -> Disposable in
+            testBodyWithFileSchema(fileSchemaTestClass: fileSchemaTestClass) { data, error in
+                if let error = error {
+                    observer.on(.error(error))
+                } else {
+                    observer.on(.next(data!))
+                }
+                observer.on(.completed)
+            }
+            return Disposables.create()
+        }
+    }
+
+    /**
+     - PUT /fake/body-with-file-schema
+     - For this test, the body for this request much reference a schema named `File`.
+     - parameter fileSchemaTestClass: (body)  
+     - returns: RequestBuilder<Void> 
+     */
+    open class func testBodyWithFileSchemaWithRequestBuilder(fileSchemaTestClass: FileSchemaTestClass) -> RequestBuilder<Void> {
+        let path = "/fake/body-with-file-schema"
+        let URLString = PetstoreClientAPI.basePath + path
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: fileSchemaTestClass)
+
+        let url = URLComponents(string: URLString)
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
+
+        return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
+    }
+
     /**
 
      - parameter query: (query)  
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index d7cd99d687a..8c9ac487f7b 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -513,4 +513,72 @@ open class PetAPI {
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
 
+    /**
+     uploads an image (required)
+     
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+        uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute { (response, error) -> Void in
+            completion(response?.body, error)
+        }
+    }
+
+    /**
+     uploads an image (required)
+     
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - returns: Observable<ApiResponse>
+     */
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> Observable<ApiResponse> {
+        return Observable.create { observer -> Disposable in
+            uploadFileWithRequiredFile(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata) { data, error in
+                if let error = error {
+                    observer.on(.error(error))
+                } else {
+                    observer.on(.next(data!))
+                }
+                observer.on(.completed)
+            }
+            return Disposables.create()
+        }
+    }
+
+    /**
+     uploads an image (required)
+     - POST /fake/{petId}/uploadImageWithRequiredFile
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - returns: RequestBuilder<ApiResponse> 
+     */
+    open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder<ApiResponse> {
+        var path = "/fake/{petId}/uploadImageWithRequiredFile"
+        let petIdPreEscape = "\(petId)"
+        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
+        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        let formParams: [String:Any?] = [
+            "additionalMetadata": additionalMetadata,
+            "requiredFile": requiredFile
+        ]
+
+        let nonNullParameters = APIHelper.rejectNil(formParams)
+        let parameters = APIHelper.convertBoolToString(nonNullParameters)
+        
+        let url = URLComponents(string: URLString)
+
+        let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/File.swift
new file mode 100644
index 00000000000..c8bd1f19589
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -0,0 +1,24 @@
+//
+// File.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** Must be named &#x60;File&#x60; for test. */
+
+public struct File: Codable {
+
+    /** Test capitalization */
+    public var sourceURI: String?
+
+    public init(sourceURI: String?) {
+        self.sourceURI = sourceURI
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
new file mode 100644
index 00000000000..64d02506802
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -0,0 +1,24 @@
+//
+// FileSchemaTestClass.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+
+public struct FileSchemaTestClass: Codable {
+
+    public var file: File?
+    public var files: [File]?
+
+    public init(file: File?, files: [File]?) {
+        self.file = file
+        self.files = files
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index dfbbee8428e..2d3a45d35a0 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -17,15 +17,21 @@ public struct MapTest: Codable {
     }
     public var mapMapOfString: [String:[String:String]]?
     public var mapOfEnumString: [String:String]?
+    public var directMap: [String:Bool]?
+    public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?) {
+    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
+        self.directMap = directMap
+        self.indirectMap = indirectMap
     }
 
     public enum CodingKeys: String, CodingKey { 
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
+        case directMap = "direct_map"
+        case indirectMap = "indirect_map"
     }
 
 
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
new file mode 100644
index 00000000000..ae15e87d94b
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -0,0 +1,51 @@
+//
+// StringBooleanMap.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+
+public struct StringBooleanMap: Codable {
+
+
+    public var additionalProperties: [String:Bool] = [:]
+
+    public subscript(key: String) -> Bool? {
+        get {
+            if let value = additionalProperties[key] {
+                return value
+            }
+            return nil
+        }
+
+        set {
+            additionalProperties[key] = newValue
+        }
+    }
+
+    // Encodable protocol methods
+
+    public func encode(to encoder: Encoder) throws {
+
+        var container = encoder.container(keyedBy: String.self)
+
+        try container.encodeMap(additionalProperties)
+    }
+
+    // Decodable protocol methods
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: String.self)
+
+        var nonAdditionalPropertyKeys = Set<String>()
+        additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
+    }
+
+
+
+}
+
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs.swift
deleted file mode 100644
index 2c2fc3157de..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs.swift
+++ /dev/null
@@ -1,61 +0,0 @@
-// APIs.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-open class PetstoreClientAPI {
-    open static var basePath = "http://petstore.swagger.io:80/v2"
-    open static var credential: URLCredential?
-    open static var customHeaders: [String:String] = [:]
-    open static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
-}
-
-open class RequestBuilder<T> {
-    var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
-    public let isBody: Bool
-    public let method: String
-    public let URLString: String
-
-    /// Optional block to obtain a reference to the request's progress instance when available.
-    public var onProgressReady: ((Progress) -> ())?
-
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
-        self.method = method
-        self.URLString = URLString
-        self.parameters = parameters
-        self.isBody = isBody
-        self.headers = headers
-
-        addHeaders(PetstoreClientAPI.customHeaders)
-    }
-
-    open func addHeaders(_ aHeaders:[String:String]) {
-        for (header, value) in aHeaders {
-            headers[header] = value
-        }
-    }
-
-    open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) { }
-
-    public func addHeader(name: String, value: String) -> Self {
-        if !value.isEmpty {
-            headers[name] = value
-        }
-        return self
-    }
-
-    open func addCredential() -> Self {
-        self.credential = PetstoreClientAPI.credential
-        return self
-    }
-}
-
-public protocol RequestBuilderFactory {
-    func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
-}
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Configuration.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Configuration.swift
deleted file mode 100644
index c03a10b930c..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Configuration.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-// Configuration.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-open class Configuration {
-	
-	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
-	// You must set it prior to encoding any dates, and it will only be read once. 
-    open static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift
deleted file mode 100644
index 19ee06b1f48..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// JSONEncodingHelper.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-import Alamofire
-
-open class JSONEncodingHelper {
-
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
-        var params: Parameters? = nil
-
-        // Encode the Encodable object
-        if let encodableObj = encodableObj {
-            let encodeResult = CodableHelper.encode(encodableObj, prettyPrint: true)
-            if encodeResult.error == nil {
-                params = JSONDataEncoding.encodingParameters(jsonData: encodeResult.data)
-            }
-        }
-
-        return params
-    }
-
-    open class func encodingParameters(forEncodableObject encodableObj: Any?) -> Parameters? {
-        var params: Parameters? = nil
-
-        if let encodableObj = encodableObj {
-            do {
-                let data = try JSONSerialization.data(withJSONObject: encodableObj, options: .prettyPrinted)
-                params = JSONDataEncoding.encodingParameters(jsonData: data)
-            } catch {
-                print(error)
-                return nil
-            }
-        }
-
-        return params
-    }
-    
-}
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models.swift
deleted file mode 100644
index 4962405f029..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models.swift
+++ /dev/null
@@ -1,36 +0,0 @@
-// Models.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-protocol JSONEncodable {
-    func encodeToJSON() -> Any
-}
-
-public enum ErrorResponse : Error {
-    case error(Int, Data?, Error)
-}
-
-open class Response<T> {
-    open let statusCode: Int
-    open let header: [String: String]
-    open let body: T?
-
-    public init(statusCode: Int, header: [String: String], body: T?) {
-        self.statusCode = statusCode
-        self.header = header
-        self.body = body
-    }
-
-    public convenience init(response: HTTPURLResponse, body: T?) {
-        let rawHeader = response.allHeaderFields
-        var header = [String:String]()
-        for case let (key, value) as (String, String) in rawHeader {
-            header[key] = value
-        }
-        self.init(statusCode: response.statusCode, header: header, body: body)
-    }
-}
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
deleted file mode 100644
index 6c1e6653b6f..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// AdditionalPropertiesClass.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct AdditionalPropertiesClass: Codable {
-
-    public var mapProperty: [String:String]?
-    public var mapOfMapProperty: [String:[String:String]]?
-
-    public init(mapProperty: [String:String]?, mapOfMapProperty: [String:[String:String]]?) {
-        self.mapProperty = mapProperty
-        self.mapOfMapProperty = mapOfMapProperty
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case mapProperty = "map_property"
-        case mapOfMapProperty = "map_of_map_property"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/AnimalFarm.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/AnimalFarm.swift
deleted file mode 100644
index 68308364894..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/AnimalFarm.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// AnimalFarm.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
deleted file mode 100644
index 3fd872dcd26..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// ApiResponse.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct ApiResponse: Codable {
-
-    public var code: Int?
-    public var type: String?
-    public var message: String?
-
-    public init(code: Int?, type: String?, message: String?) {
-        self.code = code
-        self.type = type
-        self.message = message
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
deleted file mode 100644
index ac59328a279..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// ArrayOfArrayOfNumberOnly.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct ArrayOfArrayOfNumberOnly: Codable {
-
-    public var arrayArrayNumber: [[Double]]?
-
-    public init(arrayArrayNumber: [[Double]]?) {
-        self.arrayArrayNumber = arrayArrayNumber
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case arrayArrayNumber = "ArrayArrayNumber"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
deleted file mode 100644
index 1132638458f..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// ArrayOfNumberOnly.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct ArrayOfNumberOnly: Codable {
-
-    public var arrayNumber: [Double]?
-
-    public init(arrayNumber: [Double]?) {
-        self.arrayNumber = arrayNumber
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case arrayNumber = "ArrayNumber"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
deleted file mode 100644
index 14335a75053..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// ArrayTest.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct ArrayTest: Codable {
-
-    public var arrayOfString: [String]?
-    public var arrayArrayOfInteger: [[Int64]]?
-    public var arrayArrayOfModel: [[ReadOnlyFirst]]?
-
-    public init(arrayOfString: [String]?, arrayArrayOfInteger: [[Int64]]?, arrayArrayOfModel: [[ReadOnlyFirst]]?) {
-        self.arrayOfString = arrayOfString
-        self.arrayArrayOfInteger = arrayArrayOfInteger
-        self.arrayArrayOfModel = arrayArrayOfModel
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case arrayOfString = "array_of_string"
-        case arrayArrayOfInteger = "array_array_of_integer"
-        case arrayArrayOfModel = "array_array_of_model"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
deleted file mode 100644
index 71ba400a9d7..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Capitalization.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Capitalization: Codable {
-
-    public var smallCamel: String?
-    public var capitalCamel: String?
-    public var smallSnake: String?
-    public var capitalSnake: String?
-    public var sCAETHFlowPoints: String?
-    /** Name of the pet  */
-    public var ATT_NAME: String?
-
-    public init(smallCamel: String?, capitalCamel: String?, smallSnake: String?, capitalSnake: String?, sCAETHFlowPoints: String?, ATT_NAME: String?) {
-        self.smallCamel = smallCamel
-        self.capitalCamel = capitalCamel
-        self.smallSnake = smallSnake
-        self.capitalSnake = capitalSnake
-        self.sCAETHFlowPoints = sCAETHFlowPoints
-        self.ATT_NAME = ATT_NAME
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case smallCamel
-        case capitalCamel = "CapitalCamel"
-        case smallSnake = "small_Snake"
-        case capitalSnake = "Capital_Snake"
-        case sCAETHFlowPoints = "SCA_ETH_Flow_Points"
-        case ATT_NAME
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Cat.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Cat.swift
deleted file mode 100644
index 7687f52d477..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Cat.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Cat.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Cat: Codable {
-
-    public var className: String
-    public var color: String?
-    public var declawed: Bool?
-
-    public init(className: String, color: String?, declawed: Bool?) {
-        self.className = className
-        self.color = color
-        self.declawed = declawed
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
deleted file mode 100644
index 3a38128215a..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// ClassModel.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-/** Model for testing model with \&quot;_class\&quot; property */
-
-public struct ClassModel: Codable {
-
-    public var _class: String?
-
-    public init(_class: String?) {
-        self._class = _class
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Client.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Client.swift
deleted file mode 100644
index 0c4fc0d559a..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Client.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Client.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Client: Codable {
-
-    public var client: String?
-
-    public init(client: String?) {
-        self.client = client
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Dog.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Dog.swift
deleted file mode 100644
index 9ba84f7f8cc..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Dog.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Dog.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Dog: Codable {
-
-    public var className: String
-    public var color: String?
-    public var breed: String?
-
-    public init(className: String, color: String?, breed: String?) {
-        self.className = className
-        self.color = color
-        self.breed = breed
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
deleted file mode 100644
index 084a9ab8383..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// EnumArrays.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct EnumArrays: Codable {
-
-    public enum JustSymbol: String, Codable { 
-        case greaterThanOrEqualTo = ">="
-        case dollar = "$"
-    }
-    public enum ArrayEnum: String, Codable { 
-        case fish = "fish"
-        case crab = "crab"
-    }
-    public var justSymbol: JustSymbol?
-    public var arrayEnum: [ArrayEnum]?
-
-    public init(justSymbol: JustSymbol?, arrayEnum: [ArrayEnum]?) {
-        self.justSymbol = justSymbol
-        self.arrayEnum = arrayEnum
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case justSymbol = "just_symbol"
-        case arrayEnum = "array_enum"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumClass.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumClass.swift
deleted file mode 100644
index d0889a3520a..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumClass.swift
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// EnumClass.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-public enum EnumClass: String, Codable {
-    case abc = "_abc"
-    case efg = "-efg"
-    case xyz = "(xyz)"
-
-}
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
deleted file mode 100644
index 3626846919f..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// HasOnlyReadOnly.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct HasOnlyReadOnly: Codable {
-
-    public var bar: String?
-    public var foo: String?
-
-    public init(bar: String?, foo: String?) {
-        self.bar = bar
-        self.foo = foo
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/List.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/List.swift
deleted file mode 100644
index fe11bfce840..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/List.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// List.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct List: Codable {
-
-    public var _123List: String?
-
-    public init(_123List: String?) {
-        self._123List = _123List
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _123List = "123-list"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MapTest.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
deleted file mode 100644
index ded3f7b1dde..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// MapTest.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct MapTest: Codable {
-
-    public enum MapOfEnumString: String, Codable { 
-        case upper = "UPPER"
-        case lower = "lower"
-    }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?) {
-        self.mapMapOfString = mapMapOfString
-        self.mapOfEnumString = mapOfEnumString
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case mapMapOfString = "map_map_of_string"
-        case mapOfEnumString = "map_of_enum_string"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
deleted file mode 100644
index 962b7fe65bc..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// MixedPropertiesAndAdditionalPropertiesClass.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
-
-    public var uuid: UUID?
-    public var dateTime: Date?
-    public var map: [String:Animal]?
-
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
-        self.uuid = uuid
-        self.dateTime = dateTime
-        self.map = map
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
deleted file mode 100644
index f539cd888ab..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// Model200Response.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-/** Model for testing model name starting with number */
-
-public struct Model200Response: Codable {
-
-    public var name: Int?
-    public var _class: String?
-
-    public init(name: Int?, _class: String?) {
-        self.name = name
-        self._class = _class
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case name
-        case _class = "class"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Name.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Name.swift
deleted file mode 100644
index ddd2b909851..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Name.swift
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// Name.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-/** Model for testing model name same as property name */
-
-public struct Name: Codable {
-
-    public var name: Int
-    public var snakeCase: Int?
-    public var property: String?
-    public var _123Number: Int?
-
-    public init(name: Int, snakeCase: Int?, property: String?, _123Number: Int?) {
-        self.name = name
-        self.snakeCase = snakeCase
-        self.property = property
-        self._123Number = _123Number
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case name
-        case snakeCase = "snake_case"
-        case property
-        case _123Number = "123Number"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Order.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Order.swift
deleted file mode 100644
index b6c0cc0cb5a..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Order.swift
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Order.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Order: Codable {
-
-    public enum Status: String, Codable { 
-        case placed = "placed"
-        case approved = "approved"
-        case delivered = "delivered"
-    }
-    public var _id: Int64?
-    public var petId: Int64?
-    public var quantity: Int?
-    public var shipDate: Date?
-    /** Order Status */
-    public var status: Status?
-    public var complete: Bool?
-
-    public init(_id: Int64?, petId: Int64?, quantity: Int?, shipDate: Date?, status: Status?, complete: Bool?) {
-        self._id = _id
-        self.petId = petId
-        self.quantity = quantity
-        self.shipDate = shipDate
-        self.status = status
-        self.complete = complete
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _id = "id"
-        case petId
-        case quantity
-        case shipDate
-        case status
-        case complete
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterBoolean.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterBoolean.swift
deleted file mode 100644
index 204acfe70c3..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterBoolean.swift
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// OuterBoolean.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct OuterBoolean: Codable {
-
-
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
deleted file mode 100644
index bd1984e870d..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// OuterComposite.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct OuterComposite: Codable {
-
-    public var myNumber: OuterNumber?
-    public var myString: OuterString?
-    public var myBoolean: OuterBoolean?
-
-    public init(myNumber: OuterNumber?, myString: OuterString?, myBoolean: OuterBoolean?) {
-        self.myNumber = myNumber
-        self.myString = myString
-        self.myBoolean = myBoolean
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case myNumber = "my_number"
-        case myString = "my_string"
-        case myBoolean = "my_boolean"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterEnum.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterEnum.swift
deleted file mode 100644
index d6222d2b1c4..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterEnum.swift
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// OuterEnum.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-public enum OuterEnum: String, Codable {
-    case placed = "placed"
-    case approved = "approved"
-    case delivered = "delivered"
-
-}
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterNumber.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterNumber.swift
deleted file mode 100644
index 3e3a6775a6c..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterNumber.swift
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// OuterNumber.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct OuterNumber: Codable {
-
-
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterString.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterString.swift
deleted file mode 100644
index 06ff5ccef4b..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterString.swift
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// OuterString.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct OuterString: Codable {
-
-
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Pet.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Pet.swift
deleted file mode 100644
index 73985167c96..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Pet.swift
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Pet.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Pet: Codable {
-
-    public enum Status: String, Codable { 
-        case available = "available"
-        case pending = "pending"
-        case sold = "sold"
-    }
-    public var _id: Int64?
-    public var category: Category?
-    public var name: String
-    public var photoUrls: [String]
-    public var tags: [Tag]?
-    /** pet status in the store */
-    public var status: Status?
-
-    public init(_id: Int64?, category: Category?, name: String, photoUrls: [String], tags: [Tag]?, status: Status?) {
-        self._id = _id
-        self.category = category
-        self.name = name
-        self.photoUrls = photoUrls
-        self.tags = tags
-        self.status = status
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _id = "id"
-        case category
-        case name
-        case photoUrls
-        case tags
-        case status
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
deleted file mode 100644
index f94741a854a..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// SpecialModelName.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct SpecialModelName: Codable {
-
-    public var specialPropertyName: Int64?
-
-    public init(specialPropertyName: Int64?) {
-        self.specialPropertyName = specialPropertyName
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case specialPropertyName = "$special[property.name]"
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Tag.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Tag.swift
deleted file mode 100644
index 7dd17159a73..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Tag.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Tag.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct Tag: Codable {
-
-    public var _id: Int64?
-    public var name: String?
-
-    public init(_id: Int64?, name: String?) {
-        self._id = _id
-        self.name = name
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _id = "id"
-        case name
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/User.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/User.swift
deleted file mode 100644
index 09b68da4f8f..00000000000
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/User.swift
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// User.swift
-//
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
-//
-
-import Foundation
-
-
-
-public struct User: Codable {
-
-    public var _id: Int64?
-    public var username: String?
-    public var firstName: String?
-    public var lastName: String?
-    public var email: String?
-    public var password: String?
-    public var phone: String?
-    /** User Status */
-    public var userStatus: Int?
-
-    public init(_id: Int64?, username: String?, firstName: String?, lastName: String?, email: String?, password: String?, phone: String?, userStatus: Int?) {
-        self._id = _id
-        self.username = username
-        self.firstName = firstName
-        self.lastName = lastName
-        self.email = email
-        self.password = password
-        self.phone = phone
-        self.userStatus = userStatus
-    }
-
-    public enum CodingKeys: String, CodingKey { 
-        case _id = "id"
-        case username
-        case firstName
-        case lastName
-        case email
-        case password
-        case phone
-        case userStatus
-    }
-
-
-}
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Podfile.lock b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Podfile.lock
index 0b07369bb37..f80515d257d 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Podfile.lock
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Podfile.lock
@@ -8,15 +8,20 @@ PODS:
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - RxSwift
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a
-  PetstoreClient: 321849311dc2fb14d6801d393b57c016953b6319
+  PetstoreClient: cec377a07dc2206a1c5ef08f05cb9281c70f449c
   RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
 
 PODFILE CHECKSUM: cedb3058b02f4776d7c31f6d92ae2f674fdf424d
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json
index b5264c6de5c..a46a93ce05b 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Local Podspecs/PetstoreClient.podspec.json	
@@ -2,16 +2,17 @@
   "name": "PetstoreClient",
   "platforms": {
     "ios": "9.0",
-    "osx": "10.11"
+    "osx": "10.11",
+    "tvos": "9.0"
   },
   "version": "0.0.1",
   "source": {
-    "git": "git@github.com:swagger-api/swagger-mustache.git",
+    "git": "git@github.com:openapitools/openapi-generator.git",
     "tag": "v1.0.0"
   },
   "authors": "",
   "license": "Proprietary",
-  "homepage": "https://github.com/swagger-api/swagger-codegen",
+  "homepage": "https://github.com/openapitools/openapi-generator",
   "summary": "PetstoreClient",
   "source_files": "PetstoreClient/Classes/**/*.swift",
   "dependencies": {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Manifest.lock b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Manifest.lock
index 0b07369bb37..f80515d257d 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Manifest.lock
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Manifest.lock
@@ -8,15 +8,20 @@ PODS:
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - RxSwift
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a
-  PetstoreClient: 321849311dc2fb14d6801d393b57c016953b6319
+  PetstoreClient: cec377a07dc2206a1c5ef08f05cb9281c70f449c
   RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
 
 PODFILE CHECKSUM: cedb3058b02f4776d7c31f6d92ae2f674fdf424d
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIHelper.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
similarity index 96%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIHelper.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 81e7286d6d4..3c7b53f8149 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIHelper.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -1,7 +1,7 @@
 // APIHelper.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs.swift
similarity index 95%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs.swift
index 2c2fc3157de..8cae3aacfe5 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/APIs.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -1,7 +1,7 @@
 // APIs.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/AnotherfakeAPI.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
similarity index 67%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/AnotherfakeAPI.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index 7ef6ef60148..637fa6df55e 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/AnotherfakeAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -1,8 +1,8 @@
 //
 // AnotherFakeAPI.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -15,11 +15,11 @@ open class AnotherFakeAPI {
     /**
      To test special tags
      
-     - parameter body: (body) client model 
+     - parameter client: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testSpecialTags(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testSpecialTagsWithRequestBuilder(body: body).execute { (response, error) -> Void in
+    open class func testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+        testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -27,12 +27,12 @@ open class AnotherFakeAPI {
     /**
      To test special tags
      
-     - parameter body: (body) client model 
+     - parameter client: (body) client model 
      - returns: Observable<Client>
      */
-    open class func testSpecialTags(body: Client) -> Observable<Client> {
+    open class func testSpecialTags(client: Client) -> Observable<Client> {
         return Observable.create { observer -> Disposable in
-            testSpecialTags(body: body) { data, error in
+            testSpecialTags(client: client) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -51,15 +51,13 @@ open class AnotherFakeAPI {
      - examples: [{contentType=application/json, example={
   "client" : "client"
 }}]
-     
-     - parameter body: (body) client model 
-
+     - parameter client: (body) client model 
      - returns: RequestBuilder<Client> 
      */
-    open class func testSpecialTagsWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
+    open class func testSpecialTagsWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
         let path = "/another-fake/dummy"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: client)
 
         let url = URLComponents(string: URLString)
 
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
similarity index 68%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index 9acfe228c6c..31285485c0d 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -1,8 +1,8 @@
 //
 // FakeAPI.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -17,7 +17,7 @@ open class FakeAPI {
      - parameter body: (body) Input boolean as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterBooleanSerialize(body: OuterBoolean? = nil, completion: @escaping ((_ data: OuterBoolean?,_ error: Error?) -> Void)) {
+    open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping ((_ data: Bool?,_ error: Error?) -> Void)) {
         fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -26,9 +26,9 @@ open class FakeAPI {
     /**
 
      - parameter body: (body) Input boolean as post body (optional)
-     - returns: Observable<OuterBoolean>
+     - returns: Observable<Bool>
      */
-    open class func fakeOuterBooleanSerialize(body: OuterBoolean? = nil) -> Observable<OuterBoolean> {
+    open class func fakeOuterBooleanSerialize(body: Bool? = nil) -> Observable<Bool> {
         return Observable.create { observer -> Disposable in
             fakeOuterBooleanSerialize(body: body) { data, error in
                 if let error = error {
@@ -45,43 +45,41 @@ open class FakeAPI {
     /**
      - POST /fake/outer/boolean
      - Test serialization of outer boolean types
-     - examples: [{contentType=application/json, example={ }}]
-     
+     - examples: [{contentType=*/*, example=null}]
      - parameter body: (body) Input boolean as post body (optional)
-
-     - returns: RequestBuilder<OuterBoolean> 
+     - returns: RequestBuilder<Bool> 
      */
-    open class func fakeOuterBooleanSerializeWithRequestBuilder(body: OuterBoolean? = nil) -> RequestBuilder<OuterBoolean> {
+    open class func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder<Bool> {
         let path = "/fake/outer/boolean"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
 
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<OuterBoolean>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<Bool>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
     }
 
     /**
 
-     - parameter body: (body) Input composite as post body (optional)
+     - parameter outerComposite: (body) Input composite as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
-        fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
+    open class func fakeOuterCompositeSerialize(outerComposite: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
+        fakeOuterCompositeSerializeWithRequestBuilder(outerComposite: outerComposite).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
 
     /**
 
-     - parameter body: (body) Input composite as post body (optional)
+     - parameter outerComposite: (body) Input composite as post body (optional)
      - returns: Observable<OuterComposite>
      */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil) -> Observable<OuterComposite> {
+    open class func fakeOuterCompositeSerialize(outerComposite: OuterComposite? = nil) -> Observable<OuterComposite> {
         return Observable.create { observer -> Disposable in
-            fakeOuterCompositeSerialize(body: body) { data, error in
+            fakeOuterCompositeSerialize(outerComposite: outerComposite) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -96,20 +94,14 @@ open class FakeAPI {
     /**
      - POST /fake/outer/composite
      - Test serialization of object with outer number type
-     - examples: [{contentType=application/json, example={
-  "my_string" : { },
-  "my_number" : { },
-  "my_boolean" : { }
-}}]
-     
-     - parameter body: (body) Input composite as post body (optional)
-
+     - examples: [{contentType=*/*, example={ }}]
+     - parameter outerComposite: (body) Input composite as post body (optional)
      - returns: RequestBuilder<OuterComposite> 
      */
-    open class func fakeOuterCompositeSerializeWithRequestBuilder(body: OuterComposite? = nil) -> RequestBuilder<OuterComposite> {
+    open class func fakeOuterCompositeSerializeWithRequestBuilder(outerComposite: OuterComposite? = nil) -> RequestBuilder<OuterComposite> {
         let path = "/fake/outer/composite"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: outerComposite)
 
         let url = URLComponents(string: URLString)
 
@@ -123,7 +115,7 @@ open class FakeAPI {
      - parameter body: (body) Input number as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterNumberSerialize(body: OuterNumber? = nil, completion: @escaping ((_ data: OuterNumber?,_ error: Error?) -> Void)) {
+    open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping ((_ data: Double?,_ error: Error?) -> Void)) {
         fakeOuterNumberSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -132,9 +124,9 @@ open class FakeAPI {
     /**
 
      - parameter body: (body) Input number as post body (optional)
-     - returns: Observable<OuterNumber>
+     - returns: Observable<Double>
      */
-    open class func fakeOuterNumberSerialize(body: OuterNumber? = nil) -> Observable<OuterNumber> {
+    open class func fakeOuterNumberSerialize(body: Double? = nil) -> Observable<Double> {
         return Observable.create { observer -> Disposable in
             fakeOuterNumberSerialize(body: body) { data, error in
                 if let error = error {
@@ -151,20 +143,18 @@ open class FakeAPI {
     /**
      - POST /fake/outer/number
      - Test serialization of outer number types
-     - examples: [{contentType=application/json, example={ }}]
-     
+     - examples: [{contentType=*/*, example=null}]
      - parameter body: (body) Input number as post body (optional)
-
-     - returns: RequestBuilder<OuterNumber> 
+     - returns: RequestBuilder<Double> 
      */
-    open class func fakeOuterNumberSerializeWithRequestBuilder(body: OuterNumber? = nil) -> RequestBuilder<OuterNumber> {
+    open class func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder<Double> {
         let path = "/fake/outer/number"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
 
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<OuterNumber>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<Double>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
     }
@@ -174,7 +164,7 @@ open class FakeAPI {
      - parameter body: (body) Input string as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterStringSerialize(body: OuterString? = nil, completion: @escaping ((_ data: OuterString?,_ error: Error?) -> Void)) {
+    open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
         fakeOuterStringSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -183,9 +173,9 @@ open class FakeAPI {
     /**
 
      - parameter body: (body) Input string as post body (optional)
-     - returns: Observable<OuterString>
+     - returns: Observable<String>
      */
-    open class func fakeOuterStringSerialize(body: OuterString? = nil) -> Observable<OuterString> {
+    open class func fakeOuterStringSerialize(body: String? = nil) -> Observable<String> {
         return Observable.create { observer -> Disposable in
             fakeOuterStringSerialize(body: body) { data, error in
                 if let error = error {
@@ -202,32 +192,87 @@ open class FakeAPI {
     /**
      - POST /fake/outer/string
      - Test serialization of outer string types
-     - examples: [{contentType=application/json, example={ }}]
-     
+     - examples: [{contentType=*/*, example=null}]
      - parameter body: (body) Input string as post body (optional)
-
-     - returns: RequestBuilder<OuterString> 
+     - returns: RequestBuilder<String> 
      */
-    open class func fakeOuterStringSerializeWithRequestBuilder(body: OuterString? = nil) -> RequestBuilder<OuterString> {
+    open class func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder<String> {
         let path = "/fake/outer/string"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
 
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<OuterString>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<String>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
     }
 
     /**
-     To test \"client\" model
-     
-     - parameter body: (body) client model 
+
+     - parameter query: (query)  
+     - parameter user: (body)  
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClientModel(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testClientModelWithRequestBuilder(body: body).execute { (response, error) -> Void in
+    open class func testBodyWithQueryParams(query: String, user: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        testBodyWithQueryParamsWithRequestBuilder(query: query, user: user).execute { (response, error) -> Void in
+            if error == nil {
+                completion((), error)
+            } else {
+                completion(nil, error)
+            }
+        }
+    }
+
+    /**
+
+     - parameter query: (query)  
+     - parameter user: (body)  
+     - returns: Observable<Void>
+     */
+    open class func testBodyWithQueryParams(query: String, user: User) -> Observable<Void> {
+        return Observable.create { observer -> Disposable in
+            testBodyWithQueryParams(query: query, user: user) { data, error in
+                if let error = error {
+                    observer.on(.error(error))
+                } else {
+                    observer.on(.next(data!))
+                }
+                observer.on(.completed)
+            }
+            return Disposables.create()
+        }
+    }
+
+    /**
+     - PUT /fake/body-with-query-params
+     - parameter query: (query)  
+     - parameter user: (body)  
+     - returns: RequestBuilder<Void> 
+     */
+    open class func testBodyWithQueryParamsWithRequestBuilder(query: String, user: User) -> RequestBuilder<Void> {
+        let path = "/fake/body-with-query-params"
+        let URLString = PetstoreClientAPI.basePath + path
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: user)
+
+        var url = URLComponents(string: URLString)
+        url?.queryItems = APIHelper.mapValuesToQueryItems([
+            "query": query
+        ])
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
+
+        return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
+    }
+
+    /**
+     To test \"client\" model
+     
+     - parameter client: (body) client model 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testClientModel(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+        testClientModelWithRequestBuilder(client: client).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -235,12 +280,12 @@ open class FakeAPI {
     /**
      To test \"client\" model
      
-     - parameter body: (body) client model 
+     - parameter client: (body) client model 
      - returns: Observable<Client>
      */
-    open class func testClientModel(body: Client) -> Observable<Client> {
+    open class func testClientModel(client: Client) -> Observable<Client> {
         return Observable.create { observer -> Disposable in
-            testClientModel(body: body) { data, error in
+            testClientModel(client: client) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -259,15 +304,13 @@ open class FakeAPI {
      - examples: [{contentType=application/json, example={
   "client" : "client"
 }}]
-     
-     - parameter body: (body) client model 
-
+     - parameter client: (body) client model 
      - returns: RequestBuilder<Client> 
      */
-    open class func testClientModelWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
+    open class func testClientModelWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: client)
 
         let url = URLComponents(string: URLString)
 
@@ -295,7 +338,7 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -324,7 +367,7 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - returns: Observable<Void>
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> Observable<Void> {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
             testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { data, error in
                 if let error = error {
@@ -343,9 +386,8 @@ open class FakeAPI {
      - POST /fake
      - Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      - BASIC:
-       - type: basic
+       - type: http
        - name: http_basic_test
-     
      - parameter number: (form) None 
      - parameter double: (form) None 
      - parameter patternWithoutDelimiter: (form) None 
@@ -360,10 +402,9 @@ open class FakeAPI {
      - parameter dateTime: (form) None (optional)
      - parameter password: (form) None (optional)
      - parameter callback: (form) None (optional)
-
      - returns: RequestBuilder<Void> 
      */
-    open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
+    open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
         let formParams: [String:Any?] = [
@@ -393,27 +434,10 @@ open class FakeAPI {
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
 
-    /**
-     * enum for parameter enumFormStringArray
-     */
-    public enum EnumFormStringArray_testEnumParameters: String { 
-        case greaterThan = ">"
-        case dollar = "$"
-    }
-
-    /**
-     * enum for parameter enumFormString
-     */
-    public enum EnumFormString_testEnumParameters: String { 
-        case abc = "_abc"
-        case efg = "-efg"
-        case xyz = "(xyz)"
-    }
-
     /**
      * enum for parameter enumHeaderStringArray
      */
-    public enum EnumHeaderStringArray_testEnumParameters: String { 
+    public enum EnumHeaderStringArray_testEnumParameters: String {
         case greaterThan = ">"
         case dollar = "$"
     }
@@ -421,7 +445,7 @@ open class FakeAPI {
     /**
      * enum for parameter enumHeaderString
      */
-    public enum EnumHeaderString_testEnumParameters: String { 
+    public enum EnumHeaderString_testEnumParameters: String {
         case abc = "_abc"
         case efg = "-efg"
         case xyz = "(xyz)"
@@ -430,7 +454,7 @@ open class FakeAPI {
     /**
      * enum for parameter enumQueryStringArray
      */
-    public enum EnumQueryStringArray_testEnumParameters: String { 
+    public enum EnumQueryStringArray_testEnumParameters: String {
         case greaterThan = ">"
         case dollar = "$"
     }
@@ -438,7 +462,7 @@ open class FakeAPI {
     /**
      * enum for parameter enumQueryString
      */
-    public enum EnumQueryString_testEnumParameters: String { 
+    public enum EnumQueryString_testEnumParameters: String {
         case abc = "_abc"
         case efg = "-efg"
         case xyz = "(xyz)"
@@ -447,7 +471,7 @@ open class FakeAPI {
     /**
      * enum for parameter enumQueryInteger
      */
-    public enum EnumQueryInteger_testEnumParameters: Int { 
+    public enum EnumQueryInteger_testEnumParameters: Int {
         case _1 = 1
         case number2 = -2
     }
@@ -455,26 +479,43 @@ open class FakeAPI {
     /**
      * enum for parameter enumQueryDouble
      */
-    public enum EnumQueryDouble_testEnumParameters: Double { 
+    public enum EnumQueryDouble_testEnumParameters: Double {
         case _11 = 1.1
         case number12 = -1.2
     }
 
+    /**
+     * enum for parameter enumFormStringArray
+     */
+    public enum EnumFormStringArray_testEnumParameters: String {
+        case greaterThan = ">"
+        case dollar = "$"
+    }
+
+    /**
+     * enum for parameter enumFormString
+     */
+    public enum EnumFormString_testEnumParameters: String {
+        case abc = "_abc"
+        case efg = "-efg"
+        case xyz = "(xyz)"
+    }
+
     /**
      To test enum parameters
      
-     - parameter enumFormStringArray: (form) Form parameter enum test (string array) (optional)
-     - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to -efg)
      - parameter enumHeaderStringArray: (header) Header parameter enum test (string array) (optional)
-     - parameter enumHeaderString: (header) Header parameter enum test (string) (optional, default to -efg)
+     - parameter enumHeaderString: (header) Header parameter enum test (string) (optional, default to "-efg")
      - parameter enumQueryStringArray: (query) Query parameter enum test (string array) (optional)
-     - parameter enumQueryString: (query) Query parameter enum test (string) (optional, default to -efg)
+     - parameter enumQueryString: (query) Query parameter enum test (string) (optional, default to "-efg")
      - parameter enumQueryInteger: (query) Query parameter enum test (double) (optional)
-     - parameter enumQueryDouble: (form) Query parameter enum test (double) (optional)
+     - parameter enumQueryDouble: (query) Query parameter enum test (double) (optional)
+     - parameter enumFormStringArray: (form) Form parameter enum test (string array) (optional, default to "$")
+     - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to "-efg")
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEnumParameters(enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testEnumParametersWithRequestBuilder(enumFormStringArray: enumFormStringArray, enumFormString: enumFormString, enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble).execute { (response, error) -> Void in
+    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -486,19 +527,19 @@ open class FakeAPI {
     /**
      To test enum parameters
      
-     - parameter enumFormStringArray: (form) Form parameter enum test (string array) (optional)
-     - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to -efg)
      - parameter enumHeaderStringArray: (header) Header parameter enum test (string array) (optional)
-     - parameter enumHeaderString: (header) Header parameter enum test (string) (optional, default to -efg)
+     - parameter enumHeaderString: (header) Header parameter enum test (string) (optional, default to "-efg")
      - parameter enumQueryStringArray: (query) Query parameter enum test (string array) (optional)
-     - parameter enumQueryString: (query) Query parameter enum test (string) (optional, default to -efg)
+     - parameter enumQueryString: (query) Query parameter enum test (string) (optional, default to "-efg")
      - parameter enumQueryInteger: (query) Query parameter enum test (double) (optional)
-     - parameter enumQueryDouble: (form) Query parameter enum test (double) (optional)
+     - parameter enumQueryDouble: (query) Query parameter enum test (double) (optional)
+     - parameter enumFormStringArray: (form) Form parameter enum test (string array) (optional, default to "$")
+     - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to "-efg")
      - returns: Observable<Void>
      */
-    open class func testEnumParameters(enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil) -> Observable<Void> {
+    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
-            testEnumParameters(enumFormStringArray: enumFormStringArray, enumFormString: enumFormString, enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble) { data, error in
+            testEnumParameters(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -514,25 +555,22 @@ open class FakeAPI {
      To test enum parameters
      - GET /fake
      - To test enum parameters
-     
-     - parameter enumFormStringArray: (form) Form parameter enum test (string array) (optional)
-     - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to -efg)
      - parameter enumHeaderStringArray: (header) Header parameter enum test (string array) (optional)
-     - parameter enumHeaderString: (header) Header parameter enum test (string) (optional, default to -efg)
+     - parameter enumHeaderString: (header) Header parameter enum test (string) (optional, default to "-efg")
      - parameter enumQueryStringArray: (query) Query parameter enum test (string array) (optional)
-     - parameter enumQueryString: (query) Query parameter enum test (string) (optional, default to -efg)
+     - parameter enumQueryString: (query) Query parameter enum test (string) (optional, default to "-efg")
      - parameter enumQueryInteger: (query) Query parameter enum test (double) (optional)
-     - parameter enumQueryDouble: (form) Query parameter enum test (double) (optional)
-
+     - parameter enumQueryDouble: (query) Query parameter enum test (double) (optional)
+     - parameter enumFormStringArray: (form) Form parameter enum test (string array) (optional, default to "$")
+     - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to "-efg")
      - returns: RequestBuilder<Void> 
      */
-    open class func testEnumParametersWithRequestBuilder(enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil) -> RequestBuilder<Void> {
+    open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
         let formParams: [String:Any?] = [
             "enum_form_string_array": enumFormStringArray,
-            "enum_form_string": enumFormString?.rawValue,
-            "enum_query_double": enumQueryDouble?.rawValue
+            "enum_form_string": enumFormString?.rawValue
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
@@ -542,7 +580,8 @@ open class FakeAPI {
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "enum_query_string_array": enumQueryStringArray, 
             "enum_query_string": enumQueryString?.rawValue, 
-            "enum_query_integer": enumQueryInteger?.rawValue
+            "enum_query_integer": enumQueryInteger?.rawValue, 
+            "enum_query_double": enumQueryDouble?.rawValue
         ])
         let nillableHeaders: [String: Any?] = [
             "enum_header_string_array": enumHeaderStringArray,
@@ -558,11 +597,11 @@ open class FakeAPI {
     /**
      test inline additionalProperties
      
-     - parameter param: (body) request body 
+     - parameter requestBody: (body) request body 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testInlineAdditionalProperties(param: Any, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute { (response, error) -> Void in
+    open class func testInlineAdditionalProperties(requestBody: [String:String], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        testInlineAdditionalPropertiesWithRequestBuilder(requestBody: requestBody).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -574,12 +613,12 @@ open class FakeAPI {
     /**
      test inline additionalProperties
      
-     - parameter param: (body) request body 
+     - parameter requestBody: (body) request body 
      - returns: Observable<Void>
      */
-    open class func testInlineAdditionalProperties(param: Any) -> Observable<Void> {
+    open class func testInlineAdditionalProperties(requestBody: [String:String]) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
-            testInlineAdditionalProperties(param: param) { data, error in
+            testInlineAdditionalProperties(requestBody: requestBody) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -594,16 +633,13 @@ open class FakeAPI {
     /**
      test inline additionalProperties
      - POST /fake/inline-additionalProperties
-     - 
-     
-     - parameter param: (body) request body 
-
+     - parameter requestBody: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: Any) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(requestBody: [String:String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: requestBody)
 
         let url = URLComponents(string: URLString)
 
@@ -653,11 +689,8 @@ open class FakeAPI {
     /**
      test json serialization of form data
      - GET /fake/jsonFormData
-     - 
-     
      - parameter param: (form) field1 
      - parameter param2: (form) field2 
-
      - returns: RequestBuilder<Void> 
      */
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
similarity index 70%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeClassnameTags123API.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index 30cd8561e28..b4003e2c252 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -1,8 +1,8 @@
 //
 // FakeClassnameTags123API.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -15,11 +15,11 @@ open class FakeClassnameTags123API {
     /**
      To test class name in snake case
      
-     - parameter body: (body) client model 
+     - parameter client: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testClassnameWithRequestBuilder(body: body).execute { (response, error) -> Void in
+    open class func testClassname(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+        testClassnameWithRequestBuilder(client: client).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -27,12 +27,12 @@ open class FakeClassnameTags123API {
     /**
      To test class name in snake case
      
-     - parameter body: (body) client model 
+     - parameter client: (body) client model 
      - returns: Observable<Client>
      */
-    open class func testClassname(body: Client) -> Observable<Client> {
+    open class func testClassname(client: Client) -> Observable<Client> {
         return Observable.create { observer -> Disposable in
-            testClassname(body: body) { data, error in
+            testClassname(client: client) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -54,15 +54,13 @@ open class FakeClassnameTags123API {
      - examples: [{contentType=application/json, example={
   "client" : "client"
 }}]
-     
-     - parameter body: (body) client model 
-
+     - parameter client: (body) client model 
      - returns: RequestBuilder<Client> 
      */
-    open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
+    open class func testClassnameWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
         let path = "/fake_classname_test"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: client)
 
         let url = URLComponents(string: URLString)
 
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
similarity index 81%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index e2c34075e24..59dab5ba437 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -1,8 +1,8 @@
 //
 // PetAPI.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -15,11 +15,11 @@ open class PetAPI {
     /**
      Add a new pet to the store
      
-     - parameter body: (body) Pet object that needs to be added to the store 
+     - parameter pet: (body) Pet object that needs to be added to the store 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func addPet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        addPetWithRequestBuilder(body: body).execute { (response, error) -> Void in
+    open class func addPet(pet: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        addPetWithRequestBuilder(pet: pet).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -31,12 +31,12 @@ open class PetAPI {
     /**
      Add a new pet to the store
      
-     - parameter body: (body) Pet object that needs to be added to the store 
+     - parameter pet: (body) Pet object that needs to be added to the store 
      - returns: Observable<Void>
      */
-    open class func addPet(body: Pet) -> Observable<Void> {
+    open class func addPet(pet: Pet) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
-            addPet(body: body) { data, error in
+            addPet(pet: pet) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -51,19 +51,16 @@ open class PetAPI {
     /**
      Add a new pet to the store
      - POST /pet
-     - 
      - OAuth:
        - type: oauth2
        - name: petstore_auth
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-
+     - parameter pet: (body) Pet object that needs to be added to the store 
      - returns: RequestBuilder<Void> 
      */
-    open class func addPetWithRequestBuilder(body: Pet) -> RequestBuilder<Void> {
+    open class func addPetWithRequestBuilder(pet: Pet) -> RequestBuilder<Void> {
         let path = "/pet"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: pet)
 
         let url = URLComponents(string: URLString)
 
@@ -113,14 +110,11 @@ open class PetAPI {
     /**
      Deletes a pet
      - DELETE /pet/{petId}
-     - 
      - OAuth:
        - type: oauth2
        - name: petstore_auth
-     
      - parameter petId: (path) Pet id to delete 
      - parameter apiKey: (header)  (optional)
-
      - returns: RequestBuilder<Void> 
      */
     open class func deletePetWithRequestBuilder(petId: Int64, apiKey: String? = nil) -> RequestBuilder<Void> {
@@ -145,7 +139,7 @@ open class PetAPI {
     /**
      * enum for parameter status
      */
-    public enum Status_findPetsByStatus: String { 
+    public enum Status_findPetsByStatus: String {
         case available = "available"
         case pending = "pending"
         case sold = "sold"
@@ -190,7 +184,23 @@ open class PetAPI {
      - OAuth:
        - type: oauth2
        - name: petstore_auth
-     - examples: [{contentType=application/xml, example=<Pet>
+     - examples: [{contentType=application/json, example={
+  "photoUrls" : [ "photoUrls", "photoUrls" ],
+  "name" : "doggie",
+  "id" : 0,
+  "category" : {
+    "name" : "name",
+    "id" : 6
+  },
+  "tags" : [ {
+    "name" : "name",
+    "id" : 1
+  }, {
+    "name" : "name",
+    "id" : 1
+  } ],
+  "status" : "available"
+}}, {contentType=application/xml, example=<Pet>
   <id>123456789</id>
   <name>doggie</name>
   <photoUrls>
@@ -199,84 +209,8 @@ open class PetAPI {
   <tags>
   </tags>
   <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     
+</Pet>}]
      - parameter status: (query) Status values that need to be considered for filter 
-
      - returns: RequestBuilder<[Pet]> 
      */
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
@@ -333,7 +267,23 @@ open class PetAPI {
      - OAuth:
        - type: oauth2
        - name: petstore_auth
-     - examples: [{contentType=application/xml, example=<Pet>
+     - examples: [{contentType=application/json, example={
+  "photoUrls" : [ "photoUrls", "photoUrls" ],
+  "name" : "doggie",
+  "id" : 0,
+  "category" : {
+    "name" : "name",
+    "id" : 6
+  },
+  "tags" : [ {
+    "name" : "name",
+    "id" : 1
+  }, {
+    "name" : "name",
+    "id" : 1
+  } ],
+  "status" : "available"
+}}, {contentType=application/xml, example=<Pet>
   <id>123456789</id>
   <name>doggie</name>
   <photoUrls>
@@ -342,84 +292,8 @@ open class PetAPI {
   <tags>
   </tags>
   <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example=[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-} ]}]
-     
+</Pet>}]
      - parameter tags: (query) Tags to filter by 
-
      - returns: RequestBuilder<[Pet]> 
      */
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
@@ -476,16 +350,7 @@ open class PetAPI {
      - API Key:
        - type: apiKey api_key 
        - name: api_key
-     - examples: [{contentType=application/xml, example=<Pet>
-  <id>123456789</id>
-  <name>doggie</name>
-  <photoUrls>
-    <photoUrls>aeiou</photoUrls>
-  </photoUrls>
-  <tags>
-  </tags>
-  <status>aeiou</status>
-</Pet>}, {contentType=application/json, example={
+     - examples: [{contentType=application/json, example={
   "photoUrls" : [ "photoUrls", "photoUrls" ],
   "name" : "doggie",
   "id" : 0,
@@ -501,8 +366,7 @@ open class PetAPI {
     "id" : 1
   } ],
   "status" : "available"
-}}]
-     - examples: [{contentType=application/xml, example=<Pet>
+}}, {contentType=application/xml, example=<Pet>
   <id>123456789</id>
   <name>doggie</name>
   <photoUrls>
@@ -511,26 +375,8 @@ open class PetAPI {
   <tags>
   </tags>
   <status>aeiou</status>
-</Pet>}, {contentType=application/json, example={
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
-  "id" : 0,
-  "category" : {
-    "name" : "name",
-    "id" : 6
-  },
-  "tags" : [ {
-    "name" : "name",
-    "id" : 1
-  }, {
-    "name" : "name",
-    "id" : 1
-  } ],
-  "status" : "available"
-}}]
-     
+</Pet>}]
      - parameter petId: (path) ID of pet to return 
-
      - returns: RequestBuilder<Pet> 
      */
     open class func getPetByIdWithRequestBuilder(petId: Int64) -> RequestBuilder<Pet> {
@@ -551,11 +397,11 @@ open class PetAPI {
     /**
      Update an existing pet
      
-     - parameter body: (body) Pet object that needs to be added to the store 
+     - parameter pet: (body) Pet object that needs to be added to the store 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        updatePetWithRequestBuilder(body: body).execute { (response, error) -> Void in
+    open class func updatePet(pet: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        updatePetWithRequestBuilder(pet: pet).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -567,12 +413,12 @@ open class PetAPI {
     /**
      Update an existing pet
      
-     - parameter body: (body) Pet object that needs to be added to the store 
+     - parameter pet: (body) Pet object that needs to be added to the store 
      - returns: Observable<Void>
      */
-    open class func updatePet(body: Pet) -> Observable<Void> {
+    open class func updatePet(pet: Pet) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
-            updatePet(body: body) { data, error in
+            updatePet(pet: pet) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -587,19 +433,16 @@ open class PetAPI {
     /**
      Update an existing pet
      - PUT /pet
-     - 
      - OAuth:
        - type: oauth2
        - name: petstore_auth
-     
-     - parameter body: (body) Pet object that needs to be added to the store 
-
+     - parameter pet: (body) Pet object that needs to be added to the store 
      - returns: RequestBuilder<Void> 
      */
-    open class func updatePetWithRequestBuilder(body: Pet) -> RequestBuilder<Void> {
+    open class func updatePetWithRequestBuilder(pet: Pet) -> RequestBuilder<Void> {
         let path = "/pet"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: pet)
 
         let url = URLComponents(string: URLString)
 
@@ -651,15 +494,12 @@ open class PetAPI {
     /**
      Updates a pet in the store with form data
      - POST /pet/{petId}
-     - 
      - OAuth:
        - type: oauth2
        - name: petstore_auth
-     
      - parameter petId: (path) ID of pet that needs to be updated 
      - parameter name: (form) Updated name of the pet (optional)
      - parameter status: (form) Updated status of the pet (optional)
-
      - returns: RequestBuilder<Void> 
      */
     open class func updatePetWithFormWithRequestBuilder(petId: Int64, name: String? = nil, status: String? = nil) -> RequestBuilder<Void> {
@@ -722,7 +562,6 @@ open class PetAPI {
     /**
      uploads an image
      - POST /pet/{petId}/uploadImage
-     - 
      - OAuth:
        - type: oauth2
        - name: petstore_auth
@@ -731,11 +570,9 @@ open class PetAPI {
   "type" : "type",
   "message" : "message"
 }}]
-     
      - parameter petId: (path) ID of pet to update 
      - parameter additionalMetadata: (form) Additional data to pass to server (optional)
      - parameter file: (form) file to upload (optional)
-
      - returns: RequestBuilder<ApiResponse> 
      */
     open class func uploadFileWithRequestBuilder(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> RequestBuilder<ApiResponse> {
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
similarity index 81%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 6aa649869ff..b4e23ae435c 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -1,8 +1,8 @@
 //
 // StoreAPI.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -52,9 +52,7 @@ open class StoreAPI {
      Delete purchase order by ID
      - DELETE /store/order/{order_id}
      - For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     
      - parameter orderId: (path) ID of the order that needs to be deleted 
-
      - returns: RequestBuilder<Void> 
      */
     open class func deleteOrderWithRequestBuilder(orderId: String) -> RequestBuilder<Void> {
@@ -109,10 +107,6 @@ open class StoreAPI {
      - API Key:
        - type: apiKey api_key 
        - name: api_key
-     - examples: [{contentType=application/json, example={
-  "key" : 0
-}}]
-
      - returns: RequestBuilder<[String:Int]> 
      */
     open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
@@ -163,39 +157,22 @@ open class StoreAPI {
      Find purchase order by ID
      - GET /store/order/{order_id}
      - For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     - examples: [{contentType=application/xml, example=<Order>
-  <id>123456789</id>
-  <petId>123456789</petId>
-  <quantity>123</quantity>
-  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
-  <status>aeiou</status>
-  <complete>true</complete>
-</Order>}, {contentType=application/json, example={
+     - examples: [{contentType=application/json, example={
   "petId" : 6,
   "quantity" : 1,
   "id" : 0,
   "shipDate" : "2000-01-23T04:56:07.000+00:00",
   "complete" : false,
   "status" : "placed"
-}}]
-     - examples: [{contentType=application/xml, example=<Order>
+}}, {contentType=application/xml, example=<Order>
   <id>123456789</id>
   <petId>123456789</petId>
   <quantity>123</quantity>
   <shipDate>2000-01-23T04:56:07.000Z</shipDate>
   <status>aeiou</status>
   <complete>true</complete>
-</Order>}, {contentType=application/json, example={
-  "petId" : 6,
-  "quantity" : 1,
-  "id" : 0,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
-}}]
-     
+</Order>}]
      - parameter orderId: (path) ID of pet that needs to be fetched 
-
      - returns: RequestBuilder<Order> 
      */
     open class func getOrderByIdWithRequestBuilder(orderId: Int64) -> RequestBuilder<Order> {
@@ -216,11 +193,11 @@ open class StoreAPI {
     /**
      Place an order for a pet
      
-     - parameter body: (body) order placed for purchasing the pet 
+     - parameter order: (body) order placed for purchasing the pet 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func placeOrder(body: Order, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
-        placeOrderWithRequestBuilder(body: body).execute { (response, error) -> Void in
+    open class func placeOrder(order: Order, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+        placeOrderWithRequestBuilder(order: order).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -228,12 +205,12 @@ open class StoreAPI {
     /**
      Place an order for a pet
      
-     - parameter body: (body) order placed for purchasing the pet 
+     - parameter order: (body) order placed for purchasing the pet 
      - returns: Observable<Order>
      */
-    open class func placeOrder(body: Order) -> Observable<Order> {
+    open class func placeOrder(order: Order) -> Observable<Order> {
         return Observable.create { observer -> Disposable in
-            placeOrder(body: body) { data, error in
+            placeOrder(order: order) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -248,46 +225,28 @@ open class StoreAPI {
     /**
      Place an order for a pet
      - POST /store/order
-     - 
-     - examples: [{contentType=application/xml, example=<Order>
-  <id>123456789</id>
-  <petId>123456789</petId>
-  <quantity>123</quantity>
-  <shipDate>2000-01-23T04:56:07.000Z</shipDate>
-  <status>aeiou</status>
-  <complete>true</complete>
-</Order>}, {contentType=application/json, example={
+     - examples: [{contentType=application/json, example={
   "petId" : 6,
   "quantity" : 1,
   "id" : 0,
   "shipDate" : "2000-01-23T04:56:07.000+00:00",
   "complete" : false,
   "status" : "placed"
-}}]
-     - examples: [{contentType=application/xml, example=<Order>
+}}, {contentType=application/xml, example=<Order>
   <id>123456789</id>
   <petId>123456789</petId>
   <quantity>123</quantity>
   <shipDate>2000-01-23T04:56:07.000Z</shipDate>
   <status>aeiou</status>
   <complete>true</complete>
-</Order>}, {contentType=application/json, example={
-  "petId" : 6,
-  "quantity" : 1,
-  "id" : 0,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
-}}]
-     
-     - parameter body: (body) order placed for purchasing the pet 
-
+</Order>}]
+     - parameter order: (body) order placed for purchasing the pet 
      - returns: RequestBuilder<Order> 
      */
-    open class func placeOrderWithRequestBuilder(body: Order) -> RequestBuilder<Order> {
+    open class func placeOrderWithRequestBuilder(order: Order) -> RequestBuilder<Order> {
         let path = "/store/order"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: order)
 
         let url = URLComponents(string: URLString)
 
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
similarity index 83%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index f70a08796b6..7a2e5332ad3 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -1,8 +1,8 @@
 //
 // UserAPI.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -15,11 +15,11 @@ open class UserAPI {
     /**
      Create user
      
-     - parameter body: (body) Created user object 
+     - parameter user: (body) Created user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUser(body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUserWithRequestBuilder(body: body).execute { (response, error) -> Void in
+    open class func createUser(user: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        createUserWithRequestBuilder(user: user).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -31,12 +31,12 @@ open class UserAPI {
     /**
      Create user
      
-     - parameter body: (body) Created user object 
+     - parameter user: (body) Created user object 
      - returns: Observable<Void>
      */
-    open class func createUser(body: User) -> Observable<Void> {
+    open class func createUser(user: User) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
-            createUser(body: body) { data, error in
+            createUser(user: user) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -52,15 +52,13 @@ open class UserAPI {
      Create user
      - POST /user
      - This can only be done by the logged in user.
-     
-     - parameter body: (body) Created user object 
-
+     - parameter user: (body) Created user object 
      - returns: RequestBuilder<Void> 
      */
-    open class func createUserWithRequestBuilder(body: User) -> RequestBuilder<Void> {
+    open class func createUserWithRequestBuilder(user: User) -> RequestBuilder<Void> {
         let path = "/user"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: user)
 
         let url = URLComponents(string: URLString)
 
@@ -72,11 +70,11 @@ open class UserAPI {
     /**
      Creates list of users with given input array
      
-     - parameter body: (body) List of user object 
+     - parameter user: (body) List of user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithArrayInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUsersWithArrayInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
+    open class func createUsersWithArrayInput(user: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        createUsersWithArrayInputWithRequestBuilder(user: user).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -88,12 +86,12 @@ open class UserAPI {
     /**
      Creates list of users with given input array
      
-     - parameter body: (body) List of user object 
+     - parameter user: (body) List of user object 
      - returns: Observable<Void>
      */
-    open class func createUsersWithArrayInput(body: [User]) -> Observable<Void> {
+    open class func createUsersWithArrayInput(user: [User]) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
-            createUsersWithArrayInput(body: body) { data, error in
+            createUsersWithArrayInput(user: user) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -108,16 +106,13 @@ open class UserAPI {
     /**
      Creates list of users with given input array
      - POST /user/createWithArray
-     - 
-     
-     - parameter body: (body) List of user object 
-
+     - parameter user: (body) List of user object 
      - returns: RequestBuilder<Void> 
      */
-    open class func createUsersWithArrayInputWithRequestBuilder(body: [User]) -> RequestBuilder<Void> {
+    open class func createUsersWithArrayInputWithRequestBuilder(user: [User]) -> RequestBuilder<Void> {
         let path = "/user/createWithArray"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: user)
 
         let url = URLComponents(string: URLString)
 
@@ -129,11 +124,11 @@ open class UserAPI {
     /**
      Creates list of users with given input array
      
-     - parameter body: (body) List of user object 
+     - parameter user: (body) List of user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithListInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUsersWithListInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
+    open class func createUsersWithListInput(user: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        createUsersWithListInputWithRequestBuilder(user: user).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -145,12 +140,12 @@ open class UserAPI {
     /**
      Creates list of users with given input array
      
-     - parameter body: (body) List of user object 
+     - parameter user: (body) List of user object 
      - returns: Observable<Void>
      */
-    open class func createUsersWithListInput(body: [User]) -> Observable<Void> {
+    open class func createUsersWithListInput(user: [User]) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
-            createUsersWithListInput(body: body) { data, error in
+            createUsersWithListInput(user: user) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -165,16 +160,13 @@ open class UserAPI {
     /**
      Creates list of users with given input array
      - POST /user/createWithList
-     - 
-     
-     - parameter body: (body) List of user object 
-
+     - parameter user: (body) List of user object 
      - returns: RequestBuilder<Void> 
      */
-    open class func createUsersWithListInputWithRequestBuilder(body: [User]) -> RequestBuilder<Void> {
+    open class func createUsersWithListInputWithRequestBuilder(user: [User]) -> RequestBuilder<Void> {
         let path = "/user/createWithList"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: user)
 
         let url = URLComponents(string: URLString)
 
@@ -223,9 +215,7 @@ open class UserAPI {
      Delete user
      - DELETE /user/{username}
      - This can only be done by the logged in user.
-     
      - parameter username: (path) The name that needs to be deleted 
-
      - returns: RequestBuilder<Void> 
      */
     open class func deleteUserWithRequestBuilder(username: String) -> RequestBuilder<Void> {
@@ -278,17 +268,7 @@ open class UserAPI {
     /**
      Get user by user name
      - GET /user/{username}
-     - 
-     - examples: [{contentType=application/xml, example=<User>
-  <id>123456789</id>
-  <username>aeiou</username>
-  <firstName>aeiou</firstName>
-  <lastName>aeiou</lastName>
-  <email>aeiou</email>
-  <password>aeiou</password>
-  <phone>aeiou</phone>
-  <userStatus>123</userStatus>
-</User>}, {contentType=application/json, example={
+     - examples: [{contentType=application/json, example={
   "firstName" : "firstName",
   "lastName" : "lastName",
   "password" : "password",
@@ -297,8 +277,7 @@ open class UserAPI {
   "id" : 0,
   "email" : "email",
   "username" : "username"
-}}]
-     - examples: [{contentType=application/xml, example=<User>
+}}, {contentType=application/xml, example=<User>
   <id>123456789</id>
   <username>aeiou</username>
   <firstName>aeiou</firstName>
@@ -307,19 +286,8 @@ open class UserAPI {
   <password>aeiou</password>
   <phone>aeiou</phone>
   <userStatus>123</userStatus>
-</User>}, {contentType=application/json, example={
-  "firstName" : "firstName",
-  "lastName" : "lastName",
-  "password" : "password",
-  "userStatus" : 6,
-  "phone" : "phone",
-  "id" : 0,
-  "email" : "email",
-  "username" : "username"
-}}]
-     
+</User>}]
      - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
-
      - returns: RequestBuilder<User> 
      */
     open class func getUserByNameWithRequestBuilder(username: String) -> RequestBuilder<User> {
@@ -374,15 +342,9 @@ open class UserAPI {
     /**
      Logs user into the system
      - GET /user/login
-     - 
      - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
-     - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
-     - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example=""}]
-     - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example=""}]
-     
      - parameter username: (query) The user name for login 
      - parameter password: (query) The password for login in clear text 
-
      - returns: RequestBuilder<String> 
      */
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
@@ -438,8 +400,6 @@ open class UserAPI {
     /**
      Logs out current logged in user session
      - GET /user/logout
-     - 
-
      - returns: RequestBuilder<Void> 
      */
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
@@ -458,11 +418,11 @@ open class UserAPI {
      Updated user
      
      - parameter username: (path) name that need to be deleted 
-     - parameter body: (body) Updated user object 
+     - parameter user: (body) Updated user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updateUser(username: String, body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        updateUserWithRequestBuilder(username: username, body: body).execute { (response, error) -> Void in
+    open class func updateUser(username: String, user: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        updateUserWithRequestBuilder(username: username, user: user).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -475,12 +435,12 @@ open class UserAPI {
      Updated user
      
      - parameter username: (path) name that need to be deleted 
-     - parameter body: (body) Updated user object 
+     - parameter user: (body) Updated user object 
      - returns: Observable<Void>
      */
-    open class func updateUser(username: String, body: User) -> Observable<Void> {
+    open class func updateUser(username: String, user: User) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
-            updateUser(username: username, body: body) { data, error in
+            updateUser(username: username, user: user) { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -496,19 +456,17 @@ open class UserAPI {
      Updated user
      - PUT /user/{username}
      - This can only be done by the logged in user.
-     
      - parameter username: (path) name that need to be deleted 
-     - parameter body: (body) Updated user object 
-
+     - parameter user: (body) Updated user object 
      - returns: RequestBuilder<Void> 
      */
-    open class func updateUserWithRequestBuilder(username: String, body: User) -> RequestBuilder<Void> {
+    open class func updateUserWithRequestBuilder(username: String, user: User) -> RequestBuilder<Void> {
         var path = "/user/{username}"
         let usernamePreEscape = "\(username)"
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: user)
 
         let url = URLComponents(string: URLString)
 
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
similarity index 99%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
index 381fddcc81f..280b4e53389 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -1,7 +1,7 @@
 // AlamofireImplementations.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/CodableHelper.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
similarity index 96%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/CodableHelper.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 323715c5f94..2d50e463ae1 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/CodableHelper.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -1,8 +1,8 @@
 //
 // CodableHelper.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Configuration.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Configuration.swift
similarity index 80%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Configuration.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index c03a10b930c..f8180752b67 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Configuration.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -1,7 +1,7 @@
 // Configuration.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Extensions.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Extensions.swift
similarity index 98%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Extensions.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index f9c33ea7e2d..abe218b4e7a 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Extensions.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -1,7 +1,7 @@
 // Extensions.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodableEncoding.swift
similarity index 95%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodableEncoding.swift
index 472e955ee8e..ca05906d420 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodableEncoding.swift
@@ -1,8 +1,8 @@
 //
 // JSONDataEncoding.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
similarity index 93%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 19ee06b1f48..70449515842 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -1,8 +1,8 @@
 //
 // JSONEncodingHelper.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models.swift
similarity index 90%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models.swift
index 4962405f029..42f8186ae4a 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -1,7 +1,7 @@
 // Models.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
similarity index 87%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 6c1e6653b6f..4e018486ad7 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -1,8 +1,8 @@
 //
 // AdditionalPropertiesClass.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Animal.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
similarity index 68%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Animal.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index ba2da30fedd..7221a1be099 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Animal.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -1,8 +1,8 @@
 //
 // Animal.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -12,7 +12,7 @@ import Foundation
 public struct Animal: Codable {
 
     public var className: String
-    public var color: String?
+    public var color: String? = "red"
 
     public init(className: String, color: String?) {
         self.className = className
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/AnimalFarm.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
similarity index 52%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/AnimalFarm.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index 68308364894..e7bea63f8ed 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -1,8 +1,8 @@
 //
 // AnimalFarm.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
similarity index 80%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index 3fd872dcd26..a22e9aaebbb 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -1,8 +1,8 @@
 //
 // ApiResponse.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
similarity index 82%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index ac59328a279..4e5a5ca1445 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -1,8 +1,8 @@
 //
 // ArrayOfArrayOfNumberOnly.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
similarity index 80%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 1132638458f..7d059d36833 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -1,8 +1,8 @@
 //
 // ArrayOfNumberOnly.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
similarity index 89%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 14335a75053..9c56fed50c2 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -1,8 +1,8 @@
 //
 // ArrayTest.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
similarity index 92%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index 71ba400a9d7..98cda23dac9 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -1,8 +1,8 @@
 //
 // Capitalization.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Cat.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
similarity index 73%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Cat.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index 7687f52d477..a116d964ea8 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Cat.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -1,8 +1,8 @@
 //
 // Cat.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -12,7 +12,7 @@ import Foundation
 public struct Cat: Codable {
 
     public var className: String
-    public var color: String?
+    public var color: String? = "red"
     public var declawed: Bool?
 
     public init(className: String, color: String?, declawed: Bool?) {
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Category.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
similarity index 80%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Category.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index fa0786832c6..77fba95c1d7 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Category.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -1,8 +1,8 @@
 //
 // Category.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
similarity index 76%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index 3a38128215a..f673ed127cd 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -1,8 +1,8 @@
 //
 // ClassModel.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Client.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
similarity index 69%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Client.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 0c4fc0d559a..51390b6c4ea 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Client.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -1,8 +1,8 @@
 //
 // Client.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Dog.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
similarity index 73%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Dog.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 9ba84f7f8cc..239ce74dcc2 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/Dog.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -1,8 +1,8 @@
 //
 // Dog.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -12,7 +12,7 @@ import Foundation
 public struct Dog: Codable {
 
     public var className: String
-    public var color: String?
+    public var color: String? = "red"
     public var breed: String?
 
     public init(className: String, color: String?, breed: String?) {
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
similarity index 76%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 084a9ab8383..8713961520e 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -1,8 +1,8 @@
 //
 // EnumArrays.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -11,11 +11,11 @@ import Foundation
 
 public struct EnumArrays: Codable {
 
-    public enum JustSymbol: String, Codable { 
+    public enum JustSymbol: String, Codable {
         case greaterThanOrEqualTo = ">="
         case dollar = "$"
     }
-    public enum ArrayEnum: String, Codable { 
+    public enum ArrayEnum: String, Codable {
         case fish = "fish"
         case crab = "crab"
     }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumClass.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
similarity index 65%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumClass.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index d0889a3520a..7280a621fec 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumClass.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -1,8 +1,8 @@
 //
 // EnumClass.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -12,5 +12,4 @@ public enum EnumClass: String, Codable {
     case abc = "_abc"
     case efg = "-efg"
     case xyz = "(xyz)"
-
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
similarity index 81%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index 6374df494a3..0f546c76a21 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -1,8 +1,8 @@
 //
 // EnumTest.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -11,21 +11,21 @@ import Foundation
 
 public struct EnumTest: Codable {
 
-    public enum EnumString: String, Codable { 
+    public enum EnumString: String, Codable {
         case upper = "UPPER"
         case lower = "lower"
         case empty = ""
     }
-    public enum EnumStringRequired: String, Codable { 
+    public enum EnumStringRequired: String, Codable {
         case upper = "UPPER"
         case lower = "lower"
         case empty = ""
     }
-    public enum EnumInteger: Int, Codable { 
+    public enum EnumInteger: Int, Codable {
         case _1 = 1
         case number1 = -1
     }
-    public enum EnumNumber: Double, Codable { 
+    public enum EnumNumber: Double, Codable {
         case _11 = 1.1
         case number12 = -1.2
     }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
similarity index 82%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index 1fc4bd362fd..faa091b0658 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -1,8 +1,8 @@
 //
 // FormatTest.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -19,13 +19,13 @@ public struct FormatTest: Codable {
     public var double: Double?
     public var string: String?
     public var byte: Data
-    public var binary: Data?
+    public var binary: URL?
     public var date: Date
     public var dateTime: Date?
     public var uuid: UUID?
     public var password: String
 
-    public init(integer: Int?, int32: Int?, int64: Int64?, number: Double, float: Float?, double: Double?, string: String?, byte: Data, binary: Data?, date: Date, dateTime: Date?, uuid: UUID?, password: String) {
+    public init(integer: Int?, int32: Int?, int64: Int64?, number: Double, float: Float?, double: Double?, string: String?, byte: Data, binary: URL?, date: Date, dateTime: Date?, uuid: UUID?, password: String) {
         self.integer = integer
         self.int32 = int32
         self.int64 = int64
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
similarity index 75%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 3626846919f..554aee1081a 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -1,8 +1,8 @@
 //
 // HasOnlyReadOnly.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/List.swift
new file mode 100644
index 00000000000..8997340ff4b
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -0,0 +1,26 @@
+//
+// List.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+
+public struct List: Codable {
+
+    public var _123list: String?
+
+    public init(_123list: String?) {
+        self._123list = _123list
+    }
+
+    public enum CodingKeys: String, CodingKey { 
+        case _123list = "123-list"
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MapTest.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
similarity index 81%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index ded3f7b1dde..dfbbee8428e 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -1,8 +1,8 @@
 //
 // MapTest.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -11,7 +11,7 @@ import Foundation
 
 public struct MapTest: Codable {
 
-    public enum MapOfEnumString: String, Codable { 
+    public enum MapOfEnumString: String, Codable {
         case upper = "UPPER"
         case lower = "lower"
     }
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
similarity index 83%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 962b7fe65bc..7116108fd7a 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -1,8 +1,8 @@
 //
 // MixedPropertiesAndAdditionalPropertiesClass.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
similarity index 84%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index f539cd888ab..fc1d0606b7b 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -1,8 +1,8 @@
 //
 // Model200Response.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Name.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
similarity index 71%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Name.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index ddd2b909851..cc165d767d9 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Name.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -1,8 +1,8 @@
 //
 // Name.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -15,20 +15,20 @@ public struct Name: Codable {
     public var name: Int
     public var snakeCase: Int?
     public var property: String?
-    public var _123Number: Int?
+    public var _123number: Int?
 
-    public init(name: Int, snakeCase: Int?, property: String?, _123Number: Int?) {
+    public init(name: Int, snakeCase: Int?, property: String?, _123number: Int?) {
         self.name = name
         self.snakeCase = snakeCase
         self.property = property
-        self._123Number = _123Number
+        self._123number = _123number
     }
 
     public enum CodingKeys: String, CodingKey { 
         case name
         case snakeCase = "snake_case"
         case property
-        case _123Number = "123Number"
+        case _123number = "123Number"
     }
 
 
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
similarity index 78%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index 06db22e9c3a..e6fb206093a 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -1,8 +1,8 @@
 //
 // NumberOnly.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
similarity index 84%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index b6c0cc0cb5a..5cad29458b7 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -1,8 +1,8 @@
 //
 // Order.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -11,7 +11,7 @@ import Foundation
 
 public struct Order: Codable {
 
-    public enum Status: String, Codable { 
+    public enum Status: String, Codable {
         case placed = "placed"
         case approved = "approved"
         case delivered = "delivered"
@@ -22,7 +22,7 @@ public struct Order: Codable {
     public var shipDate: Date?
     /** Order Status */
     public var status: Status?
-    public var complete: Bool?
+    public var complete: Bool? = false
 
     public init(_id: Int64?, petId: Int64?, quantity: Int?, shipDate: Date?, status: Status?, complete: Bool?) {
         self._id = _id
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
similarity index 56%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index bd1984e870d..edc4523d9f0 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -1,8 +1,8 @@
 //
 // OuterComposite.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -11,11 +11,11 @@ import Foundation
 
 public struct OuterComposite: Codable {
 
-    public var myNumber: OuterNumber?
-    public var myString: OuterString?
-    public var myBoolean: OuterBoolean?
+    public var myNumber: Double?
+    public var myString: String?
+    public var myBoolean: Bool?
 
-    public init(myNumber: OuterNumber?, myString: OuterString?, myBoolean: OuterBoolean?) {
+    public init(myNumber: Double?, myString: String?, myBoolean: Bool?) {
         self.myNumber = myNumber
         self.myString = myString
         self.myBoolean = myBoolean
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterEnum.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
similarity index 68%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterEnum.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index d6222d2b1c4..bd1643d279e 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -1,8 +1,8 @@
 //
 // OuterEnum.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -12,5 +12,4 @@ public enum OuterEnum: String, Codable {
     case placed = "placed"
     case approved = "approved"
     case delivered = "delivered"
-
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
similarity index 87%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index 73985167c96..3773bf53317 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -1,8 +1,8 @@
 //
 // Pet.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
@@ -11,7 +11,7 @@ import Foundation
 
 public struct Pet: Codable {
 
-    public enum Status: String, Codable { 
+    public enum Status: String, Codable {
         case available = "available"
         case pending = "pending"
         case sold = "sold"
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
similarity index 75%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index 6e984760cd6..48b655a5b0a 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -1,8 +1,8 @@
 //
 // ReadOnlyFirst.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Return.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
similarity index 79%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Return.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index 9502f08130c..de4b218999b 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Return.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -1,8 +1,8 @@
 //
 // Return.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
similarity index 82%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index f94741a854a..213d896ba98 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -1,8 +1,8 @@
 //
 // SpecialModelName.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
similarity index 80%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index 7dd17159a73..20f50efd3ac 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -1,8 +1,8 @@
 //
 // Tag.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/User.swift
similarity index 92%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift
rename to samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index 09b68da4f8f..d9c564d2a1f 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -1,8 +1,8 @@
 //
 // User.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
index 15be786b172..f400bc064e0 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
@@ -7,239 +7,239 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0721D774D0F763F753132FA7C49C45DC /* GroupBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E9C1C4F819D8D851C307E466169CB21 /* GroupBy.swift */; };
-		07FE6BB5C180A6B4B8388D9A56ED79EC /* RxMutableBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86D29E0EE141C77A4C49AAF72DB8E07D /* RxMutableBox.swift */; };
-		08B3F38A47C3345683F3CFFE0E887279 /* SerialDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F086740E78B8F642AED0C6902B6DE4C0 /* SerialDisposable.swift */; };
-		093A149379B5B08C73F940DD60C04723 /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = D104485DE4B89C2C0F5DA06F8D8FB321 /* Model200Response.swift */; };
-		0F68BA9663BD8CC4AF99E6A2CDA0F6F1 /* Disposables.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71E8601E606A1D56F2F719B3B12C04D8 /* Disposables.swift */; };
-		0F735BA66AC3EB0A2460CBB8C181B7F8 /* SubscribeOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = 754E291B4C1217597C2D3362A0E8ACA3 /* SubscribeOn.swift */; };
-		102CF7BE65E8881472DAE6C869A69FFB /* Bag+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81E85D3981FE03082AA978BDFBA49A9B /* Bag+Rx.swift */; };
+		031A698AD1E45BE38B7BE16FEBC64872 /* Just.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1796A4B389BA873A7F76668E6C4107 /* Just.swift */; };
+		079022D786BA4C3392FAF6B2C3FF240C /* ObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9D10C334CB3B654E4E06CFF4ECB4697 /* ObservableType.swift */; };
+		08A42D53039D7E6228776A2EA7CB8D40 /* Debounce.swift in Sources */ = {isa = PBXBuildFile; fileRef = AADFB1E909FA43812598B97F8A724A07 /* Debounce.swift */; };
+		0AF4F1BD8E12251095AE3B8858A2886E /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2DDAE4995DB14893EA47ED21E6742BA /* ReadOnlyFirst.swift */; };
+		0DD3C9A04DBC740C0D71572394BF5AF6 /* ToArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51A7D7185A63093DD22C20C0229D982 /* ToArray.swift */; };
+		108114CC076350BA1B5EA582CFFAB26F /* Switch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6DDD969EDD7FE74DA02BBC1C061C21 /* Switch.swift */; };
 		10EB23E9ECC4B33E16933BB1EA560B6A /* Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90E1B0D9DB713B4E3E6400DDF0D647FF /* Timeline.swift */; };
-		120840F727931F263DB3875ECB5FE69A /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AA8957F940318D27FB6791638E59D4 /* FakeAPI.swift */; };
-		1339FF3750A7FA24CA7C57BB8982BE3A /* PrimitiveSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07EDD2BF92D8FD22BFABA279D2DD3EA5 /* PrimitiveSequence.swift */; };
-		14888090A2E9E49FF94C483054546B2D /* First.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41C438FC82246FEC404A5B82F1DE4D7A /* First.swift */; };
-		152D4BACCDCB7642AA71A18734BC6829 /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EE69B76F52C63676CC0FD332D7C3E1 /* Timer.swift */; };
-		15A98581467120DDEFA8FFEC32513F44 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6821C4EA4A6F2142E30406BD33EAC97 /* Errors.swift */; };
-		15AAEF2E9BFE39816B15393EE6BB3B8D /* Maybe.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCF1913DDC595240519CF39D2AC2C147 /* Maybe.swift */; };
-		18B577D3222D3158AEE353FDBE9BA333 /* SkipWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D5FBC6478B111DD333D8796A766BFD6 /* SkipWhile.swift */; };
-		19515401C0D38AF488E20FCF871C697B /* Completable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77FBCF2C53C2D7D2BB94EA30B345F5A8 /* Completable.swift */; };
-		1A8DB9ACF161DFEE505AFF28AC60162F /* SwitchIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = D31F08BCF85659A8411D93F4D567E999 /* SwitchIfEmpty.swift */; };
-		1AC1D7BC79867EFC31D1373A1E89DC58 /* DisposeBag.swift in Sources */ = {isa = PBXBuildFile; fileRef = C503B5686D69F33CD75FBE9AC02EB509 /* DisposeBag.swift */; };
-		1B9EDEDC964E6B08F78920B4F4B9DB84 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = C5D5E8ED92C86186CBBA4B492338D644 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1C13606BCB3096578C56A3B3CF6630CC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
-		1CEDD428B3F87DE7B99721AC67D51626 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44617D1A0C7A3B1E4A8CDD554179965 /* Client.swift */; };
-		1EE9474E48F5AE172B16AD5CCFCA0292 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = A02A9568A88535A81FBDC040CAD0FBE7 /* List.swift */; };
-		1FA22E5EBF4DF1D4A91D71061086CE60 /* ObservableType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6DB69590EDE806419A0D994D4E5DBE9 /* ObservableType+Extensions.swift */; };
-		1FE5800C304828B7940E511BF90CDE8A /* Platform.Darwin.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADF76CD14B0F97AC2A26DA7FB93093F1 /* Platform.Darwin.swift */; };
-		249B91EAF9ABBFF6FB1D8A15330B18D0 /* RefCountDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98AF5D706945730277047DB4646140D7 /* RefCountDisposable.swift */; };
-		281AFAEA94C9F83ACC6296BBD7A0D2E4 /* Pods-SwaggerClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		297FCDFDA07BDC84C9B4AD3C476B6F62 /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02E9D01AB5459DC2AF94581DEDD90B0C /* Sequence.swift */; };
-		2983844BF8D7FF1E56FBA8520CC899DA /* Create.swift in Sources */ = {isa = PBXBuildFile; fileRef = B273EB6FBAF3DB2E4F6E8D0E01609EA5 /* Create.swift */; };
-		2ACBD1C0E5044C0C27D9FEC72BA4D169 /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4886231E24F79A689B75D91994EDC167 /* Debug.swift */; };
-		2AE59EA62E0DF2A32C91098D2780A022 /* Cancelable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852E8D4E0D5EFB1772568D1FBC770FFE /* Cancelable.swift */; };
-		2CB165EE9C63D73D85CC3520DED27073 /* CurrentThreadScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D314BF46101711EC426C005067C11153 /* CurrentThreadScheduler.swift */; };
-		2D0E7BAF86065E08D5B936EE2EA46FCC /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6422C74BD1B120F80FEFC87A5FED472 /* NumberOnly.swift */; };
-		2DE9F311F590A0F059C617EE97087ED5 /* Take.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2056EAF85B9C63D72098DF15E9CC9BDE /* Take.swift */; };
-		2E4EB995A5128A1781F53E53F1A766C9 /* ScheduledItemType.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABF5E733F3DC52B229408B8E2980C204 /* ScheduledItemType.swift */; };
-		2F1E994F3772F01E3610F5E186088E32 /* HistoricalSchedulerTimeConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED78303DE5DBB10FABF2DA8DC94C711 /* HistoricalSchedulerTimeConverter.swift */; };
-		30C4449ACEEF083352ABFF154B2D7968 /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC0E02F846FD6026FB1DB1A89A5A1FC /* ArrayOfArrayOfNumberOnly.swift */; };
-		31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3512C8FF3FE0AA949AE38ACC0AB1CFE8 /* ObserverBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE885DA3E711891BDF628CFB5836A951 /* ObserverBase.swift */; };
+		12D37A05DA6E1E19ED68B57E6E77A06A /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40D76A0512402285DC5FCF2795D7926 /* APIs.swift */; };
+		13380DA9B5B6EA2DFC225E0146A5569B /* MainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96502A901063BD4C174D11BB00C710E3 /* MainScheduler.swift */; };
+		13CE8E6804D706546739C0D7D3261BF2 /* DispatchQueueConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC6F9C571A0E1ED418373AA5D41E148B /* DispatchQueueConfiguration.swift */; };
+		146BF55F555209EEFA2E62EC5C2391E8 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6821C4EA4A6F2142E30406BD33EAC97 /* Errors.swift */; };
+		146F3F02FEA83BB72CF2752C04E106D4 /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A12346A10D54F80F5FA16D11CB2F939 /* Zip.swift */; };
+		170EEA58B4F41BEAFB6429D116D3CE7A /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14B3C282191A88FADAB9CC2C684F72AA /* SpecialModelName.swift */; };
+		18762DA609434C0E3728BF55DE80FCCF /* SubjectType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F2D4164A946CA486B328C6BE33C0C03 /* SubjectType.swift */; };
+		19BDA30E180BDA014910A4C07D1BF067 /* String+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3592C8F1344FCA07945EEFCE38DBF3A /* String+Rx.swift */; };
+		1A69F474C02F9EF10FFBE14501B10373 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 19296A8C5E948345E5744A748B1CC720 /* RxSwift.framework */; };
+		1B1F4B0E19F6F851E6C54CFB8FEC22B5 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C030C0F6BD877478B1CA4BC8BFBAD057 /* Pet.swift */; };
+		1B6F47211DD38D70756B5499A7FE08E4 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 776D2DC046923CE3DDE934FF73659587 /* PetstoreClient-dummy.m */; };
+		1B9EDEDC964E6B08F78920B4F4B9DB84 /* Alamofire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A763501E8213F6B0B834F999C1BAA8 /* Alamofire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		1D6C98EAB06448D41FF240AA126ECA4E /* ImmediateSchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77D6786FE8AB55808EE46B906D873C2A /* ImmediateSchedulerType.swift */; };
+		1ED692095FC82315639BC2F65C5A6961 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEB048F7684923FC8C99614FB91CDE30 /* Models.swift */; };
+		1FFBAC31426B7CD4D42276917F87C562 /* ScheduledItemType.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABF5E733F3DC52B229408B8E2980C204 /* ScheduledItemType.swift */; };
+		200AFAA12203AF2A4D979A0F31DB5B6E /* Deferred.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7273DF1D9C6FAB18A8BA7D2574F808CA /* Deferred.swift */; };
+		2084E80B376F22D944DA886AA978E6E0 /* Reactive.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D35A14067C74AA3A70F94CEB566E582 /* Reactive.swift */; };
+		20AFA0F5F5F9BF3840C3A0044F03701C /* GroupBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E9C1C4F819D8D851C307E466169CB21 /* GroupBy.swift */; };
+		21CBEB768D02EAE5A553A8CC6B1CA82D /* ShareReplayScope.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A3D84003C01646124C7B78C047BE3B1 /* ShareReplayScope.swift */; };
+		242B9D8AAA07CDFB1DDA0D5FBD45F028 /* Using.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5707C69C09A801609ACEF257F57B2207 /* Using.swift */; };
+		265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		27F2215CBB17F8E2C82CA73A82BB42CE /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4886231E24F79A689B75D91994EDC167 /* Debug.swift */; };
+		281AFAEA94C9F83ACC6296BBD7A0D2E4 /* Pods-SwaggerClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		282D621DEF60D9AE2199CE0B5B359F25 /* RetryWhen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25ADA9B1338936AFBF09430C0723FE25 /* RetryWhen.swift */; };
+		28DF98EA02994AD7AE8D5DB81C918AFD /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49A545F954B2A10B0D26618084D1FF73 /* Tag.swift */; };
+		291529C2AD8278F0E29BCE2CA087D145 /* Catch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6230781ECAEC837966DC5158BCFC7A4E /* Catch.swift */; };
+		2986D1A5463F79F567425AC813D4EF5B /* InvocableScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = E747DD70D6594E514E39D2B22C48F97C /* InvocableScheduledItem.swift */; };
+		29AC2B62E354D62A7D6E439ABD8D8705 /* Amb.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD7BA2F761195481CE42D1A600F26C23 /* Amb.swift */; };
+		29DECFB9242C247EC2436B96DBCD868D /* Optional.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2319E93DF3310834B4D8114909C00A /* Optional.swift */; };
+		2D8F385280D9A32412657D65BDAFD897 /* SingleAsync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93B81CE85BB7F1617FC2A790C1A427D8 /* SingleAsync.swift */; };
+		2E728847ABC0CCA9AE13F02B14CF5493 /* FileSchemaTestClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DE2FEBAD4A5F085054978914D2BAD7F /* FileSchemaTestClass.swift */; };
+		328799E235BC5232BAE478CB4420155C /* Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EECDD8B4213F3EBDE36517E494EE648 /* Rx.swift */; };
 		3626B94094672CB1C9DEA32B9F9502E1 /* TaskDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3C171CE5B7E92489A6610716886E986 /* TaskDelegate.swift */; };
-		36FB93DEFBE1013E88CCFFDA85191E89 /* ReplaySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EE2D113E4C8B291895E5DECD9BACA93 /* ReplaySubject.swift */; };
-		379DBA65DA25BCDAA1819B0B9CE597A0 /* SynchronizedDisposeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31FCC1893DCAA54D01761B7F3D389D62 /* SynchronizedDisposeType.swift */; };
-		38C4BC7C4D5F7F832AC5692B757514CF /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27F52AACF4F996CDD6856D86C166B144 /* JSONEncodableEncoding.swift */; };
-		39188F6A68DA352296C7AA68B04A7634 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC41879241FE814CEDA9D6C468E03FA3 /* ApiResponse.swift */; };
-		3CA1570189D857764A9F5D0A58A331C9 /* InvocableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90D1C72DBA823431EA295407C3606D21 /* InvocableType.swift */; };
-		3CC36945887A8B975354D58D9F40844C /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 248C33B0119C8E61FDED4A0A75898C0A /* FakeClassnameTags123API.swift */; };
-		3CCBC419966A8DDCBD77543A392CEE4D /* Reduce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F71DF127C2F62D486E98F40E2522470 /* Reduce.swift */; };
-		3E3315111C3DEFAAC76C1A4ECAE85852 /* Using.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5707C69C09A801609ACEF257F57B2207 /* Using.swift */; };
-		3E5FB8280117F89928AADF001F8B5203 /* Amb.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD7BA2F761195481CE42D1A600F26C23 /* Amb.swift */; };
-		3FF149097ED8B1C60C6E2A4AEDED4140 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2400ECA3F3C11CFC96A0A348CF92F4 /* MapTest.swift */; };
-		4038FA0DAE5E3E62D316F6806F8BDA8E /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E902BD3FF06123585AC7822AAD73A02 /* Dog.swift */; };
-		411AC1E2BFEEDA777527D5C8DC496BDE /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25E1BBEDB400BAF88BEDACEE2464D85C /* Extensions.swift */; };
-		41C3453DDBA3EFF9809FCF528442B54A /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF56E8175C31FFC9C5FE532793765D33 /* Animal.swift */; };
-		42E5B5BE039C693257EFC30960881DCB /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0643D6008A1CC710E2E3B9F5A59EAC9C /* User.swift */; };
-		430DC1A27F565B8EA3CF088AD93A94BD /* Producer.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC133608CAE8A7B9F40CE4A43E43E6E /* Producer.swift */; };
-		4339105DAF7A86F4E96FE61DF1460BAC /* Do.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBBD7A139F31C78AE70CE7FD8C2EA2C8 /* Do.swift */; };
-		435161D581A5EE3AE722478ACB75017D /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3AC4FE6C97025C460E86C450274D6D1 /* UserAPI.swift */; };
-		438BBF4B32B6CD24D27FAF48FE59A1B5 /* ImmediateSchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77D6786FE8AB55808EE46B906D873C2A /* ImmediateSchedulerType.swift */; };
-		4E5FDA1BE82472210C9C523A0C1DB7C4 /* ConcurrentMainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FFCDAB755375F5D44F4B1523CDE155 /* ConcurrentMainScheduler.swift */; };
-		5058AC85F2DB2F4FA15167325F02713E /* Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4D050A460709C1B52F11FFDA31AF1AC /* Delay.swift */; };
-		50A395AAD0986EFBA9C7F1F7500C32F5 /* RetryWhen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25ADA9B1338936AFBF09430C0723FE25 /* RetryWhen.swift */; };
-		51EC8B7898542CB445947B8DFC4BF22D /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8FB97481720144B9BFAC91018683A13 /* ClassModel.swift */; };
-		521E82B5650538B3E88FFFA81339DBE3 /* Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 778229E6AF8CDFD4BD9C5D35E1BFBDEA /* Empty.swift */; };
-		5299F775188B741DB878B94A5FF165E4 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 732FBB0810C3F91070490823AC9C860A /* Name.swift */; };
+		37637660CD3F5876BB0EBAC16EC992A7 /* DisposeBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21DA635307D6367AE5546DD28FE93F5E /* DisposeBase.swift */; };
+		3806FDBB433140D468EF008E5C1BA014 /* StartWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87C0E7EA02EE5E0426278FAF8937E3E5 /* StartWith.swift */; };
+		38B1EC6AE8B173A0ED2054C7F17F3304 /* AddRef.swift in Sources */ = {isa = PBXBuildFile; fileRef = D189C69FF14E18C13139A32F1ED916FE /* AddRef.swift */; };
+		393738EA89EC44C0179A3F94152AE904 /* PublishSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 278FBADBD6FF5564512DA0CBBCB82B5F /* PublishSubject.swift */; };
+		3946D9C48A85CF4ABD301EBD29FBAB6A /* ObservableType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6DB69590EDE806419A0D994D4E5DBE9 /* ObservableType+Extensions.swift */; };
+		3B404BDF5A8118770D87A3D5A3580C57 /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A6821DE25768EABE3B84E13AA2767AA /* UserAPI.swift */; };
+		3C3A4CEC534C7AAFE058E473520D3A2B /* Materialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE0EE14832B0DEE34688A721D3B3A954 /* Materialize.swift */; };
+		3DFFA1E65DBFC5F9A813B915AD36B9DD /* InfiniteSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47EA63B913BCFF0010BFCED1DF08E819 /* InfiniteSequence.swift */; };
+		3F287A167118B07BB9795F4D74A358D3 /* Zip+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB01C4A269BB41DDD347FEA23DF43E9B /* Zip+Collection.swift */; };
+		3FBA3F2CE4617D11704CA8E9DFEA9879 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F66D63E8AA66846EDB3A12966E6951E /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		4091C79F74F01B548E8C7B7C2FB3CDA2 /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = D26E32A3BC2BFB67B8101778868F725B /* Deprecated.swift */; };
+		41D49ED21EB01A05D078B0A544C56A5A /* Bag+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81E85D3981FE03082AA978BDFBA49A9B /* Bag+Rx.swift */; };
+		422D3DE3CC90F6A7619E52CB0BB6EF63 /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E2EC4565EC8F367639B92CDB70CB6A /* Lock.swift */; };
+		43B0430DB5D2D99D8EA2CA53005F3AC8 /* Reduce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F71DF127C2F62D486E98F40E2522470 /* Reduce.swift */; };
+		44E56759EA227A975CFE8C1C62E74BA3 /* OperationQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10F0021C0883B5E674AC1DAD342DE88A /* OperationQueueScheduler.swift */; };
+		45C42555A2D2FB43A4C233497E1D8BA9 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E81223B1EAA15A1063FABA2C1F83FD46 /* NumberOnly.swift */; };
+		45FC10FA7B11102F204B1A4C3595533A /* Bag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C87378B8848CEAA8FE988BC61DA402D /* Bag.swift */; };
+		46527321E2E30477D8BDA2D0454721B8 /* RxSwift-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 93868E0A391CFC012C1EC5F79555C633 /* RxSwift-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		476792705280C405EA9C3260DACB5232 /* AnonymousObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38142CCEF853DEC3364FCED228937B98 /* AnonymousObserver.swift */; };
+		48E4B400170D1A67500A63B222F09F0C /* SwiftSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3E1B433D507DFC2548C9808484EE7B9 /* SwiftSupport.swift */; };
+		496B51294599ED4AE1BA687C1C2FB909 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B30B9F0FA3EB01FFACD8AF1A5E3C02A /* Client.swift */; };
+		4D058BAA377C140D2417BF7A19B948F4 /* SubscriptionDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED01E14130399734F56212D8C0692200 /* SubscriptionDisposable.swift */; };
+		4D696BF979D171B81F55FD381CEC100B /* Timeout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16DD6B584BD6FB5E1825E397DBF89CB2 /* Timeout.swift */; };
+		4DAEF2BA9B74B2216CCF2C426E510B04 /* SynchronizedDisposeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31FCC1893DCAA54D01761B7F3D389D62 /* SynchronizedDisposeType.swift */; };
+		4F18B5772E4DF4B1483B9BD39AD8F01E /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26460FFB88FB0F37F26FBC2496044DF4 /* Event.swift */; };
+		4FB6027EADADE2DFBE6517E185024881 /* Maybe.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCF1913DDC595240519CF39D2AC2C147 /* Maybe.swift */; };
+		4FC912959F09FACB9E16FE88578DBB78 /* ScheduledDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9856E1BC4B7134F1A3BC95D731C8E8 /* ScheduledDisposable.swift */; };
+		515056D5D617588984888FD2FB132B0A /* SchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8823E1E2CA5694EE96E4518471A935B /* SchedulerType.swift */; };
+		5210B4D13454F2D219F3E0380FC11CEE /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B82CEB4985EF0211265D6B07E03F35A /* Observable.swift */; };
+		522C49543C28F29BD3C2D80C7817EACC /* AnonymousDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6EE828AE8CA3D73EAE4F45FEDEC134E /* AnonymousDisposable.swift */; };
+		52E7E6FFC004710E47C6FA0B3A707A58 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA9C5856BEAE5090A7D1EB450A10C04F /* Alamofire.framework */; };
+		534C167AEFB598D0CAB052DF7E33DFCE /* SingleAssignmentDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8486D625B453FA8C43F57CFA44075520 /* SingleAssignmentDisposable.swift */; };
 		5387216E723A3C68E851CA15573CDD71 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F85D6F1C4AC3264F8C521D56F6A7E6C /* Request.swift */; };
-		5397DCCBB26C926C6A09ECBE4BF51F49 /* GroupedObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = A550A224A85B3B8CA43C7BB61AA652A2 /* GroupedObservable.swift */; };
-		54AB4B3DF840DE7025877C7FF20743EA /* OuterNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 969B0FD4E599E77A9AD7C257CC8AAC3B /* OuterNumber.swift */; };
-		552161139E36DBE53079012FFB7EE545 /* ShareReplayScope.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A3D84003C01646124C7B78C047BE3B1 /* ShareReplayScope.swift */; };
-		559202606F4577F8B281E90A6B77038E /* CombineLatest+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 865C950981FA36DC925DBA465F744C78 /* CombineLatest+arity.swift */; };
-		56116B6C30C783DD7ADC21EACFBB87E1 /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A3C32E3A778873EE0B779B167A4D0D6 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		5991B6FC359C9D799692A722AA85B16C /* SynchronizedOnType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7508ECA5370B58D9DC088F29D3F25E6F /* SynchronizedOnType.swift */; };
-		5A170B711C2612A8F622C4F3BDE86DCC /* Concat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59050F7DF97E92BFE7F75E147A9B38CD /* Concat.swift */; };
-		5A5A96ACB462E280A4492A30EA8BB063 /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8776282D2BE56A89D0919D4A53830234 /* JSONEncodingHelper.swift */; };
-		5AD8EFFBE4DFB4F2D9F77368C2CBAB1B /* ToArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51A7D7185A63093DD22C20C0229D982 /* ToArray.swift */; };
-		5C59A1B60C2AE8404AD7857B16481AEB /* DispatchQueue+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5CE2E894C9FCA4384CF06E82483EAD /* DispatchQueue+Extensions.swift */; };
-		5CAA8581BEFB270CB196F8F1A0422721 /* Map.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3C16A4EB884F3A4B5B6371798D893C /* Map.swift */; };
-		5CB6D5F3703EA000051D67F8BA01390A /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA27384EA9C66568B39162DB8A982404 /* EnumTest.swift */; };
-		5D1256D0D639CA66C952B508232D0126 /* PriorityQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C53834E2F3171F9AEE0BA7D592FE137 /* PriorityQueue.swift */; };
-		5F8C2989B73BEF455F1D5B54E98F5B20 /* ScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E5664B892C181E9610F65C3CBE7A202 /* ScheduledItem.swift */; };
-		60605453AEB2DBB803CDECF1639A6723 /* Generate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 725A254A70C1644528A73DD4BC5D3FB0 /* Generate.swift */; };
+		548D1251A6333F3C14D3B410878A0728 /* AsyncSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E5B474C909B7494527255E231DE532C /* AsyncSubject.swift */; };
+		548D415C3ECB026FB6EEC2CE33006E5F /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5A46D45023C6CBF06AA36844D59C59E /* User.swift */; };
+		55996E2B4AF6CAE25D431FDE76C11BDB /* Completable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77FBCF2C53C2D7D2BB94EA30B345F5A8 /* Completable.swift */; };
+		56033D6D3A9CD87275E6D75EE1C2C9B7 /* Concat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59050F7DF97E92BFE7F75E147A9B38CD /* Concat.swift */; };
+		573B70D063CBCDAB039CB05125C9E768 /* RecursiveScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5559FE6F17E7EB202D9B91627C76B357 /* RecursiveScheduler.swift */; };
+		579FCF1CF577D7912BEDD744C068B3D3 /* RxMutableBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86D29E0EE141C77A4C49AAF72DB8E07D /* RxMutableBox.swift */; };
+		57D2C8EE1E8BB499FCD2CBDF4AEA1D0F /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FF19147CE4412D2804D578DF81FA6E6 /* Animal.swift */; };
+		57EF68964E352D6FEC794EF5A542EDD8 /* ObserveOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = 155108F6B6F2A77E5DCCA25DBE612A0F /* ObserveOn.swift */; };
+		57FF6C6AE83AE47969AA9E6068F3A118 /* Cancelable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852E8D4E0D5EFB1772568D1FBC770FFE /* Cancelable.swift */; };
+		58DF548418220FF399DB6318AB0BD0AF /* Single.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8396870D4DF2D01692A7FA9629447399 /* Single.swift */; };
+		58FC1ED61E3A3F8A26FEAEF2D263DD87 /* Multicast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9305C58CCB3D473FAE5478F497A30785 /* Multicast.swift */; };
+		592BEB1813D8123103A5CB2FFD10746F /* PetstoreClient-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 974697BA63D3232B3CBCF781253D6FD8 /* PetstoreClient-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5CB1D20182D013136D1A4D7F63026F32 /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = D822C4C7D3E161B2623D9538CFB3993E /* Dog.swift */; };
+		5DE3D4CD20BAC4AA98D56D58CFA84E3C /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FB2BB634F7165B7E02CB903C153DD5F /* StoreAPI.swift */; };
+		5E6C7E636827D5FD75C44F93E760E272 /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A2BDAA57AA98A4A74ACCB907248C44 /* Filter.swift */; };
+		5EB1912C5BD866EF22078E6342DDF626 /* AnotherFakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF33FE500328600F30A0008C612F377 /* AnotherFakeAPI.swift */; };
+		5EC3C041B207798AA15184D6772ECA08 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 405921FE252DC3DC1087DA4217236D81 /* Name.swift */; };
 		61200D01A1855D7920CEF835C8BE00B0 /* DispatchQueue+Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E28CEA6D0BE78D961F82D5325ECA7CF /* DispatchQueue+Alamofire.swift */; };
-		61355136E313943D2D96A8E7619C9E3A /* TakeUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24A342FA417364D21C8656DD5802AB13 /* TakeUntil.swift */; };
-		62318C169E2E0CCA1FDCF84FF8DA74B8 /* Completable+AndThen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872320DCEAE93CAE583E3F339A3C08CB /* Completable+AndThen.swift */; };
 		62F65AD8DC4F0F9610F4B8B4738EC094 /* ServerTrustPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD792F2DD31CDD45A0512A9F57FDEF1F /* ServerTrustPolicy.swift */; };
-		65FC19B4E6EACB6B645EFCF3D9E4A6F5 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = E49AA3853C7F8F73E4790EDEA54FDBB4 /* ReadOnlyFirst.swift */; };
-		66AB5C5B2CF44EC128C3C452276E4C74 /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43401D5E814F2B2B70B4268C9700D233 /* AdditionalPropertiesClass.swift */; };
-		6792CE9AB26A214E343417164DB02D7B /* ObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9D10C334CB3B654E4E06CFF4ECB4697 /* ObservableType.swift */; };
-		67A7736CAAFC0E38B4B95A5C7D95A7E7 /* RecursiveScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5559FE6F17E7EB202D9B91627C76B357 /* RecursiveScheduler.swift */; };
-		68202AFB988F6E80E8AA2AA5E556F63B /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E65BEC72AE9A9C2682D1FF779537AA2 /* OuterEnum.swift */; };
-		6975335509CCEAD83AD83EBD88225337 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32177EF0EA0FBB3B62950055E2BCC550 /* Configuration.swift */; };
-		6BE9D6CB3F8F50E6542DE7B26E953FE6 /* Timeout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16DD6B584BD6FB5E1825E397DBF89CB2 /* Timeout.swift */; };
-		6C6A8700E85F13B85B864146351A09A7 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 303CFF12CD99D66790B079406AE453BB /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
-		6E1EA28E8B2EDDE6207F2EFDE5E823E9 /* PrimitiveSequence+Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EC54F54E2CA741399F3CCB1B3A601AF /* PrimitiveSequence+Zip+arity.swift */; };
-		6FAEFB7A49AF44FD7BC8B19045F2B6D5 /* Single.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8396870D4DF2D01692A7FA9629447399 /* Single.swift */; };
-		7310E38D47A859D4BF9B37F899E1E12A /* DisposeBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21DA635307D6367AE5546DD28FE93F5E /* DisposeBase.swift */; };
+		65B160A97B74B22F64D9C4CD628E317A /* LockOwnerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F09EB4EF714BBEE87A9F2096DFA2B895 /* LockOwnerType.swift */; };
+		669BD672AE0D5D72A75FC5A53AEB90E8 /* Skip.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCA556DABECD244AD1E3A0DDD6ED3FCB /* Skip.swift */; };
+		67B27DAF4FE1906DAB120FB30A35F0B7 /* Take.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2056EAF85B9C63D72098DF15E9CC9BDE /* Take.swift */; };
+		69305D2FA0FCEC9660EAF14C211CEF1E /* InvocableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90D1C72DBA823431EA295407C3606D21 /* InvocableType.swift */; };
+		6A660FDFCD7C6F8B8622087B0A538CBD /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392B0EBFD414446E3C9A271B38B72DA0 /* EnumClass.swift */; };
+		6A7F2469317BE4339FF2FACF2FF99AE8 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23810842569AE35D0E94BB511DF8A4FC /* Order.swift */; };
+		6ABF5ACD27F9CB11B315C934DA579538 /* RecursiveLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D0335BE86918B0C7F1804659E339803 /* RecursiveLock.swift */; };
+		6B2EBB7B77F9B11C2223CAAE31B68652 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EE661EFEC3A229F1219958C4244153F /* ArrayTest.swift */; };
+		6BDE32E70C5D69C2E660535264EDEDB9 /* SerialDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0F40ABCAC55B85443A252C6025B5E48 /* SerialDispatchQueueScheduler.swift */; };
+		6CF09409ADF83E89F4C293961A949D7B /* DelaySubscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = D69F66BA2AFADE32485D04ED138762EE /* DelaySubscription.swift */; };
+		6DAC97988C9B146A100EF15D5B7D8A2A /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7304FCBBF3A1E3E5A44C2B06C880606 /* JSONEncodableEncoding.swift */; };
+		711F397F738E31A401BB5E41DFBB633E /* ScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E5664B892C181E9610F65C3CBE7A202 /* ScheduledItem.swift */; };
+		713F021C8A1B11ADB8AAB3BE2AB28612 /* AnyObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B07A773370E37EDA8572ACD83EF3F827 /* AnyObserver.swift */; };
+		717E3DE6C8A82E3A666E6B9953FF7AEE /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF5D23F22EEE2FBFA826151A4E186DE3 /* ApiResponse.swift */; };
+		724399A8802626116CBD6D815993340E /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = FECB278917C7651872C44FB1C0B6E620 /* Category.swift */; };
+		730BF0627DCA8B2B0CAE4D08D0C7332A /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41E52FC18B43257D6D924850398E9AE /* ArrayOfArrayOfNumberOnly.swift */; };
 		73B9C996AED49ED7CF8EC2A6F1738059 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
-		73FF155683AE9CD8396D19BB06E2A8D7 /* Disposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 926462C4CE81BF73964FEBCF551AD4AC /* Disposable.swift */; };
-		74D0D51B724F3FB316A66EE6ADB6FC13 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26460FFB88FB0F37F26FBC2496044DF4 /* Event.swift */; };
-		750C3E103400C491B58CE253595190C3 /* CombineLatest+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88D3E7E2BAA9B2CD334714DFD331344B /* CombineLatest+Collection.swift */; };
-		756791FEBF425E98530FE7EE04521037 /* PetstoreClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 573394BE348ECB16EEF1017407804E56 /* PetstoreClient-dummy.m */; };
-		765734EF1BB6D03D914CAF073E6EA56D /* Scan.swift in Sources */ = {isa = PBXBuildFile; fileRef = D707D0C2E9B6081FACC6E50AED59454A /* Scan.swift */; };
-		77A551C9616B0C57A51BB9AF7DAD4938 /* Queue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FAF790D7762EE57130F23C580A16DBA /* Queue.swift */; };
-		796562476BBE671FBD8DCEC20C2CE0D1 /* ObserveOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = 155108F6B6F2A77E5DCCA25DBE612A0F /* ObserveOn.swift */; };
-		79F828F573BA3DB3E564AD5A1B78BAA9 /* OperationQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10F0021C0883B5E674AC1DAD342DE88A /* OperationQueueScheduler.swift */; };
+		743389633EBF4450FF0D08C40AE31AFA /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D0A663A60EBEDC85D7204FF294D7A8E /* FakeClassnameTags123API.swift */; };
+		745B6321970E5A6B54F13A3BD5641F28 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A4D6098BB7067FA34B381F4446DDB10 /* PetAPI.swift */; };
+		74817260A74EC7B413B77A62ADAD3DF7 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 246C4149EB1F7D2CF07D83FD3B4A7683 /* ArrayOfNumberOnly.swift */; };
+		75344FDDF1374B3419C134FCCD184411 /* Disposables.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71E8601E606A1D56F2F719B3B12C04D8 /* Disposables.swift */; };
+		75C705C277D4C20D9E3421A1215F4A59 /* Map.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3C16A4EB884F3A4B5B6371798D893C /* Map.swift */; };
+		75D6A01ED8132F2E8B08A25FF3BACCD1 /* Sample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9501ACC3F376E8B44AA930B90C92E958 /* Sample.swift */; };
+		761DB0B921617D34EB73B8BB73351962 /* ElementAt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B902B6B72079D059ACE4C24A6561D46 /* ElementAt.swift */; };
+		78F640A5405F3C3EF4A3745AE5EDB7F4 /* AsyncLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24B5F3A003FEF6F4731F657C0CFA00C1 /* AsyncLock.swift */; };
+		79EE3D1B608BC079E2909BE77EE9E43B /* DispatchQueue+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5CE2E894C9FCA4384CF06E82483EAD /* DispatchQueue+Extensions.swift */; };
 		7B5FE28C7EA4122B0598738E54DBEBD8 /* SessionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 550CC0489DBA99CBBC0F2B2DF83F01E2 /* SessionDelegate.swift */; };
-		7C07E1C8D4192CF1F9FDF7136D62A631 /* Zip+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB01C4A269BB41DDD347FEA23DF43E9B /* Zip+Collection.swift */; };
-		7C172538D4FCB50C3E242BA310283179 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA5D5240A5E375F716132587718DC6F8 /* ArrayOfNumberOnly.swift */; };
+		7B640961C4AAE7333EBFF6FB25EB6FFE /* Never.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11CB440D74AFBF6B48EAB4EB37E6682A /* Never.swift */; };
 		7D8CC01E8C9EFFF9F4D65406CDE0AB66 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0E2A103D6F5288370F338F6C9D39FB6 /* Result.swift */; };
-		7E393BC7E21AA50F18D9507A18EC0068 /* AsMaybe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 300AB0FDCC78385863E1A037E686402D /* AsMaybe.swift */; };
-		7FC19A0A42D5A941FAC85D716FA4164F /* ConcurrentDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0DC3E605EDF8CDB2FDFE7F0F6D9732 /* ConcurrentDispatchQueueScheduler.swift */; };
-		7FD4625EC4BDE2E32BB1075824C8FC42 /* SchedulerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8823E1E2CA5694EE96E4518471A935B /* SchedulerType.swift */; };
-		80260F45F9AD8887F8419F3F6087878C /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80DB2369BE8133A5163C158A5DBF024 /* OuterComposite.swift */; };
-		819E7EBD4F451762DB3989AC97F36113 /* AnonymousObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38142CCEF853DEC3364FCED228937B98 /* AnonymousObserver.swift */; };
-		83970D48183878762CCD1E07492E896C /* AsyncSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E5B474C909B7494527255E231DE532C /* AsyncSubject.swift */; };
-		83F5151C46CEC3F09FDB0619E1FC274F /* SynchronizedUnsubscribeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = E62D112073B23555DB849DE81B9E8ECE /* SynchronizedUnsubscribeType.swift */; };
-		847FC6EB6B293CD065F790499DDAB3FF /* Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E0BC80BF5585F0121294A2C7E4146BC /* Window.swift */; };
-		84B272390789161463BC801E47BB8777 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC8D06D1E9BE16DF40F38B8754ABF064 /* Models.swift */; };
-		84C79F2EAF64B4578B086C9907D53B79 /* AnyObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B07A773370E37EDA8572ACD83EF3F827 /* AnyObserver.swift */; };
-		8608FEA8E591A67672BDC56A2CD87DD5 /* BehaviorSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = E46CAB7540439CE3BF12759F9A7D5616 /* BehaviorSubject.swift */; };
-		86E553218B0471CC4413DEDADE49CB29 /* Optional.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2319E93DF3310834B4D8114909C00A /* Optional.swift */; };
-		87AEC7D0045C5835C82EF3AE06AB7EA3 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8497720E80CDEFA1D74B3E87908F10C /* Category.swift */; };
-		8958D6099E900867E70383C1C7A105A5 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F66F7B800381443AA5E1CDDFA51429 /* PetAPI.swift */; };
-		897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */; };
-		89E14B7531F830DFADC7E4D32ECCD730 /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF515424DF68A3AAC931232EEC1D3956 /* EnumArrays.swift */; };
-		8AC5952E36872ABE6634048006F73E21 /* Catch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6230781ECAEC837966DC5158BCFC7A4E /* Catch.swift */; };
-		8B310B56B5FB1B5C5458170D304F1E2C /* TailRecursiveSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92570D279A6EF44EE26B079BA1B9A53A /* TailRecursiveSink.swift */; };
-		8D35AC516C6B00547C19A2ED3BAAA682 /* Sink.swift in Sources */ = {isa = PBXBuildFile; fileRef = B272A051EA5BC60E1179C65014C6241E /* Sink.swift */; };
-		8E1A9CD890B273CC44127DFAC690D253 /* SingleAsync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93B81CE85BB7F1617FC2A790C1A427D8 /* SingleAsync.swift */; };
-		90C9D0DE224190848D0EEC26A05EDF00 /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91315B18340C0DAF9FCBF20C50A33D75 /* FormatTest.swift */; };
-		91BCA631F516CB40742B0D2B1A211246 /* Pods-SwaggerClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */; };
-		92E7BFD9225D3FD3C5B361A63FE64A8B /* MainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96502A901063BD4C174D11BB00C710E3 /* MainScheduler.swift */; };
-		946051763C1CBC403668632BD0B7DB00 /* SubjectType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F2D4164A946CA486B328C6BE33C0C03 /* SubjectType.swift */; };
-		948C82E8FA6B2DC477300612D0581FBB /* HistoricalScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C193C2F1EC9DDF20CA9EAC2B8DB2EF88 /* HistoricalScheduler.swift */; };
-		96A53E5FDFC3B8B16C733A6A2A5632AD /* DefaultIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0304884DC326DB6CD950585017A4C9B8 /* DefaultIfEmpty.swift */; };
-		972A98911DFBEF9FBD92F7863196DA2A /* RecursiveLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D0335BE86918B0C7F1804659E339803 /* RecursiveLock.swift */; };
-		9901D2631F06C0B31732333EF456D9B5 /* Multicast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9305C58CCB3D473FAE5478F497A30785 /* Multicast.swift */; };
-		99500E9F843B5E9720AE001645058C9F /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BFF16C6A77D6FADE4068F05EDFBAC9B /* Cat.swift */; };
-		9A89541810A7108D0C2F3390D83C1779 /* ConnectableObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 428535B37310BA598511CE1337F0B48E /* ConnectableObservableType.swift */; };
-		9C6C65A3F40356896A7A988EF15FABEB /* OuterString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 567ACF2871B2843E1D080D4FD26C9F90 /* OuterString.swift */; };
-		9DD21B22ECCEC0331AAA66925D7EA3A6 /* SingleAssignmentDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8486D625B453FA8C43F57CFA44075520 /* SingleAssignmentDisposable.swift */; };
+		7E0B46A33AE6C2E525D3806C1C780CB6 /* HistoricalScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C193C2F1EC9DDF20CA9EAC2B8DB2EF88 /* HistoricalScheduler.swift */; };
+		7E1F799E544BFFA1095CE862D6716833 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39CFCEF99F7C460D0F08FDCCF1457477 /* File.swift */; };
+		7F3341BB95A2261046DFCEB79CE690BF /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42AA25A3EEB248D295081E15036472FA /* FakeAPI.swift */; };
+		7FB5CF2118BE24D55B3554C400732BBC /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E06E455867386B3481EDF14972006E /* JSONEncodingHelper.swift */; };
+		80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */; };
+		8159B4FC350C9B0106135B168CD9F2B0 /* SubscribeOn.swift in Sources */ = {isa = PBXBuildFile; fileRef = 754E291B4C1217597C2D3362A0E8ACA3 /* SubscribeOn.swift */; };
+		815B92D888D4669FB086E91692655D7B /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D9E3149DFEE7783ACEC1596236B2268 /* Return.swift */; };
+		830013706DE764A14DFFC2A0153CA5B6 /* Enumerated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39F86600CD28FCBEAC21EC445036F5BB /* Enumerated.swift */; };
+		83B993381A841C44FEDC4220F9F16E24 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
+		847A8B420331AF45153CAF20037CAD62 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53DCDFCEE59497257D4D8E5C61AC1BF6 /* APIHelper.swift */; };
+		85A781C3C3166C0FAD748F0D145DD723 /* ConcurrentDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0DC3E605EDF8CDB2FDFE7F0F6D9732 /* ConcurrentDispatchQueueScheduler.swift */; };
+		888734304CADEF702525FDBE547BA4EC /* Completable+AndThen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872320DCEAE93CAE583E3F339A3C08CB /* Completable+AndThen.swift */; };
+		89314462735557CCBC303AD490F9F8B3 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C249F0D3A4AFFFC155DEC2FBB68F0CC /* Capitalization.swift */; };
+		8DEB713831DB8C2EB2F29E1B7E5ACBF7 /* CombineLatest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66EC3E2F3DCF45D5AB51829897FA086A /* CombineLatest.swift */; };
+		904D8F4F61970DC316274757617D2722 /* DefaultIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0304884DC326DB6CD950585017A4C9B8 /* DefaultIfEmpty.swift */; };
+		90DBBC062F26ED5B3257591E1A6C5467 /* GroupedObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = A550A224A85B3B8CA43C7BB61AA652A2 /* GroupedObservable.swift */; };
+		90EBDD35E19A3A885E49DE638239BC5A /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BFEAC12D510253937BA86D1172977BE /* ObservableConvertibleType.swift */; };
+		91B097F77214E509BAB1A42837B61088 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61179CE650778B2A5C39664F0A792B5C /* List.swift */; };
+		91BCA631F516CB40742B0D2B1A211246 /* Pods-SwaggerClient-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */; };
+		9566F222CEA9E8E1135A960C7081E5A0 /* Producer.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC133608CAE8A7B9F40CE4A43E43E6E /* Producer.swift */; };
+		9A42BB18B315261E03EE2DC0D75D3EC3 /* ReplaySubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EE2D113E4C8B291895E5DECD9BACA93 /* ReplaySubject.swift */; };
+		9B1D7E40251AB57E8EBE740DB2E47AFB /* BinaryDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF45C813123D291DEF8F063BFA56634A /* BinaryDisposable.swift */; };
+		9BA839DEF7AAC24ECD245E314BD04A15 /* Buffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F887BA42DB31F9EB31BE815228F2508 /* Buffer.swift */; };
+		9CEA37BFAC7CDD93C3762DDDA104CA13 /* Merge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C0DD329CAEE6B9D220FDBAB65949BA /* Merge.swift */; };
+		9D1D18853B381D5BFC3DD39ED5FED962 /* RxSwift-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D6BFAEEEDA8B0422531E1FA16BF92B7 /* RxSwift-dummy.m */; };
 		9ED2BB2981896E0A39EFA365503F58CE /* AFError.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3770A7BCE7BDE74070F1208CD8E1869 /* AFError.swift */; };
-		A0116BA9A30AAC96E99F1EAFC62AE5DF /* DispatchQueueConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC6F9C571A0E1ED418373AA5D41E148B /* DispatchQueueConfiguration.swift */; };
-		A0168DDC27B6B9C21B87713895626507 /* AnotherfakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 116B390BD0A7F0EF01D8711E0289C84B /* AnotherfakeAPI.swift */; };
-		A1C6CD39EE860825F742BE02C4B7848B /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B1424428997FCBA698D13E6CE48242 /* Error.swift */; };
-		A29B6721D5A3E9A02E44DD5BA9629462 /* ObservableConvertibleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BFEAC12D510253937BA86D1172977BE /* ObservableConvertibleType.swift */; };
+		9F66ED85A4E76494225473E71F4032D7 /* TakeLast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17AF1B5A1853F182329E30482F55A73C /* TakeLast.swift */; };
+		A050BE11CA9F1C4158474FBAB7BF5C28 /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6E49082BB281EDC5D7B6E76772E87CF /* FormatTest.swift */; };
+		A1CAEA9C386892DD5A79335D7EEE19B6 /* Platform.Linux.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC1D8F37AB6B7D7586E28EFAB469B93 /* Platform.Linux.swift */; };
 		A2A6F71B727312BD45CC7A4AAD7B0AB7 /* NetworkReachabilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35D5CF20C3D3984F7EC413FFBD6374DD /* NetworkReachabilityManager.swift */; };
-		A33317A6FE554B9BB1584E32D8E408DD /* Skip.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCA556DABECD244AD1E3A0DDD6ED3FCB /* Skip.swift */; };
-		A3357DC269351DAB92D3D463D424BE4F /* ObserverType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612CBBE5854087BD9092A17953EBE4D0 /* ObserverType.swift */; };
-		A4235BF24DA740970A86E26D8CCC4BD7 /* RxSwift-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F3DC98E86B4AC213505C195455245A5 /* RxSwift-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		A5F1A6EEF34196C111E8EA5DAE8A7B33 /* ObservableType+PrimitiveSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BBF2BA674B90D1EB01A4A6247F5879B /* ObservableType+PrimitiveSequence.swift */; };
-		A609714B6192F6F3C0A029A84FE28B2B /* SchedulerServices+Emulation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAE1234D37DD5D2F5CAFA10C32C6B64 /* SchedulerServices+Emulation.swift */; };
+		A38EA0BB0CD542EA84780B2BE82D2E5D /* CombineLatest+Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88D3E7E2BAA9B2CD334714DFD331344B /* CombineLatest+Collection.swift */; };
+		A3DC0A56758CE1D9AB82ADCA71DB5234 /* BooleanDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17D809A9B0AC223CA246D114D7A20617 /* BooleanDisposable.swift */; };
+		A7824EDE649EB8D2F0298F8A11C3EFA7 /* Dematerialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7252C613B9CBA42CB511A8DEAF74B9B6 /* Dematerialize.swift */; };
 		A7C5CF056E08D8CF885F5A923F8A7655 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
-		A7DCD78BDF799B85D72906C4C6469932 /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A12346A10D54F80F5FA16D11CB2F939 /* Zip.swift */; };
-		A8F1CEA456C73ADEDE65F500CDC8363A /* BooleanDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17D809A9B0AC223CA246D114D7A20617 /* BooleanDisposable.swift */; };
-		A9EEEA7477981DEEBC72432DE9990A4B /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 05EBFE23A4E6704F2B564DA56691E1C2 /* Alamofire-dummy.m */; };
-		ABF8A1A069B4C501E1AE3A626BD0C318 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = CFB7B4E2B9662BFD982DE3B5E209D30D /* Tag.swift */; };
+		A94FA890E645C229AB74FEF87823B83A /* First.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41C438FC82246FEC404A5B82F1DE4D7A /* First.swift */; };
+		A9EEEA7477981DEEBC72432DE9990A4B /* Alamofire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 64F36B6A4E5A28C08FE61EA222DE0E34 /* Alamofire-dummy.m */; };
+		AA35CB063B89D843E92A0A8F0B7D8E9C /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE0EE75A3806EB2BA0C9EEF687CE2B93 /* Cat.swift */; };
+		AB8E05A67556D5C85EC5939DF27E5782 /* SchedulerServices+Emulation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAE1234D37DD5D2F5CAFA10C32C6B64 /* SchedulerServices+Emulation.swift */; };
 		AE1EF48399533730D0066E04B22CA2D6 /* SessionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E61CBE9462CC6E03F04B656ED52B756 /* SessionManager.swift */; };
-		B318AAA2B87195FA8EC6AAB24962F8A6 /* InvocableScheduledItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = E747DD70D6594E514E39D2B22C48F97C /* InvocableScheduledItem.swift */; };
-		B34531A5B3B7DE054111634A9CFCECE7 /* Reactive.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D35A14067C74AA3A70F94CEB566E582 /* Reactive.swift */; };
-		B5EAB00E2CAE715103AC46B7AFF67A48 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DE323395ACA46B7F898EE5E5DFF7F3E /* Order.swift */; };
+		B06D77BF39326F4FE57C760C0041846F /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B5354642428AF26C69F2155FEBFA4B /* OuterEnum.swift */; };
+		B1DA4D8BF7F12F162AAC8A6B31F20D01 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7898EEC6A565DE133438C48988478954 /* Extensions.swift */; };
+		B356FE92080EAC800E6E7737A4656DAE /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EE69B76F52C63676CC0FD332D7C3E1 /* Timer.swift */; };
+		B3A57F58991B701C639E67153A193D9C /* RefCountDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98AF5D706945730277047DB4646140D7 /* RefCountDisposable.swift */; };
+		B5A1B1046FF0DEF6AB91D794CEBEAEDD /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02E9D01AB5459DC2AF94581DEDD90B0C /* Sequence.swift */; };
+		B613EC6F435CD31F7C7169AE21404DAF /* ObserverType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612CBBE5854087BD9092A17953EBE4D0 /* ObserverType.swift */; };
 		B65FCF589DA398C3EFE0128064E510EC /* MultipartFormData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B6C5E68612574DDB98D2BF22919E493 /* MultipartFormData.swift */; };
-		B6B08C17232261A7C5344CCB19B3F6B3 /* Repeat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7FD506CEC38B2558C059C5213C1A8AA /* Repeat.swift */; };
-		B7EA71790C58BAF28B054A40C134E60A /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37B1F46DC47D437D85AD27B958BC7BB7 /* AlamofireImplementations.swift */; };
-		B806D1064402DAF164FCBEF90E79D84B /* Buffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F887BA42DB31F9EB31BE815228F2508 /* Buffer.swift */; };
-		B8142F32EB2B0B4BE0195A1185A9C895 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBC66A91F3E1B8141F59B08ADF8D38CF /* Capitalization.swift */; };
-		B94F515AB5AE57EB799AC4D084E1CE26 /* Deferred.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7273DF1D9C6FAB18A8BA7D2574F808CA /* Deferred.swift */; };
-		B991826B7C535F73E785A3ECBD6D71B2 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA9C5856BEAE5090A7D1EB450A10C04F /* Alamofire.framework */; };
-		B9AA8D13231A733A1FB5EC960E7DDF83 /* InfiniteSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47EA63B913BCFF0010BFCED1DF08E819 /* InfiniteSequence.swift */; };
-		B9DB05413EA5FC6B4D44A72C47740929 /* AddRef.swift in Sources */ = {isa = PBXBuildFile; fileRef = D189C69FF14E18C13139A32F1ED916FE /* AddRef.swift */; };
+		B67DD84B3E51F83CBD3E18C08464CCF7 /* Queue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FAF790D7762EE57130F23C580A16DBA /* Queue.swift */; };
+		B71EBC63D6A1DF0CC24A75908AAE795B /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18B675845795AE8F97C41BFE1B734DF3 /* EnumArrays.swift */; };
+		B762C2E5C06297D7E449EA77E28B6162 /* SynchronizedUnsubscribeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = E62D112073B23555DB849DE81B9E8ECE /* SynchronizedUnsubscribeType.swift */; };
+		B9281CBADFA7BBC09D30EA0A410BE83B /* WithLatestFrom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63A3DC39C396AE681B862EAECAFD03CB /* WithLatestFrom.swift */; };
+		BAFD94BF33006889FD98615CCD3AE0BE /* Sink.swift in Sources */ = {isa = PBXBuildFile; fileRef = B272A051EA5BC60E1179C65014C6241E /* Sink.swift */; };
+		BB0AA91C4DEA60BEE9DAF6231E952CF7 /* Throttle.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA40B452E0222A6E844B7A8178E3FCDD /* Throttle.swift */; };
 		BBEFE2F9CEB73DC7BD97FFA66A0D9D4F /* Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2915A616B54E6864B51DE807710B3AC6 /* Validation.swift */; };
-		BC52825EDB741DC6711CA5C946939B71 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30216D1F18443637A23B317E25A44330 /* ArrayTest.swift */; };
-		BCC034A610C630B3F73D3D4B04DCF858 /* RxSwift-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = DF424CC13A312AC0C01EEE0E7D7F9C71 /* RxSwift-dummy.m */; };
+		BC15C89A997BEF3AE7C38B8CFCDE4A3C /* BehaviorSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = E46CAB7540439CE3BF12759F9A7D5616 /* BehaviorSubject.swift */; };
+		BC95410B29A7332DCE5B03D8FB7C8E5C /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA70EA7732BDFFE905C353D9709B2AD /* ClassModel.swift */; };
+		BDF2B23BD698F186BEF225D473992D4D /* VirtualTimeScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA62AC58EBCAF1EB81CD4E52C064006F /* VirtualTimeScheduler.swift */; };
+		BE48EC240CE65E350939EC61700194D5 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A9361010C64B5A1F7A9DF65338A4060 /* HasOnlyReadOnly.swift */; };
 		BE5C67A07E289FE1F9BE27335B159997 /* ParameterEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43A398089B296EE103D1FC016CFACB60 /* ParameterEncoding.swift */; };
-		BF18B6BF5657B61C189367FB60397B26 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF438B2B7CFD2D75076C56994007327 /* Pet.swift */; };
-		BFDD4F46020E6DF10EADB0453041D77C /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBC05B4BF54E30963F2B2DFDA89AD97 /* StoreAPI.swift */; };
-		C009C8D6795AD30C3268CDF7DD0F3769 /* StartWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87C0E7EA02EE5E0426278FAF8937E3E5 /* StartWith.swift */; };
-		C1DE304D0A86256FCD7E47C68254F0E0 /* Enumerated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39F86600CD28FCBEAC21EC445036F5BB /* Enumerated.swift */; };
-		C2592A96F83B169B73E97702CF748BF7 /* Never.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11CB440D74AFBF6B48EAB4EB37E6682A /* Never.swift */; };
-		C27CD8430D1BB415F819FE866F380962 /* AnonymousDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6EE828AE8CA3D73EAE4F45FEDEC134E /* AnonymousDisposable.swift */; };
-		C48CBB1F8225EF0FEA86DA1AED821DC1 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 19296A8C5E948345E5744A748B1CC720 /* RxSwift.framework */; };
-		C5A078F87376B2CA2773F803AC624053 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5179EB017CA14D044D4AC4881A6519C0 /* HasOnlyReadOnly.swift */; };
-		C7CD9FD5A01A338D6D417B2C97D105F9 /* Switch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6DDD969EDD7FE74DA02BBC1C061C21 /* Switch.swift */; };
-		C7F4529BD9C239459D16BFA7ADE06A89 /* AsSingle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D33254979611A41EF47958094DD8114 /* AsSingle.swift */; };
-		CA6F2A877BFDF83F228434CD39F8FFBE /* SubscriptionDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED01E14130399734F56212D8C0692200 /* SubscriptionDisposable.swift */; };
+		BFA2F9507EA89FD10256D776A0823724 /* PrimitiveSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07EDD2BF92D8FD22BFABA279D2DD3EA5 /* PrimitiveSequence.swift */; };
+		C04C9786E7B745C8594670708023F83F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
+		C081E427BEE4B8462E9992C762D029C2 /* Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4D050A460709C1B52F11FFDA31AF1AC /* Delay.swift */; };
+		C3B9A8243631D998AD9EED7EAD60CAAB /* HistoricalSchedulerTimeConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED78303DE5DBB10FABF2DA8DC94C711 /* HistoricalSchedulerTimeConverter.swift */; };
+		C42A137BFE76E0D792983F3D785D132A /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7FFC55F1307BC98855D3D546660D4F2 /* OuterComposite.swift */; };
+		C809F0D5A36737F28B40C24EAF4DEB62 /* StringBooleanMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2990DE0BC65EFC8D04E0FE470B40D295 /* StringBooleanMap.swift */; };
 		CB6D60925223897FFA2662667DF83E8A /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95743667DF9F7A20E243F6122E306F37 /* Response.swift */; };
-		CB9EA6F0A8FE83325A17171EEE5C5898 /* ElementAt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B902B6B72079D059ACE4C24A6561D46 /* ElementAt.swift */; };
-		CBA689CC77D7CFDC8D8D2604025524C2 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9996663E24F264D09E9D8C8C54EF5BF3 /* SpecialModelName.swift */; };
-		CC3747E4861205050BF1AE883A1DC35C /* VirtualTimeScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA62AC58EBCAF1EB81CD4E52C064006F /* VirtualTimeScheduler.swift */; };
-		CCD2FCAE7573C15F8181C2F344989524 /* Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FEE1B647BF3BF83A15307D0FE6C9061 /* Zip+arity.swift */; };
-		D0D0AA23A747A22AAAA039AC721F45F6 /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E2EC4565EC8F367639B92CDB70CB6A /* Lock.swift */; };
-		D282218AF15C2E8A21136A7BDF30FAD5 /* PublishSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 278FBADBD6FF5564512DA0CBBCB82B5F /* PublishSubject.swift */; };
-		D345371D5463B2B04FEFC9BEF0D29DA2 /* Throttle.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA40B452E0222A6E844B7A8178E3FCDD /* Throttle.swift */; };
-		D3E8F381E33F8BC1E4822469A0AA604A /* Materialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE0EE14832B0DEE34688A721D3B3A954 /* Materialize.swift */; };
-		D5727E52B7D172445EB237004BDD608C /* TakeLast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17AF1B5A1853F182329E30482F55A73C /* TakeLast.swift */; };
-		D5AE6E9D367EC6626808EB9A0D3025F3 /* CompositeDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169D4CE14EAA396C1DFA35E1F9117B10 /* CompositeDisposable.swift */; };
-		D5C28E85E329AD61CC0594B9FA53A828 /* TakeWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4C822BA58E0D22E0B2694BE9F9E675D /* TakeWhile.swift */; };
-		D71897E4ED2B5ADC2CA7FB8062D8A047 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDCCDD3634C44CBBFC8AE4EAD9FEAAC1 /* AnimalFarm.swift */; };
-		D85A963F7346348480A14C59885EFAA9 /* AsyncLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24B5F3A003FEF6F4731F657C0CFA00C1 /* AsyncLock.swift */; };
-		D94FE1464C101028B32A4FD34CFE7BA7 /* DistinctUntilChanged.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF979F3D76337A7A50EFDB371F52942 /* DistinctUntilChanged.swift */; };
-		D96CB89457748E03A60BE778F1BD2811 /* String+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3592C8F1344FCA07945EEFCE38DBF3A /* String+Rx.swift */; };
-		D9790D7ABE1D6BE95CF53AAC8534D596 /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A2BDAA57AA98A4A74ACCB907248C44 /* Filter.swift */; };
-		DA32E92CC1E9AFF53F9A8ED4B52082F6 /* NopDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5176FF47E6A67E9207490055CCF514E /* NopDisposable.swift */; };
-		DDFDE95E8C00BC953A3F457C60BBAFB0 /* Merge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C0DD329CAEE6B9D220FDBAB65949BA /* Merge.swift */; };
-		DFF5A9AAE4DD6E616FB1B8E331050A9B /* VirtualTimeConverterType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 078D5979EA15FA805F4444D47087701D /* VirtualTimeConverterType.swift */; };
-		E1296913C586DBEE4B85E987C70116CE /* OuterBoolean.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD4D7E3630CD7534338BFCD817C0430 /* OuterBoolean.swift */; };
-		E14F01F859236D557A9C571CB93E473B /* DelaySubscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = D69F66BA2AFADE32485D04ED138762EE /* DelaySubscription.swift */; };
-		E205A712A33BBAEBC6F50A6920B8BF9E /* LockOwnerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F09EB4EF714BBEE87A9F2096DFA2B895 /* LockOwnerType.swift */; };
-		E26899F79249D7A6D2725A5278113F30 /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26C368B2C0DCEEFAB4E4B49581B98400 /* APIs.swift */; };
-		E68DCA07E54D07263E2E13AA809D2023 /* Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EECDD8B4213F3EBDE36517E494EE648 /* Rx.swift */; };
-		E6FF0E4E4A084DEA3485F1EB3AB315D9 /* CombineLatest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66EC3E2F3DCF45D5AB51829897FA086A /* CombineLatest.swift */; };
-		E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
-		E7F43123D9A754E04B3A7278DCFB60C7 /* BinaryDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF45C813123D291DEF8F063BFA56634A /* BinaryDisposable.swift */; };
-		E9773E7F41BE44A4BEFCF70983A6CFE6 /* ScheduledDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9856E1BC4B7134F1A3BC95D731C8E8 /* ScheduledDisposable.swift */; };
-		E97FA6997E7F9DD1E805F9D78FB3BE9D /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = 962F09981F6DA884B7F9D9558435C813 /* Return.swift */; };
-		EA857DEBCA9D6FB7CD5A75DC24B698CC /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B82CEB4985EF0211265D6B07E03F35A /* Observable.swift */; };
-		EAF2C366AF89475636307F3EDE40515E /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = D231D2C7D42049951D365E540D2046E2 /* EnumClass.swift */; };
-		EAF84B1398CDC51DCB192025947E2CDC /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 400315FB500300F90ADAD73D6FF0AB0E /* Range.swift */; };
-		EB7F998A562C4544925579B4D76FC4A4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
-		EBFE64D14D62EE06912455760387B926 /* Debounce.swift in Sources */ = {isa = PBXBuildFile; fileRef = AADFB1E909FA43812598B97F8A724A07 /* Debounce.swift */; };
+		CB750DB061E608CC37AD48C3BA1E3E96 /* ObserverBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE885DA3E711891BDF628CFB5836A951 /* ObserverBase.swift */; };
+		CBE317FF6A6A07FA5DE832B60E5CCFF4 /* Disposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 926462C4CE81BF73964FEBCF551AD4AC /* Disposable.swift */; };
+		CC31CAD1462D2D0CF5F37A3CE1415378 /* Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E0BC80BF5585F0121294A2C7E4146BC /* Window.swift */; };
+		CDB63E2A05D79352D15E8A29E113D405 /* DisposeBag.swift in Sources */ = {isa = PBXBuildFile; fileRef = C503B5686D69F33CD75FBE9AC02EB509 /* DisposeBag.swift */; };
+		CEA030BEEAD8977EDA9F88A46B9EBA3A /* CurrentThreadScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D314BF46101711EC426C005067C11153 /* CurrentThreadScheduler.swift */; };
+		CF924E398D3C1D1B5FD565F8E8B3B0DC /* SkipUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 575CEB50BF06C2F37DF4186A98A9BE3E /* SkipUntil.swift */; };
+		D1BE17983D6A2EB1B5C249E76880A53C /* TakeWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4C822BA58E0D22E0B2694BE9F9E675D /* TakeWhile.swift */; };
+		D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */; };
+		D3E7615181B3A1EB18E20877C721FC0E /* SkipWhile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D5FBC6478B111DD333D8796A766BFD6 /* SkipWhile.swift */; };
+		D60D3566E070D46EADB202EE37B6C0BC /* SynchronizedOnType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7508ECA5370B58D9DC088F29D3F25E6F /* SynchronizedOnType.swift */; };
+		D8DD939406B1DBDF04A4B19F0D00A213 /* TailRecursiveSink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92570D279A6EF44EE26B079BA1B9A53A /* TailRecursiveSink.swift */; };
+		DA9DF86F690E492DD6EC9938CC8498E1 /* Repeat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7FD506CEC38B2558C059C5213C1A8AA /* Repeat.swift */; };
+		DAC2F7A82728C40BD846B5C450BFEE6C /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4B75FFB3C6B26ACDD73938BF18310B /* Configuration.swift */; };
+		DAC419378279DA6A1599A5B47765B63C /* ObservableType+PrimitiveSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BBF2BA674B90D1EB01A4A6247F5879B /* ObservableType+PrimitiveSequence.swift */; };
+		DADD7E65A13BCE9B341CC7E4EFBE4250 /* ConcurrentMainScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FFCDAB755375F5D44F4B1523CDE155 /* ConcurrentMainScheduler.swift */; };
+		DAF432897B5C3742F05ED25C555FF924 /* ConnectableObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 428535B37310BA598511CE1337F0B48E /* ConnectableObservableType.swift */; };
+		DC4B17FE15845C8126B6A2E35A5D6B5E /* VirtualTimeConverterType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 078D5979EA15FA805F4444D47087701D /* VirtualTimeConverterType.swift */; };
+		DCDEC6851B435D0C1154EBAAD275D077 /* SwitchIfEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = D31F08BCF85659A8411D93F4D567E999 /* SwitchIfEmpty.swift */; };
+		DD2D6855AB7887327C2D51DD2EA6278A /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B1424428997FCBA698D13E6CE48242 /* Error.swift */; };
+		DDB64E935A02B97584F744A0EA102F19 /* AsMaybe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 300AB0FDCC78385863E1A037E686402D /* AsMaybe.swift */; };
+		DEE5AF52A5F4BF6EC469B623E0E1DABD /* Generate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 725A254A70C1644528A73DD4BC5D3FB0 /* Generate.swift */; };
+		DF8D62E0646D452D5B7372FFB426CEDA /* Create.swift in Sources */ = {isa = PBXBuildFile; fileRef = B273EB6FBAF3DB2E4F6E8D0E01609EA5 /* Create.swift */; };
+		DF95F9C5B39CEEF6AC17E8908609A583 /* Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 778229E6AF8CDFD4BD9C5D35E1BFBDEA /* Empty.swift */; };
+		E22E64B194506573EEEFEC5F80DD3796 /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 400315FB500300F90ADAD73D6FF0AB0E /* Range.swift */; };
+		E35C89BE9DD97E026796FC961F786AAA /* Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FEE1B647BF3BF83A15307D0FE6C9061 /* Zip+arity.swift */; };
+		E3B302872276D8CA84795F07F3D46A1B /* AsSingle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D33254979611A41EF47958094DD8114 /* AsSingle.swift */; };
+		E64F88532D4A8205A62C6375FFCCD141 /* Scan.swift in Sources */ = {isa = PBXBuildFile; fileRef = D707D0C2E9B6081FACC6E50AED59454A /* Scan.swift */; };
+		E80420EED4F739800F9B77BF588946EE /* TakeUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24A342FA417364D21C8656DD5802AB13 /* TakeUntil.swift */; };
+		E8A12A1070CCC6254D322C36D49E5BD5 /* Platform.Darwin.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADF76CD14B0F97AC2A26DA7FB93093F1 /* Platform.Darwin.swift */; };
+		E8C2DB24A8B915661914F6A698BA02E3 /* Do.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBBD7A139F31C78AE70CE7FD8C2EA2C8 /* Do.swift */; };
+		E94566BA9FF4DBF9E869E4F2723DE0F1 /* SerialDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F086740E78B8F642AED0C6902B6DE4C0 /* SerialDisposable.swift */; };
+		EB938F3396BB7942B55A870DB770FB2C /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399E6B8FE158024592ED8B770864696C /* AdditionalPropertiesClass.swift */; };
+		EC72D0A9C3DF774FE3CBE8D109986421 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2002E2C081EDBF95460841AEE40A1F /* AlamofireImplementations.swift */; };
+		EDFCAD6831B42D32F8D7D717DAF8ACC8 /* PriorityQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C53834E2F3171F9AEE0BA7D592FE137 /* PriorityQueue.swift */; };
 		EFD264FC408EBF3BA2528E70B08DDD94 /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 619BFBAD9916AFBC31DE28B7C2577B78 /* Notifications.swift */; };
-		F1CCC4FBCB96CD9EFFFC9E4F614FF41B /* SwiftSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3E1B433D507DFC2548C9808484EE7B9 /* SwiftSupport.swift */; };
-		F2DA91AD3765D4389F012AC7DB2C74F3 /* WithLatestFrom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63A3DC39C396AE681B862EAECAFD03CB /* WithLatestFrom.swift */; };
-		F31B1636EFF84C018D378C544B69A1B1 /* Platform.Linux.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC1D8F37AB6B7D7586E28EFAB469B93 /* Platform.Linux.swift */; };
-		F363E4B6C3204C82906523AC903FECF8 /* Just.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1796A4B389BA873A7F76668E6C4107 /* Just.swift */; };
-		F42B09E81B1DFCAD0C38D85360BE2AF0 /* Sample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9501ACC3F376E8B44AA930B90C92E958 /* Sample.swift */; };
-		F52E7F86A618B14FF01AC6E8D01721EE /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 572F7F503F4D3E1A6CDF97FC985AF3BD /* APIHelper.swift */; };
-		F64CA64592E9E53B2D3AA49560029CD5 /* Bag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C87378B8848CEAA8FE988BC61DA402D /* Bag.swift */; };
+		F1C9507B3B3B8F864FD4AFB6C173CE77 /* NopDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5176FF47E6A67E9207490055CCF514E /* NopDisposable.swift */; };
+		F208F8D5D7723B1564A660298EFD2EFA /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDAB71F06CE94B9B9AD9438DAC00B6D2 /* AnimalFarm.swift */; };
+		F28B843584C1403E3577AA2613E58F79 /* CombineLatest+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 865C950981FA36DC925DBA465F744C78 /* CombineLatest+arity.swift */; };
+		F359656D869E357DCDCF5A3E15F014AD /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A917A61915DC34D93F7CA22E9FEEAB8 /* MapTest.swift */; };
+		F495E5E33C3A119F2220F7777C2732EB /* CompositeDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169D4CE14EAA396C1DFA35E1F9117B10 /* CompositeDisposable.swift */; };
+		F6084FFB3584DC5A8E46E6D95F0BC5F7 /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C7066E86827634F5A961005F5CDA325 /* CodableHelper.swift */; };
+		F6139A70665B785C707ADEE693C728A1 /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1D16F98B0546986ED64CD76F6678480 /* Model200Response.swift */; };
 		F6BECD98B97CBFEBE2C96F0E9E72A6C0 /* ResponseSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B73F1FF881BC53EB92AFEEE79E41B8 /* ResponseSerialization.swift */; };
-		F894BEC46F1E9AACC71CB4ECB10F239E /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = D26E32A3BC2BFB67B8101778868F725B /* Deprecated.swift */; };
 		F8B3D3092ED0417E8CDF32033F6122F5 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B768A340CE4954E18D2EA2C7FFBC23 /* Alamofire.swift */; };
-		FA5DD670643CBFDD06C1A60B0710BC6F /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF591C1D623007B1075CB02863648280 /* CodableHelper.swift */; };
-		FB3D99146123236CAA6C80CAEC8267DB /* SerialDispatchQueueScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0F40ABCAC55B85443A252C6025B5E48 /* SerialDispatchQueueScheduler.swift */; };
-		FC37580ECD434F954F4EA89C18477B05 /* Dematerialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7252C613B9CBA42CB511A8DEAF74B9B6 /* Dematerialize.swift */; };
-		FD0897400B54FCFDE495273F58A17043 /* SkipUntil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 575CEB50BF06C2F37DF4186A98A9BE3E /* SkipUntil.swift */; };
+		FC06B7D50BFCE70D1A13B26D88084F02 /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAFFDA41414FACE0139A3B1F22FB6717 /* EnumTest.swift */; };
+		FDB32E859E1047CB29425B3BC97181A6 /* PrimitiveSequence+Zip+arity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EC54F54E2CA741399F3CCB1B3A601AF /* PrimitiveSequence+Zip+arity.swift */; };
+		FE87FDE191C7E251EF4F41418947E4B0 /* DistinctUntilChanged.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF979F3D76337A7A50EFDB371F52942 /* DistinctUntilChanged.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -254,314 +254,330 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = E62F1FC39CD3E50528A1FD615087B79E;
+			remoteGlobalIDString = BC247F0137DAAFC66C8186BFF14D52BD;
 			remoteInfo = PetstoreClient;
 		};
-		A50F0C9B9BA00FA72637B7EE5F05D32C /* PBXContainerItemProxy */ = {
+		39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 9741823C73C54208699F008BEC051C81;
-			remoteInfo = RxSwift;
+			remoteGlobalIDString = 136F0A318F13DF38351AC0F2E6934563;
+			remoteInfo = "Pods-SwaggerClient";
 		};
-		AAE7A7F70E39A535DADF325A23F37A47 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 9741823C73C54208699F008BEC051C81;
-			remoteInfo = RxSwift;
-		};
-		E90B33A5936DFD411E882325EB4C8ABB /* PBXContainerItemProxy */ = {
+		7F731371D496E7DADCF6E51F404CA3FB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 88E9EC28B8B46C3631E6B242B50F4442;
 			remoteInfo = Alamofire;
 		};
+		A50F0C9B9BA00FA72637B7EE5F05D32C /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 0A6465AB09B51FAB877E30050A6766DC;
+			remoteInfo = RxSwift;
+		};
+		AA2CE5FED79751232AE3399B1C92EAAF /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 0A6465AB09B51FAB877E30050A6766DC;
+			remoteInfo = RxSwift;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		00ACB4396DD1B4E4539E4E81C1D7A14E /* Pods-SwaggerClientTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-SwaggerClientTests.modulemap"; sourceTree = "<group>"; };
+		0075000FF9024228C130ADDA9B81114E /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
+		0238FCB62F6F199FD219AA96372323A4 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		02E9D01AB5459DC2AF94581DEDD90B0C /* Sequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sequence.swift; path = RxSwift/Observables/Sequence.swift; sourceTree = "<group>"; };
-		02F28E719AA874BE9213D6CF8CE7E36B /* Pods-SwaggerClientTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClientTests-acknowledgements.plist"; sourceTree = "<group>"; };
 		0304884DC326DB6CD950585017A4C9B8 /* DefaultIfEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DefaultIfEmpty.swift; path = RxSwift/Observables/DefaultIfEmpty.swift; sourceTree = "<group>"; };
-		04AA8957F940318D27FB6791638E59D4 /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
-		057FC3E5DE19EA8F4DD600557D771032 /* Pods_SwaggerClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SwaggerClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		05EBFE23A4E6704F2B564DA56691E1C2 /* Alamofire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Alamofire-dummy.m"; sourceTree = "<group>"; };
-		0643D6008A1CC710E2E3B9F5A59EAC9C /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		057FC3E5DE19EA8F4DD600557D771032 /* Pods_SwaggerClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClient.framework; path = "Pods-SwaggerClient.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
 		078D5979EA15FA805F4444D47087701D /* VirtualTimeConverterType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VirtualTimeConverterType.swift; path = RxSwift/Schedulers/VirtualTimeConverterType.swift; sourceTree = "<group>"; };
 		07EDD2BF92D8FD22BFABA279D2DD3EA5 /* PrimitiveSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PrimitiveSequence.swift; path = RxSwift/Traits/PrimitiveSequence.swift; sourceTree = "<group>"; };
-		0C2400ECA3F3C11CFC96A0A348CF92F4 /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
-		0D51C075771C5C7E71A671D0D03ADAA0 /* Alamofire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Alamofire.xcconfig; sourceTree = "<group>"; };
+		08BDFE9C9E9365771FF2D47928E3E79A /* Pods-SwaggerClient-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClient-acknowledgements.plist"; sourceTree = "<group>"; };
+		0AD61F8554C909A3AFA66AD9ECCB5F23 /* Pods-SwaggerClient-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-frameworks.sh"; sourceTree = "<group>"; };
+		0B30B9F0FA3EB01FFACD8AF1A5E3C02A /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
 		0E5664B892C181E9610F65C3CBE7A202 /* ScheduledItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledItem.swift; path = RxSwift/Schedulers/Internal/ScheduledItem.swift; sourceTree = "<group>"; };
 		0E61CBE9462CC6E03F04B656ED52B756 /* SessionManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionManager.swift; path = Source/SessionManager.swift; sourceTree = "<group>"; };
 		10F0021C0883B5E674AC1DAD342DE88A /* OperationQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = OperationQueueScheduler.swift; path = RxSwift/Schedulers/OperationQueueScheduler.swift; sourceTree = "<group>"; };
-		116B390BD0A7F0EF01D8711E0289C84B /* AnotherfakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnotherfakeAPI.swift; sourceTree = "<group>"; };
 		11CB440D74AFBF6B48EAB4EB37E6682A /* Never.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Never.swift; path = RxSwift/Observables/Never.swift; sourceTree = "<group>"; };
+		14B3C282191A88FADAB9CC2C684F72AA /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
 		155108F6B6F2A77E5DCCA25DBE612A0F /* ObserveOn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserveOn.swift; path = RxSwift/Observables/ObserveOn.swift; sourceTree = "<group>"; };
 		169D4CE14EAA396C1DFA35E1F9117B10 /* CompositeDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CompositeDisposable.swift; path = RxSwift/Disposables/CompositeDisposable.swift; sourceTree = "<group>"; };
 		16DD6B584BD6FB5E1825E397DBF89CB2 /* Timeout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeout.swift; path = RxSwift/Observables/Timeout.swift; sourceTree = "<group>"; };
 		17AF1B5A1853F182329E30482F55A73C /* TakeLast.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeLast.swift; path = RxSwift/Observables/TakeLast.swift; sourceTree = "<group>"; };
 		17D809A9B0AC223CA246D114D7A20617 /* BooleanDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BooleanDisposable.swift; path = RxSwift/Disposables/BooleanDisposable.swift; sourceTree = "<group>"; };
+		18B675845795AE8F97C41BFE1B734DF3 /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
 		19296A8C5E948345E5744A748B1CC720 /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.debug.xcconfig"; sourceTree = "<group>"; };
 		1BBF2BA674B90D1EB01A4A6247F5879B /* ObservableType+PrimitiveSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "ObservableType+PrimitiveSequence.swift"; path = "RxSwift/Traits/ObservableType+PrimitiveSequence.swift"; sourceTree = "<group>"; };
+		1C4B75FFB3C6B26ACDD73938BF18310B /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/OpenAPIs/Configuration.swift; sourceTree = "<group>"; };
 		1D35A14067C74AA3A70F94CEB566E582 /* Reactive.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Reactive.swift; path = RxSwift/Reactive.swift; sourceTree = "<group>"; };
 		1EC54F54E2CA741399F3CCB1B3A601AF /* PrimitiveSequence+Zip+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "PrimitiveSequence+Zip+arity.swift"; path = "RxSwift/Traits/PrimitiveSequence+Zip+arity.swift"; sourceTree = "<group>"; };
+		1FF33FE500328600F30A0008C612F377 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = "<group>"; };
 		2056EAF85B9C63D72098DF15E9CC9BDE /* Take.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Take.swift; path = RxSwift/Observables/Take.swift; sourceTree = "<group>"; };
 		21DA635307D6367AE5546DD28FE93F5E /* DisposeBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DisposeBase.swift; path = RxSwift/Disposables/DisposeBase.swift; sourceTree = "<group>"; };
-		248C33B0119C8E61FDED4A0A75898C0A /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
+		23810842569AE35D0E94BB511DF8A4FC /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		246C4149EB1F7D2CF07D83FD3B4A7683 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
 		24A342FA417364D21C8656DD5802AB13 /* TakeUntil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeUntil.swift; path = RxSwift/Observables/TakeUntil.swift; sourceTree = "<group>"; };
 		24B5F3A003FEF6F4731F657C0CFA00C1 /* AsyncLock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncLock.swift; path = RxSwift/Concurrency/AsyncLock.swift; sourceTree = "<group>"; };
 		25ADA9B1338936AFBF09430C0723FE25 /* RetryWhen.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RetryWhen.swift; path = RxSwift/Observables/RetryWhen.swift; sourceTree = "<group>"; };
-		25E1BBEDB400BAF88BEDACEE2464D85C /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/Swaggers/Extensions.swift; sourceTree = "<group>"; };
 		26460FFB88FB0F37F26FBC2496044DF4 /* Event.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Event.swift; path = RxSwift/Event.swift; sourceTree = "<group>"; };
-		26C368B2C0DCEEFAB4E4B49581B98400 /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/Swaggers/APIs.swift; sourceTree = "<group>"; };
 		278FBADBD6FF5564512DA0CBBCB82B5F /* PublishSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PublishSubject.swift; path = RxSwift/Subjects/PublishSubject.swift; sourceTree = "<group>"; };
-		27F52AACF4F996CDD6856D86C166B144 /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodableEncoding.swift; path = PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift; sourceTree = "<group>"; };
-		291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClient-dummy.m"; sourceTree = "<group>"; };
 		2915A616B54E6864B51DE807710B3AC6 /* Validation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Validation.swift; path = Source/Validation.swift; sourceTree = "<group>"; };
+		2990DE0BC65EFC8D04E0FE470B40D295 /* StringBooleanMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StringBooleanMap.swift; sourceTree = "<group>"; };
 		2B6C5E68612574DDB98D2BF22919E493 /* MultipartFormData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MultipartFormData.swift; path = Source/MultipartFormData.swift; sourceTree = "<group>"; };
 		2B82CEB4985EF0211265D6B07E03F35A /* Observable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Observable.swift; path = RxSwift/Observable.swift; sourceTree = "<group>"; };
+		2BB1D491A4C824A6BFA9C0C35E36BD85 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		2C2002E2C081EDBF95460841AEE40A1F /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift; sourceTree = "<group>"; };
+		2C7066E86827634F5A961005F5CDA325 /* CodableHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CodableHelper.swift; path = PetstoreClient/Classes/OpenAPIs/CodableHelper.swift; sourceTree = "<group>"; };
 		2C7B6B4C3E8F676A457C5FF16CEE7682 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
-		2FF17440CCD2E1A69791A4AA23325AD5 /* Pods-SwaggerClient-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClient-acknowledgements.markdown"; sourceTree = "<group>"; };
 		300AB0FDCC78385863E1A037E686402D /* AsMaybe.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsMaybe.swift; path = RxSwift/Observables/AsMaybe.swift; sourceTree = "<group>"; };
-		30216D1F18443637A23B317E25A44330 /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
-		303CFF12CD99D66790B079406AE453BB /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
 		31FCC1893DCAA54D01761B7F3D389D62 /* SynchronizedDisposeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedDisposeType.swift; path = RxSwift/Concurrency/SynchronizedDisposeType.swift; sourceTree = "<group>"; };
-		32177EF0EA0FBB3B62950055E2BCC550 /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = PetstoreClient/Classes/Swaggers/Configuration.swift; sourceTree = "<group>"; };
+		32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClient-umbrella.h"; sourceTree = "<group>"; };
 		35D5CF20C3D3984F7EC413FFBD6374DD /* NetworkReachabilityManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NetworkReachabilityManager.swift; path = Source/NetworkReachabilityManager.swift; sourceTree = "<group>"; };
-		37B1F46DC47D437D85AD27B958BC7BB7 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AlamofireImplementations.swift; path = PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift; sourceTree = "<group>"; };
+		37A763501E8213F6B0B834F999C1BAA8 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
+		37E06E455867386B3481EDF14972006E /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodingHelper.swift; path = PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift; sourceTree = "<group>"; };
 		38142CCEF853DEC3364FCED228937B98 /* AnonymousObserver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousObserver.swift; path = RxSwift/Observers/AnonymousObserver.swift; sourceTree = "<group>"; };
+		392B0EBFD414446E3C9A271B38B72DA0 /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		399E6B8FE158024592ED8B770864696C /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		39CFCEF99F7C460D0F08FDCCF1457477 /* File.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
 		39E2EC4565EC8F367639B92CDB70CB6A /* Lock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Lock.swift; path = RxSwift/Concurrency/Lock.swift; sourceTree = "<group>"; };
 		39F86600CD28FCBEAC21EC445036F5BB /* Enumerated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Enumerated.swift; path = RxSwift/Observables/Enumerated.swift; sourceTree = "<group>"; };
+		3A917A61915DC34D93F7CA22E9FEEAB8 /* MapTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
 		3AAE1234D37DD5D2F5CAFA10C32C6B64 /* SchedulerServices+Emulation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "SchedulerServices+Emulation.swift"; path = "RxSwift/Schedulers/SchedulerServices+Emulation.swift"; sourceTree = "<group>"; };
 		3D33254979611A41EF47958094DD8114 /* AsSingle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsSingle.swift; path = RxSwift/Observables/AsSingle.swift; sourceTree = "<group>"; };
-		3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClient-umbrella.h"; sourceTree = "<group>"; };
-		3F16B43ABD2C8CD4A311AA1AB3B6C02F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3FEE1B647BF3BF83A15307D0FE6C9061 /* Zip+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Zip+arity.swift"; path = "RxSwift/Observables/Zip+arity.swift"; sourceTree = "<group>"; };
 		400315FB500300F90ADAD73D6FF0AB0E /* Range.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Range.swift; path = RxSwift/Observables/Range.swift; sourceTree = "<group>"; };
+		405921FE252DC3DC1087DA4217236D81 /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
+		419496CDDD7E7536CBEA02BAEE2C7C21 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		41C438FC82246FEC404A5B82F1DE4D7A /* First.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = First.swift; path = RxSwift/Observables/First.swift; sourceTree = "<group>"; };
 		428535B37310BA598511CE1337F0B48E /* ConnectableObservableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConnectableObservableType.swift; path = RxSwift/ConnectableObservableType.swift; sourceTree = "<group>"; };
-		43401D5E814F2B2B70B4268C9700D233 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		42AA25A3EEB248D295081E15036472FA /* FakeAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
 		43A398089B296EE103D1FC016CFACB60 /* ParameterEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ParameterEncoding.swift; path = Source/ParameterEncoding.swift; sourceTree = "<group>"; };
-		43FC49AA70D3E2A84CAED9C37BE9C4B5 /* Pods-SwaggerClientTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-frameworks.sh"; sourceTree = "<group>"; };
 		47EA63B913BCFF0010BFCED1DF08E819 /* InfiniteSequence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InfiniteSequence.swift; path = Platform/DataStructures/InfiniteSequence.swift; sourceTree = "<group>"; };
 		4886231E24F79A689B75D91994EDC167 /* Debug.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Debug.swift; path = RxSwift/Observables/Debug.swift; sourceTree = "<group>"; };
+		49A545F954B2A10B0D26618084D1FF73 /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
 		4B3C16A4EB884F3A4B5B6371798D893C /* Map.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Map.swift; path = RxSwift/Observables/Map.swift; sourceTree = "<group>"; };
 		4B6DDD969EDD7FE74DA02BBC1C061C21 /* Switch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Switch.swift; path = RxSwift/Observables/Switch.swift; sourceTree = "<group>"; };
-		4BC0E02F846FD6026FB1DB1A89A5A1FC /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
 		4C53834E2F3171F9AEE0BA7D592FE137 /* PriorityQueue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PriorityQueue.swift; path = Platform/DataStructures/PriorityQueue.swift; sourceTree = "<group>"; };
 		4C5CE2E894C9FCA4384CF06E82483EAD /* DispatchQueue+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Extensions.swift"; path = "Platform/DispatchQueue+Extensions.swift"; sourceTree = "<group>"; };
 		4CF979F3D76337A7A50EFDB371F52942 /* DistinctUntilChanged.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DistinctUntilChanged.swift; path = RxSwift/Observables/DistinctUntilChanged.swift; sourceTree = "<group>"; };
-		4DE323395ACA46B7F898EE5E5DFF7F3E /* Order.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		4EB7BF4F57FA381E9DA7A1AA9B04857D /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
 		4F2D4164A946CA486B328C6BE33C0C03 /* SubjectType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubjectType.swift; path = RxSwift/Subjects/SubjectType.swift; sourceTree = "<group>"; };
-		4F3DC98E86B4AC213505C195455245A5 /* RxSwift-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-umbrella.h"; sourceTree = "<group>"; };
 		4F887BA42DB31F9EB31BE815228F2508 /* Buffer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Buffer.swift; path = RxSwift/Observables/Buffer.swift; sourceTree = "<group>"; };
+		501C268D3DC431E81C876F4F7EE389C6 /* PetstoreClient.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = PetstoreClient.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		50B73F1FF881BC53EB92AFEEE79E41B8 /* ResponseSerialization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResponseSerialization.swift; path = Source/ResponseSerialization.swift; sourceTree = "<group>"; };
-		5179EB017CA14D044D4AC4881A6519C0 /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
-		549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.debug.xcconfig"; sourceTree = "<group>"; };
+		53DCDFCEE59497257D4D8E5C61AC1BF6 /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/OpenAPIs/APIHelper.swift; sourceTree = "<group>"; };
 		550CC0489DBA99CBBC0F2B2DF83F01E2 /* SessionDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SessionDelegate.swift; path = Source/SessionDelegate.swift; sourceTree = "<group>"; };
 		5559FE6F17E7EB202D9B91627C76B357 /* RecursiveScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RecursiveScheduler.swift; path = RxSwift/Schedulers/RecursiveScheduler.swift; sourceTree = "<group>"; };
-		567ACF2871B2843E1D080D4FD26C9F90 /* OuterString.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterString.swift; sourceTree = "<group>"; };
 		5707C69C09A801609ACEF257F57B2207 /* Using.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Using.swift; path = RxSwift/Observables/Using.swift; sourceTree = "<group>"; };
-		572F7F503F4D3E1A6CDF97FC985AF3BD /* APIHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIHelper.swift; path = PetstoreClient/Classes/Swaggers/APIHelper.swift; sourceTree = "<group>"; };
-		573394BE348ECB16EEF1017407804E56 /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
-		57468AE7B3F6AC14DB702CEAF8BDF453 /* RxSwift.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RxSwift.xcconfig; sourceTree = "<group>"; };
 		575CEB50BF06C2F37DF4186A98A9BE3E /* SkipUntil.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SkipUntil.swift; path = RxSwift/Observables/SkipUntil.swift; sourceTree = "<group>"; };
 		59050F7DF97E92BFE7F75E147A9B38CD /* Concat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Concat.swift; path = RxSwift/Observables/Concat.swift; sourceTree = "<group>"; };
 		5A12346A10D54F80F5FA16D11CB2F939 /* Zip.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Zip.swift; path = RxSwift/Observables/Zip.swift; sourceTree = "<group>"; };
-		5B598E168B47485DC60F9DBBCBEEF5BB /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		5B598E168B47485DC60F9DBBCBEEF5BB /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Alamofire.framework; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5B902B6B72079D059ACE4C24A6561D46 /* ElementAt.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ElementAt.swift; path = RxSwift/Observables/ElementAt.swift; sourceTree = "<group>"; };
-		5BD4D7E3630CD7534338BFCD817C0430 /* OuterBoolean.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterBoolean.swift; sourceTree = "<group>"; };
+		5D9E3149DFEE7783ACEC1596236B2268 /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
 		5E0BC80BF5585F0121294A2C7E4146BC /* Window.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Window.swift; path = RxSwift/Observables/Window.swift; sourceTree = "<group>"; };
 		5E28CEA6D0BE78D961F82D5325ECA7CF /* DispatchQueue+Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DispatchQueue+Alamofire.swift"; path = "Source/DispatchQueue+Alamofire.swift"; sourceTree = "<group>"; };
 		5E5B474C909B7494527255E231DE532C /* AsyncSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncSubject.swift; path = RxSwift/Subjects/AsyncSubject.swift; sourceTree = "<group>"; };
+		5EE661EFEC3A229F1219958C4244153F /* ArrayTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
+		5F66D63E8AA66846EDB3A12966E6951E /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		61179CE650778B2A5C39664F0A792B5C /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
 		612CBBE5854087BD9092A17953EBE4D0 /* ObserverType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserverType.swift; path = RxSwift/ObserverType.swift; sourceTree = "<group>"; };
 		619BFBAD9916AFBC31DE28B7C2577B78 /* Notifications.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Notifications.swift; path = Source/Notifications.swift; sourceTree = "<group>"; };
 		6230781ECAEC837966DC5158BCFC7A4E /* Catch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Catch.swift; path = RxSwift/Observables/Catch.swift; sourceTree = "<group>"; };
 		63A3DC39C396AE681B862EAECAFD03CB /* WithLatestFrom.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = WithLatestFrom.swift; path = RxSwift/Observables/WithLatestFrom.swift; sourceTree = "<group>"; };
+		64F36B6A4E5A28C08FE61EA222DE0E34 /* Alamofire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Alamofire-dummy.m"; sourceTree = "<group>"; };
+		65B00ADD2392D7BD5B257CD24EAA7E1A /* Alamofire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-prefix.pch"; sourceTree = "<group>"; };
 		66EC3E2F3DCF45D5AB51829897FA086A /* CombineLatest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombineLatest.swift; path = RxSwift/Observables/CombineLatest.swift; sourceTree = "<group>"; };
-		672FD5B112C6AEE3CAC296A02DD9BD20 /* PetstoreClient-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-prefix.pch"; sourceTree = "<group>"; };
-		674205591C035DB7AD3429C36E857709 /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = Alamofire.modulemap; sourceTree = "<group>"; };
-		687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClientTests-dummy.m"; sourceTree = "<group>"; };
-		68F66F7B800381443AA5E1CDDFA51429 /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
 		6C87378B8848CEAA8FE988BC61DA402D /* Bag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Bag.swift; path = Platform/DataStructures/Bag.swift; sourceTree = "<group>"; };
-		6E902BD3FF06123585AC7822AAD73A02 /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
 		6F85D6F1C4AC3264F8C521D56F6A7E6C /* Request.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Request.swift; path = Source/Request.swift; sourceTree = "<group>"; };
+		6FF19147CE4412D2804D578DF81FA6E6 /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
 		71E8601E606A1D56F2F719B3B12C04D8 /* Disposables.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Disposables.swift; path = RxSwift/Disposables/Disposables.swift; sourceTree = "<group>"; };
+		721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClientTests-dummy.m"; sourceTree = "<group>"; };
 		7252C613B9CBA42CB511A8DEAF74B9B6 /* Dematerialize.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Dematerialize.swift; path = RxSwift/Observables/Dematerialize.swift; sourceTree = "<group>"; };
 		725A254A70C1644528A73DD4BC5D3FB0 /* Generate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Generate.swift; path = RxSwift/Observables/Generate.swift; sourceTree = "<group>"; };
 		7273DF1D9C6FAB18A8BA7D2574F808CA /* Deferred.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Deferred.swift; path = RxSwift/Observables/Deferred.swift; sourceTree = "<group>"; };
-		732FBB0810C3F91070490823AC9C860A /* Name.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
 		7508ECA5370B58D9DC088F29D3F25E6F /* SynchronizedOnType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedOnType.swift; path = RxSwift/Concurrency/SynchronizedOnType.swift; sourceTree = "<group>"; };
 		754E291B4C1217597C2D3362A0E8ACA3 /* SubscribeOn.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubscribeOn.swift; path = RxSwift/Observables/SubscribeOn.swift; sourceTree = "<group>"; };
+		76645699475D3AB6EB5242AC4D0CEFAE /* Pods-SwaggerClient-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClient-acknowledgements.markdown"; sourceTree = "<group>"; };
+		76F79E34A551F423AD58E85DBF91DB8F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		776D2DC046923CE3DDE934FF73659587 /* PetstoreClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "PetstoreClient-dummy.m"; sourceTree = "<group>"; };
 		778229E6AF8CDFD4BD9C5D35E1BFBDEA /* Empty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Empty.swift; path = RxSwift/Observables/Empty.swift; sourceTree = "<group>"; };
 		77D6786FE8AB55808EE46B906D873C2A /* ImmediateSchedulerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ImmediateSchedulerType.swift; path = RxSwift/ImmediateSchedulerType.swift; sourceTree = "<group>"; };
-		77EDDBF5C8059EF4B5E394E09901B296 /* PetstoreClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = PetstoreClient.modulemap; sourceTree = "<group>"; };
 		77FBCF2C53C2D7D2BB94EA30B345F5A8 /* Completable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Completable.swift; path = RxSwift/Traits/Completable.swift; sourceTree = "<group>"; };
+		7898EEC6A565DE133438C48988478954 /* Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = PetstoreClient/Classes/OpenAPIs/Extensions.swift; sourceTree = "<group>"; };
 		78B768A340CE4954E18D2EA2C7FFBC23 /* Alamofire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Alamofire.swift; path = Source/Alamofire.swift; sourceTree = "<group>"; };
-		7C8E63660D346FD8ED2A97242E74EA09 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		7A4D6098BB7067FA34B381F4446DDB10 /* PetAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		7A9361010C64B5A1F7A9DF65338A4060 /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
 		7D0335BE86918B0C7F1804659E339803 /* RecursiveLock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RecursiveLock.swift; path = Platform/RecursiveLock.swift; sourceTree = "<group>"; };
-		7E65BEC72AE9A9C2682D1FF779537AA2 /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
 		7EE2D113E4C8B291895E5DECD9BACA93 /* ReplaySubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ReplaySubject.swift; path = RxSwift/Subjects/ReplaySubject.swift; sourceTree = "<group>"; };
+		814471C0F27B39D751143F0CD53670BD /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		81E85D3981FE03082AA978BDFBA49A9B /* Bag+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Bag+Rx.swift"; path = "RxSwift/Extensions/Bag+Rx.swift"; sourceTree = "<group>"; };
 		8396870D4DF2D01692A7FA9629447399 /* Single.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Single.swift; path = RxSwift/Traits/Single.swift; sourceTree = "<group>"; };
 		8486D625B453FA8C43F57CFA44075520 /* SingleAssignmentDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SingleAssignmentDisposable.swift; path = RxSwift/Disposables/SingleAssignmentDisposable.swift; sourceTree = "<group>"; };
-		849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.release.xcconfig"; sourceTree = "<group>"; };
-		84A09D760BA2EA13D5BE269086BAD34C /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		84A09D760BA2EA13D5BE269086BAD34C /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = RxSwift.framework; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		852E8D4E0D5EFB1772568D1FBC770FFE /* Cancelable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Cancelable.swift; path = RxSwift/Cancelable.swift; sourceTree = "<group>"; };
 		865C950981FA36DC925DBA465F744C78 /* CombineLatest+arity.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "CombineLatest+arity.swift"; path = "RxSwift/Observables/CombineLatest+arity.swift"; sourceTree = "<group>"; };
-		86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.release.xcconfig"; sourceTree = "<group>"; };
 		86D29E0EE141C77A4C49AAF72DB8E07D /* RxMutableBox.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RxMutableBox.swift; path = RxSwift/RxMutableBox.swift; sourceTree = "<group>"; };
 		872320DCEAE93CAE583E3F339A3C08CB /* Completable+AndThen.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Completable+AndThen.swift"; path = "RxSwift/Traits/Completable+AndThen.swift"; sourceTree = "<group>"; };
-		8776282D2BE56A89D0919D4A53830234 /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodingHelper.swift; path = PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift; sourceTree = "<group>"; };
 		87C0E7EA02EE5E0426278FAF8937E3E5 /* StartWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = StartWith.swift; path = RxSwift/Observables/StartWith.swift; sourceTree = "<group>"; };
+		88B5354642428AF26C69F2155FEBFA4B /* OuterEnum.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
 		88D3E7E2BAA9B2CD334714DFD331344B /* CombineLatest+Collection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "CombineLatest+Collection.swift"; path = "RxSwift/Observables/CombineLatest+Collection.swift"; sourceTree = "<group>"; };
-		8A3C32E3A778873EE0B779B167A4D0D6 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
-		8AD1BF0D6C428F9D31E88654F85DB9F1 /* Alamofire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-prefix.pch"; sourceTree = "<group>"; };
-		8CF438B2B7CFD2D75076C56994007327 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		8C249F0D3A4AFFFC155DEC2FBB68F0CC /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
 		8D5FBC6478B111DD333D8796A766BFD6 /* SkipWhile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SkipWhile.swift; path = RxSwift/Observables/SkipWhile.swift; sourceTree = "<group>"; };
+		8FB2BB634F7165B7E02CB903C153DD5F /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
 		90D1C72DBA823431EA295407C3606D21 /* InvocableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InvocableType.swift; path = RxSwift/Schedulers/Internal/InvocableType.swift; sourceTree = "<group>"; };
 		90E1B0D9DB713B4E3E6400DDF0D647FF /* Timeline.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timeline.swift; path = Source/Timeline.swift; sourceTree = "<group>"; };
-		91315B18340C0DAF9FCBF20C50A33D75 /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
 		92570D279A6EF44EE26B079BA1B9A53A /* TailRecursiveSink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TailRecursiveSink.swift; path = RxSwift/Observers/TailRecursiveSink.swift; sourceTree = "<group>"; };
 		926462C4CE81BF73964FEBCF551AD4AC /* Disposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Disposable.swift; path = RxSwift/Disposable.swift; sourceTree = "<group>"; };
 		9305C58CCB3D473FAE5478F497A30785 /* Multicast.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Multicast.swift; path = RxSwift/Observables/Multicast.swift; sourceTree = "<group>"; };
-		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		93868E0A391CFC012C1EC5F79555C633 /* RxSwift-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-umbrella.h"; sourceTree = "<group>"; };
+		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		93B81CE85BB7F1617FC2A790C1A427D8 /* SingleAsync.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SingleAsync.swift; path = RxSwift/Observables/SingleAsync.swift; sourceTree = "<group>"; };
 		9501ACC3F376E8B44AA930B90C92E958 /* Sample.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sample.swift; path = RxSwift/Observables/Sample.swift; sourceTree = "<group>"; };
 		95743667DF9F7A20E243F6122E306F37 /* Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Response.swift; path = Source/Response.swift; sourceTree = "<group>"; };
 		95C0DD329CAEE6B9D220FDBAB65949BA /* Merge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Merge.swift; path = RxSwift/Observables/Merge.swift; sourceTree = "<group>"; };
-		962F09981F6DA884B7F9D9558435C813 /* Return.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
 		96502A901063BD4C174D11BB00C710E3 /* MainScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = MainScheduler.swift; path = RxSwift/Schedulers/MainScheduler.swift; sourceTree = "<group>"; };
-		969B0FD4E599E77A9AD7C257CC8AAC3B /* OuterNumber.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterNumber.swift; sourceTree = "<group>"; };
-		969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.debug.xcconfig"; sourceTree = "<group>"; };
+		974697BA63D3232B3CBCF781253D6FD8 /* PetstoreClient-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-umbrella.h"; sourceTree = "<group>"; };
 		97EE69B76F52C63676CC0FD332D7C3E1 /* Timer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Timer.swift; path = RxSwift/Observables/Timer.swift; sourceTree = "<group>"; };
 		98AF5D706945730277047DB4646140D7 /* RefCountDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RefCountDisposable.swift; path = RxSwift/Disposables/RefCountDisposable.swift; sourceTree = "<group>"; };
-		9996663E24F264D09E9D8C8C54EF5BF3 /* SpecialModelName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
 		9A3D84003C01646124C7B78C047BE3B1 /* ShareReplayScope.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ShareReplayScope.swift; path = RxSwift/Observables/ShareReplayScope.swift; sourceTree = "<group>"; };
+		9A6821DE25768EABE3B84E13AA2767AA /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
 		9BFEAC12D510253937BA86D1172977BE /* ObservableConvertibleType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObservableConvertibleType.swift; path = RxSwift/ObservableConvertibleType.swift; sourceTree = "<group>"; };
-		9BFF16C6A77D6FADE4068F05EDFBAC9B /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
+		9D08EC9B39FEBA43A5B55DAF97AAEBE9 /* Pods-SwaggerClientTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClientTests.modulemap"; sourceTree = "<group>"; };
+		9D0A663A60EBEDC85D7204FF294D7A8E /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
+		9D6BFAEEEDA8B0422531E1FA16BF92B7 /* RxSwift-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "RxSwift-dummy.m"; sourceTree = "<group>"; };
+		9D780FDAD16A03CC25F4D6F3317B9423 /* Pods-SwaggerClientTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClientTests-acknowledgements.plist"; sourceTree = "<group>"; };
+		9DE2FEBAD4A5F085054978914D2BAD7F /* FileSchemaTestClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FileSchemaTestClass.swift; sourceTree = "<group>"; };
+		9E1B0545F1DE54FF293A66BBEBA7DFCF /* Alamofire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Alamofire.modulemap; sourceTree = "<group>"; };
 		9E9C1C4F819D8D851C307E466169CB21 /* GroupBy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GroupBy.swift; path = RxSwift/Observables/GroupBy.swift; sourceTree = "<group>"; };
 		9EECDD8B4213F3EBDE36517E494EE648 /* Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Rx.swift; path = RxSwift/Rx.swift; sourceTree = "<group>"; };
 		9F71DF127C2F62D486E98F40E2522470 /* Reduce.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Reduce.swift; path = RxSwift/Observables/Reduce.swift; sourceTree = "<group>"; };
 		9FAF790D7762EE57130F23C580A16DBA /* Queue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Queue.swift; path = Platform/DataStructures/Queue.swift; sourceTree = "<group>"; };
 		9FC1D8F37AB6B7D7586E28EFAB469B93 /* Platform.Linux.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Platform.Linux.swift; path = Platform/Platform.Linux.swift; sourceTree = "<group>"; };
-		A02A9568A88535A81FBDC040CAD0FBE7 /* List.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		A03BC8805CBE2C065F120EE33E91CD9B /* Alamofire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Alamofire.xcconfig; sourceTree = "<group>"; };
 		A3770A7BCE7BDE74070F1208CD8E1869 /* AFError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AFError.swift; path = Source/AFError.swift; sourceTree = "<group>"; };
 		A3C171CE5B7E92489A6610716886E986 /* TaskDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TaskDelegate.swift; path = Source/TaskDelegate.swift; sourceTree = "<group>"; };
 		A4D050A460709C1B52F11FFDA31AF1AC /* Delay.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Delay.swift; path = RxSwift/Observables/Delay.swift; sourceTree = "<group>"; };
 		A550A224A85B3B8CA43C7BB61AA652A2 /* GroupedObservable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GroupedObservable.swift; path = RxSwift/GroupedObservable.swift; sourceTree = "<group>"; };
-		A5CE1FECDB85BBB6B5BADF719F978217 /* RxSwift-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-prefix.pch"; sourceTree = "<group>"; };
+		A61F0A3AC33784A820D599954D478D34 /* RxSwift.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = RxSwift.modulemap; sourceTree = "<group>"; };
 		AA9856E1BC4B7134F1A3BC95D731C8E8 /* ScheduledDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledDisposable.swift; path = RxSwift/Disposables/ScheduledDisposable.swift; sourceTree = "<group>"; };
 		AA9C5856BEAE5090A7D1EB450A10C04F /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		AADFB1E909FA43812598B97F8A724A07 /* Debounce.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Debounce.swift; path = RxSwift/Observables/Debounce.swift; sourceTree = "<group>"; };
+		AAFFDA41414FACE0139A3B1F22FB6717 /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
 		ABF5E733F3DC52B229408B8E2980C204 /* ScheduledItemType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScheduledItemType.swift; path = RxSwift/Schedulers/Internal/ScheduledItemType.swift; sourceTree = "<group>"; };
-		AC8D06D1E9BE16DF40F38B8754ABF064 /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/Swaggers/Models.swift; sourceTree = "<group>"; };
 		ADF76CD14B0F97AC2A26DA7FB93093F1 /* Platform.Darwin.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Platform.Darwin.swift; path = Platform/Platform.Darwin.swift; sourceTree = "<group>"; };
+		AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.debug.xcconfig"; sourceTree = "<group>"; };
 		AF1796A4B389BA873A7F76668E6C4107 /* Just.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Just.swift; path = RxSwift/Observables/Just.swift; sourceTree = "<group>"; };
 		B07A773370E37EDA8572ACD83EF3F827 /* AnyObserver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnyObserver.swift; path = RxSwift/AnyObserver.swift; sourceTree = "<group>"; };
 		B0F40ABCAC55B85443A252C6025B5E48 /* SerialDispatchQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SerialDispatchQueueScheduler.swift; path = RxSwift/Schedulers/SerialDispatchQueueScheduler.swift; sourceTree = "<group>"; };
 		B272A051EA5BC60E1179C65014C6241E /* Sink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Sink.swift; path = RxSwift/Observables/Sink.swift; sourceTree = "<group>"; };
 		B273EB6FBAF3DB2E4F6E8D0E01609EA5 /* Create.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Create.swift; path = RxSwift/Observables/Create.swift; sourceTree = "<group>"; };
 		B3592C8F1344FCA07945EEFCE38DBF3A /* String+Rx.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+Rx.swift"; path = "RxSwift/Extensions/String+Rx.swift"; sourceTree = "<group>"; };
+		B40D76A0512402285DC5FCF2795D7926 /* APIs.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = APIs.swift; path = PetstoreClient/Classes/OpenAPIs/APIs.swift; sourceTree = "<group>"; };
+		B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
 		B5176FF47E6A67E9207490055CCF514E /* NopDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NopDisposable.swift; path = RxSwift/Disposables/NopDisposable.swift; sourceTree = "<group>"; };
 		B51A7D7185A63093DD22C20C0229D982 /* ToArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ToArray.swift; path = RxSwift/Observables/ToArray.swift; sourceTree = "<group>"; };
+		B632009833A31B892589EDD4D3F52A26 /* RxSwift-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RxSwift-prefix.pch"; sourceTree = "<group>"; };
 		B6821C4EA4A6F2142E30406BD33EAC97 /* Errors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = RxSwift/Errors.swift; sourceTree = "<group>"; };
+		B7304FCBBF3A1E3E5A44C2B06C880606 /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = JSONEncodableEncoding.swift; path = PetstoreClient/Classes/OpenAPIs/JSONEncodableEncoding.swift; sourceTree = "<group>"; };
 		B8B1424428997FCBA698D13E6CE48242 /* Error.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Error.swift; path = RxSwift/Observables/Error.swift; sourceTree = "<group>"; };
-		B8FB97481720144B9BFAC91018683A13 /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
 		BB01C4A269BB41DDD347FEA23DF43E9B /* Zip+Collection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Zip+Collection.swift"; path = "RxSwift/Observables/Zip+Collection.swift"; sourceTree = "<group>"; };
-		BBBC05B4BF54E30963F2B2DFDA89AD97 /* StoreAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
 		BC6F9C571A0E1ED418373AA5D41E148B /* DispatchQueueConfiguration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DispatchQueueConfiguration.swift; path = RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift; sourceTree = "<group>"; };
-		BCF2D4DFF08D2A18E8C8FE4C4B4633FB /* Pods-SwaggerClient-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-frameworks.sh"; sourceTree = "<group>"; };
 		BF45C813123D291DEF8F063BFA56634A /* BinaryDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BinaryDisposable.swift; path = RxSwift/Disposables/BinaryDisposable.swift; sourceTree = "<group>"; };
-		BF515424DF68A3AAC931232EEC1D3956 /* EnumArrays.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
-		BF56E8175C31FFC9C5FE532793765D33 /* Animal.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
-		C176AD0A1A1DD21BEB8E9E711571A605 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		C030C0F6BD877478B1CA4BC8BFBAD057 /* Pet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
 		C193C2F1EC9DDF20CA9EAC2B8DB2EF88 /* HistoricalScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HistoricalScheduler.swift; path = RxSwift/Schedulers/HistoricalScheduler.swift; sourceTree = "<group>"; };
-		C3AC4FE6C97025C460E86C450274D6D1 /* UserAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
-		C44617D1A0C7A3B1E4A8CDD554179965 /* Client.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
-		C4B474BD9070828C0F786071EEF46CD0 /* Pods_SwaggerClientTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SwaggerClientTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		C4B474BD9070828C0F786071EEF46CD0 /* Pods_SwaggerClientTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_SwaggerClientTests.framework; path = "Pods-SwaggerClientTests.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C503B5686D69F33CD75FBE9AC02EB509 /* DisposeBag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DisposeBag.swift; path = RxSwift/Disposables/DisposeBag.swift; sourceTree = "<group>"; };
-		C5D5E8ED92C86186CBBA4B492338D644 /* Alamofire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Alamofire-umbrella.h"; sourceTree = "<group>"; };
 		C6DB69590EDE806419A0D994D4E5DBE9 /* ObservableType+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "ObservableType+Extensions.swift"; path = "RxSwift/ObservableType+Extensions.swift"; sourceTree = "<group>"; };
-		CA5D5240A5E375F716132587718DC6F8 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
-		CAAE1FE3D4078631A67B5F065A94F367 /* PetstoreClient.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PetstoreClient.xcconfig; sourceTree = "<group>"; };
-		CBC66A91F3E1B8141F59B08ADF8D38CF /* Capitalization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		C6E49082BB281EDC5D7B6E76772E87CF /* FormatTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
+		CAF6F32F117197F6F08B477687F09728 /* Pods-SwaggerClientTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-frameworks.sh"; sourceTree = "<group>"; };
 		CCA556DABECD244AD1E3A0DDD6ED3FCB /* Skip.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Skip.swift; path = RxSwift/Observables/Skip.swift; sourceTree = "<group>"; };
 		CE885DA3E711891BDF628CFB5836A951 /* ObserverBase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObserverBase.swift; path = RxSwift/Observers/ObserverBase.swift; sourceTree = "<group>"; };
-		CF591C1D623007B1075CB02863648280 /* CodableHelper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CodableHelper.swift; path = PetstoreClient/Classes/Swaggers/CodableHelper.swift; sourceTree = "<group>"; };
-		CFB7B4E2B9662BFD982DE3B5E209D30D /* Tag.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
-		D0A9394DE040B753DE1B7893A469B65C /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClientTests-umbrella.h"; sourceTree = "<group>"; };
+		CFA4F581E074596AB5C3DAF3D9C39F17 /* Pods-SwaggerClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-SwaggerClient.modulemap"; sourceTree = "<group>"; };
 		D0E2A103D6F5288370F338F6C9D39FB6 /* Result.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Result.swift; path = Source/Result.swift; sourceTree = "<group>"; };
-		D104485DE4B89C2C0F5DA06F8D8FB321 /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
 		D189C69FF14E18C13139A32F1ED916FE /* AddRef.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AddRef.swift; path = RxSwift/Observables/AddRef.swift; sourceTree = "<group>"; };
-		D231D2C7D42049951D365E540D2046E2 /* EnumClass.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
 		D26E32A3BC2BFB67B8101778868F725B /* Deprecated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Deprecated.swift; path = RxSwift/Deprecated.swift; sourceTree = "<group>"; };
-		D2841E5E2183846280B97F6E660DA26C /* Pods-SwaggerClient-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-resources.sh"; sourceTree = "<group>"; };
+		D2DDAE4995DB14893EA47ED21E6742BA /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
 		D314BF46101711EC426C005067C11153 /* CurrentThreadScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CurrentThreadScheduler.swift; path = RxSwift/Schedulers/CurrentThreadScheduler.swift; sourceTree = "<group>"; };
 		D31F08BCF85659A8411D93F4D567E999 /* SwitchIfEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SwitchIfEmpty.swift; path = RxSwift/Observables/SwitchIfEmpty.swift; sourceTree = "<group>"; };
-		D3BB5308AD09A46303EED9211876967E /* RxSwift.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = RxSwift.modulemap; sourceTree = "<group>"; };
 		D3E1B433D507DFC2548C9808484EE7B9 /* SwiftSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SwiftSupport.swift; path = RxSwift/SwiftSupport/SwiftSupport.swift; sourceTree = "<group>"; };
-		D6422C74BD1B120F80FEFC87A5FED472 /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
+		D47B812D78D0AE64D85D16A96840F8C4 /* Pods-SwaggerClientTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClientTests-acknowledgements.markdown"; sourceTree = "<group>"; };
 		D69F66BA2AFADE32485D04ED138762EE /* DelaySubscription.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DelaySubscription.swift; path = RxSwift/Observables/DelaySubscription.swift; sourceTree = "<group>"; };
 		D707D0C2E9B6081FACC6E50AED59454A /* Scan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Scan.swift; path = RxSwift/Observables/Scan.swift; sourceTree = "<group>"; };
-		DA27384EA9C66568B39162DB8A982404 /* EnumTest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
-		DC41879241FE814CEDA9D6C468E03FA3 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
+		D822C4C7D3E161B2623D9538CFB3993E /* Dog.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
 		DCF1913DDC595240519CF39D2AC2C147 /* Maybe.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Maybe.swift; path = RxSwift/Traits/Maybe.swift; sourceTree = "<group>"; };
 		DD0DC3E605EDF8CDB2FDFE7F0F6D9732 /* ConcurrentDispatchQueueScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConcurrentDispatchQueueScheduler.swift; path = RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift; sourceTree = "<group>"; };
-		DD77C122BCA23FDAD121414FCF0FF430 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		DD792F2DD31CDD45A0512A9F57FDEF1F /* ServerTrustPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ServerTrustPolicy.swift; path = Source/ServerTrustPolicy.swift; sourceTree = "<group>"; };
 		DD7BA2F761195481CE42D1A600F26C23 /* Amb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Amb.swift; path = RxSwift/Observables/Amb.swift; sourceTree = "<group>"; };
-		DE164497A94DD3215ED4D1AE0D4703B1 /* Pods-SwaggerClient.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-SwaggerClient.modulemap"; sourceTree = "<group>"; };
+		DE0EE75A3806EB2BA0C9EEF687CE2B93 /* Cat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
+		DEA70EA7732BDFFE905C353D9709B2AD /* ClassModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
 		DED78303DE5DBB10FABF2DA8DC94C711 /* HistoricalSchedulerTimeConverter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HistoricalSchedulerTimeConverter.swift; path = RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift; sourceTree = "<group>"; };
-		DF424CC13A312AC0C01EEE0E7D7F9C71 /* RxSwift-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "RxSwift-dummy.m"; sourceTree = "<group>"; };
-		E1E4BCB344D3C100253B24B79421F00A /* Pods-SwaggerClient-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-SwaggerClient-acknowledgements.plist"; sourceTree = "<group>"; };
+		E1D16F98B0546986ED64CD76F6678480 /* Model200Response.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		E41E52FC18B43257D6D924850398E9AE /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
 		E46CAB7540439CE3BF12759F9A7D5616 /* BehaviorSubject.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BehaviorSubject.swift; path = RxSwift/Subjects/BehaviorSubject.swift; sourceTree = "<group>"; };
-		E49AA3853C7F8F73E4790EDEA54FDBB4 /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
 		E4C822BA58E0D22E0B2694BE9F9E675D /* TakeWhile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TakeWhile.swift; path = RxSwift/Observables/TakeWhile.swift; sourceTree = "<group>"; };
-		E4E6F4A58FE7868CA2177D3AC79AD2FA /* Pods-SwaggerClientTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-resources.sh"; sourceTree = "<group>"; };
+		E5A46D45023C6CBF06AA36844D59C59E /* User.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
 		E62D112073B23555DB849DE81B9E8ECE /* SynchronizedUnsubscribeType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SynchronizedUnsubscribeType.swift; path = RxSwift/Concurrency/SynchronizedUnsubscribeType.swift; sourceTree = "<group>"; };
 		E6EE828AE8CA3D73EAE4F45FEDEC134E /* AnonymousDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AnonymousDisposable.swift; path = RxSwift/Disposables/AnonymousDisposable.swift; sourceTree = "<group>"; };
 		E747DD70D6594E514E39D2B22C48F97C /* InvocableScheduledItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = InvocableScheduledItem.swift; path = RxSwift/Schedulers/Internal/InvocableScheduledItem.swift; sourceTree = "<group>"; };
+		E7FFC55F1307BC98855D3D546660D4F2 /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
+		E81223B1EAA15A1063FABA2C1F83FD46 /* NumberOnly.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
 		E8823E1E2CA5694EE96E4518471A935B /* SchedulerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SchedulerType.swift; path = RxSwift/SchedulerType.swift; sourceTree = "<group>"; };
-		E9CBBB398E7A62950FA8BC091CBE0359 /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		E9CBBB398E7A62950FA8BC091CBE0359 /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = PetstoreClient.framework; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		EA40B452E0222A6E844B7A8178E3FCDD /* Throttle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Throttle.swift; path = RxSwift/Observables/Throttle.swift; sourceTree = "<group>"; };
 		EA62AC58EBCAF1EB81CD4E52C064006F /* VirtualTimeScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = VirtualTimeScheduler.swift; path = RxSwift/Schedulers/VirtualTimeScheduler.swift; sourceTree = "<group>"; };
 		EBBD7A139F31C78AE70CE7FD8C2EA2C8 /* Do.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Do.swift; path = RxSwift/Observables/Do.swift; sourceTree = "<group>"; };
 		ED01E14130399734F56212D8C0692200 /* SubscriptionDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SubscriptionDisposable.swift; path = RxSwift/Disposables/SubscriptionDisposable.swift; sourceTree = "<group>"; };
 		ED2319E93DF3310834B4D8114909C00A /* Optional.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Optional.swift; path = RxSwift/Observables/Optional.swift; sourceTree = "<group>"; };
-		EDCCDD3634C44CBBFC8AE4EAD9FEAAC1 /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
 		F086740E78B8F642AED0C6902B6DE4C0 /* SerialDisposable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SerialDisposable.swift; path = RxSwift/Disposables/SerialDisposable.swift; sourceTree = "<group>"; };
 		F09EB4EF714BBEE87A9F2096DFA2B895 /* LockOwnerType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LockOwnerType.swift; path = RxSwift/Concurrency/LockOwnerType.swift; sourceTree = "<group>"; };
 		F1A2BDAA57AA98A4A74ACCB907248C44 /* Filter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Filter.swift; path = RxSwift/Observables/Filter.swift; sourceTree = "<group>"; };
 		F1FFCDAB755375F5D44F4B1523CDE155 /* ConcurrentMainScheduler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConcurrentMainScheduler.swift; path = RxSwift/Schedulers/ConcurrentMainScheduler.swift; sourceTree = "<group>"; };
-		F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-SwaggerClientTests-umbrella.h"; sourceTree = "<group>"; };
+		F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClient.release.xcconfig"; sourceTree = "<group>"; };
+		F3E1116FA9F9F3AFD9332B7236F6E711 /* Pods-SwaggerClientTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClientTests-resources.sh"; sourceTree = "<group>"; };
+		F4BB3B2146310CA18C30F145BFF15BD9 /* Pods-SwaggerClient-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-SwaggerClient-resources.sh"; sourceTree = "<group>"; };
 		F7FD506CEC38B2558C059C5213C1A8AA /* Repeat.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Repeat.swift; path = RxSwift/Observables/Repeat.swift; sourceTree = "<group>"; };
-		F80DB2369BE8133A5163C158A5DBF024 /* OuterComposite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
-		F8497720E80CDEFA1D74B3E87908F10C /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-SwaggerClient-dummy.m"; sourceTree = "<group>"; };
+		F918D1A343F79C67A66D6F1E88AB8654 /* RxSwift.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RxSwift.xcconfig; sourceTree = "<group>"; };
 		F9D10C334CB3B654E4E06CFF4ECB4697 /* ObservableType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ObservableType.swift; path = RxSwift/ObservableType.swift; sourceTree = "<group>"; };
-		FB170EFD14935F121CDE3211DB4C5CA3 /* Pods-SwaggerClientTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-SwaggerClientTests-acknowledgements.markdown"; sourceTree = "<group>"; };
+		FDAB71F06CE94B9B9AD9438DAC00B6D2 /* AnimalFarm.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
+		FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-SwaggerClientTests.release.xcconfig"; sourceTree = "<group>"; };
 		FDC133608CAE8A7B9F40CE4A43E43E6E /* Producer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Producer.swift; path = RxSwift/Observables/Producer.swift; sourceTree = "<group>"; };
 		FE0EE14832B0DEE34688A721D3B3A954 /* Materialize.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Materialize.swift; path = RxSwift/Observables/Materialize.swift; sourceTree = "<group>"; };
+		FEB048F7684923FC8C99614FB91CDE30 /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = PetstoreClient/Classes/OpenAPIs/Models.swift; sourceTree = "<group>"; };
+		FECB278917C7651872C44FB1C0B6E620 /* Category.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		FF5D23F22EEE2FBFA826151A4E186DE3 /* ApiResponse.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		2332DE544C299EB2747D90A4E97E78FB /* Frameworks */ = {
+		38E7CA873A88008667A9B2F265272ECA /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B991826B7C535F73E785A3ECBD6D71B2 /* Alamofire.framework in Frameworks */,
-				EB7F998A562C4544925579B4D76FC4A4 /* Foundation.framework in Frameworks */,
-				C48CBB1F8225EF0FEA86DA1AED821DC1 /* RxSwift.framework in Frameworks */,
+				52E7E6FFC004710E47C6FA0B3A707A58 /* Alamofire.framework in Frameworks */,
+				83B993381A841C44FEDC4220F9F16E24 /* Foundation.framework in Frameworks */,
+				1A69F474C02F9EF10FFBE14501B10373 /* RxSwift.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */ = {
+		7139BF778844E2A9E420524D8146ECD8 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E723EED99F633C8620915572700A2D2E /* Foundation.framework in Frameworks */,
+				D210B9E8D1B698A92D285845C09C9960 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		79A9E80C51806F31B3857087548F4C95 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C04C9786E7B745C8594670708023F83F /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -581,59 +597,9 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		D7653A4AC0F0FE34905A430235389509 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				1C13606BCB3096578C56A3B3CF6630CC /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		00A33E2CD3112CD579257A5195E90208 /* APIs */ = {
-			isa = PBXGroup;
-			children = (
-				116B390BD0A7F0EF01D8711E0289C84B /* AnotherfakeAPI.swift */,
-				04AA8957F940318D27FB6791638E59D4 /* FakeAPI.swift */,
-				248C33B0119C8E61FDED4A0A75898C0A /* FakeClassnameTags123API.swift */,
-				68F66F7B800381443AA5E1CDDFA51429 /* PetAPI.swift */,
-				BBBC05B4BF54E30963F2B2DFDA89AD97 /* StoreAPI.swift */,
-				C3AC4FE6C97025C460E86C450274D6D1 /* UserAPI.swift */,
-			);
-			name = APIs;
-			path = PetstoreClient/Classes/Swaggers/APIs;
-			sourceTree = "<group>";
-		};
-		0B8DE55707EA8293395D0D1159AE579B /* Support Files */ = {
-			isa = PBXGroup;
-			children = (
-				D0A9394DE040B753DE1B7893A469B65C /* Info.plist */,
-				D3BB5308AD09A46303EED9211876967E /* RxSwift.modulemap */,
-				57468AE7B3F6AC14DB702CEAF8BDF453 /* RxSwift.xcconfig */,
-				DF424CC13A312AC0C01EEE0E7D7F9C71 /* RxSwift-dummy.m */,
-				A5CE1FECDB85BBB6B5BADF719F978217 /* RxSwift-prefix.pch */,
-				4F3DC98E86B4AC213505C195455245A5 /* RxSwift-umbrella.h */,
-			);
-			name = "Support Files";
-			path = "../Target Support Files/RxSwift";
-			sourceTree = "<group>";
-		};
-		1B217E43383FBC4B83697AFF5CD73831 /* Support Files */ = {
-			isa = PBXGroup;
-			children = (
-				674205591C035DB7AD3429C36E857709 /* Alamofire.modulemap */,
-				0D51C075771C5C7E71A671D0D03ADAA0 /* Alamofire.xcconfig */,
-				05EBFE23A4E6704F2B564DA56691E1C2 /* Alamofire-dummy.m */,
-				8AD1BF0D6C428F9D31E88654F85DB9F1 /* Alamofire-prefix.pch */,
-				C5D5E8ED92C86186CBBA4B492338D644 /* Alamofire-umbrella.h */,
-				C176AD0A1A1DD21BEB8E9E711571A605 /* Info.plist */,
-			);
-			name = "Support Files";
-			path = "../Target Support Files/Alamofire";
-			sourceTree = "<group>";
-		};
 		278550D14ED46E76A8C3F458B5E6177F /* iOS */ = {
 			isa = PBXGroup;
 			children = (
@@ -642,6 +608,34 @@
 			name = iOS;
 			sourceTree = "<group>";
 		};
+		4B0AE4A662EE77AE0E42AEBFA28BFAB1 /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				9E1B0545F1DE54FF293A66BBEBA7DFCF /* Alamofire.modulemap */,
+				A03BC8805CBE2C065F120EE33E91CD9B /* Alamofire.xcconfig */,
+				64F36B6A4E5A28C08FE61EA222DE0E34 /* Alamofire-dummy.m */,
+				65B00ADD2392D7BD5B257CD24EAA7E1A /* Alamofire-prefix.pch */,
+				37A763501E8213F6B0B834F999C1BAA8 /* Alamofire-umbrella.h */,
+				76F79E34A551F423AD58E85DBF91DB8F /* Info.plist */,
+			);
+			name = "Support Files";
+			path = "../Target Support Files/Alamofire";
+			sourceTree = "<group>";
+		};
+		606EAF5FBC9930BD9D22CDECD222A32A /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				1FF33FE500328600F30A0008C612F377 /* AnotherFakeAPI.swift */,
+				42AA25A3EEB248D295081E15036472FA /* FakeAPI.swift */,
+				9D0A663A60EBEDC85D7204FF294D7A8E /* FakeClassnameTags123API.swift */,
+				7A4D6098BB7067FA34B381F4446DDB10 /* PetAPI.swift */,
+				8FB2BB634F7165B7E02CB903C153DD5F /* StoreAPI.swift */,
+				9A6821DE25768EABE3B84E13AA2767AA /* UserAPI.swift */,
+			);
+			name = APIs;
+			path = PetstoreClient/Classes/OpenAPIs/APIs;
+			sourceTree = "<group>";
+		};
 		69750F9014CEFA9B29584C65B2491D2E /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -652,11 +646,25 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		6D4B4C422937D815279D2A96BCCE2815 /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				2BB1D491A4C824A6BFA9C0C35E36BD85 /* Info.plist */,
+				4EB7BF4F57FA381E9DA7A1AA9B04857D /* PetstoreClient.modulemap */,
+				B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */,
+				776D2DC046923CE3DDE934FF73659587 /* PetstoreClient-dummy.m */,
+				0075000FF9024228C130ADDA9B81114E /* PetstoreClient-prefix.pch */,
+				974697BA63D3232B3CBCF781253D6FD8 /* PetstoreClient-umbrella.h */,
+			);
+			name = "Support Files";
+			path = "SwaggerClientTests/Pods/Target Support Files/PetstoreClient";
+			sourceTree = "<group>";
+		};
 		7DB346D0F39D3F0E887471402A8071AB = {
 			isa = PBXGroup;
 			children = (
 				93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */,
-				EDE36CDEEF568DD818B58A28C3C0DA80 /* Development Pods */,
+				EC52080E65FE34CBDE5F694B08BA9836 /* Development Pods */,
 				69750F9014CEFA9B29584C65B2491D2E /* Frameworks */,
 				7E13D91F036D00CF715C9294D40691DC /* Pods */,
 				C1398CE2D296EEBAA178C160CA6E6AD6 /* Products */,
@@ -673,22 +681,77 @@
 			name = Pods;
 			sourceTree = "<group>";
 		};
-		88CE2B3F08C34DDB098AD8A5DCC1DF1E /* Pods-SwaggerClient */ = {
+		894E625B654BBE2FB6E8E88AA51D3E5A /* PetstoreClient */ = {
 			isa = PBXGroup;
 			children = (
-				7C8E63660D346FD8ED2A97242E74EA09 /* Info.plist */,
-				DE164497A94DD3215ED4D1AE0D4703B1 /* Pods-SwaggerClient.modulemap */,
-				2FF17440CCD2E1A69791A4AA23325AD5 /* Pods-SwaggerClient-acknowledgements.markdown */,
-				E1E4BCB344D3C100253B24B79421F00A /* Pods-SwaggerClient-acknowledgements.plist */,
-				291054DAA3207AFC1F6B3D7AD6C25E5C /* Pods-SwaggerClient-dummy.m */,
-				BCF2D4DFF08D2A18E8C8FE4C4B4633FB /* Pods-SwaggerClient-frameworks.sh */,
-				D2841E5E2183846280B97F6E660DA26C /* Pods-SwaggerClient-resources.sh */,
-				3EEBA91980AEC8774CF7EC08035B089A /* Pods-SwaggerClient-umbrella.h */,
-				549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */,
-				86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */,
+				2C2002E2C081EDBF95460841AEE40A1F /* AlamofireImplementations.swift */,
+				53DCDFCEE59497257D4D8E5C61AC1BF6 /* APIHelper.swift */,
+				B40D76A0512402285DC5FCF2795D7926 /* APIs.swift */,
+				2C7066E86827634F5A961005F5CDA325 /* CodableHelper.swift */,
+				1C4B75FFB3C6B26ACDD73938BF18310B /* Configuration.swift */,
+				7898EEC6A565DE133438C48988478954 /* Extensions.swift */,
+				B7304FCBBF3A1E3E5A44C2B06C880606 /* JSONEncodableEncoding.swift */,
+				37E06E455867386B3481EDF14972006E /* JSONEncodingHelper.swift */,
+				FEB048F7684923FC8C99614FB91CDE30 /* Models.swift */,
+				606EAF5FBC9930BD9D22CDECD222A32A /* APIs */,
+				A3225C42DC72DA2FDCC24B1154D893D9 /* Models */,
+				8B703AC5760FFB3F3A475448C3FD2DD8 /* Pod */,
+				6D4B4C422937D815279D2A96BCCE2815 /* Support Files */,
 			);
-			name = "Pods-SwaggerClient";
-			path = "Target Support Files/Pods-SwaggerClient";
+			name = PetstoreClient;
+			path = ../..;
+			sourceTree = "<group>";
+		};
+		8B703AC5760FFB3F3A475448C3FD2DD8 /* Pod */ = {
+			isa = PBXGroup;
+			children = (
+				501C268D3DC431E81C876F4F7EE389C6 /* PetstoreClient.podspec */,
+			);
+			name = Pod;
+			sourceTree = "<group>";
+		};
+		A3225C42DC72DA2FDCC24B1154D893D9 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				399E6B8FE158024592ED8B770864696C /* AdditionalPropertiesClass.swift */,
+				6FF19147CE4412D2804D578DF81FA6E6 /* Animal.swift */,
+				FDAB71F06CE94B9B9AD9438DAC00B6D2 /* AnimalFarm.swift */,
+				FF5D23F22EEE2FBFA826151A4E186DE3 /* ApiResponse.swift */,
+				E41E52FC18B43257D6D924850398E9AE /* ArrayOfArrayOfNumberOnly.swift */,
+				246C4149EB1F7D2CF07D83FD3B4A7683 /* ArrayOfNumberOnly.swift */,
+				5EE661EFEC3A229F1219958C4244153F /* ArrayTest.swift */,
+				8C249F0D3A4AFFFC155DEC2FBB68F0CC /* Capitalization.swift */,
+				DE0EE75A3806EB2BA0C9EEF687CE2B93 /* Cat.swift */,
+				FECB278917C7651872C44FB1C0B6E620 /* Category.swift */,
+				DEA70EA7732BDFFE905C353D9709B2AD /* ClassModel.swift */,
+				0B30B9F0FA3EB01FFACD8AF1A5E3C02A /* Client.swift */,
+				D822C4C7D3E161B2623D9538CFB3993E /* Dog.swift */,
+				18B675845795AE8F97C41BFE1B734DF3 /* EnumArrays.swift */,
+				392B0EBFD414446E3C9A271B38B72DA0 /* EnumClass.swift */,
+				AAFFDA41414FACE0139A3B1F22FB6717 /* EnumTest.swift */,
+				39CFCEF99F7C460D0F08FDCCF1457477 /* File.swift */,
+				9DE2FEBAD4A5F085054978914D2BAD7F /* FileSchemaTestClass.swift */,
+				C6E49082BB281EDC5D7B6E76772E87CF /* FormatTest.swift */,
+				7A9361010C64B5A1F7A9DF65338A4060 /* HasOnlyReadOnly.swift */,
+				61179CE650778B2A5C39664F0A792B5C /* List.swift */,
+				3A917A61915DC34D93F7CA22E9FEEAB8 /* MapTest.swift */,
+				5F66D63E8AA66846EDB3A12966E6951E /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
+				E1D16F98B0546986ED64CD76F6678480 /* Model200Response.swift */,
+				405921FE252DC3DC1087DA4217236D81 /* Name.swift */,
+				E81223B1EAA15A1063FABA2C1F83FD46 /* NumberOnly.swift */,
+				23810842569AE35D0E94BB511DF8A4FC /* Order.swift */,
+				E7FFC55F1307BC98855D3D546660D4F2 /* OuterComposite.swift */,
+				88B5354642428AF26C69F2155FEBFA4B /* OuterEnum.swift */,
+				C030C0F6BD877478B1CA4BC8BFBAD057 /* Pet.swift */,
+				D2DDAE4995DB14893EA47ED21E6742BA /* ReadOnlyFirst.swift */,
+				5D9E3149DFEE7783ACEC1596236B2268 /* Return.swift */,
+				14B3C282191A88FADAB9CC2C684F72AA /* SpecialModelName.swift */,
+				2990DE0BC65EFC8D04E0FE470B40D295 /* StringBooleanMap.swift */,
+				49A545F954B2A10B0D26618084D1FF73 /* Tag.swift */,
+				E5A46D45023C6CBF06AA36844D59C59E /* User.swift */,
+			);
+			name = Models;
+			path = PetstoreClient/Classes/OpenAPIs/Models;
 			sourceTree = "<group>";
 		};
 		AFB15E7EE8978CE00D6893E034E7E7E0 /* Alamofire */ = {
@@ -711,55 +774,12 @@
 				A3C171CE5B7E92489A6610716886E986 /* TaskDelegate.swift */,
 				90E1B0D9DB713B4E3E6400DDF0D647FF /* Timeline.swift */,
 				2915A616B54E6864B51DE807710B3AC6 /* Validation.swift */,
-				1B217E43383FBC4B83697AFF5CD73831 /* Support Files */,
+				4B0AE4A662EE77AE0E42AEBFA28BFAB1 /* Support Files */,
 			);
+			name = Alamofire;
 			path = Alamofire;
 			sourceTree = "<group>";
 		};
-		BC43E283C7AD5FD3ADEBDAAA04603A0D /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				43401D5E814F2B2B70B4268C9700D233 /* AdditionalPropertiesClass.swift */,
-				BF56E8175C31FFC9C5FE532793765D33 /* Animal.swift */,
-				EDCCDD3634C44CBBFC8AE4EAD9FEAAC1 /* AnimalFarm.swift */,
-				DC41879241FE814CEDA9D6C468E03FA3 /* ApiResponse.swift */,
-				4BC0E02F846FD6026FB1DB1A89A5A1FC /* ArrayOfArrayOfNumberOnly.swift */,
-				CA5D5240A5E375F716132587718DC6F8 /* ArrayOfNumberOnly.swift */,
-				30216D1F18443637A23B317E25A44330 /* ArrayTest.swift */,
-				CBC66A91F3E1B8141F59B08ADF8D38CF /* Capitalization.swift */,
-				9BFF16C6A77D6FADE4068F05EDFBAC9B /* Cat.swift */,
-				F8497720E80CDEFA1D74B3E87908F10C /* Category.swift */,
-				B8FB97481720144B9BFAC91018683A13 /* ClassModel.swift */,
-				C44617D1A0C7A3B1E4A8CDD554179965 /* Client.swift */,
-				6E902BD3FF06123585AC7822AAD73A02 /* Dog.swift */,
-				BF515424DF68A3AAC931232EEC1D3956 /* EnumArrays.swift */,
-				D231D2C7D42049951D365E540D2046E2 /* EnumClass.swift */,
-				DA27384EA9C66568B39162DB8A982404 /* EnumTest.swift */,
-				91315B18340C0DAF9FCBF20C50A33D75 /* FormatTest.swift */,
-				5179EB017CA14D044D4AC4881A6519C0 /* HasOnlyReadOnly.swift */,
-				A02A9568A88535A81FBDC040CAD0FBE7 /* List.swift */,
-				0C2400ECA3F3C11CFC96A0A348CF92F4 /* MapTest.swift */,
-				303CFF12CD99D66790B079406AE453BB /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
-				D104485DE4B89C2C0F5DA06F8D8FB321 /* Model200Response.swift */,
-				732FBB0810C3F91070490823AC9C860A /* Name.swift */,
-				D6422C74BD1B120F80FEFC87A5FED472 /* NumberOnly.swift */,
-				4DE323395ACA46B7F898EE5E5DFF7F3E /* Order.swift */,
-				5BD4D7E3630CD7534338BFCD817C0430 /* OuterBoolean.swift */,
-				F80DB2369BE8133A5163C158A5DBF024 /* OuterComposite.swift */,
-				7E65BEC72AE9A9C2682D1FF779537AA2 /* OuterEnum.swift */,
-				969B0FD4E599E77A9AD7C257CC8AAC3B /* OuterNumber.swift */,
-				567ACF2871B2843E1D080D4FD26C9F90 /* OuterString.swift */,
-				8CF438B2B7CFD2D75076C56994007327 /* Pet.swift */,
-				E49AA3853C7F8F73E4790EDEA54FDBB4 /* ReadOnlyFirst.swift */,
-				962F09981F6DA884B7F9D9558435C813 /* Return.swift */,
-				9996663E24F264D09E9D8C8C54EF5BF3 /* SpecialModelName.swift */,
-				CFB7B4E2B9662BFD982DE3B5E209D30D /* Tag.swift */,
-				0643D6008A1CC710E2E3B9F5A59EAC9C /* User.swift */,
-			);
-			name = Models;
-			path = PetstoreClient/Classes/Swaggers/Models;
-			sourceTree = "<group>";
-		};
 		BEB24E3652F42513B61AC1C27F52FFBF /* RxSwift */ = {
 			isa = PBXGroup;
 			children = (
@@ -911,8 +931,9 @@
 				5A12346A10D54F80F5FA16D11CB2F939 /* Zip.swift */,
 				3FEE1B647BF3BF83A15307D0FE6C9061 /* Zip+arity.swift */,
 				BB01C4A269BB41DDD347FEA23DF43E9B /* Zip+Collection.swift */,
-				0B8DE55707EA8293395D0D1159AE579B /* Support Files */,
+				EC4762CA6D4C075664CB22CF712106D2 /* Support Files */,
 			);
+			name = RxSwift;
 			path = RxSwift;
 			sourceTree = "<group>";
 		};
@@ -931,91 +952,73 @@
 		C1A60D10CED0E61146591438999C7502 /* Targets Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				88CE2B3F08C34DDB098AD8A5DCC1DF1E /* Pods-SwaggerClient */,
-				D6D0CD30E3EAF2ED10AE0CBC07506C5A /* Pods-SwaggerClientTests */,
+				DE503BFFEBBF78BDC743C8A6A50DFF47 /* Pods-SwaggerClient */,
+				E9EDF70990CC7A4463ED5FC2E3719BD0 /* Pods-SwaggerClientTests */,
 			);
 			name = "Targets Support Files";
 			sourceTree = "<group>";
 		};
-		D6D0CD30E3EAF2ED10AE0CBC07506C5A /* Pods-SwaggerClientTests */ = {
+		DE503BFFEBBF78BDC743C8A6A50DFF47 /* Pods-SwaggerClient */ = {
 			isa = PBXGroup;
 			children = (
-				3F16B43ABD2C8CD4A311AA1AB3B6C02F /* Info.plist */,
-				00ACB4396DD1B4E4539E4E81C1D7A14E /* Pods-SwaggerClientTests.modulemap */,
-				FB170EFD14935F121CDE3211DB4C5CA3 /* Pods-SwaggerClientTests-acknowledgements.markdown */,
-				02F28E719AA874BE9213D6CF8CE7E36B /* Pods-SwaggerClientTests-acknowledgements.plist */,
-				687B19CB3E722272B41D60B485C29EE7 /* Pods-SwaggerClientTests-dummy.m */,
-				43FC49AA70D3E2A84CAED9C37BE9C4B5 /* Pods-SwaggerClientTests-frameworks.sh */,
-				E4E6F4A58FE7868CA2177D3AC79AD2FA /* Pods-SwaggerClientTests-resources.sh */,
-				F22FE315AC1C04A8749BD18281EE9028 /* Pods-SwaggerClientTests-umbrella.h */,
-				969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */,
-				849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */,
+				814471C0F27B39D751143F0CD53670BD /* Info.plist */,
+				CFA4F581E074596AB5C3DAF3D9C39F17 /* Pods-SwaggerClient.modulemap */,
+				76645699475D3AB6EB5242AC4D0CEFAE /* Pods-SwaggerClient-acknowledgements.markdown */,
+				08BDFE9C9E9365771FF2D47928E3E79A /* Pods-SwaggerClient-acknowledgements.plist */,
+				F8FCC3BC0A0823C3FF68C4E1EF67B2FD /* Pods-SwaggerClient-dummy.m */,
+				0AD61F8554C909A3AFA66AD9ECCB5F23 /* Pods-SwaggerClient-frameworks.sh */,
+				F4BB3B2146310CA18C30F145BFF15BD9 /* Pods-SwaggerClient-resources.sh */,
+				32432BEBC9EDBC5E269C9AA0E570F464 /* Pods-SwaggerClient-umbrella.h */,
+				AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */,
+				F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */,
+			);
+			name = "Pods-SwaggerClient";
+			path = "Target Support Files/Pods-SwaggerClient";
+			sourceTree = "<group>";
+		};
+		E9EDF70990CC7A4463ED5FC2E3719BD0 /* Pods-SwaggerClientTests */ = {
+			isa = PBXGroup;
+			children = (
+				419496CDDD7E7536CBEA02BAEE2C7C21 /* Info.plist */,
+				9D08EC9B39FEBA43A5B55DAF97AAEBE9 /* Pods-SwaggerClientTests.modulemap */,
+				D47B812D78D0AE64D85D16A96840F8C4 /* Pods-SwaggerClientTests-acknowledgements.markdown */,
+				9D780FDAD16A03CC25F4D6F3317B9423 /* Pods-SwaggerClientTests-acknowledgements.plist */,
+				721957E37E3EE5DB5F8DBF20A032B42A /* Pods-SwaggerClientTests-dummy.m */,
+				CAF6F32F117197F6F08B477687F09728 /* Pods-SwaggerClientTests-frameworks.sh */,
+				F3E1116FA9F9F3AFD9332B7236F6E711 /* Pods-SwaggerClientTests-resources.sh */,
+				CF1ECC5499BE9BF36F0AE0CE47ABB673 /* Pods-SwaggerClientTests-umbrella.h */,
+				1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */,
+				FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */,
 			);
 			name = "Pods-SwaggerClientTests";
 			path = "Target Support Files/Pods-SwaggerClientTests";
 			sourceTree = "<group>";
 		};
-		EA92DE2AC05567C73F1DCE69B0AA9C2A /* PetstoreClient */ = {
+		EC4762CA6D4C075664CB22CF712106D2 /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				37B1F46DC47D437D85AD27B958BC7BB7 /* AlamofireImplementations.swift */,
-				572F7F503F4D3E1A6CDF97FC985AF3BD /* APIHelper.swift */,
-				26C368B2C0DCEEFAB4E4B49581B98400 /* APIs.swift */,
-				CF591C1D623007B1075CB02863648280 /* CodableHelper.swift */,
-				32177EF0EA0FBB3B62950055E2BCC550 /* Configuration.swift */,
-				25E1BBEDB400BAF88BEDACEE2464D85C /* Extensions.swift */,
-				27F52AACF4F996CDD6856D86C166B144 /* JSONEncodableEncoding.swift */,
-				8776282D2BE56A89D0919D4A53830234 /* JSONEncodingHelper.swift */,
-				AC8D06D1E9BE16DF40F38B8754ABF064 /* Models.swift */,
-				00A33E2CD3112CD579257A5195E90208 /* APIs */,
-				BC43E283C7AD5FD3ADEBDAAA04603A0D /* Models */,
-				F6B5B89CEDF0058E6D0C7C3237336FC3 /* Support Files */,
-			);
-			name = PetstoreClient;
-			path = ../..;
-			sourceTree = "<group>";
-		};
-		EDE36CDEEF568DD818B58A28C3C0DA80 /* Development Pods */ = {
-			isa = PBXGroup;
-			children = (
-				EA92DE2AC05567C73F1DCE69B0AA9C2A /* PetstoreClient */,
-			);
-			name = "Development Pods";
-			sourceTree = "<group>";
-		};
-		F6B5B89CEDF0058E6D0C7C3237336FC3 /* Support Files */ = {
-			isa = PBXGroup;
-			children = (
-				DD77C122BCA23FDAD121414FCF0FF430 /* Info.plist */,
-				77EDDBF5C8059EF4B5E394E09901B296 /* PetstoreClient.modulemap */,
-				CAAE1FE3D4078631A67B5F065A94F367 /* PetstoreClient.xcconfig */,
-				573394BE348ECB16EEF1017407804E56 /* PetstoreClient-dummy.m */,
-				672FD5B112C6AEE3CAC296A02DD9BD20 /* PetstoreClient-prefix.pch */,
-				8A3C32E3A778873EE0B779B167A4D0D6 /* PetstoreClient-umbrella.h */,
+				0238FCB62F6F199FD219AA96372323A4 /* Info.plist */,
+				A61F0A3AC33784A820D599954D478D34 /* RxSwift.modulemap */,
+				F918D1A343F79C67A66D6F1E88AB8654 /* RxSwift.xcconfig */,
+				9D6BFAEEEDA8B0422531E1FA16BF92B7 /* RxSwift-dummy.m */,
+				B632009833A31B892589EDD4D3F52A26 /* RxSwift-prefix.pch */,
+				93868E0A391CFC012C1EC5F79555C633 /* RxSwift-umbrella.h */,
 			);
 			name = "Support Files";
-			path = "SwaggerClientTests/Pods/Target Support Files/PetstoreClient";
+			path = "../Target Support Files/RxSwift";
+			sourceTree = "<group>";
+		};
+		EC52080E65FE34CBDE5F694B08BA9836 /* Development Pods */ = {
+			isa = PBXGroup;
+			children = (
+				894E625B654BBE2FB6E8E88AA51D3E5A /* PetstoreClient */,
+			);
+			name = "Development Pods";
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		1353AC7A6419F876B294A55E5550D1E4 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				31F8B86E3672D0B828B6352C875649C4 /* Pods-SwaggerClientTests-umbrella.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		2BBB4A893BB302510B96388C85CB4C86 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				56116B6C30C783DD7ADC21EACFBB87E1 /* PetstoreClient-umbrella.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		411A88E43D5D9D797C82EAD090B6B7C3 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -1024,6 +1027,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		6BCCFF9ED59B07C86D0AEBC585647D2A /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				592BEB1813D8123103A5CB2FFD10746F /* PetstoreClient-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		B4002B6E97835FDCCAA5963EFE09A3E0 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -1032,17 +1043,42 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		F69DE75D93B3C1FA7AF0388DCFC70778 /* Headers */ = {
+		C19E54C800095CFA2457EC19C7C2E974 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A4235BF24DA740970A86E26D8CCC4BD7 /* RxSwift-umbrella.h in Headers */,
+				265B9DA59211B0B5FFF987E408A0AA9C /* Pods-SwaggerClientTests-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		DB7097D9DADBB6E2208573E06F945E67 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				46527321E2E30477D8BDA2D0454721B8 /* RxSwift-umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
+		0A6465AB09B51FAB877E30050A6766DC /* RxSwift */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 740E48F5390F3BE99AC637B4CCBF2AE6 /* Build configuration list for PBXNativeTarget "RxSwift" */;
+			buildPhases = (
+				2FDD9275DD6B614CEF4DD40A66758865 /* Sources */,
+				79A9E80C51806F31B3857087548F4C95 /* Frameworks */,
+				DB7097D9DADBB6E2208573E06F945E67 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = RxSwift;
+			productName = RxSwift;
+			productReference = 84A09D760BA2EA13D5BE269086BAD34C /* RxSwift.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 		136F0A318F13DF38351AC0F2E6934563 /* Pods-SwaggerClient */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = F74B56615E0AC0F998019998CF3D73B7 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClient" */;
@@ -1080,53 +1116,37 @@
 			productReference = 5B598E168B47485DC60F9DBBCBEEF5BB /* Alamofire.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		9741823C73C54208699F008BEC051C81 /* RxSwift */ = {
+		BC247F0137DAAFC66C8186BFF14D52BD /* PetstoreClient */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 243111D6704C9CF1B02BA1490CD261C3 /* Build configuration list for PBXNativeTarget "RxSwift" */;
+			buildConfigurationList = 42E07A8C43753B5C46F3A6473B0CA34F /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
 			buildPhases = (
-				E3DBEE9ED166D1345896E1239D720A10 /* Sources */,
-				D7653A4AC0F0FE34905A430235389509 /* Frameworks */,
-				F69DE75D93B3C1FA7AF0388DCFC70778 /* Headers */,
+				9217977733F6A7BEEA705CAFC72377DC /* Sources */,
+				38E7CA873A88008667A9B2F265272ECA /* Frameworks */,
+				6BCCFF9ED59B07C86D0AEBC585647D2A /* Headers */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-			);
-			name = RxSwift;
-			productName = RxSwift;
-			productReference = 84A09D760BA2EA13D5BE269086BAD34C /* RxSwift.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-		E62F1FC39CD3E50528A1FD615087B79E /* PetstoreClient */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = BF8513C7E662BCA5040298D897E576C6 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
-			buildPhases = (
-				92A5C1BD30687221DF0FB10E265F32D4 /* Sources */,
-				2332DE544C299EB2747D90A4E97E78FB /* Frameworks */,
-				2BBB4A893BB302510B96388C85CB4C86 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				726C82AF86FDDE866EAFC6C5F988015B /* PBXTargetDependency */,
-				60D6EE9E319978C36C7A787D65F59D7D /* PBXTargetDependency */,
+				7D8548558CCCCC6CC421AAD0C492CB90 /* PBXTargetDependency */,
+				0629B05459E45CEF6470D046D99632D6 /* PBXTargetDependency */,
 			);
 			name = PetstoreClient;
 			productName = PetstoreClient;
 			productReference = E9CBBB398E7A62950FA8BC091CBE0359 /* PetstoreClient.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */ = {
+		BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
+			buildConfigurationList = 6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */;
 			buildPhases = (
-				BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */,
-				87AF7EC7404199AC8C5D22375A6059BF /* Frameworks */,
-				1353AC7A6419F876B294A55E5550D1E4 /* Headers */,
+				61868F2FE74A9422171483DBABE7C61F /* Sources */,
+				7139BF778844E2A9E420524D8146ECD8 /* Frameworks */,
+				C19E54C800095CFA2457EC19C7C2E974 /* Headers */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */,
 			);
 			name = "Pods-SwaggerClientTests";
 			productName = "Pods-SwaggerClientTests";
@@ -1139,8 +1159,8 @@
 		D41D8CD98F00B204E9800998ECF8427E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0700;
+				LastSwiftUpdateCheck = 0930;
+				LastUpgradeCheck = 0930;
 			};
 			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -1155,15 +1175,171 @@
 			projectRoot = "";
 			targets = (
 				88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */,
-				E62F1FC39CD3E50528A1FD615087B79E /* PetstoreClient */,
+				BC247F0137DAAFC66C8186BFF14D52BD /* PetstoreClient */,
 				136F0A318F13DF38351AC0F2E6934563 /* Pods-SwaggerClient */,
-				F3DF8DD6DBDCB07B04D7B1CC8A462562 /* Pods-SwaggerClientTests */,
-				9741823C73C54208699F008BEC051C81 /* RxSwift */,
+				BCF05B222D1CA50E84618B500CB18541 /* Pods-SwaggerClientTests */,
+				0A6465AB09B51FAB877E30050A6766DC /* RxSwift */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXSourcesBuildPhase section */
+		2FDD9275DD6B614CEF4DD40A66758865 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				38B1EC6AE8B173A0ED2054C7F17F3304 /* AddRef.swift in Sources */,
+				29AC2B62E354D62A7D6E439ABD8D8705 /* Amb.swift in Sources */,
+				522C49543C28F29BD3C2D80C7817EACC /* AnonymousDisposable.swift in Sources */,
+				476792705280C405EA9C3260DACB5232 /* AnonymousObserver.swift in Sources */,
+				713F021C8A1B11ADB8AAB3BE2AB28612 /* AnyObserver.swift in Sources */,
+				DDB64E935A02B97584F744A0EA102F19 /* AsMaybe.swift in Sources */,
+				E3B302872276D8CA84795F07F3D46A1B /* AsSingle.swift in Sources */,
+				78F640A5405F3C3EF4A3745AE5EDB7F4 /* AsyncLock.swift in Sources */,
+				548D1251A6333F3C14D3B410878A0728 /* AsyncSubject.swift in Sources */,
+				41D49ED21EB01A05D078B0A544C56A5A /* Bag+Rx.swift in Sources */,
+				45FC10FA7B11102F204B1A4C3595533A /* Bag.swift in Sources */,
+				BC15C89A997BEF3AE7C38B8CFCDE4A3C /* BehaviorSubject.swift in Sources */,
+				9B1D7E40251AB57E8EBE740DB2E47AFB /* BinaryDisposable.swift in Sources */,
+				A3DC0A56758CE1D9AB82ADCA71DB5234 /* BooleanDisposable.swift in Sources */,
+				9BA839DEF7AAC24ECD245E314BD04A15 /* Buffer.swift in Sources */,
+				57FF6C6AE83AE47969AA9E6068F3A118 /* Cancelable.swift in Sources */,
+				291529C2AD8278F0E29BCE2CA087D145 /* Catch.swift in Sources */,
+				F28B843584C1403E3577AA2613E58F79 /* CombineLatest+arity.swift in Sources */,
+				A38EA0BB0CD542EA84780B2BE82D2E5D /* CombineLatest+Collection.swift in Sources */,
+				8DEB713831DB8C2EB2F29E1B7E5ACBF7 /* CombineLatest.swift in Sources */,
+				888734304CADEF702525FDBE547BA4EC /* Completable+AndThen.swift in Sources */,
+				55996E2B4AF6CAE25D431FDE76C11BDB /* Completable.swift in Sources */,
+				F495E5E33C3A119F2220F7777C2732EB /* CompositeDisposable.swift in Sources */,
+				56033D6D3A9CD87275E6D75EE1C2C9B7 /* Concat.swift in Sources */,
+				85A781C3C3166C0FAD748F0D145DD723 /* ConcurrentDispatchQueueScheduler.swift in Sources */,
+				DADD7E65A13BCE9B341CC7E4EFBE4250 /* ConcurrentMainScheduler.swift in Sources */,
+				DAF432897B5C3742F05ED25C555FF924 /* ConnectableObservableType.swift in Sources */,
+				DF8D62E0646D452D5B7372FFB426CEDA /* Create.swift in Sources */,
+				CEA030BEEAD8977EDA9F88A46B9EBA3A /* CurrentThreadScheduler.swift in Sources */,
+				08A42D53039D7E6228776A2EA7CB8D40 /* Debounce.swift in Sources */,
+				27F2215CBB17F8E2C82CA73A82BB42CE /* Debug.swift in Sources */,
+				904D8F4F61970DC316274757617D2722 /* DefaultIfEmpty.swift in Sources */,
+				200AFAA12203AF2A4D979A0F31DB5B6E /* Deferred.swift in Sources */,
+				C081E427BEE4B8462E9992C762D029C2 /* Delay.swift in Sources */,
+				6CF09409ADF83E89F4C293961A949D7B /* DelaySubscription.swift in Sources */,
+				A7824EDE649EB8D2F0298F8A11C3EFA7 /* Dematerialize.swift in Sources */,
+				4091C79F74F01B548E8C7B7C2FB3CDA2 /* Deprecated.swift in Sources */,
+				79EE3D1B608BC079E2909BE77EE9E43B /* DispatchQueue+Extensions.swift in Sources */,
+				13CE8E6804D706546739C0D7D3261BF2 /* DispatchQueueConfiguration.swift in Sources */,
+				CBE317FF6A6A07FA5DE832B60E5CCFF4 /* Disposable.swift in Sources */,
+				75344FDDF1374B3419C134FCCD184411 /* Disposables.swift in Sources */,
+				CDB63E2A05D79352D15E8A29E113D405 /* DisposeBag.swift in Sources */,
+				37637660CD3F5876BB0EBAC16EC992A7 /* DisposeBase.swift in Sources */,
+				FE87FDE191C7E251EF4F41418947E4B0 /* DistinctUntilChanged.swift in Sources */,
+				E8C2DB24A8B915661914F6A698BA02E3 /* Do.swift in Sources */,
+				761DB0B921617D34EB73B8BB73351962 /* ElementAt.swift in Sources */,
+				DF95F9C5B39CEEF6AC17E8908609A583 /* Empty.swift in Sources */,
+				830013706DE764A14DFFC2A0153CA5B6 /* Enumerated.swift in Sources */,
+				DD2D6855AB7887327C2D51DD2EA6278A /* Error.swift in Sources */,
+				146BF55F555209EEFA2E62EC5C2391E8 /* Errors.swift in Sources */,
+				4F18B5772E4DF4B1483B9BD39AD8F01E /* Event.swift in Sources */,
+				5E6C7E636827D5FD75C44F93E760E272 /* Filter.swift in Sources */,
+				A94FA890E645C229AB74FEF87823B83A /* First.swift in Sources */,
+				DEE5AF52A5F4BF6EC469B623E0E1DABD /* Generate.swift in Sources */,
+				20AFA0F5F5F9BF3840C3A0044F03701C /* GroupBy.swift in Sources */,
+				90DBBC062F26ED5B3257591E1A6C5467 /* GroupedObservable.swift in Sources */,
+				7E0B46A33AE6C2E525D3806C1C780CB6 /* HistoricalScheduler.swift in Sources */,
+				C3B9A8243631D998AD9EED7EAD60CAAB /* HistoricalSchedulerTimeConverter.swift in Sources */,
+				1D6C98EAB06448D41FF240AA126ECA4E /* ImmediateSchedulerType.swift in Sources */,
+				3DFFA1E65DBFC5F9A813B915AD36B9DD /* InfiniteSequence.swift in Sources */,
+				2986D1A5463F79F567425AC813D4EF5B /* InvocableScheduledItem.swift in Sources */,
+				69305D2FA0FCEC9660EAF14C211CEF1E /* InvocableType.swift in Sources */,
+				031A698AD1E45BE38B7BE16FEBC64872 /* Just.swift in Sources */,
+				422D3DE3CC90F6A7619E52CB0BB6EF63 /* Lock.swift in Sources */,
+				65B160A97B74B22F64D9C4CD628E317A /* LockOwnerType.swift in Sources */,
+				13380DA9B5B6EA2DFC225E0146A5569B /* MainScheduler.swift in Sources */,
+				75C705C277D4C20D9E3421A1215F4A59 /* Map.swift in Sources */,
+				3C3A4CEC534C7AAFE058E473520D3A2B /* Materialize.swift in Sources */,
+				4FB6027EADADE2DFBE6517E185024881 /* Maybe.swift in Sources */,
+				9CEA37BFAC7CDD93C3762DDDA104CA13 /* Merge.swift in Sources */,
+				58FC1ED61E3A3F8A26FEAEF2D263DD87 /* Multicast.swift in Sources */,
+				7B640961C4AAE7333EBFF6FB25EB6FFE /* Never.swift in Sources */,
+				F1C9507B3B3B8F864FD4AFB6C173CE77 /* NopDisposable.swift in Sources */,
+				5210B4D13454F2D219F3E0380FC11CEE /* Observable.swift in Sources */,
+				90EBDD35E19A3A885E49DE638239BC5A /* ObservableConvertibleType.swift in Sources */,
+				3946D9C48A85CF4ABD301EBD29FBAB6A /* ObservableType+Extensions.swift in Sources */,
+				DAC419378279DA6A1599A5B47765B63C /* ObservableType+PrimitiveSequence.swift in Sources */,
+				079022D786BA4C3392FAF6B2C3FF240C /* ObservableType.swift in Sources */,
+				57EF68964E352D6FEC794EF5A542EDD8 /* ObserveOn.swift in Sources */,
+				CB750DB061E608CC37AD48C3BA1E3E96 /* ObserverBase.swift in Sources */,
+				B613EC6F435CD31F7C7169AE21404DAF /* ObserverType.swift in Sources */,
+				44E56759EA227A975CFE8C1C62E74BA3 /* OperationQueueScheduler.swift in Sources */,
+				29DECFB9242C247EC2436B96DBCD868D /* Optional.swift in Sources */,
+				E8A12A1070CCC6254D322C36D49E5BD5 /* Platform.Darwin.swift in Sources */,
+				A1CAEA9C386892DD5A79335D7EEE19B6 /* Platform.Linux.swift in Sources */,
+				FDB32E859E1047CB29425B3BC97181A6 /* PrimitiveSequence+Zip+arity.swift in Sources */,
+				BFA2F9507EA89FD10256D776A0823724 /* PrimitiveSequence.swift in Sources */,
+				EDFCAD6831B42D32F8D7D717DAF8ACC8 /* PriorityQueue.swift in Sources */,
+				9566F222CEA9E8E1135A960C7081E5A0 /* Producer.swift in Sources */,
+				393738EA89EC44C0179A3F94152AE904 /* PublishSubject.swift in Sources */,
+				B67DD84B3E51F83CBD3E18C08464CCF7 /* Queue.swift in Sources */,
+				E22E64B194506573EEEFEC5F80DD3796 /* Range.swift in Sources */,
+				2084E80B376F22D944DA886AA978E6E0 /* Reactive.swift in Sources */,
+				6ABF5ACD27F9CB11B315C934DA579538 /* RecursiveLock.swift in Sources */,
+				573B70D063CBCDAB039CB05125C9E768 /* RecursiveScheduler.swift in Sources */,
+				43B0430DB5D2D99D8EA2CA53005F3AC8 /* Reduce.swift in Sources */,
+				B3A57F58991B701C639E67153A193D9C /* RefCountDisposable.swift in Sources */,
+				DA9DF86F690E492DD6EC9938CC8498E1 /* Repeat.swift in Sources */,
+				9A42BB18B315261E03EE2DC0D75D3EC3 /* ReplaySubject.swift in Sources */,
+				282D621DEF60D9AE2199CE0B5B359F25 /* RetryWhen.swift in Sources */,
+				328799E235BC5232BAE478CB4420155C /* Rx.swift in Sources */,
+				579FCF1CF577D7912BEDD744C068B3D3 /* RxMutableBox.swift in Sources */,
+				9D1D18853B381D5BFC3DD39ED5FED962 /* RxSwift-dummy.m in Sources */,
+				75D6A01ED8132F2E8B08A25FF3BACCD1 /* Sample.swift in Sources */,
+				E64F88532D4A8205A62C6375FFCCD141 /* Scan.swift in Sources */,
+				4FC912959F09FACB9E16FE88578DBB78 /* ScheduledDisposable.swift in Sources */,
+				711F397F738E31A401BB5E41DFBB633E /* ScheduledItem.swift in Sources */,
+				1FFBAC31426B7CD4D42276917F87C562 /* ScheduledItemType.swift in Sources */,
+				AB8E05A67556D5C85EC5939DF27E5782 /* SchedulerServices+Emulation.swift in Sources */,
+				515056D5D617588984888FD2FB132B0A /* SchedulerType.swift in Sources */,
+				B5A1B1046FF0DEF6AB91D794CEBEAEDD /* Sequence.swift in Sources */,
+				6BDE32E70C5D69C2E660535264EDEDB9 /* SerialDispatchQueueScheduler.swift in Sources */,
+				E94566BA9FF4DBF9E869E4F2723DE0F1 /* SerialDisposable.swift in Sources */,
+				21CBEB768D02EAE5A553A8CC6B1CA82D /* ShareReplayScope.swift in Sources */,
+				58DF548418220FF399DB6318AB0BD0AF /* Single.swift in Sources */,
+				534C167AEFB598D0CAB052DF7E33DFCE /* SingleAssignmentDisposable.swift in Sources */,
+				2D8F385280D9A32412657D65BDAFD897 /* SingleAsync.swift in Sources */,
+				BAFD94BF33006889FD98615CCD3AE0BE /* Sink.swift in Sources */,
+				669BD672AE0D5D72A75FC5A53AEB90E8 /* Skip.swift in Sources */,
+				CF924E398D3C1D1B5FD565F8E8B3B0DC /* SkipUntil.swift in Sources */,
+				D3E7615181B3A1EB18E20877C721FC0E /* SkipWhile.swift in Sources */,
+				3806FDBB433140D468EF008E5C1BA014 /* StartWith.swift in Sources */,
+				19BDA30E180BDA014910A4C07D1BF067 /* String+Rx.swift in Sources */,
+				18762DA609434C0E3728BF55DE80FCCF /* SubjectType.swift in Sources */,
+				8159B4FC350C9B0106135B168CD9F2B0 /* SubscribeOn.swift in Sources */,
+				4D058BAA377C140D2417BF7A19B948F4 /* SubscriptionDisposable.swift in Sources */,
+				48E4B400170D1A67500A63B222F09F0C /* SwiftSupport.swift in Sources */,
+				108114CC076350BA1B5EA582CFFAB26F /* Switch.swift in Sources */,
+				DCDEC6851B435D0C1154EBAAD275D077 /* SwitchIfEmpty.swift in Sources */,
+				4DAEF2BA9B74B2216CCF2C426E510B04 /* SynchronizedDisposeType.swift in Sources */,
+				D60D3566E070D46EADB202EE37B6C0BC /* SynchronizedOnType.swift in Sources */,
+				B762C2E5C06297D7E449EA77E28B6162 /* SynchronizedUnsubscribeType.swift in Sources */,
+				D8DD939406B1DBDF04A4B19F0D00A213 /* TailRecursiveSink.swift in Sources */,
+				67B27DAF4FE1906DAB120FB30A35F0B7 /* Take.swift in Sources */,
+				9F66ED85A4E76494225473E71F4032D7 /* TakeLast.swift in Sources */,
+				E80420EED4F739800F9B77BF588946EE /* TakeUntil.swift in Sources */,
+				D1BE17983D6A2EB1B5C249E76880A53C /* TakeWhile.swift in Sources */,
+				BB0AA91C4DEA60BEE9DAF6231E952CF7 /* Throttle.swift in Sources */,
+				4D696BF979D171B81F55FD381CEC100B /* Timeout.swift in Sources */,
+				B356FE92080EAC800E6E7737A4656DAE /* Timer.swift in Sources */,
+				0DD3C9A04DBC740C0D71572394BF5AF6 /* ToArray.swift in Sources */,
+				242B9D8AAA07CDFB1DDA0D5FBD45F028 /* Using.swift in Sources */,
+				DC4B17FE15845C8126B6A2E35A5D6B5E /* VirtualTimeConverterType.swift in Sources */,
+				BDF2B23BD698F186BEF225D473992D4D /* VirtualTimeScheduler.swift in Sources */,
+				CC31CAD1462D2D0CF5F37A3CE1415378 /* Window.swift in Sources */,
+				B9281CBADFA7BBC09D30EA0A410BE83B /* WithLatestFrom.swift in Sources */,
+				E35C89BE9DD97E026796FC961F786AAA /* Zip+arity.swift in Sources */,
+				3F287A167118B07BB9795F4D74A358D3 /* Zip+Collection.swift in Sources */,
+				146F3F02FEA83BB72CF2752C04E106D4 /* Zip.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		32B9974868188C4803318E36329C87FE /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1189,70 +1365,70 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		92A5C1BD30687221DF0FB10E265F32D4 /* Sources */ = {
+		61868F2FE74A9422171483DBABE7C61F /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				66AB5C5B2CF44EC128C3C452276E4C74 /* AdditionalPropertiesClass.swift in Sources */,
-				B7EA71790C58BAF28B054A40C134E60A /* AlamofireImplementations.swift in Sources */,
-				41C3453DDBA3EFF9809FCF528442B54A /* Animal.swift in Sources */,
-				D71897E4ED2B5ADC2CA7FB8062D8A047 /* AnimalFarm.swift in Sources */,
-				A0168DDC27B6B9C21B87713895626507 /* AnotherfakeAPI.swift in Sources */,
-				F52E7F86A618B14FF01AC6E8D01721EE /* APIHelper.swift in Sources */,
-				39188F6A68DA352296C7AA68B04A7634 /* ApiResponse.swift in Sources */,
-				E26899F79249D7A6D2725A5278113F30 /* APIs.swift in Sources */,
-				30C4449ACEEF083352ABFF154B2D7968 /* ArrayOfArrayOfNumberOnly.swift in Sources */,
-				7C172538D4FCB50C3E242BA310283179 /* ArrayOfNumberOnly.swift in Sources */,
-				BC52825EDB741DC6711CA5C946939B71 /* ArrayTest.swift in Sources */,
-				B8142F32EB2B0B4BE0195A1185A9C895 /* Capitalization.swift in Sources */,
-				99500E9F843B5E9720AE001645058C9F /* Cat.swift in Sources */,
-				87AEC7D0045C5835C82EF3AE06AB7EA3 /* Category.swift in Sources */,
-				51EC8B7898542CB445947B8DFC4BF22D /* ClassModel.swift in Sources */,
-				1CEDD428B3F87DE7B99721AC67D51626 /* Client.swift in Sources */,
-				FA5DD670643CBFDD06C1A60B0710BC6F /* CodableHelper.swift in Sources */,
-				6975335509CCEAD83AD83EBD88225337 /* Configuration.swift in Sources */,
-				4038FA0DAE5E3E62D316F6806F8BDA8E /* Dog.swift in Sources */,
-				89E14B7531F830DFADC7E4D32ECCD730 /* EnumArrays.swift in Sources */,
-				EAF2C366AF89475636307F3EDE40515E /* EnumClass.swift in Sources */,
-				5CB6D5F3703EA000051D67F8BA01390A /* EnumTest.swift in Sources */,
-				411AC1E2BFEEDA777527D5C8DC496BDE /* Extensions.swift in Sources */,
-				120840F727931F263DB3875ECB5FE69A /* FakeAPI.swift in Sources */,
-				3CC36945887A8B975354D58D9F40844C /* FakeClassnameTags123API.swift in Sources */,
-				90C9D0DE224190848D0EEC26A05EDF00 /* FormatTest.swift in Sources */,
-				C5A078F87376B2CA2773F803AC624053 /* HasOnlyReadOnly.swift in Sources */,
-				38C4BC7C4D5F7F832AC5692B757514CF /* JSONEncodableEncoding.swift in Sources */,
-				5A5A96ACB462E280A4492A30EA8BB063 /* JSONEncodingHelper.swift in Sources */,
-				1EE9474E48F5AE172B16AD5CCFCA0292 /* List.swift in Sources */,
-				3FF149097ED8B1C60C6E2A4AEDED4140 /* MapTest.swift in Sources */,
-				6C6A8700E85F13B85B864146351A09A7 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
-				093A149379B5B08C73F940DD60C04723 /* Model200Response.swift in Sources */,
-				84B272390789161463BC801E47BB8777 /* Models.swift in Sources */,
-				5299F775188B741DB878B94A5FF165E4 /* Name.swift in Sources */,
-				2D0E7BAF86065E08D5B936EE2EA46FCC /* NumberOnly.swift in Sources */,
-				B5EAB00E2CAE715103AC46B7AFF67A48 /* Order.swift in Sources */,
-				E1296913C586DBEE4B85E987C70116CE /* OuterBoolean.swift in Sources */,
-				80260F45F9AD8887F8419F3F6087878C /* OuterComposite.swift in Sources */,
-				68202AFB988F6E80E8AA2AA5E556F63B /* OuterEnum.swift in Sources */,
-				54AB4B3DF840DE7025877C7FF20743EA /* OuterNumber.swift in Sources */,
-				9C6C65A3F40356896A7A988EF15FABEB /* OuterString.swift in Sources */,
-				BF18B6BF5657B61C189367FB60397B26 /* Pet.swift in Sources */,
-				8958D6099E900867E70383C1C7A105A5 /* PetAPI.swift in Sources */,
-				756791FEBF425E98530FE7EE04521037 /* PetstoreClient-dummy.m in Sources */,
-				65FC19B4E6EACB6B645EFCF3D9E4A6F5 /* ReadOnlyFirst.swift in Sources */,
-				E97FA6997E7F9DD1E805F9D78FB3BE9D /* Return.swift in Sources */,
-				CBA689CC77D7CFDC8D8D2604025524C2 /* SpecialModelName.swift in Sources */,
-				BFDD4F46020E6DF10EADB0453041D77C /* StoreAPI.swift in Sources */,
-				ABF8A1A069B4C501E1AE3A626BD0C318 /* Tag.swift in Sources */,
-				42E5B5BE039C693257EFC30960881DCB /* User.swift in Sources */,
-				435161D581A5EE3AE722478ACB75017D /* UserAPI.swift in Sources */,
+				80C3B52F0D2A4EFBCFFB4F3581FA3598 /* Pods-SwaggerClientTests-dummy.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		BDFDEE831A91E115AA482B4E9E9B5CC8 /* Sources */ = {
+		9217977733F6A7BEEA705CAFC72377DC /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				897985FA042CD12B825C3032898FAB26 /* Pods-SwaggerClientTests-dummy.m in Sources */,
+				EB938F3396BB7942B55A870DB770FB2C /* AdditionalPropertiesClass.swift in Sources */,
+				EC72D0A9C3DF774FE3CBE8D109986421 /* AlamofireImplementations.swift in Sources */,
+				57D2C8EE1E8BB499FCD2CBDF4AEA1D0F /* Animal.swift in Sources */,
+				F208F8D5D7723B1564A660298EFD2EFA /* AnimalFarm.swift in Sources */,
+				5EB1912C5BD866EF22078E6342DDF626 /* AnotherFakeAPI.swift in Sources */,
+				847A8B420331AF45153CAF20037CAD62 /* APIHelper.swift in Sources */,
+				717E3DE6C8A82E3A666E6B9953FF7AEE /* ApiResponse.swift in Sources */,
+				12D37A05DA6E1E19ED68B57E6E77A06A /* APIs.swift in Sources */,
+				730BF0627DCA8B2B0CAE4D08D0C7332A /* ArrayOfArrayOfNumberOnly.swift in Sources */,
+				74817260A74EC7B413B77A62ADAD3DF7 /* ArrayOfNumberOnly.swift in Sources */,
+				6B2EBB7B77F9B11C2223CAAE31B68652 /* ArrayTest.swift in Sources */,
+				89314462735557CCBC303AD490F9F8B3 /* Capitalization.swift in Sources */,
+				AA35CB063B89D843E92A0A8F0B7D8E9C /* Cat.swift in Sources */,
+				724399A8802626116CBD6D815993340E /* Category.swift in Sources */,
+				BC95410B29A7332DCE5B03D8FB7C8E5C /* ClassModel.swift in Sources */,
+				496B51294599ED4AE1BA687C1C2FB909 /* Client.swift in Sources */,
+				F6084FFB3584DC5A8E46E6D95F0BC5F7 /* CodableHelper.swift in Sources */,
+				DAC2F7A82728C40BD846B5C450BFEE6C /* Configuration.swift in Sources */,
+				5CB1D20182D013136D1A4D7F63026F32 /* Dog.swift in Sources */,
+				B71EBC63D6A1DF0CC24A75908AAE795B /* EnumArrays.swift in Sources */,
+				6A660FDFCD7C6F8B8622087B0A538CBD /* EnumClass.swift in Sources */,
+				FC06B7D50BFCE70D1A13B26D88084F02 /* EnumTest.swift in Sources */,
+				B1DA4D8BF7F12F162AAC8A6B31F20D01 /* Extensions.swift in Sources */,
+				7F3341BB95A2261046DFCEB79CE690BF /* FakeAPI.swift in Sources */,
+				743389633EBF4450FF0D08C40AE31AFA /* FakeClassnameTags123API.swift in Sources */,
+				7E1F799E544BFFA1095CE862D6716833 /* File.swift in Sources */,
+				2E728847ABC0CCA9AE13F02B14CF5493 /* FileSchemaTestClass.swift in Sources */,
+				A050BE11CA9F1C4158474FBAB7BF5C28 /* FormatTest.swift in Sources */,
+				BE48EC240CE65E350939EC61700194D5 /* HasOnlyReadOnly.swift in Sources */,
+				6DAC97988C9B146A100EF15D5B7D8A2A /* JSONEncodableEncoding.swift in Sources */,
+				7FB5CF2118BE24D55B3554C400732BBC /* JSONEncodingHelper.swift in Sources */,
+				91B097F77214E509BAB1A42837B61088 /* List.swift in Sources */,
+				F359656D869E357DCDCF5A3E15F014AD /* MapTest.swift in Sources */,
+				3FBA3F2CE4617D11704CA8E9DFEA9879 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
+				F6139A70665B785C707ADEE693C728A1 /* Model200Response.swift in Sources */,
+				1ED692095FC82315639BC2F65C5A6961 /* Models.swift in Sources */,
+				5EC3C041B207798AA15184D6772ECA08 /* Name.swift in Sources */,
+				45C42555A2D2FB43A4C233497E1D8BA9 /* NumberOnly.swift in Sources */,
+				6A7F2469317BE4339FF2FACF2FF99AE8 /* Order.swift in Sources */,
+				C42A137BFE76E0D792983F3D785D132A /* OuterComposite.swift in Sources */,
+				B06D77BF39326F4FE57C760C0041846F /* OuterEnum.swift in Sources */,
+				1B1F4B0E19F6F851E6C54CFB8FEC22B5 /* Pet.swift in Sources */,
+				745B6321970E5A6B54F13A3BD5641F28 /* PetAPI.swift in Sources */,
+				1B6F47211DD38D70756B5499A7FE08E4 /* PetstoreClient-dummy.m in Sources */,
+				0AF4F1BD8E12251095AE3B8858A2886E /* ReadOnlyFirst.swift in Sources */,
+				815B92D888D4669FB086E91692655D7B /* Return.swift in Sources */,
+				170EEA58B4F41BEAFB6429D116D3CE7A /* SpecialModelName.swift in Sources */,
+				5DE3D4CD20BAC4AA98D56D58CFA84E3C /* StoreAPI.swift in Sources */,
+				C809F0D5A36737F28B40C24EAF4DEB62 /* StringBooleanMap.swift in Sources */,
+				28DF98EA02994AD7AE8D5DB81C918AFD /* Tag.swift in Sources */,
+				548D415C3ECB026FB6EEC2CE33006E5F /* User.swift in Sources */,
+				3B404BDF5A8118770D87A3D5A3580C57 /* UserAPI.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1264,187 +1440,31 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		E3DBEE9ED166D1345896E1239D720A10 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				B9DB05413EA5FC6B4D44A72C47740929 /* AddRef.swift in Sources */,
-				3E5FB8280117F89928AADF001F8B5203 /* Amb.swift in Sources */,
-				C27CD8430D1BB415F819FE866F380962 /* AnonymousDisposable.swift in Sources */,
-				819E7EBD4F451762DB3989AC97F36113 /* AnonymousObserver.swift in Sources */,
-				84C79F2EAF64B4578B086C9907D53B79 /* AnyObserver.swift in Sources */,
-				7E393BC7E21AA50F18D9507A18EC0068 /* AsMaybe.swift in Sources */,
-				C7F4529BD9C239459D16BFA7ADE06A89 /* AsSingle.swift in Sources */,
-				D85A963F7346348480A14C59885EFAA9 /* AsyncLock.swift in Sources */,
-				83970D48183878762CCD1E07492E896C /* AsyncSubject.swift in Sources */,
-				102CF7BE65E8881472DAE6C869A69FFB /* Bag+Rx.swift in Sources */,
-				F64CA64592E9E53B2D3AA49560029CD5 /* Bag.swift in Sources */,
-				8608FEA8E591A67672BDC56A2CD87DD5 /* BehaviorSubject.swift in Sources */,
-				E7F43123D9A754E04B3A7278DCFB60C7 /* BinaryDisposable.swift in Sources */,
-				A8F1CEA456C73ADEDE65F500CDC8363A /* BooleanDisposable.swift in Sources */,
-				B806D1064402DAF164FCBEF90E79D84B /* Buffer.swift in Sources */,
-				2AE59EA62E0DF2A32C91098D2780A022 /* Cancelable.swift in Sources */,
-				8AC5952E36872ABE6634048006F73E21 /* Catch.swift in Sources */,
-				559202606F4577F8B281E90A6B77038E /* CombineLatest+arity.swift in Sources */,
-				750C3E103400C491B58CE253595190C3 /* CombineLatest+Collection.swift in Sources */,
-				E6FF0E4E4A084DEA3485F1EB3AB315D9 /* CombineLatest.swift in Sources */,
-				62318C169E2E0CCA1FDCF84FF8DA74B8 /* Completable+AndThen.swift in Sources */,
-				19515401C0D38AF488E20FCF871C697B /* Completable.swift in Sources */,
-				D5AE6E9D367EC6626808EB9A0D3025F3 /* CompositeDisposable.swift in Sources */,
-				5A170B711C2612A8F622C4F3BDE86DCC /* Concat.swift in Sources */,
-				7FC19A0A42D5A941FAC85D716FA4164F /* ConcurrentDispatchQueueScheduler.swift in Sources */,
-				4E5FDA1BE82472210C9C523A0C1DB7C4 /* ConcurrentMainScheduler.swift in Sources */,
-				9A89541810A7108D0C2F3390D83C1779 /* ConnectableObservableType.swift in Sources */,
-				2983844BF8D7FF1E56FBA8520CC899DA /* Create.swift in Sources */,
-				2CB165EE9C63D73D85CC3520DED27073 /* CurrentThreadScheduler.swift in Sources */,
-				EBFE64D14D62EE06912455760387B926 /* Debounce.swift in Sources */,
-				2ACBD1C0E5044C0C27D9FEC72BA4D169 /* Debug.swift in Sources */,
-				96A53E5FDFC3B8B16C733A6A2A5632AD /* DefaultIfEmpty.swift in Sources */,
-				B94F515AB5AE57EB799AC4D084E1CE26 /* Deferred.swift in Sources */,
-				5058AC85F2DB2F4FA15167325F02713E /* Delay.swift in Sources */,
-				E14F01F859236D557A9C571CB93E473B /* DelaySubscription.swift in Sources */,
-				FC37580ECD434F954F4EA89C18477B05 /* Dematerialize.swift in Sources */,
-				F894BEC46F1E9AACC71CB4ECB10F239E /* Deprecated.swift in Sources */,
-				5C59A1B60C2AE8404AD7857B16481AEB /* DispatchQueue+Extensions.swift in Sources */,
-				A0116BA9A30AAC96E99F1EAFC62AE5DF /* DispatchQueueConfiguration.swift in Sources */,
-				73FF155683AE9CD8396D19BB06E2A8D7 /* Disposable.swift in Sources */,
-				0F68BA9663BD8CC4AF99E6A2CDA0F6F1 /* Disposables.swift in Sources */,
-				1AC1D7BC79867EFC31D1373A1E89DC58 /* DisposeBag.swift in Sources */,
-				7310E38D47A859D4BF9B37F899E1E12A /* DisposeBase.swift in Sources */,
-				D94FE1464C101028B32A4FD34CFE7BA7 /* DistinctUntilChanged.swift in Sources */,
-				4339105DAF7A86F4E96FE61DF1460BAC /* Do.swift in Sources */,
-				CB9EA6F0A8FE83325A17171EEE5C5898 /* ElementAt.swift in Sources */,
-				521E82B5650538B3E88FFFA81339DBE3 /* Empty.swift in Sources */,
-				C1DE304D0A86256FCD7E47C68254F0E0 /* Enumerated.swift in Sources */,
-				A1C6CD39EE860825F742BE02C4B7848B /* Error.swift in Sources */,
-				15A98581467120DDEFA8FFEC32513F44 /* Errors.swift in Sources */,
-				74D0D51B724F3FB316A66EE6ADB6FC13 /* Event.swift in Sources */,
-				D9790D7ABE1D6BE95CF53AAC8534D596 /* Filter.swift in Sources */,
-				14888090A2E9E49FF94C483054546B2D /* First.swift in Sources */,
-				60605453AEB2DBB803CDECF1639A6723 /* Generate.swift in Sources */,
-				0721D774D0F763F753132FA7C49C45DC /* GroupBy.swift in Sources */,
-				5397DCCBB26C926C6A09ECBE4BF51F49 /* GroupedObservable.swift in Sources */,
-				948C82E8FA6B2DC477300612D0581FBB /* HistoricalScheduler.swift in Sources */,
-				2F1E994F3772F01E3610F5E186088E32 /* HistoricalSchedulerTimeConverter.swift in Sources */,
-				438BBF4B32B6CD24D27FAF48FE59A1B5 /* ImmediateSchedulerType.swift in Sources */,
-				B9AA8D13231A733A1FB5EC960E7DDF83 /* InfiniteSequence.swift in Sources */,
-				B318AAA2B87195FA8EC6AAB24962F8A6 /* InvocableScheduledItem.swift in Sources */,
-				3CA1570189D857764A9F5D0A58A331C9 /* InvocableType.swift in Sources */,
-				F363E4B6C3204C82906523AC903FECF8 /* Just.swift in Sources */,
-				D0D0AA23A747A22AAAA039AC721F45F6 /* Lock.swift in Sources */,
-				E205A712A33BBAEBC6F50A6920B8BF9E /* LockOwnerType.swift in Sources */,
-				92E7BFD9225D3FD3C5B361A63FE64A8B /* MainScheduler.swift in Sources */,
-				5CAA8581BEFB270CB196F8F1A0422721 /* Map.swift in Sources */,
-				D3E8F381E33F8BC1E4822469A0AA604A /* Materialize.swift in Sources */,
-				15AAEF2E9BFE39816B15393EE6BB3B8D /* Maybe.swift in Sources */,
-				DDFDE95E8C00BC953A3F457C60BBAFB0 /* Merge.swift in Sources */,
-				9901D2631F06C0B31732333EF456D9B5 /* Multicast.swift in Sources */,
-				C2592A96F83B169B73E97702CF748BF7 /* Never.swift in Sources */,
-				DA32E92CC1E9AFF53F9A8ED4B52082F6 /* NopDisposable.swift in Sources */,
-				EA857DEBCA9D6FB7CD5A75DC24B698CC /* Observable.swift in Sources */,
-				A29B6721D5A3E9A02E44DD5BA9629462 /* ObservableConvertibleType.swift in Sources */,
-				1FA22E5EBF4DF1D4A91D71061086CE60 /* ObservableType+Extensions.swift in Sources */,
-				A5F1A6EEF34196C111E8EA5DAE8A7B33 /* ObservableType+PrimitiveSequence.swift in Sources */,
-				6792CE9AB26A214E343417164DB02D7B /* ObservableType.swift in Sources */,
-				796562476BBE671FBD8DCEC20C2CE0D1 /* ObserveOn.swift in Sources */,
-				3512C8FF3FE0AA949AE38ACC0AB1CFE8 /* ObserverBase.swift in Sources */,
-				A3357DC269351DAB92D3D463D424BE4F /* ObserverType.swift in Sources */,
-				79F828F573BA3DB3E564AD5A1B78BAA9 /* OperationQueueScheduler.swift in Sources */,
-				86E553218B0471CC4413DEDADE49CB29 /* Optional.swift in Sources */,
-				1FE5800C304828B7940E511BF90CDE8A /* Platform.Darwin.swift in Sources */,
-				F31B1636EFF84C018D378C544B69A1B1 /* Platform.Linux.swift in Sources */,
-				6E1EA28E8B2EDDE6207F2EFDE5E823E9 /* PrimitiveSequence+Zip+arity.swift in Sources */,
-				1339FF3750A7FA24CA7C57BB8982BE3A /* PrimitiveSequence.swift in Sources */,
-				5D1256D0D639CA66C952B508232D0126 /* PriorityQueue.swift in Sources */,
-				430DC1A27F565B8EA3CF088AD93A94BD /* Producer.swift in Sources */,
-				D282218AF15C2E8A21136A7BDF30FAD5 /* PublishSubject.swift in Sources */,
-				77A551C9616B0C57A51BB9AF7DAD4938 /* Queue.swift in Sources */,
-				EAF84B1398CDC51DCB192025947E2CDC /* Range.swift in Sources */,
-				B34531A5B3B7DE054111634A9CFCECE7 /* Reactive.swift in Sources */,
-				972A98911DFBEF9FBD92F7863196DA2A /* RecursiveLock.swift in Sources */,
-				67A7736CAAFC0E38B4B95A5C7D95A7E7 /* RecursiveScheduler.swift in Sources */,
-				3CCBC419966A8DDCBD77543A392CEE4D /* Reduce.swift in Sources */,
-				249B91EAF9ABBFF6FB1D8A15330B18D0 /* RefCountDisposable.swift in Sources */,
-				B6B08C17232261A7C5344CCB19B3F6B3 /* Repeat.swift in Sources */,
-				36FB93DEFBE1013E88CCFFDA85191E89 /* ReplaySubject.swift in Sources */,
-				50A395AAD0986EFBA9C7F1F7500C32F5 /* RetryWhen.swift in Sources */,
-				E68DCA07E54D07263E2E13AA809D2023 /* Rx.swift in Sources */,
-				07FE6BB5C180A6B4B8388D9A56ED79EC /* RxMutableBox.swift in Sources */,
-				BCC034A610C630B3F73D3D4B04DCF858 /* RxSwift-dummy.m in Sources */,
-				F42B09E81B1DFCAD0C38D85360BE2AF0 /* Sample.swift in Sources */,
-				765734EF1BB6D03D914CAF073E6EA56D /* Scan.swift in Sources */,
-				E9773E7F41BE44A4BEFCF70983A6CFE6 /* ScheduledDisposable.swift in Sources */,
-				5F8C2989B73BEF455F1D5B54E98F5B20 /* ScheduledItem.swift in Sources */,
-				2E4EB995A5128A1781F53E53F1A766C9 /* ScheduledItemType.swift in Sources */,
-				A609714B6192F6F3C0A029A84FE28B2B /* SchedulerServices+Emulation.swift in Sources */,
-				7FD4625EC4BDE2E32BB1075824C8FC42 /* SchedulerType.swift in Sources */,
-				297FCDFDA07BDC84C9B4AD3C476B6F62 /* Sequence.swift in Sources */,
-				FB3D99146123236CAA6C80CAEC8267DB /* SerialDispatchQueueScheduler.swift in Sources */,
-				08B3F38A47C3345683F3CFFE0E887279 /* SerialDisposable.swift in Sources */,
-				552161139E36DBE53079012FFB7EE545 /* ShareReplayScope.swift in Sources */,
-				6FAEFB7A49AF44FD7BC8B19045F2B6D5 /* Single.swift in Sources */,
-				9DD21B22ECCEC0331AAA66925D7EA3A6 /* SingleAssignmentDisposable.swift in Sources */,
-				8E1A9CD890B273CC44127DFAC690D253 /* SingleAsync.swift in Sources */,
-				8D35AC516C6B00547C19A2ED3BAAA682 /* Sink.swift in Sources */,
-				A33317A6FE554B9BB1584E32D8E408DD /* Skip.swift in Sources */,
-				FD0897400B54FCFDE495273F58A17043 /* SkipUntil.swift in Sources */,
-				18B577D3222D3158AEE353FDBE9BA333 /* SkipWhile.swift in Sources */,
-				C009C8D6795AD30C3268CDF7DD0F3769 /* StartWith.swift in Sources */,
-				D96CB89457748E03A60BE778F1BD2811 /* String+Rx.swift in Sources */,
-				946051763C1CBC403668632BD0B7DB00 /* SubjectType.swift in Sources */,
-				0F735BA66AC3EB0A2460CBB8C181B7F8 /* SubscribeOn.swift in Sources */,
-				CA6F2A877BFDF83F228434CD39F8FFBE /* SubscriptionDisposable.swift in Sources */,
-				F1CCC4FBCB96CD9EFFFC9E4F614FF41B /* SwiftSupport.swift in Sources */,
-				C7CD9FD5A01A338D6D417B2C97D105F9 /* Switch.swift in Sources */,
-				1A8DB9ACF161DFEE505AFF28AC60162F /* SwitchIfEmpty.swift in Sources */,
-				379DBA65DA25BCDAA1819B0B9CE597A0 /* SynchronizedDisposeType.swift in Sources */,
-				5991B6FC359C9D799692A722AA85B16C /* SynchronizedOnType.swift in Sources */,
-				83F5151C46CEC3F09FDB0619E1FC274F /* SynchronizedUnsubscribeType.swift in Sources */,
-				8B310B56B5FB1B5C5458170D304F1E2C /* TailRecursiveSink.swift in Sources */,
-				2DE9F311F590A0F059C617EE97087ED5 /* Take.swift in Sources */,
-				D5727E52B7D172445EB237004BDD608C /* TakeLast.swift in Sources */,
-				61355136E313943D2D96A8E7619C9E3A /* TakeUntil.swift in Sources */,
-				D5C28E85E329AD61CC0594B9FA53A828 /* TakeWhile.swift in Sources */,
-				D345371D5463B2B04FEFC9BEF0D29DA2 /* Throttle.swift in Sources */,
-				6BE9D6CB3F8F50E6542DE7B26E953FE6 /* Timeout.swift in Sources */,
-				152D4BACCDCB7642AA71A18734BC6829 /* Timer.swift in Sources */,
-				5AD8EFFBE4DFB4F2D9F77368C2CBAB1B /* ToArray.swift in Sources */,
-				3E3315111C3DEFAAC76C1A4ECAE85852 /* Using.swift in Sources */,
-				DFF5A9AAE4DD6E616FB1B8E331050A9B /* VirtualTimeConverterType.swift in Sources */,
-				CC3747E4861205050BF1AE883A1DC35C /* VirtualTimeScheduler.swift in Sources */,
-				847FC6EB6B293CD065F790499DDAB3FF /* Window.swift in Sources */,
-				F2DA91AD3765D4389F012AC7DB2C74F3 /* WithLatestFrom.swift in Sources */,
-				CCD2FCAE7573C15F8181C2F344989524 /* Zip+arity.swift in Sources */,
-				7C07E1C8D4192CF1F9FDF7136D62A631 /* Zip+Collection.swift in Sources */,
-				A7DCD78BDF799B85D72906C4C6469932 /* Zip.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		0629B05459E45CEF6470D046D99632D6 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = RxSwift;
+			target = 0A6465AB09B51FAB877E30050A6766DC /* RxSwift */;
+			targetProxy = AA2CE5FED79751232AE3399B1C92EAAF /* PBXContainerItemProxy */;
+		};
 		4DAA97CFDA7F8099D3A7AFC561A555B9 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = RxSwift;
-			target = 9741823C73C54208699F008BEC051C81 /* RxSwift */;
+			target = 0A6465AB09B51FAB877E30050A6766DC /* RxSwift */;
 			targetProxy = A50F0C9B9BA00FA72637B7EE5F05D32C /* PBXContainerItemProxy */;
 		};
-		60D6EE9E319978C36C7A787D65F59D7D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = RxSwift;
-			target = 9741823C73C54208699F008BEC051C81 /* RxSwift */;
-			targetProxy = AAE7A7F70E39A535DADF325A23F37A47 /* PBXContainerItemProxy */;
-		};
-		726C82AF86FDDE866EAFC6C5F988015B /* PBXTargetDependency */ = {
+		7D8548558CCCCC6CC421AAD0C492CB90 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = Alamofire;
 			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
-			targetProxy = E90B33A5936DFD411E882325EB4C8ABB /* PBXContainerItemProxy */;
+			targetProxy = 7F731371D496E7DADCF6E51F404CA3FB /* PBXContainerItemProxy */;
 		};
 		9188E15F2308611275AADD534748A210 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PetstoreClient;
-			target = E62F1FC39CD3E50528A1FD615087B79E /* PetstoreClient */;
+			target = BC247F0137DAAFC66C8186BFF14D52BD /* PetstoreClient */;
 			targetProxy = 2B4A36E763D78D2BA39A638AF167D81A /* PBXContainerItemProxy */;
 		};
 		AF4FFAE64524D9270D895911B9A3ABB3 /* PBXTargetDependency */ = {
@@ -1453,12 +1473,51 @@
 			target = 88E9EC28B8B46C3631E6B242B50F4442 /* Alamofire */;
 			targetProxy = 0B2AA791B256C6F1530511EEF7AB4A24 /* PBXContainerItemProxy */;
 		};
+		CAD6237EE98BEB14DA0AE88C1F89DF12 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "Pods-SwaggerClient";
+			target = 136F0A318F13DF38351AC0F2E6934563 /* Pods-SwaggerClient */;
+			targetProxy = 39BC36C8D9E651B0E90400DB5CB4450E /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		1293933F34B549A5BB888828B327A928 /* Debug */ = {
+		05035E7F5C7702F2E8A5574F3C2B0B0C /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = CAAE1FE3D4078631A67B5F065A94F367 /* PetstoreClient.xcconfig */;
+			baseConfigurationReference = F918D1A343F79C67A66D6F1E88AB8654 /* RxSwift.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/RxSwift/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap";
+				PRODUCT_MODULE_NAME = RxSwift;
+				PRODUCT_NAME = RxSwift;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		15A0BDBFBF81E32935E6D80E2ADE275A /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -1475,10 +1534,44 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				PRODUCT_MODULE_NAME = PetstoreClient;
 				PRODUCT_NAME = PetstoreClient;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		7B0415700290D1DEBAB6B173951CC0C7 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = A03BC8805CBE2C065F120EE33E91CD9B /* Alamofire.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				PRODUCT_MODULE_NAME = Alamofire;
+				PRODUCT_NAME = Alamofire;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1487,7 +1580,7 @@
 			};
 			name = Debug;
 		};
-		33DA7F43A1D2FA3C74A8C8FC246E1FA6 /* Debug */ = {
+		8B33C5230DE4A9DFA6D8F46505DD7AF7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -1497,10 +1590,12 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -1508,6 +1603,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1516,6 +1612,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
 				CODE_SIGNING_REQUIRED = NO;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1540,16 +1637,15 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
 				STRIP_INSTALLED_PRODUCT = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SYMROOT = "${SRCROOT}/../build";
 			};
 			name = Debug;
 		};
-		4B5858DCCA6A5C5C186A155AAC87EC5D /* Release */ = {
+		8D22F88484E8074A5C3CB6DA2599B29E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = CAAE1FE3D4078631A67B5F065A94F367 /* PetstoreClient.xcconfig */;
+			baseConfigurationReference = B4C5C74CD00CFB8204601915777CDAD8 /* PetstoreClient.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -1566,55 +1662,22 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "Target Support Files/PetstoreClient/PetstoreClient.modulemap";
+				PRODUCT_MODULE_NAME = PetstoreClient;
 				PRODUCT_NAME = PetstoreClient;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
-			name = Release;
+			name = Debug;
 		};
-		670C6E4AABA91DE7735961069ACA47F0 /* Release */ = {
+		95DBEF0AB0B74932A7CEF4BB6099470D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 849FECBC6CC67F2B6800F982927E3A9E /* Pods-SwaggerClientTests.release.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		6CD2CF3CB56F8D2390B8CD744515AD17 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0D51C075771C5C7E71A671D0D03ADAA0 /* Alamofire.xcconfig */;
+			baseConfigurationReference = A03BC8805CBE2C065F120EE33E91CD9B /* Alamofire.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -1631,6 +1694,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
+				PRODUCT_MODULE_NAME = Alamofire;
 				PRODUCT_NAME = Alamofire;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -1644,7 +1708,42 @@
 			};
 			name = Release;
 		};
-		731DC216E1A58545B559F6E0A2418060 /* Release */ = {
+		9CB6E56449BA9778D01D3C3BFE8CAE66 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = AE8315D9D127E9BAC2C7256DB40D1D6D /* Pods-SwaggerClient.debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		B42B54097A876E8A982CBF5DAA91B1AB /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -1654,10 +1753,12 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -1665,6 +1766,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1673,6 +1775,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGNING_ALLOWED = NO;
 				CODE_SIGNING_REQUIRED = NO;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -1693,112 +1796,16 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
 				STRIP_INSTALLED_PRODUCT = NO;
 				SYMROOT = "${SRCROOT}/../build";
 			};
 			name = Release;
 		};
-		7DB423C96E88F961D3E1333A94639EB9 /* Debug */ = {
+		CC5DA2C28823D1375B8C9F952A34D890 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 549C6527D10094289B101749047807C5 /* Pods-SwaggerClient.debug.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClient/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.modulemap";
-				OTHER_LDFLAGS = "";
-				OTHER_LIBTOOLFLAGS = "";
-				PODS_ROOT = "$(SRCROOT)";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		972BD31D68F98035DE59A64D32AC1F3A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0D51C075771C5C7E71A671D0D03ADAA0 /* Alamofire.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/Alamofire/Alamofire-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/Alamofire/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/Alamofire/Alamofire.modulemap";
-				PRODUCT_NAME = Alamofire;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		A9DE667EDC4521C5C985414439FEC9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 57468AE7B3F6AC14DB702CEAF8BDF453 /* RxSwift.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/RxSwift/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap";
-				PRODUCT_NAME = RxSwift;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		B57B93511F49DD621E2E7769554A19D3 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 969C2AF48F4307163B301A92E78AFCF2 /* Pods-SwaggerClientTests.debug.xcconfig */;
+			baseConfigurationReference = FDBB687EF1CAF131DB3DDD99AAE54AB6 /* Pods-SwaggerClientTests.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -1818,51 +1825,21 @@
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClientTests;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		D267F10A2760D50C04E6142D7293E66A /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 57468AE7B3F6AC14DB702CEAF8BDF453 /* RxSwift.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch";
-				INFOPLIST_FILE = "Target Support Files/RxSwift/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap";
-				PRODUCT_NAME = RxSwift;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
 			name = Release;
 		};
-		EF0EBAD566CC2A7FFF56FA2F839415E2 /* Release */ = {
+		E5785A99739859A758898045BE7A3251 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 86B1DDCB9E27DF43C2C35D9E7B2E84DA /* Pods-SwaggerClient.release.xcconfig */;
+			baseConfigurationReference = F388A1ADD212030D9542E86628F22BD6 /* Pods-SwaggerClient.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -1882,7 +1859,7 @@
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
-				PRODUCT_NAME = Pods_SwaggerClient;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -1893,23 +1870,79 @@
 			};
 			name = Release;
 		};
+		FA64C1BCF9BDC96B6BEB97C85A7ABFB2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F918D1A343F79C67A66D6F1E88AB8654 /* RxSwift.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREFIX_HEADER = "Target Support Files/RxSwift/RxSwift-prefix.pch";
+				INFOPLIST_FILE = "Target Support Files/RxSwift/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap";
+				PRODUCT_MODULE_NAME = RxSwift;
+				PRODUCT_NAME = RxSwift;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		FCD594EE5728AEE3FEE8A282C27BA825 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1ACCB3378E1513AEAADC85C4036257E4 /* Pods-SwaggerClientTests.debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				INFOPLIST_FILE = "Target Support Files/Pods-SwaggerClientTests/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MACH_O_TYPE = staticlib;
+				MODULEMAP_FILE = "Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.modulemap";
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
+				PODS_ROOT = "$(SRCROOT)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		243111D6704C9CF1B02BA1490CD261C3 /* Build configuration list for PBXNativeTarget "RxSwift" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				A9DE667EDC4521C5C985414439FEC9CD /* Debug */,
-				D267F10A2760D50C04E6142D7293E66A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				33DA7F43A1D2FA3C74A8C8FC246E1FA6 /* Debug */,
-				731DC216E1A58545B559F6E0A2418060 /* Release */,
+				8B33C5230DE4A9DFA6D8F46505DD7AF7 /* Debug */,
+				B42B54097A876E8A982CBF5DAA91B1AB /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1917,26 +1950,35 @@
 		419E5D95491847CD79841B971A8A3277 /* Build configuration list for PBXNativeTarget "Alamofire" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				972BD31D68F98035DE59A64D32AC1F3A /* Debug */,
-				6CD2CF3CB56F8D2390B8CD744515AD17 /* Release */,
+				7B0415700290D1DEBAB6B173951CC0C7 /* Debug */,
+				95DBEF0AB0B74932A7CEF4BB6099470D /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		B462F7329881FF6565EF44016BE2B959 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
+		42E07A8C43753B5C46F3A6473B0CA34F /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				B57B93511F49DD621E2E7769554A19D3 /* Debug */,
-				670C6E4AABA91DE7735961069ACA47F0 /* Release */,
+				8D22F88484E8074A5C3CB6DA2599B29E /* Debug */,
+				15A0BDBFBF81E32935E6D80E2ADE275A /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		BF8513C7E662BCA5040298D897E576C6 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+		6038DB15B6014EE0617ADC32733FC361 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClientTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				1293933F34B549A5BB888828B327A928 /* Debug */,
-				4B5858DCCA6A5C5C186A155AAC87EC5D /* Release */,
+				FCD594EE5728AEE3FEE8A282C27BA825 /* Debug */,
+				CC5DA2C28823D1375B8C9F952A34D890 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		740E48F5390F3BE99AC637B4CCBF2AE6 /* Build configuration list for PBXNativeTarget "RxSwift" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FA64C1BCF9BDC96B6BEB97C85A7ABFB2 /* Debug */,
+				05035E7F5C7702F2E8A5574F3C2B0B0C /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -1944,8 +1986,8 @@
 		F74B56615E0AC0F998019998CF3D73B7 /* Build configuration list for PBXNativeTarget "Pods-SwaggerClient" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				7DB423C96E88F961D3E1333A94639EB9 /* Debug */,
-				EF0EBAD566CC2A7FFF56FA2F839415E2 /* Release */,
+				9CB6E56449BA9778D01D3C3BFE8CAE66 /* Debug */,
+				E5785A99739859A758898045BE7A3251 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig
index 619e5f4acef..6b8baab300a 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.xcconfig	
@@ -1,9 +1,8 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Alamofire
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Alamofire
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/Alamofire
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig
index 0b6473e99b9..97e02319e76 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.xcconfig	
@@ -1,10 +1,9 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/PetstoreClient
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/RxSwift"
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh
index def160388eb..c1c9203b646 100755
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh	
@@ -1,15 +1,28 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+# Used as a return value for each invocation of `strip_invalid_archs` function.
+STRIP_BINARY_RETVAL=0
+
 # This protects against multiple targets copying the same framework dependency at the same time. The solution
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
+# Copies and strips a vendored framework
 install_framework()
 {
   if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -58,21 +71,40 @@ install_framework()
   fi
 }
 
-# Copies the dSYM of a vendored framework
+# Copies and strips a vendored dSYM
 install_dsym() {
   local source="$1"
   if [ -r "$source" ]; then
-    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\""
-    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
+    # Copy the dSYM into a the targets temp dir.
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
+
+    local basename
+    basename="$(basename -s .framework.dSYM "$source")"
+    binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+    # Strip invalid architectures so "fat" simulator / device frameworks work on device
+    if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+      strip_invalid_archs "$binary"
+    fi
+
+    if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
+      # Move the stripped file into its final destination.
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+    else
+      # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
+    fi
   fi
 }
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
@@ -85,10 +117,18 @@ code_sign_if_enabled() {
 # Strip invalid architectures
 strip_invalid_archs() {
   binary="$1"
-  # Get architectures for current file
-  archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+  # Get architectures for current target binary
+  binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+  # Intersect them with the architectures we are building for
+  intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
+  # If there are no archs supported by this binary then warn the user
+  if [[ -z "$intersected_archs" ]]; then
+    echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+    STRIP_BINARY_RETVAL=0
+    return
+  fi
   stripped=""
-  for arch in $archs; do
+  for arch in $binary_archs; do
     if ! [[ "${ARCHS}" == *"$arch"* ]]; then
       # Strip non-valid architectures in-place
       lipo -remove "$arch" -output "$binary" "$binary" || exit 1
@@ -98,6 +138,7 @@ strip_invalid_archs() {
   if [[ "$stripped" ]]; then
     echo "Stripped $binary of architectures:$stripped"
   fi
+  STRIP_BINARY_RETVAL=1
 }
 
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig
index b86868ff727..e9c582e16a6 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.debug.xcconfig	
@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/RxSwift"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/RxSwift/RxSwift.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift/RxSwift.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "PetstoreClient" -framework "RxSwift"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig
index b86868ff727..e9c582e16a6 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient.release.xcconfig	
@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/RxSwift"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/RxSwift/RxSwift.framework/Headers"
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift/RxSwift.framework/Headers"
 OTHER_LDFLAGS = $(inherited) -framework "Alamofire" -framework "PetstoreClient" -framework "RxSwift"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh
index 88dd5379907..08e3eaaca45 100755
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh	
@@ -1,15 +1,28 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # frameworks to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+# Used as a return value for each invocation of `strip_invalid_archs` function.
+STRIP_BINARY_RETVAL=0
+
 # This protects against multiple targets copying the same framework dependency at the same time. The solution
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
+# Copies and strips a vendored framework
 install_framework()
 {
   if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -58,21 +71,40 @@ install_framework()
   fi
 }
 
-# Copies the dSYM of a vendored framework
+# Copies and strips a vendored dSYM
 install_dsym() {
   local source="$1"
   if [ -r "$source" ]; then
-    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\""
-    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
+    # Copy the dSYM into a the targets temp dir.
+    echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
+    rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
+
+    local basename
+    basename="$(basename -s .framework.dSYM "$source")"
+    binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+    # Strip invalid architectures so "fat" simulator / device frameworks work on device
+    if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+      strip_invalid_archs "$binary"
+    fi
+
+    if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
+      # Move the stripped file into its final destination.
+      echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
+      rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+    else
+      # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
+    fi
   fi
 }
 
 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
     # Use the current code_sign_identitiy
     echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
     if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
       code_sign_cmd="$code_sign_cmd &"
@@ -85,10 +117,18 @@ code_sign_if_enabled() {
 # Strip invalid architectures
 strip_invalid_archs() {
   binary="$1"
-  # Get architectures for current file
-  archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+  # Get architectures for current target binary
+  binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+  # Intersect them with the architectures we are building for
+  intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
+  # If there are no archs supported by this binary then warn the user
+  if [[ -z "$intersected_archs" ]]; then
+    echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+    STRIP_BINARY_RETVAL=0
+    return
+  fi
   stripped=""
-  for arch in $archs; do
+  for arch in $binary_archs; do
     if ! [[ "${ARCHS}" == *"$arch"* ]]; then
       # Strip non-valid architectures in-place
       lipo -remove "$arch" -output "$binary" "$binary" || exit 1
@@ -98,6 +138,7 @@ strip_invalid_archs() {
   if [[ "$stripped" ]]; then
     echo "Stripped $binary of architectures:$stripped"
   fi
+  STRIP_BINARY_RETVAL=1
 }
 
 if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh
index a7df4405b65..345301f2c5c 100755
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh	
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -12,7 +20,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@@ -102,5 +110,9 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  else
+    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
+  fi
 fi
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig
index 740c74ce0dc..7629eed9e69 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.debug.xcconfig	
@@ -1,8 +1,8 @@
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/RxSwift"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/RxSwift/RxSwift.framework/Headers"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift/RxSwift.framework/Headers"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig
index 740c74ce0dc..7629eed9e69 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests.release.xcconfig	
@@ -1,8 +1,8 @@
-FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Alamofire" "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient" "$PODS_CONFIGURATION_BUILD_DIR/RxSwift"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/Alamofire/Alamofire.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/PetstoreClient/PetstoreClient.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/RxSwift/RxSwift.framework/Headers"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/PetstoreClient/PetstoreClient.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift/RxSwift.framework/Headers"
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/RxSwift.xcconfig b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/RxSwift.xcconfig
index 8b032eddccb..b6cce651c27 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/RxSwift.xcconfig	
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Target Support Files/RxSwift/RxSwift.xcconfig	
@@ -1,9 +1,8 @@
-CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/RxSwift
+CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/RxSwift
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
 OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
-PODS_BUILD_DIR = $BUILD_DIR
-PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_BUILD_DIR = ${BUILD_DIR}
+PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/RxSwift
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
index 6f2f338f55c..c3c31a0d6f8 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj
@@ -149,7 +149,6 @@
 				EAEC0BBB1D4E30CE00C908A3 /* Frameworks */,
 				EAEC0BBC1D4E30CE00C908A3 /* Resources */,
 				8A7961360961F06AADAF17C9 /* [CP] Embed Pods Frameworks */,
-				E008DDC7FA2126F111F972F5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -168,8 +167,6 @@
 				EAEC0BCE1D4E30CE00C908A3 /* Sources */,
 				EAEC0BCF1D4E30CE00C908A3 /* Frameworks */,
 				EAEC0BD01D4E30CE00C908A3 /* Resources */,
-				3920D9C143B997879E5A5B9C /* [CP] Embed Pods Frameworks */,
-				60E7B02FBDEB028CCE7CCCC5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -242,36 +239,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3920D9C143B997879E5A5B9C /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		60E7B02FBDEB028CCE7CCCC5 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClientTests/Pods-SwaggerClientTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		82CB35D52E274C6177DAC0DD /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -330,21 +297,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E008DDC7FA2126F111F972F5 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 00000000000..18d981003d6
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
index eaabe70dcfb..af0c653d2b7 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
@@ -32,7 +32,7 @@ class PetAPITests: XCTestCase {
         let tags = [Tag(_id: 1234, name: "New York"), Tag(_id: 124321, name: "Jose")]
         let newPet = Pet(_id: 1000, category: category, name: "Fluffy", photoUrls: ["https://petstore.com/sample/photo1.jpg", "https://petstore.com/sample/photo2.jpg"], tags: tags, status: .available)
 
-        PetAPI.addPet(body: newPet).subscribe(onNext: {
+        PetAPI.addPet(pet: newPet).subscribe(onNext: {
             expectation.fulfill()
             }, onError: { errorType in
                 XCTFail("error creating pet")
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
index 81497f5e0b9..7558e6f069a 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
@@ -23,7 +23,7 @@ class StoreAPITests: XCTestCase {
         let shipDate = Date()
         let order = Order(_id: 1000, petId: 1000, quantity: 10, shipDate: shipDate, status: .placed, complete: true)
         let expectation = self.expectation(description: "testPlaceOrder")
-        StoreAPI.placeOrder(body: order).subscribe(onNext: { order in
+        StoreAPI.placeOrder(order: order).subscribe(onNext: { order in
             XCTAssert(order._id == 1000, "invalid id")
             XCTAssert(order.quantity == 10, "invalid quantity")
             XCTAssert(order.status == .placed, "invalid status")
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
index d18372e27be..bb5e0b26e95 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
@@ -68,7 +68,7 @@ class UserAPITests: XCTestCase {
     func test1CreateUser() {
         let expectation = self.expectation(description: "testCreateUser")
         let newUser = User(_id: 1000, username: "test@test.com", firstName: "Test", lastName: "Tester", email: "test@test.com", password: "test!", phone: "867-5309", userStatus: 0)
-        UserAPI.createUser(body: newUser).subscribe(onNext: {
+        UserAPI.createUser(user: newUser).subscribe(onNext: {
             expectation.fulfill()
             }, onError: { errorType in
                 // The server gives us no data back so alamofire parsing fails - at least
diff --git a/samples/client/petstore/swift4/unwrapRequired/.openapi-generator/VERSION b/samples/client/petstore/swift4/unwrapRequired/.openapi-generator/VERSION
index ad121e8340e..4395ff59232 100644
--- a/samples/client/petstore/swift4/unwrapRequired/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift4/unwrapRequired/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.1-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index f8313034a66..a31864437b1 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -17,8 +17,8 @@ open class AnotherFakeAPI {
      - parameter client: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
-        testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
+    open class func call123testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+        call123testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
@@ -27,11 +27,11 @@ open class AnotherFakeAPI {
     /**
      To test special tags
      - PATCH /another-fake/dummy
-     - To test special tags
+     - To test special tags and operation ID starting with number
      - parameter client: (body) client model 
      - returns: RequestBuilder<Client> 
      */
-    open class func testSpecialTagsWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
+    open class func call123testSpecialTagsWithRequestBuilder(client: Client) -> RequestBuilder<Client> {
         let path = "/another-fake/dummy"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: client)
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index d22ed47557e..00f689db519 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -131,6 +131,40 @@ open class FakeAPI {
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
     }
 
+    /**
+
+     - parameter fileSchemaTestClass: (body)  
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testBodyWithFileSchema(fileSchemaTestClass: FileSchemaTestClass, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+        testBodyWithFileSchemaWithRequestBuilder(fileSchemaTestClass: fileSchemaTestClass).execute { (response, error) -> Void in
+            if error == nil {
+                completion((), error)
+            } else {
+                completion(nil, error)
+            }
+        }
+    }
+
+
+    /**
+     - PUT /fake/body-with-file-schema
+     - For this test, the body for this request much reference a schema named `File`.
+     - parameter fileSchemaTestClass: (body)  
+     - returns: RequestBuilder<Void> 
+     */
+    open class func testBodyWithFileSchemaWithRequestBuilder(fileSchemaTestClass: FileSchemaTestClass) -> RequestBuilder<Void> {
+        let path = "/fake/body-with-file-schema"
+        let URLString = PetstoreClientAPI.basePath + path
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: fileSchemaTestClass)
+
+        let url = URLComponents(string: URLString)
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
+
+        return requestBuilder.init(method: "PUT", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
+    }
+
     /**
 
      - parameter query: (query)  
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index c525e66cce5..266ac7c402b 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -355,4 +355,51 @@ open class PetAPI {
         return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
 
+    /**
+     uploads an image (required)
+     
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+        uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute { (response, error) -> Void in
+            completion(response?.body, error)
+        }
+    }
+
+
+    /**
+     uploads an image (required)
+     - POST /fake/{petId}/uploadImageWithRequiredFile
+     - OAuth:
+       - type: oauth2
+       - name: petstore_auth
+     - parameter petId: (path) ID of pet to update 
+     - parameter requiredFile: (form) file to upload 
+     - parameter additionalMetadata: (form) Additional data to pass to server (optional)
+     - returns: RequestBuilder<ApiResponse> 
+     */
+    open class func uploadFileWithRequiredFileWithRequestBuilder(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> RequestBuilder<ApiResponse> {
+        var path = "/fake/{petId}/uploadImageWithRequiredFile"
+        let petIdPreEscape = "\(petId)"
+        let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
+        path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
+        let URLString = PetstoreClientAPI.basePath + path
+        let formParams: [String:Any?] = [
+            "additionalMetadata": additionalMetadata,
+            "requiredFile": requiredFile
+        ]
+
+        let nonNullParameters = APIHelper.rejectNil(formParams)
+        let parameters = APIHelper.convertBoolToString(nonNullParameters)
+        
+        let url = URLComponents(string: URLString)
+
+        let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "POST", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
 }
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/File.swift
new file mode 100644
index 00000000000..c8bd1f19589
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -0,0 +1,24 @@
+//
+// File.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** Must be named &#x60;File&#x60; for test. */
+
+public struct File: Codable {
+
+    /** Test capitalization */
+    public var sourceURI: String?
+
+    public init(sourceURI: String?) {
+        self.sourceURI = sourceURI
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
new file mode 100644
index 00000000000..64d02506802
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -0,0 +1,24 @@
+//
+// FileSchemaTestClass.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+
+public struct FileSchemaTestClass: Codable {
+
+    public var file: File?
+    public var files: [File]?
+
+    public init(file: File?, files: [File]?) {
+        self.file = file
+        self.files = files
+    }
+
+
+}
+
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index dfbbee8428e..2d3a45d35a0 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -17,15 +17,21 @@ public struct MapTest: Codable {
     }
     public var mapMapOfString: [String:[String:String]]?
     public var mapOfEnumString: [String:String]?
+    public var directMap: [String:Bool]?
+    public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?) {
+    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
+        self.directMap = directMap
+        self.indirectMap = indirectMap
     }
 
     public enum CodingKeys: String, CodingKey { 
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
+        case directMap = "direct_map"
+        case indirectMap = "indirect_map"
     }
 
 
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
new file mode 100644
index 00000000000..ae15e87d94b
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -0,0 +1,51 @@
+//
+// StringBooleanMap.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+
+public struct StringBooleanMap: Codable {
+
+
+    public var additionalProperties: [String:Bool] = [:]
+
+    public subscript(key: String) -> Bool? {
+        get {
+            if let value = additionalProperties[key] {
+                return value
+            }
+            return nil
+        }
+
+        set {
+            additionalProperties[key] = newValue
+        }
+    }
+
+    // Encodable protocol methods
+
+    public func encode(to encoder: Encoder) throws {
+
+        var container = encoder.container(keyedBy: String.self)
+
+        try container.encodeMap(additionalProperties)
+    }
+
+    // Decodable protocol methods
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: String.self)
+
+        var nonAdditionalPropertyKeys = Set<String>()
+        additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
+    }
+
+
+
+}
+
diff --git a/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/default/README.md b/samples/client/petstore/typescript-angular-v2/default/README.md
index 596c10f3937..ae7f5c307e4 100644
--- a/samples/client/petstore/typescript-angular-v2/default/README.md
+++ b/samples/client/petstore/typescript-angular-v2/default/README.md
@@ -10,7 +10,7 @@ npm run build
 
 ### publishing
 
-First build the package than run ```npm publish```
+First build the package then run ```npm publish```
 
 ### consuming
 
@@ -171,4 +171,4 @@ import { environment } from '../environments/environment';
   bootstrap: [ AppComponent ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```  
diff --git a/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/npm/README.md b/samples/client/petstore/typescript-angular-v2/npm/README.md
index 8c00e066833..0239b2b8e0b 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/README.md
+++ b/samples/client/petstore/typescript-angular-v2/npm/README.md
@@ -10,7 +10,7 @@ npm run build
 
 ### publishing
 
-First build the package than run ```npm publish```
+First build the package then run ```npm publish```
 
 ### consuming
 
@@ -171,4 +171,4 @@ import { environment } from '../environments/environment';
   bootstrap: [ AppComponent ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```  
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/README.md b/samples/client/petstore/typescript-angular-v2/with-interfaces/README.md
index 596c10f3937..ae7f5c307e4 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/README.md
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/README.md
@@ -10,7 +10,7 @@ npm run build
 
 ### publishing
 
-First build the package than run ```npm publish```
+First build the package then run ```npm publish```
 
 ### consuming
 
@@ -171,4 +171,4 @@ import { environment } from '../environments/environment';
   bootstrap: [ AppComponent ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```  
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/README.md b/samples/client/petstore/typescript-angular-v4.3/npm/README.md
index b504a6395b0..64246348157 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/README.md
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/README.md
@@ -10,7 +10,7 @@ npm run build
 
 ### publishing
 
-First build the package than run ```npm publish dist``` (don't forget to specify the `dist` folder!)
+First build the package then run ```npm publish dist``` (don't forget to specify the `dist` folder!)
 
 ### consuming
 
@@ -175,4 +175,4 @@ import { environment } from '../environments/environment';
   bootstrap: [ AppComponent ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```  
diff --git a/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v4/npm/README.md b/samples/client/petstore/typescript-angular-v4/npm/README.md
index f1a1a349de7..867df4b48fb 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/README.md
+++ b/samples/client/petstore/typescript-angular-v4/npm/README.md
@@ -10,7 +10,7 @@ npm run build
 
 ### publishing
 
-First build the package than run ```npm publish dist``` (don't forget to specify the `dist` folder!)
+First build the package then run ```npm publish dist``` (don't forget to specify the `dist` folder!)
 
 ### consuming
 
@@ -171,4 +171,4 @@ import { environment } from '../environments/environment';
   bootstrap: [ AppComponent ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```  
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md
index 533ff05c0d4..b6c812a56ef 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md
@@ -10,7 +10,7 @@ npm run build
 
 ### publishing
 
-First build the package than run ```npm publish```
+First build the package then run ```npm publish```
 
 ### consuming
 
@@ -175,4 +175,4 @@ import { environment } from '../environments/environment';
   bootstrap: [ AppComponent ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```  
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md
index 6f80c2cdc80..a1d8a9592d8 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md
@@ -10,7 +10,7 @@ npm run build
 
 ### publishing
 
-First build the package than run ```npm publish dist``` (don't forget to specify the `dist` folder!)
+First build the package then run ```npm publish dist``` (don't forget to specify the `dist` folder!)
 
 ### consuming
 
@@ -175,4 +175,4 @@ import { environment } from '../environments/environment';
   bootstrap: [ AppComponent ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```  
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md
index 533ff05c0d4..b6c812a56ef 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md
@@ -10,7 +10,7 @@ npm run build
 
 ### publishing
 
-First build the package than run ```npm publish```
+First build the package then run ```npm publish```
 
 ### consuming
 
@@ -175,4 +175,4 @@ import { environment } from '../environments/environment';
   bootstrap: [ AppComponent ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```  
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md
index 6f80c2cdc80..a1d8a9592d8 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md
@@ -10,7 +10,7 @@ npm run build
 
 ### publishing
 
-First build the package than run ```npm publish dist``` (don't forget to specify the `dist` folder!)
+First build the package then run ```npm publish dist``` (don't forget to specify the `dist` folder!)
 
 ### consuming
 
@@ -175,4 +175,4 @@ import { environment } from '../environments/environment';
   bootstrap: [ AppComponent ]
 })
 export class AppModule { }
-```  
\ No newline at end of file
+```  
diff --git a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/default/api.ts b/samples/client/petstore/typescript-fetch/builds/default/api.ts
index d3a2eaade1d..4cff8a4087c 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/api.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/api.ts
@@ -341,7 +341,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -384,7 +388,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -425,7 +433,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet/findByStatus`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -466,7 +478,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet/findByTags`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -508,7 +524,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -544,7 +564,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'PUT' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'PUT' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -588,7 +612,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
             const localVarFormParams = new url.URLSearchParams();
@@ -640,7 +668,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}/uploadImage`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
             const localVarFormParams = new url.URLSearchParams();
@@ -1069,7 +1101,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             const localVarPath = `/store/order/{orderId}`
                 .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1092,7 +1128,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
         getInventory(options: any = {}): FetchArgs {
             const localVarPath = `/store/inventory`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1129,7 +1169,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             const localVarPath = `/store/order/{orderId}`
                 .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1157,7 +1201,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             }
             const localVarPath = `/store/order`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1386,7 +1434,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1418,7 +1470,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/createWithArray`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1450,7 +1506,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/createWithList`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1483,7 +1543,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1512,7 +1576,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1545,7 +1613,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/login`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1576,7 +1648,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
         logoutUser(options: any = {}): FetchArgs {
             const localVarPath = `/user/logout`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1610,7 +1686,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'PUT' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'PUT' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
diff --git a/samples/client/petstore/typescript-fetch/builds/default/configuration.ts b/samples/client/petstore/typescript-fetch/builds/default/configuration.ts
index a8e26313010..79bc07fb8ff 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/configuration.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/configuration.ts
@@ -18,6 +18,7 @@ export interface ConfigurationParameters {
     password?: string;
     accessToken?: string | ((name: string, scopes?: string[]) => string);
     basePath?: string;
+    baseOptions?: any;
 }
 
 export class Configuration {
@@ -55,6 +56,13 @@ export class Configuration {
      * @memberof Configuration
      */
     basePath?: string;
+    /**
+     * base options for fetch calls
+     *
+     * @type {any}
+     * @memberof Configuration
+     */
+    baseOptions?: any;
 
     constructor(param: ConfigurationParameters = {}) {
         this.apiKey = param.apiKey;
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
index d3a2eaade1d..4cff8a4087c 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
@@ -341,7 +341,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -384,7 +388,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -425,7 +433,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet/findByStatus`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -466,7 +478,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet/findByTags`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -508,7 +524,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -544,7 +564,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'PUT' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'PUT' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -588,7 +612,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
             const localVarFormParams = new url.URLSearchParams();
@@ -640,7 +668,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}/uploadImage`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
             const localVarFormParams = new url.URLSearchParams();
@@ -1069,7 +1101,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             const localVarPath = `/store/order/{orderId}`
                 .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1092,7 +1128,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
         getInventory(options: any = {}): FetchArgs {
             const localVarPath = `/store/inventory`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1129,7 +1169,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             const localVarPath = `/store/order/{orderId}`
                 .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1157,7 +1201,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             }
             const localVarPath = `/store/order`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1386,7 +1434,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1418,7 +1470,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/createWithArray`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1450,7 +1506,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/createWithList`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1483,7 +1543,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1512,7 +1576,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1545,7 +1613,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/login`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1576,7 +1648,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
         logoutUser(options: any = {}): FetchArgs {
             const localVarPath = `/user/logout`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1610,7 +1686,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'PUT' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'PUT' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/configuration.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/configuration.ts
index a8e26313010..79bc07fb8ff 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/configuration.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/configuration.ts
@@ -18,6 +18,7 @@ export interface ConfigurationParameters {
     password?: string;
     accessToken?: string | ((name: string, scopes?: string[]) => string);
     basePath?: string;
+    baseOptions?: any;
 }
 
 export class Configuration {
@@ -55,6 +56,13 @@ export class Configuration {
      * @memberof Configuration
      */
     basePath?: string;
+    /**
+     * base options for fetch calls
+     *
+     * @type {any}
+     * @memberof Configuration
+     */
+    baseOptions?: any;
 
     constructor(param: ConfigurationParameters = {}) {
         this.apiKey = param.apiKey;
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/api.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/api.ts
index ad8e33381c5..8acdc0f6753 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/api.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/api.ts
@@ -341,7 +341,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -384,7 +388,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -425,7 +433,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet/findByStatus`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -466,7 +478,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet/findByTags`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -508,7 +524,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -544,7 +564,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'PUT' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'PUT' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -588,7 +612,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
             const localVarFormParams = new url.URLSearchParams();
@@ -640,7 +668,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}/uploadImage`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
             const localVarFormParams = new url.URLSearchParams();
@@ -1162,7 +1194,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             const localVarPath = `/store/order/{orderId}`
                 .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1185,7 +1221,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
         getInventory(options: any = {}): FetchArgs {
             const localVarPath = `/store/inventory`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1222,7 +1262,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             const localVarPath = `/store/order/{orderId}`
                 .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1250,7 +1294,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             }
             const localVarPath = `/store/order`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1526,7 +1574,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1558,7 +1610,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/createWithArray`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1590,7 +1646,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/createWithList`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1623,7 +1683,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1652,7 +1716,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1685,7 +1753,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/login`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1716,7 +1788,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
         logoutUser(options: any = {}): FetchArgs {
             const localVarPath = `/user/logout`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1750,7 +1826,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'PUT' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'PUT' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/configuration.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/configuration.ts
index a8e26313010..79bc07fb8ff 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/configuration.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/configuration.ts
@@ -18,6 +18,7 @@ export interface ConfigurationParameters {
     password?: string;
     accessToken?: string | ((name: string, scopes?: string[]) => string);
     basePath?: string;
+    baseOptions?: any;
 }
 
 export class Configuration {
@@ -55,6 +56,13 @@ export class Configuration {
      * @memberof Configuration
      */
     basePath?: string;
+    /**
+     * base options for fetch calls
+     *
+     * @type {any}
+     * @memberof Configuration
+     */
+    baseOptions?: any;
 
     constructor(param: ConfigurationParameters = {}) {
         this.apiKey = param.apiKey;
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
index d3a2eaade1d..4cff8a4087c 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
@@ -341,7 +341,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -384,7 +388,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -425,7 +433,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet/findByStatus`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -466,7 +478,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet/findByTags`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -508,7 +524,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -544,7 +564,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/pet`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'PUT' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'PUT' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -588,7 +612,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
             const localVarFormParams = new url.URLSearchParams();
@@ -640,7 +668,11 @@ export const PetApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/pet/{petId}/uploadImage`
                 .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
             const localVarFormParams = new url.URLSearchParams();
@@ -1069,7 +1101,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             const localVarPath = `/store/order/{orderId}`
                 .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1092,7 +1128,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
         getInventory(options: any = {}): FetchArgs {
             const localVarPath = `/store/inventory`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1129,7 +1169,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             const localVarPath = `/store/order/{orderId}`
                 .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1157,7 +1201,11 @@ export const StoreApiFetchParamCreator = function (configuration?: Configuration
             }
             const localVarPath = `/store/order`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1386,7 +1434,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1418,7 +1470,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/createWithArray`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1450,7 +1506,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/createWithList`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'POST' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1483,7 +1543,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1512,7 +1576,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1545,7 +1613,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             }
             const localVarPath = `/user/login`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1576,7 +1648,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
         logoutUser(options: any = {}): FetchArgs {
             const localVarPath = `/user/logout`;
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'GET' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -1610,7 +1686,11 @@ export const UserApiFetchParamCreator = function (configuration?: Configuration)
             const localVarPath = `/user/{username}`
                 .replace(`{${"username"}}`, encodeURIComponent(String(username)));
             const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'PUT' }, options);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = Object.assign({ method: 'PUT' }, baseOptions, options);
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/configuration.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/configuration.ts
index a8e26313010..79bc07fb8ff 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/configuration.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/configuration.ts
@@ -18,6 +18,7 @@ export interface ConfigurationParameters {
     password?: string;
     accessToken?: string | ((name: string, scopes?: string[]) => string);
     basePath?: string;
+    baseOptions?: any;
 }
 
 export class Configuration {
@@ -55,6 +56,13 @@ export class Configuration {
      * @memberof Configuration
      */
     basePath?: string;
+    /**
+     * base options for fetch calls
+     *
+     * @type {any}
+     * @memberof Configuration
+     */
+    baseOptions?: any;
 
     constructor(param: ConfigurationParameters = {}) {
         this.apiKey = param.apiKey;
diff --git a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION
index 855ff9501eb..14900cee60e 100644
--- a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
\ No newline at end of file
+3.2.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-jquery/default/api/PetApi.ts b/samples/client/petstore/typescript-jquery/default/api/PetApi.ts
index d80ef92fd5b..d025ec3636a 100644
--- a/samples/client/petstore/typescript-jquery/default/api/PetApi.ts
+++ b/samples/client/petstore/typescript-jquery/default/api/PetApi.ts
@@ -1,12 +1,12 @@
 /**
- * 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 Petstore
+ * This is a sample server Petstore server. 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
+ * 
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
@@ -49,9 +49,9 @@ export class PetApi {
     /**
      * 
      * @summary Add a new pet to the store
-     * @param body Pet object that needs to be added to the store
+     * @param pet Pet object that needs to be added to the store
      */
-    public addPet(body: models.Pet, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
+    public addPet(pet: models.Pet, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
     { response: JQueryXHR; body?: any;  },
     { response: JQueryXHR; errorThrown: string }
     > {
@@ -59,9 +59,9 @@ export class PetApi {
 
         let queryParameters: any = {};
         let headerParams: any = {};
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling addPet.');
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new Error('Required parameter pet was null or undefined when calling addPet.');
         }
 
 
@@ -74,8 +74,6 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/xml', 
-            'application/json'
         ];
 
         // authentication (petstore_auth) required
@@ -97,7 +95,7 @@ export class PetApi {
             processData: false
         };
 
-        requestOptions.data = JSON.stringify(body);
+        requestOptions.data = JSON.stringify(pet);
         if (headerParams['Content-Type']) {
             requestOptions.contentType = headerParams['Content-Type'];
         }
@@ -116,7 +114,7 @@ export class PetApi {
         >();
         $.ajax(requestOptions).then(
             (data: any, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -152,8 +150,6 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/xml', 
-            'application/json'
         ];
 
         // authentication (petstore_auth) required
@@ -191,7 +187,7 @@ export class PetApi {
         >();
         $.ajax(requestOptions).then(
             (data: any, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -266,7 +262,7 @@ export class PetApi {
         >();
         $.ajax(requestOptions).then(
             (data: Array<models.Pet>, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -341,7 +337,7 @@ export class PetApi {
         >();
         $.ajax(requestOptions).then(
             (data: Array<models.Pet>, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -409,7 +405,7 @@ export class PetApi {
         >();
         $.ajax(requestOptions).then(
             (data: models.Pet, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -419,9 +415,9 @@ export class PetApi {
     /**
      * 
      * @summary Update an existing pet
-     * @param body Pet object that needs to be added to the store
+     * @param pet Pet object that needs to be added to the store
      */
-    public updatePet(body: models.Pet, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
+    public updatePet(pet: models.Pet, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
     { response: JQueryXHR; body?: any;  },
     { response: JQueryXHR; errorThrown: string }
     > {
@@ -429,9 +425,9 @@ export class PetApi {
 
         let queryParameters: any = {};
         let headerParams: any = {};
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling updatePet.');
+        // verify required parameter 'pet' is not null or undefined
+        if (pet === null || pet === undefined) {
+            throw new Error('Required parameter pet was null or undefined when calling updatePet.');
         }
 
 
@@ -444,8 +440,6 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/xml', 
-            'application/json'
         ];
 
         // authentication (petstore_auth) required
@@ -467,7 +461,7 @@ export class PetApi {
             processData: false
         };
 
-        requestOptions.data = JSON.stringify(body);
+        requestOptions.data = JSON.stringify(pet);
         if (headerParams['Content-Type']) {
             requestOptions.contentType = headerParams['Content-Type'];
         }
@@ -486,7 +480,7 @@ export class PetApi {
         >();
         $.ajax(requestOptions).then(
             (data: any, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -531,8 +525,6 @@ export class PetApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/xml', 
-            'application/json'
         ];
 
         // authentication (petstore_auth) required
@@ -578,7 +570,7 @@ export class PetApi {
         >();
         $.ajax(requestOptions).then(
             (data: any, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -668,7 +660,7 @@ export class PetApi {
         >();
         $.ajax(requestOptions).then(
             (data: models.ApiResponse, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
diff --git a/samples/client/petstore/typescript-jquery/default/api/StoreApi.ts b/samples/client/petstore/typescript-jquery/default/api/StoreApi.ts
index 3a08a004bae..bce32cef437 100644
--- a/samples/client/petstore/typescript-jquery/default/api/StoreApi.ts
+++ b/samples/client/petstore/typescript-jquery/default/api/StoreApi.ts
@@ -1,12 +1,12 @@
 /**
- * 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 Petstore
+ * This is a sample server Petstore server. 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
+ * 
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
@@ -72,8 +72,6 @@ export class StoreApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/xml', 
-            'application/json'
         ];
 
 
@@ -102,7 +100,7 @@ export class StoreApi {
         >();
         $.ajax(requestOptions).then(
             (data: any, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -163,7 +161,7 @@ export class StoreApi {
         >();
         $.ajax(requestOptions).then(
             (data: { [key: string]: number; }, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -226,7 +224,7 @@ export class StoreApi {
         >();
         $.ajax(requestOptions).then(
             (data: models.Order, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -236,9 +234,9 @@ export class StoreApi {
     /**
      * 
      * @summary Place an order for a pet
-     * @param body order placed for purchasing the pet
+     * @param order order placed for purchasing the pet
      */
-    public placeOrder(body: models.Order, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
+    public placeOrder(order: models.Order, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
     { response: JQueryXHR; body: models.Order;  },
     { response: JQueryXHR; errorThrown: string }
     > {
@@ -246,9 +244,9 @@ export class StoreApi {
 
         let queryParameters: any = {};
         let headerParams: any = {};
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling placeOrder.');
+        // verify required parameter 'order' is not null or undefined
+        if (order === null || order === undefined) {
+            throw new Error('Required parameter order was null or undefined when calling placeOrder.');
         }
 
 
@@ -273,7 +271,7 @@ export class StoreApi {
             processData: false
         };
 
-        requestOptions.data = JSON.stringify(body);
+        requestOptions.data = JSON.stringify(order);
         if (headerParams['Content-Type']) {
             requestOptions.contentType = headerParams['Content-Type'];
         }
@@ -292,7 +290,7 @@ export class StoreApi {
         >();
         $.ajax(requestOptions).then(
             (data: models.Order, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
diff --git a/samples/client/petstore/typescript-jquery/default/api/UserApi.ts b/samples/client/petstore/typescript-jquery/default/api/UserApi.ts
index b896fd794b4..4c1152bffb2 100644
--- a/samples/client/petstore/typescript-jquery/default/api/UserApi.ts
+++ b/samples/client/petstore/typescript-jquery/default/api/UserApi.ts
@@ -1,12 +1,12 @@
 /**
- * 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 Petstore
+ * This is a sample server Petstore server. 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
+ * 
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
@@ -49,9 +49,9 @@ export class UserApi {
     /**
      * This can only be done by the logged in user.
      * @summary Create user
-     * @param body Created user object
+     * @param user Created user object
      */
-    public createUser(body: models.User, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
+    public createUser(user: models.User, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
     { response: JQueryXHR; body?: any;  },
     { response: JQueryXHR; errorThrown: string }
     > {
@@ -59,9 +59,9 @@ export class UserApi {
 
         let queryParameters: any = {};
         let headerParams: any = {};
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling createUser.');
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new Error('Required parameter user was null or undefined when calling createUser.');
         }
 
 
@@ -72,8 +72,6 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/xml', 
-            'application/json'
         ];
 
 
@@ -86,7 +84,7 @@ export class UserApi {
             processData: false
         };
 
-        requestOptions.data = JSON.stringify(body);
+        requestOptions.data = JSON.stringify(user);
         if (headerParams['Content-Type']) {
             requestOptions.contentType = headerParams['Content-Type'];
         }
@@ -105,7 +103,7 @@ export class UserApi {
         >();
         $.ajax(requestOptions).then(
             (data: any, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -115,9 +113,9 @@ export class UserApi {
     /**
      * 
      * @summary Creates list of users with given input array
-     * @param body List of user object
+     * @param modelsUser List of user object
      */
-    public createUsersWithArrayInput(body: Array<models.User>, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
+    public createUsersWithArrayInput(modelsUser: Array<models.User>, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
     { response: JQueryXHR; body?: any;  },
     { response: JQueryXHR; errorThrown: string }
     > {
@@ -125,9 +123,9 @@ export class UserApi {
 
         let queryParameters: any = {};
         let headerParams: any = {};
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling createUsersWithArrayInput.');
+        // verify required parameter 'modelsUser' is not null or undefined
+        if (modelsUser === null || modelsUser === undefined) {
+            throw new Error('Required parameter modelsUser was null or undefined when calling createUsersWithArrayInput.');
         }
 
 
@@ -138,8 +136,6 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/xml', 
-            'application/json'
         ];
 
 
@@ -152,7 +148,7 @@ export class UserApi {
             processData: false
         };
 
-        requestOptions.data = JSON.stringify(body);
+        requestOptions.data = JSON.stringify(modelsUser);
         if (headerParams['Content-Type']) {
             requestOptions.contentType = headerParams['Content-Type'];
         }
@@ -171,7 +167,7 @@ export class UserApi {
         >();
         $.ajax(requestOptions).then(
             (data: any, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -181,9 +177,9 @@ export class UserApi {
     /**
      * 
      * @summary Creates list of users with given input array
-     * @param body List of user object
+     * @param modelsUser List of user object
      */
-    public createUsersWithListInput(body: Array<models.User>, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
+    public createUsersWithListInput(modelsUser: Array<models.User>, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
     { response: JQueryXHR; body?: any;  },
     { response: JQueryXHR; errorThrown: string }
     > {
@@ -191,9 +187,9 @@ export class UserApi {
 
         let queryParameters: any = {};
         let headerParams: any = {};
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling createUsersWithListInput.');
+        // verify required parameter 'modelsUser' is not null or undefined
+        if (modelsUser === null || modelsUser === undefined) {
+            throw new Error('Required parameter modelsUser was null or undefined when calling createUsersWithListInput.');
         }
 
 
@@ -204,8 +200,6 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/xml', 
-            'application/json'
         ];
 
 
@@ -218,7 +212,7 @@ export class UserApi {
             processData: false
         };
 
-        requestOptions.data = JSON.stringify(body);
+        requestOptions.data = JSON.stringify(modelsUser);
         if (headerParams['Content-Type']) {
             requestOptions.contentType = headerParams['Content-Type'];
         }
@@ -237,7 +231,7 @@ export class UserApi {
         >();
         $.ajax(requestOptions).then(
             (data: any, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -270,8 +264,6 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/xml', 
-            'application/json'
         ];
 
 
@@ -300,7 +292,7 @@ export class UserApi {
         >();
         $.ajax(requestOptions).then(
             (data: any, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -363,7 +355,7 @@ export class UserApi {
         >();
         $.ajax(requestOptions).then(
             (data: models.User, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -438,7 +430,7 @@ export class UserApi {
         >();
         $.ajax(requestOptions).then(
             (data: string, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -465,8 +457,6 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/xml', 
-            'application/json'
         ];
 
 
@@ -495,7 +485,7 @@ export class UserApi {
         >();
         $.ajax(requestOptions).then(
             (data: any, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
@@ -506,9 +496,9 @@ export class UserApi {
      * This can only be done by the logged in user.
      * @summary Updated user
      * @param username name that need to be deleted
-     * @param body Updated user object
+     * @param user Updated user object
      */
-    public updateUser(username: string, body: models.User, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
+    public updateUser(username: string, user: models.User, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise<
     { response: JQueryXHR; body?: any;  },
     { response: JQueryXHR; errorThrown: string }
     > {
@@ -521,9 +511,9 @@ export class UserApi {
             throw new Error('Required parameter username was null or undefined when calling updateUser.');
         }
 
-        // verify required parameter 'body' is not null or undefined
-        if (body === null || body === undefined) {
-            throw new Error('Required parameter body was null or undefined when calling updateUser.');
+        // verify required parameter 'user' is not null or undefined
+        if (user === null || user === undefined) {
+            throw new Error('Required parameter user was null or undefined when calling updateUser.');
         }
 
 
@@ -534,8 +524,6 @@ export class UserApi {
 
         // to determine the Accept header
         let produces: string[] = [
-            'application/xml', 
-            'application/json'
         ];
 
 
@@ -548,7 +536,7 @@ export class UserApi {
             processData: false
         };
 
-        requestOptions.data = JSON.stringify(body);
+        requestOptions.data = JSON.stringify(user);
         if (headerParams['Content-Type']) {
             requestOptions.contentType = headerParams['Content-Type'];
         }
@@ -567,7 +555,7 @@ export class UserApi {
         >();
         $.ajax(requestOptions).then(
             (data: any, textStatus: string, jqXHR: JQueryXHR) =>
-                dfd.resolve({response: jqXHR, body: data),
+                dfd.resolve({response: jqXHR, body: data}),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({response: xhr, errorThrown: errorThrown})
         );
diff --git a/samples/client/petstore/typescript-jquery/default/git_push.sh b/samples/client/petstore/typescript-jquery/default/git_push.sh
index ae01b182ae9..8442b80bb44 100644
--- a/samples/client/petstore/typescript-jquery/default/git_push.sh
+++ b/samples/client/petstore/typescript-jquery/default/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
 
 git_user_id=$1
 git_repo_id=$2
diff --git a/samples/client/petstore/typescript-jquery/default/model/ApiResponse.ts b/samples/client/petstore/typescript-jquery/default/model/ApiResponse.ts
index f86e84f93a3..f55509ae2ba 100644
--- a/samples/client/petstore/typescript-jquery/default/model/ApiResponse.ts
+++ b/samples/client/petstore/typescript-jquery/default/model/ApiResponse.ts
@@ -1,12 +1,12 @@
 /**
- * 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 Petstore
+ * This is a sample server Petstore server. 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
+ * 
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
diff --git a/samples/client/petstore/typescript-jquery/default/model/Category.ts b/samples/client/petstore/typescript-jquery/default/model/Category.ts
index 254c3003c89..7def6ebb648 100644
--- a/samples/client/petstore/typescript-jquery/default/model/Category.ts
+++ b/samples/client/petstore/typescript-jquery/default/model/Category.ts
@@ -1,12 +1,12 @@
 /**
- * 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 Petstore
+ * This is a sample server Petstore server. 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
+ * 
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
diff --git a/samples/client/petstore/typescript-jquery/default/model/Order.ts b/samples/client/petstore/typescript-jquery/default/model/Order.ts
index 2b6c7aeebd6..122efb30a43 100644
--- a/samples/client/petstore/typescript-jquery/default/model/Order.ts
+++ b/samples/client/petstore/typescript-jquery/default/model/Order.ts
@@ -1,12 +1,12 @@
 /**
- * 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 Petstore
+ * This is a sample server Petstore server. 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
+ * 
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
diff --git a/samples/client/petstore/typescript-jquery/default/model/Pet.ts b/samples/client/petstore/typescript-jquery/default/model/Pet.ts
index b878cadb905..92925560af9 100644
--- a/samples/client/petstore/typescript-jquery/default/model/Pet.ts
+++ b/samples/client/petstore/typescript-jquery/default/model/Pet.ts
@@ -1,12 +1,12 @@
 /**
- * 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 Petstore
+ * This is a sample server Petstore server. 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
+ * 
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
diff --git a/samples/client/petstore/typescript-jquery/default/model/Tag.ts b/samples/client/petstore/typescript-jquery/default/model/Tag.ts
index 8cbdc4fa145..9ab112007ce 100644
--- a/samples/client/petstore/typescript-jquery/default/model/Tag.ts
+++ b/samples/client/petstore/typescript-jquery/default/model/Tag.ts
@@ -1,12 +1,12 @@
 /**
- * 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 Petstore
+ * This is a sample server Petstore server. 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
+ * 
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
diff --git a/samples/client/petstore/typescript-jquery/default/model/User.ts b/samples/client/petstore/typescript-jquery/default/model/User.ts
index fbf75dfe28e..8e1f9d817b3 100644
--- a/samples/client/petstore/typescript-jquery/default/model/User.ts
+++ b/samples/client/petstore/typescript-jquery/default/model/User.ts
@@ -1,12 +1,12 @@
 /**
- * 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 Petstore
+ * This is a sample server Petstore server. 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
+ * 
  *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
diff --git a/samples/client/petstore/typescript-jquery/default/model/models.ts b/samples/client/petstore/typescript-jquery/default/model/models.ts
index 840919adceb..f53c1dd42bd 100644
--- a/samples/client/petstore/typescript-jquery/default/model/models.ts
+++ b/samples/client/petstore/typescript-jquery/default/model/models.ts
@@ -1,7 +1,5 @@
-export * from './Amount';
 export * from './ApiResponse';
 export * from './Category';
-export * from './Currency';
 export * from './Order';
 export * from './Pet';
 export * from './Tag';
diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
+++ b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/test/swift4/default/.openapi-generator/VERSION b/samples/client/test/swift4/default/.openapi-generator/VERSION
index 096bf47efe3..4395ff59232 100644
--- a/samples/client/test/swift4/default/.openapi-generator/VERSION
+++ b/samples/client/test/swift4/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/test/swift4/default/TestClient.podspec b/samples/client/test/swift4/default/TestClient.podspec
index 1c434b30306..83aee4c5d05 100644
--- a/samples/client/test/swift4/default/TestClient.podspec
+++ b/samples/client/test/swift4/default/TestClient.podspec
@@ -4,10 +4,10 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.11'
   s.tvos.deployment_target = '9.0'
   s.version = '0.0.1'
-  s.source = { :git => 'git@github.com:swagger-api/swagger-mustache.git', :tag => 'v1.0.0' }
+  s.source = { :git => 'git@github.com:openapitools/openapi-generator.git', :tag => 'v1.0.0' }
   s.authors = ''
   s.license = 'Proprietary'
-  s.homepage = 'https://github.com/swagger-api/swagger-codegen'
+  s.homepage = 'https://github.com/openapitools/openapi-generator'
   s.summary = 'TestClient'
   s.source_files = 'TestClient/Classes/**/*.swift'
   s.dependency 'Alamofire', '~> 4.5.0'
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIHelper.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIHelper.swift
similarity index 96%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIHelper.swift
rename to samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIHelper.swift
index 81e7286d6d4..3c7b53f8149 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIHelper.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIHelper.swift
@@ -1,7 +1,7 @@
 // APIHelper.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs.swift
similarity index 84%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs.swift
rename to samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs.swift
index 2c2fc3157de..6835520c990 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs.swift
@@ -1,13 +1,13 @@
 // APIs.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
 
-open class PetstoreClientAPI {
-    open static var basePath = "http://petstore.swagger.io:80/v2"
+open class TestClientAPI {
+    open static var basePath = "http://api.example.com/basePath"
     open static var credential: URLCredential?
     open static var customHeaders: [String:String] = [:]
     open static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
@@ -31,7 +31,7 @@ open class RequestBuilder<T> {
         self.isBody = isBody
         self.headers = headers
 
-        addHeaders(PetstoreClientAPI.customHeaders)
+        addHeaders(TestClientAPI.customHeaders)
     }
 
     open func addHeaders(_ aHeaders:[String:String]) {
@@ -50,7 +50,7 @@ open class RequestBuilder<T> {
     }
 
     open func addCredential() -> Self {
-        self.credential = PetstoreClientAPI.credential
+        self.credential = TestClientAPI.credential
         return self
     }
 }
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs/Swift4TestAPI.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs/Swift4TestAPI.swift
new file mode 100644
index 00000000000..537b874f262
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs/Swift4TestAPI.swift
@@ -0,0 +1,49 @@
+//
+// Swift4TestAPI.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+import Alamofire
+
+
+
+open class Swift4TestAPI {
+    /**
+     Get all of the models
+     
+     - parameter clientId: (query) id that represent the Api client 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func getAllModels(clientId: String, completion: @escaping ((_ data: GetAllModelsResult?,_ error: Error?) -> Void)) {
+        getAllModelsWithRequestBuilder(clientId: clientId).execute { (response, error) -> Void in
+            completion(response?.body, error)
+        }
+    }
+
+
+    /**
+     Get all of the models
+     - GET /allModels
+     - This endpoint tests get a dictionary which contains examples of all of the models.
+     - parameter clientId: (query) id that represent the Api client 
+     - returns: RequestBuilder<GetAllModelsResult> 
+     */
+    open class func getAllModelsWithRequestBuilder(clientId: String) -> RequestBuilder<GetAllModelsResult> {
+        let path = "/allModels"
+        let URLString = TestClientAPI.basePath + path
+        let parameters: [String:Any]? = nil
+        
+        var url = URLComponents(string: URLString)
+        url?.queryItems = APIHelper.mapValuesToQueryItems([
+            "client_id": clientId
+        ])
+
+        let requestBuilder: RequestBuilder<GetAllModelsResult>.Type = TestClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
+}
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/AlamofireImplementations.swift
similarity index 99%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
rename to samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/AlamofireImplementations.swift
index 381fddcc81f..280b4e53389 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -1,7 +1,7 @@
 // AlamofireImplementations.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/CodableHelper.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/CodableHelper.swift
similarity index 96%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/CodableHelper.swift
rename to samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/CodableHelper.swift
index 323715c5f94..2d50e463ae1 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/CodableHelper.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/CodableHelper.swift
@@ -1,8 +1,8 @@
 //
 // CodableHelper.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Configuration.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Configuration.swift
similarity index 80%
rename from samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Configuration.swift
rename to samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Configuration.swift
index c03a10b930c..f8180752b67 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Configuration.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Configuration.swift
@@ -1,7 +1,7 @@
 // Configuration.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Extensions.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Extensions.swift
similarity index 98%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Extensions.swift
rename to samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Extensions.swift
index f9c33ea7e2d..abe218b4e7a 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Extensions.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Extensions.swift
@@ -1,7 +1,7 @@
 // Extensions.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/JSONEncodableEncoding.swift
similarity index 95%
rename from samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift
rename to samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/JSONEncodableEncoding.swift
index 472e955ee8e..ca05906d420 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/JSONEncodableEncoding.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/JSONEncodableEncoding.swift
@@ -1,8 +1,8 @@
 //
 // JSONDataEncoding.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/JSONEncodingHelper.swift
similarity index 93%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift
rename to samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 19ee06b1f48..70449515842 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/JSONEncodingHelper.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -1,8 +1,8 @@
 //
 // JSONEncodingHelper.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models.swift
similarity index 90%
rename from samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models.swift
rename to samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models.swift
index 4962405f029..42f8186ae4a 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/Swaggers/Models.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models.swift
@@ -1,7 +1,7 @@
 // Models.swift
 //
-// Generated by swagger-codegen
-// https://github.com/swagger-api/swagger-codegen
+// Generated by openapi-generator
+// https://openapi-generator.tech
 //
 
 import Foundation
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/AllPrimitives.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/AllPrimitives.swift
new file mode 100644
index 00000000000..3ce27fcd98f
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/AllPrimitives.swift
@@ -0,0 +1,76 @@
+//
+// AllPrimitives.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** Object which contains lots of different primitive Swagger types */
+
+public struct AllPrimitives: Codable {
+
+    public enum MyInlineStringEnum: String, Codable {
+        case inlinestringenumvalue1 = "inlineStringEnumValue1"
+        case inlinestringenumvalue2 = "inlineStringEnumValue2"
+        case inlinestringenumvalue3 = "inlineStringEnumValue3"
+    }
+    public var myInteger: Int?
+    public var myIntegerArray: [Int]?
+    public var myLong: Int64?
+    public var myLongArray: [Int64]?
+    public var myFloat: Float?
+    public var myFloatArray: [Float]?
+    public var myDouble: Double?
+    public var myDoubleArray: [Double]?
+    public var myString: String?
+    public var myStringArray: [String]?
+    public var myBytes: Data?
+    public var myBytesArray: [Data]?
+    public var myBoolean: Bool?
+    public var myBooleanArray: [Bool]?
+    public var myDate: Date?
+    public var myDateArray: [Date]?
+    public var myDateTime: Date?
+    public var myDateTimeArray: [Date]?
+    public var myFile: URL?
+    public var myFileArray: [URL]?
+    public var myUUID: UUID?
+    public var myUUIDArray: [UUID]?
+    public var myStringEnum: StringEnum?
+    public var myStringEnumArray: [StringEnum]?
+    public var myInlineStringEnum: MyInlineStringEnum?
+
+    public init(myInteger: Int?, myIntegerArray: [Int]?, myLong: Int64?, myLongArray: [Int64]?, myFloat: Float?, myFloatArray: [Float]?, myDouble: Double?, myDoubleArray: [Double]?, myString: String?, myStringArray: [String]?, myBytes: Data?, myBytesArray: [Data]?, myBoolean: Bool?, myBooleanArray: [Bool]?, myDate: Date?, myDateArray: [Date]?, myDateTime: Date?, myDateTimeArray: [Date]?, myFile: URL?, myFileArray: [URL]?, myUUID: UUID?, myUUIDArray: [UUID]?, myStringEnum: StringEnum?, myStringEnumArray: [StringEnum]?, myInlineStringEnum: MyInlineStringEnum?) {
+        self.myInteger = myInteger
+        self.myIntegerArray = myIntegerArray
+        self.myLong = myLong
+        self.myLongArray = myLongArray
+        self.myFloat = myFloat
+        self.myFloatArray = myFloatArray
+        self.myDouble = myDouble
+        self.myDoubleArray = myDoubleArray
+        self.myString = myString
+        self.myStringArray = myStringArray
+        self.myBytes = myBytes
+        self.myBytesArray = myBytesArray
+        self.myBoolean = myBoolean
+        self.myBooleanArray = myBooleanArray
+        self.myDate = myDate
+        self.myDateArray = myDateArray
+        self.myDateTime = myDateTime
+        self.myDateTimeArray = myDateTimeArray
+        self.myFile = myFile
+        self.myFileArray = myFileArray
+        self.myUUID = myUUID
+        self.myUUIDArray = myUUIDArray
+        self.myStringEnum = myStringEnum
+        self.myStringEnumArray = myStringEnumArray
+        self.myInlineStringEnum = myInlineStringEnum
+    }
+
+
+}
+
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/BaseCard.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/BaseCard.swift
new file mode 100644
index 00000000000..7e4bb2c0cd5
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/BaseCard.swift
@@ -0,0 +1,23 @@
+//
+// BaseCard.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This is a base card object which uses a &#39;cardType&#39; discriminator. */
+
+public struct BaseCard: Codable {
+
+    public var cardType: String
+
+    public init(cardType: String) {
+        self.cardType = cardType
+    }
+
+
+}
+
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ErrorInfo.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ErrorInfo.swift
new file mode 100644
index 00000000000..ae5327eda32
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ErrorInfo.swift
@@ -0,0 +1,27 @@
+//
+// ErrorInfo.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** Example Error object */
+
+public struct ErrorInfo: Codable {
+
+    public var code: Int?
+    public var message: String?
+    public var details: [String]?
+
+    public init(code: Int?, message: String?, details: [String]?) {
+        self.code = code
+        self.message = message
+        self.details = details
+    }
+
+
+}
+
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/GetAllModelsResult.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/GetAllModelsResult.swift
new file mode 100644
index 00000000000..286c5a7a35b
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/GetAllModelsResult.swift
@@ -0,0 +1,27 @@
+//
+// GetAllModelsResult.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** Response object containing AllPrimitives object */
+
+public struct GetAllModelsResult: Codable {
+
+    public var myPrimitiveArray: [AllPrimitives]?
+    public var myPrimitive: AllPrimitives?
+    public var myVariableNameTest: VariableNameTest?
+
+    public init(myPrimitiveArray: [AllPrimitives]?, myPrimitive: AllPrimitives?, myVariableNameTest: VariableNameTest?) {
+        self.myPrimitiveArray = myPrimitiveArray
+        self.myPrimitive = myPrimitive
+        self.myVariableNameTest = myVariableNameTest
+    }
+
+
+}
+
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelDoubleArray.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelDoubleArray.swift
new file mode 100644
index 00000000000..e6e986dce61
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelDoubleArray.swift
@@ -0,0 +1,12 @@
+//
+// ModelDoubleArray.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This defines an array of doubles. */
+public typealias ModelDoubleArray = [Double]
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelErrorInfoArray.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelErrorInfoArray.swift
new file mode 100644
index 00000000000..6656e6abe8c
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelErrorInfoArray.swift
@@ -0,0 +1,12 @@
+//
+// ModelErrorInfoArray.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This defines an array of ErrorInfo objects. */
+public typealias ModelErrorInfoArray = [ErrorInfo]
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelStringArray.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelStringArray.swift
new file mode 100644
index 00000000000..7f0e0cbd135
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelStringArray.swift
@@ -0,0 +1,12 @@
+//
+// ModelStringArray.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This defines an array of strings. */
+public typealias ModelStringArray = [String]
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithIntAdditionalPropertiesOnly.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithIntAdditionalPropertiesOnly.swift
new file mode 100644
index 00000000000..16d9a784fb6
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithIntAdditionalPropertiesOnly.swift
@@ -0,0 +1,52 @@
+//
+// ModelWithIntAdditionalPropertiesOnly.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This is an empty model with no properties and only additionalProperties of type int32 */
+
+public struct ModelWithIntAdditionalPropertiesOnly: Codable {
+
+
+    public var additionalProperties: [String:Int] = [:]
+
+    public subscript(key: String) -> Int? {
+        get {
+            if let value = additionalProperties[key] {
+                return value
+            }
+            return nil
+        }
+
+        set {
+            additionalProperties[key] = newValue
+        }
+    }
+
+    // Encodable protocol methods
+
+    public func encode(to encoder: Encoder) throws {
+
+        var container = encoder.container(keyedBy: String.self)
+
+        try container.encodeMap(additionalProperties)
+    }
+
+    // Decodable protocol methods
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: String.self)
+
+        var nonAdditionalPropertyKeys = Set<String>()
+        additionalProperties = try container.decodeMap(Int.self, excludedKeys: nonAdditionalPropertyKeys)
+    }
+
+
+
+}
+
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithPropertiesAndAdditionalProperties.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithPropertiesAndAdditionalProperties.swift
new file mode 100644
index 00000000000..d7f2ca15262
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithPropertiesAndAdditionalProperties.swift
@@ -0,0 +1,94 @@
+//
+// ModelWithPropertiesAndAdditionalProperties.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This is an empty model with no properties and only additionalProperties of type int32 */
+
+public struct ModelWithPropertiesAndAdditionalProperties: Codable {
+
+    public var myIntegerReq: Int
+    public var myIntegerOpt: Int?
+    public var myPrimitiveReq: AllPrimitives
+    public var myPrimitiveOpt: AllPrimitives?
+    public var myStringArrayReq: [String]
+    public var myStringArrayOpt: [String]?
+    public var myPrimitiveArrayReq: [AllPrimitives]
+    public var myPrimitiveArrayOpt: [AllPrimitives]?
+
+    public init(myIntegerReq: Int, myIntegerOpt: Int?, myPrimitiveReq: AllPrimitives, myPrimitiveOpt: AllPrimitives?, myStringArrayReq: [String], myStringArrayOpt: [String]?, myPrimitiveArrayReq: [AllPrimitives], myPrimitiveArrayOpt: [AllPrimitives]?) {
+        self.myIntegerReq = myIntegerReq
+        self.myIntegerOpt = myIntegerOpt
+        self.myPrimitiveReq = myPrimitiveReq
+        self.myPrimitiveOpt = myPrimitiveOpt
+        self.myStringArrayReq = myStringArrayReq
+        self.myStringArrayOpt = myStringArrayOpt
+        self.myPrimitiveArrayReq = myPrimitiveArrayReq
+        self.myPrimitiveArrayOpt = myPrimitiveArrayOpt
+    }
+    public var additionalProperties: [String:String] = [:]
+
+    public subscript(key: String) -> String? {
+        get {
+            if let value = additionalProperties[key] {
+                return value
+            }
+            return nil
+        }
+
+        set {
+            additionalProperties[key] = newValue
+        }
+    }
+
+    // Encodable protocol methods
+
+    public func encode(to encoder: Encoder) throws {
+
+        var container = encoder.container(keyedBy: String.self)
+
+        try container.encode(myIntegerReq, forKey: "myIntegerReq")
+        try container.encodeIfPresent(myIntegerOpt, forKey: "myIntegerOpt")
+        try container.encode(myPrimitiveReq, forKey: "myPrimitiveReq")
+        try container.encodeIfPresent(myPrimitiveOpt, forKey: "myPrimitiveOpt")
+        try container.encode(myStringArrayReq, forKey: "myStringArrayReq")
+        try container.encodeIfPresent(myStringArrayOpt, forKey: "myStringArrayOpt")
+        try container.encode(myPrimitiveArrayReq, forKey: "myPrimitiveArrayReq")
+        try container.encodeIfPresent(myPrimitiveArrayOpt, forKey: "myPrimitiveArrayOpt")
+        try container.encodeMap(additionalProperties)
+    }
+
+    // Decodable protocol methods
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: String.self)
+
+        myIntegerReq = try container.decode(Int.self, forKey: "myIntegerReq")
+        myIntegerOpt = try container.decodeIfPresent(Int.self, forKey: "myIntegerOpt")
+        myPrimitiveReq = try container.decode(AllPrimitives.self, forKey: "myPrimitiveReq")
+        myPrimitiveOpt = try container.decodeIfPresent(AllPrimitives.self, forKey: "myPrimitiveOpt")
+        myStringArrayReq = try container.decode([String].self, forKey: "myStringArrayReq")
+        myStringArrayOpt = try container.decodeIfPresent([String].self, forKey: "myStringArrayOpt")
+        myPrimitiveArrayReq = try container.decode([AllPrimitives].self, forKey: "myPrimitiveArrayReq")
+        myPrimitiveArrayOpt = try container.decodeIfPresent([AllPrimitives].self, forKey: "myPrimitiveArrayOpt")
+        var nonAdditionalPropertyKeys = Set<String>()
+        nonAdditionalPropertyKeys.insert("myIntegerReq")
+        nonAdditionalPropertyKeys.insert("myIntegerOpt")
+        nonAdditionalPropertyKeys.insert("myPrimitiveReq")
+        nonAdditionalPropertyKeys.insert("myPrimitiveOpt")
+        nonAdditionalPropertyKeys.insert("myStringArrayReq")
+        nonAdditionalPropertyKeys.insert("myStringArrayOpt")
+        nonAdditionalPropertyKeys.insert("myPrimitiveArrayReq")
+        nonAdditionalPropertyKeys.insert("myPrimitiveArrayOpt")
+        additionalProperties = try container.decodeMap(String.self, excludedKeys: nonAdditionalPropertyKeys)
+    }
+
+
+
+}
+
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithStringAdditionalPropertiesOnly.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithStringAdditionalPropertiesOnly.swift
new file mode 100644
index 00000000000..ae87d68a229
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithStringAdditionalPropertiesOnly.swift
@@ -0,0 +1,52 @@
+//
+// ModelWithStringAdditionalPropertiesOnly.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This is an empty model with no properties and only additionalProperties of type string */
+
+public struct ModelWithStringAdditionalPropertiesOnly: Codable {
+
+
+    public var additionalProperties: [String:String] = [:]
+
+    public subscript(key: String) -> String? {
+        get {
+            if let value = additionalProperties[key] {
+                return value
+            }
+            return nil
+        }
+
+        set {
+            additionalProperties[key] = newValue
+        }
+    }
+
+    // Encodable protocol methods
+
+    public func encode(to encoder: Encoder) throws {
+
+        var container = encoder.container(keyedBy: String.self)
+
+        try container.encodeMap(additionalProperties)
+    }
+
+    // Decodable protocol methods
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: String.self)
+
+        var nonAdditionalPropertyKeys = Set<String>()
+        additionalProperties = try container.decodeMap(String.self, excludedKeys: nonAdditionalPropertyKeys)
+    }
+
+
+
+}
+
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PersonCard.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PersonCard.swift
new file mode 100644
index 00000000000..9ce70e0b95e
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PersonCard.swift
@@ -0,0 +1,27 @@
+//
+// PersonCard.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This is a card object for a Person derived from BaseCard. */
+
+public struct PersonCard: Codable {
+
+    public var cardType: String
+    public var firstName: String?
+    public var lastName: String?
+
+    public init(cardType: String, firstName: String?, lastName: String?) {
+        self.cardType = cardType
+        self.firstName = firstName
+        self.lastName = lastName
+    }
+
+
+}
+
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PlaceCard.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PlaceCard.swift
new file mode 100644
index 00000000000..905b80ae524
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PlaceCard.swift
@@ -0,0 +1,27 @@
+//
+// PlaceCard.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This is a card object for a Person derived from BaseCard. */
+
+public struct PlaceCard: Codable {
+
+    public var cardType: String
+    public var placeName: String?
+    public var placeAddress: String?
+
+    public init(cardType: String, placeName: String?, placeAddress: String?) {
+        self.cardType = cardType
+        self.placeName = placeName
+        self.placeAddress = placeAddress
+    }
+
+
+}
+
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleBase.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleBase.swift
new file mode 100644
index 00000000000..77f8897cdf3
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleBase.swift
@@ -0,0 +1,25 @@
+//
+// SampleBase.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This is a base class object from which other classes will derive. */
+
+public struct SampleBase: Codable {
+
+    public var baseClassStringProp: String?
+    public var baseClassIntegerProp: Int?
+
+    public init(baseClassStringProp: String?, baseClassIntegerProp: Int?) {
+        self.baseClassStringProp = baseClassStringProp
+        self.baseClassIntegerProp = baseClassIntegerProp
+    }
+
+
+}
+
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClass.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClass.swift
new file mode 100644
index 00000000000..d53cd948fe7
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClass.swift
@@ -0,0 +1,29 @@
+//
+// SampleSubClass.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This is a subclass defived from the SampleBase class. */
+
+public struct SampleSubClass: Codable {
+
+    public var baseClassStringProp: String?
+    public var baseClassIntegerProp: Int?
+    public var subClassStringProp: String?
+    public var subClassIntegerProp: Int?
+
+    public init(baseClassStringProp: String?, baseClassIntegerProp: Int?, subClassStringProp: String?, subClassIntegerProp: Int?) {
+        self.baseClassStringProp = baseClassStringProp
+        self.baseClassIntegerProp = baseClassIntegerProp
+        self.subClassStringProp = subClassStringProp
+        self.subClassIntegerProp = subClassIntegerProp
+    }
+
+
+}
+
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/StringEnum.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/StringEnum.swift
new file mode 100644
index 00000000000..d4cce19e6d6
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/StringEnum.swift
@@ -0,0 +1,15 @@
+//
+// StringEnum.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+public enum StringEnum: String, Codable {
+    case stringenumvalue1 = "stringEnumValue1"
+    case stringenumvalue2 = "stringEnumValue2"
+    case stringenumvalue3 = "stringEnumValue3"
+}
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/VariableNameTest.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/VariableNameTest.swift
new file mode 100644
index 00000000000..1248e645c60
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/VariableNameTest.swift
@@ -0,0 +1,36 @@
+//
+// VariableNameTest.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+
+/** This object contains property names which we know will be different from their variable name. Examples of this include snake case property names and property names which are Swift 4 reserved words. */
+
+public struct VariableNameTest: Codable {
+
+    /** This snake-case examle_name property name should be converted to a camelCase variable name like exampleName */
+    public var exampleName: String?
+    /** This property name is a reserved word in most languages, including Swift 4. */
+    public var _for: String?
+    /** This model object property name should be unchanged from the JSON property name. */
+    public var normalName: String?
+
+    public init(exampleName: String?, _for: String?, normalName: String?) {
+        self.exampleName = exampleName
+        self._for = _for
+        self.normalName = normalName
+    }
+
+    public enum CodingKeys: String, CodingKey { 
+        case exampleName = "example_name"
+        case _for = "for"
+        case normalName
+    }
+
+
+}
+
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.gitignore b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.gitignore
new file mode 100644
index 00000000000..edcf63f6aee
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.gitignore
@@ -0,0 +1,8 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+composer.lock
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md
index 4ae16d9d864..b42462087c7 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md
@@ -124,6 +124,12 @@ Class | Method | HTTP request | Description
  - [ArrayOfArrayOfNumberOnly](docs/Model/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/Model/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/Model/ArrayTest.md)
+ - [Body](docs/Model/Body.md)
+ - [Body1](docs/Model/Body1.md)
+ - [Body2](docs/Model/Body2.md)
+ - [Body3](docs/Model/Body3.md)
+ - [Body4](docs/Model/Body4.md)
+ - [Body5](docs/Model/Body5.md)
  - [Capitalization](docs/Model/Capitalization.md)
  - [Cat](docs/Model/Cat.md)
  - [Category](docs/Model/Category.md)
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body.md
new file mode 100644
index 00000000000..c3cbc85ee89
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body.md
@@ -0,0 +1,11 @@
+# Body
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **string** | Updated name of the pet | [optional] 
+**status** | **string** | Updated status of the pet | [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/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body1.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body1.md
new file mode 100644
index 00000000000..8f063c22f08
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body1.md
@@ -0,0 +1,11 @@
+# Body1
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**additional_metadata** | **string** | Additional data to pass to server | [optional] 
+**file** | [**\SplFileObject**](\SplFileObject.md) | file to upload | [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/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body2.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body2.md
new file mode 100644
index 00000000000..5afe5ce7313
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body2.md
@@ -0,0 +1,11 @@
+# Body2
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**enum_form_string_array** | **string[]** | Form parameter enum test (string array) | [optional] 
+**enum_form_string** | **string** | Form parameter enum test (string) | [optional] [default to '-efg']
+
+[[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/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body3.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body3.md
new file mode 100644
index 00000000000..fe21931b97d
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body3.md
@@ -0,0 +1,23 @@
+# Body3
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**integer** | **int** | None | [optional] 
+**int32** | **int** | None | [optional] 
+**int64** | **int** | None | [optional] 
+**number** | **float** | None | 
+**float** | **float** | None | [optional] 
+**double** | **double** | None | 
+**string** | **string** | None | [optional] 
+**pattern_without_delimiter** | **string** | None | 
+**byte** | **string** | None | 
+**binary** | [**\SplFileObject**](\SplFileObject.md) | None | [optional] 
+**date** | [**\DateTime**](\DateTime.md) | None | [optional] 
+**date_time** | [**\DateTime**](\DateTime.md) | None | [optional] 
+**password** | **string** | None | [optional] 
+**callback** | **string** | None | [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/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body4.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body4.md
new file mode 100644
index 00000000000..f583ce67bec
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body4.md
@@ -0,0 +1,11 @@
+# Body4
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**param** | **string** | field1 | 
+**param2** | **string** | field2 | 
+
+[[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/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body5.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body5.md
new file mode 100644
index 00000000000..bb39fd91717
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/Body5.md
@@ -0,0 +1,11 @@
+# Body5
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**additional_metadata** | **string** | Additional data to pass to server | [optional] 
+**required_file** | [**\SplFileObject**](\SplFileObject.md) | file to upload | 
+
+[[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/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
index 5823c0c0ee0..99f505c8848 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
index e5d53a08e5b..82b27dcdbb7 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
index 33427981bda..01514377032 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
index cc8aa218449..8795c879f0f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
index 83b43e02587..f12a918dc9c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
index 14b1720e0e4..afe2b3563c2 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
index 0152162f71e..da631f51d79 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
index f6b5a845aaa..06150749a24 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
index c63bed58b4e..9f785db442d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
index e0580382283..0e9116158ae 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
index de132087d2d..fbb1d2f23ed 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
index f3b820922b3..9122cd1cb18 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AnimalFarm.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
index a90a9af8243..ba9cb5ce79b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
index c1fde194525..f6047651834 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
index 30f62c06667..5d5c92f9546 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
index 8625f31f1d1..39bdc1ad056 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body.php
new file mode 100644
index 00000000000..da5eb94ffc1
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * Body
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+
+use \ArrayAccess;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * Body Class Doc Comment
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+class Body implements ModelInterface, ArrayAccess
+{
+    const DISCRIMINATOR = null;
+
+    /**
+      * The original name of the model.
+      *
+      * @var string
+      */
+    protected static $openAPIModelName = 'body';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPITypes = [
+        'name' => 'string',
+        'status' => 'string'
+    ];
+
+    /**
+      * Array of property to format mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPIFormats = [
+        'name' => null,
+        'status' => null
+    ];
+
+    /**
+     * Array of property to type mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPITypes()
+    {
+        return self::$openAPITypes;
+    }
+
+    /**
+     * Array of property to format mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPIFormats()
+    {
+        return self::$openAPIFormats;
+    }
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @var string[]
+     */
+    protected static $attributeMap = [
+        'name' => 'name',
+        'status' => 'status'
+    ];
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @var string[]
+     */
+    protected static $setters = [
+        'name' => 'setName',
+        'status' => 'setStatus'
+    ];
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @var string[]
+     */
+    protected static $getters = [
+        'name' => 'getName',
+        'status' => 'getStatus'
+    ];
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @return array
+     */
+    public static function attributeMap()
+    {
+        return self::$attributeMap;
+    }
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @return array
+     */
+    public static function setters()
+    {
+        return self::$setters;
+    }
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @return array
+     */
+    public static function getters()
+    {
+        return self::$getters;
+    }
+
+    /**
+     * The original name of the model.
+     *
+     * @return string
+     */
+    public function getModelName()
+    {
+        return self::$openAPIModelName;
+    }
+
+    
+
+    
+
+    /**
+     * Associative array for storing property values
+     *
+     * @var mixed[]
+     */
+    protected $container = [];
+
+    /**
+     * Constructor
+     *
+     * @param mixed[] $data Associated array of property values
+     *                      initializing the model
+     */
+    public function __construct(array $data = null)
+    {
+        $this->container['name'] = isset($data['name']) ? $data['name'] : null;
+        $this->container['status'] = isset($data['status']) ? $data['status'] : null;
+    }
+
+    /**
+     * Show all the invalid properties with reasons.
+     *
+     * @return array invalid properties with reasons
+     */
+    public function listInvalidProperties()
+    {
+        $invalidProperties = [];
+
+        return $invalidProperties;
+    }
+
+    /**
+     * Validate all the properties in the model
+     * return true if all passed
+     *
+     * @return bool True if all properties are valid
+     */
+    public function valid()
+    {
+        return count($this->listInvalidProperties()) === 0;
+    }
+
+
+    /**
+     * Gets name
+     *
+     * @return string|null
+     */
+    public function getName()
+    {
+        return $this->container['name'];
+    }
+
+    /**
+     * Sets name
+     *
+     * @param string|null $name Updated name of the pet
+     *
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->container['name'] = $name;
+
+        return $this;
+    }
+
+    /**
+     * Gets status
+     *
+     * @return string|null
+     */
+    public function getStatus()
+    {
+        return $this->container['status'];
+    }
+
+    /**
+     * Sets status
+     *
+     * @param string|null $status Updated status of the pet
+     *
+     * @return $this
+     */
+    public function setStatus($status)
+    {
+        $this->container['status'] = $status;
+
+        return $this;
+    }
+    /**
+     * 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()
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
+}
+
+
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body1.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body1.php
new file mode 100644
index 00000000000..c8a67fc743d
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body1.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * Body1
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+
+use \ArrayAccess;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * Body1 Class Doc Comment
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+class Body1 implements ModelInterface, ArrayAccess
+{
+    const DISCRIMINATOR = null;
+
+    /**
+      * The original name of the model.
+      *
+      * @var string
+      */
+    protected static $openAPIModelName = 'body_1';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPITypes = [
+        'additional_metadata' => 'string',
+        'file' => '\SplFileObject'
+    ];
+
+    /**
+      * Array of property to format mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPIFormats = [
+        'additional_metadata' => null,
+        'file' => 'binary'
+    ];
+
+    /**
+     * Array of property to type mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPITypes()
+    {
+        return self::$openAPITypes;
+    }
+
+    /**
+     * Array of property to format mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPIFormats()
+    {
+        return self::$openAPIFormats;
+    }
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @var string[]
+     */
+    protected static $attributeMap = [
+        'additional_metadata' => 'additionalMetadata',
+        'file' => 'file'
+    ];
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @var string[]
+     */
+    protected static $setters = [
+        'additional_metadata' => 'setAdditionalMetadata',
+        'file' => 'setFile'
+    ];
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @var string[]
+     */
+    protected static $getters = [
+        'additional_metadata' => 'getAdditionalMetadata',
+        'file' => 'getFile'
+    ];
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @return array
+     */
+    public static function attributeMap()
+    {
+        return self::$attributeMap;
+    }
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @return array
+     */
+    public static function setters()
+    {
+        return self::$setters;
+    }
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @return array
+     */
+    public static function getters()
+    {
+        return self::$getters;
+    }
+
+    /**
+     * The original name of the model.
+     *
+     * @return string
+     */
+    public function getModelName()
+    {
+        return self::$openAPIModelName;
+    }
+
+    
+
+    
+
+    /**
+     * Associative array for storing property values
+     *
+     * @var mixed[]
+     */
+    protected $container = [];
+
+    /**
+     * Constructor
+     *
+     * @param mixed[] $data Associated array of property values
+     *                      initializing the model
+     */
+    public function __construct(array $data = null)
+    {
+        $this->container['additional_metadata'] = isset($data['additional_metadata']) ? $data['additional_metadata'] : null;
+        $this->container['file'] = isset($data['file']) ? $data['file'] : null;
+    }
+
+    /**
+     * Show all the invalid properties with reasons.
+     *
+     * @return array invalid properties with reasons
+     */
+    public function listInvalidProperties()
+    {
+        $invalidProperties = [];
+
+        return $invalidProperties;
+    }
+
+    /**
+     * Validate all the properties in the model
+     * return true if all passed
+     *
+     * @return bool True if all properties are valid
+     */
+    public function valid()
+    {
+        return count($this->listInvalidProperties()) === 0;
+    }
+
+
+    /**
+     * Gets additional_metadata
+     *
+     * @return string|null
+     */
+    public function getAdditionalMetadata()
+    {
+        return $this->container['additional_metadata'];
+    }
+
+    /**
+     * Sets additional_metadata
+     *
+     * @param string|null $additional_metadata Additional data to pass to server
+     *
+     * @return $this
+     */
+    public function setAdditionalMetadata($additional_metadata)
+    {
+        $this->container['additional_metadata'] = $additional_metadata;
+
+        return $this;
+    }
+
+    /**
+     * Gets file
+     *
+     * @return \SplFileObject|null
+     */
+    public function getFile()
+    {
+        return $this->container['file'];
+    }
+
+    /**
+     * Sets file
+     *
+     * @param \SplFileObject|null $file file to upload
+     *
+     * @return $this
+     */
+    public function setFile($file)
+    {
+        $this->container['file'] = $file;
+
+        return $this;
+    }
+    /**
+     * 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()
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
+}
+
+
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body2.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body2.php
new file mode 100644
index 00000000000..8d3bf0580ac
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body2.php
@@ -0,0 +1,385 @@
+<?php
+/**
+ * Body2
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+
+use \ArrayAccess;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * Body2 Class Doc Comment
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+class Body2 implements ModelInterface, ArrayAccess
+{
+    const DISCRIMINATOR = null;
+
+    /**
+      * The original name of the model.
+      *
+      * @var string
+      */
+    protected static $openAPIModelName = 'body_2';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPITypes = [
+        'enum_form_string_array' => 'string[]',
+        'enum_form_string' => 'string'
+    ];
+
+    /**
+      * Array of property to format mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPIFormats = [
+        'enum_form_string_array' => null,
+        'enum_form_string' => null
+    ];
+
+    /**
+     * Array of property to type mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPITypes()
+    {
+        return self::$openAPITypes;
+    }
+
+    /**
+     * Array of property to format mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPIFormats()
+    {
+        return self::$openAPIFormats;
+    }
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @var string[]
+     */
+    protected static $attributeMap = [
+        'enum_form_string_array' => 'enum_form_string_array',
+        'enum_form_string' => 'enum_form_string'
+    ];
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @var string[]
+     */
+    protected static $setters = [
+        'enum_form_string_array' => 'setEnumFormStringArray',
+        'enum_form_string' => 'setEnumFormString'
+    ];
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @var string[]
+     */
+    protected static $getters = [
+        'enum_form_string_array' => 'getEnumFormStringArray',
+        'enum_form_string' => 'getEnumFormString'
+    ];
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @return array
+     */
+    public static function attributeMap()
+    {
+        return self::$attributeMap;
+    }
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @return array
+     */
+    public static function setters()
+    {
+        return self::$setters;
+    }
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @return array
+     */
+    public static function getters()
+    {
+        return self::$getters;
+    }
+
+    /**
+     * The original name of the model.
+     *
+     * @return string
+     */
+    public function getModelName()
+    {
+        return self::$openAPIModelName;
+    }
+
+    const ENUM_FORM_STRING_ARRAY_GREATER_THAN = '>';
+    const ENUM_FORM_STRING_ARRAY_DOLLAR = '$';
+    const ENUM_FORM_STRING_ABC = '_abc';
+    const ENUM_FORM_STRING_EFG = '-efg';
+    const ENUM_FORM_STRING_XYZ = '(xyz)';
+    
+
+    
+    /**
+     * Gets allowable values of the enum
+     *
+     * @return string[]
+     */
+    public function getEnumFormStringArrayAllowableValues()
+    {
+        return [
+            self::ENUM_FORM_STRING_ARRAY_GREATER_THAN,
+            self::ENUM_FORM_STRING_ARRAY_DOLLAR,
+        ];
+    }
+    
+    /**
+     * Gets allowable values of the enum
+     *
+     * @return string[]
+     */
+    public function getEnumFormStringAllowableValues()
+    {
+        return [
+            self::ENUM_FORM_STRING_ABC,
+            self::ENUM_FORM_STRING_EFG,
+            self::ENUM_FORM_STRING_XYZ,
+        ];
+    }
+    
+
+    /**
+     * Associative array for storing property values
+     *
+     * @var mixed[]
+     */
+    protected $container = [];
+
+    /**
+     * Constructor
+     *
+     * @param mixed[] $data Associated array of property values
+     *                      initializing the model
+     */
+    public function __construct(array $data = null)
+    {
+        $this->container['enum_form_string_array'] = isset($data['enum_form_string_array']) ? $data['enum_form_string_array'] : null;
+        $this->container['enum_form_string'] = isset($data['enum_form_string']) ? $data['enum_form_string'] : '-efg';
+    }
+
+    /**
+     * Show all the invalid properties with reasons.
+     *
+     * @return array invalid properties with reasons
+     */
+    public function listInvalidProperties()
+    {
+        $invalidProperties = [];
+
+        $allowedValues = $this->getEnumFormStringAllowableValues();
+        if (!is_null($this->container['enum_form_string']) && !in_array($this->container['enum_form_string'], $allowedValues, true)) {
+            $invalidProperties[] = sprintf(
+                "invalid value for 'enum_form_string', must be one of '%s'",
+                implode("', '", $allowedValues)
+            );
+        }
+
+        return $invalidProperties;
+    }
+
+    /**
+     * Validate all the properties in the model
+     * return true if all passed
+     *
+     * @return bool True if all properties are valid
+     */
+    public function valid()
+    {
+        return count($this->listInvalidProperties()) === 0;
+    }
+
+
+    /**
+     * Gets enum_form_string_array
+     *
+     * @return string[]|null
+     */
+    public function getEnumFormStringArray()
+    {
+        return $this->container['enum_form_string_array'];
+    }
+
+    /**
+     * Sets enum_form_string_array
+     *
+     * @param string[]|null $enum_form_string_array Form parameter enum test (string array)
+     *
+     * @return $this
+     */
+    public function setEnumFormStringArray($enum_form_string_array)
+    {
+        $allowedValues = $this->getEnumFormStringArrayAllowableValues();
+        if (!is_null($enum_form_string_array) && array_diff($enum_form_string_array, $allowedValues)) {
+            throw new \InvalidArgumentException(
+                sprintf(
+                    "Invalid value for 'enum_form_string_array', must be one of '%s'",
+                    implode("', '", $allowedValues)
+                )
+            );
+        }
+        $this->container['enum_form_string_array'] = $enum_form_string_array;
+
+        return $this;
+    }
+
+    /**
+     * Gets enum_form_string
+     *
+     * @return string|null
+     */
+    public function getEnumFormString()
+    {
+        return $this->container['enum_form_string'];
+    }
+
+    /**
+     * Sets enum_form_string
+     *
+     * @param string|null $enum_form_string Form parameter enum test (string)
+     *
+     * @return $this
+     */
+    public function setEnumFormString($enum_form_string)
+    {
+        $allowedValues = $this->getEnumFormStringAllowableValues();
+        if (!is_null($enum_form_string) && !in_array($enum_form_string, $allowedValues, true)) {
+            throw new \InvalidArgumentException(
+                sprintf(
+                    "Invalid value for 'enum_form_string', must be one of '%s'",
+                    implode("', '", $allowedValues)
+                )
+            );
+        }
+        $this->container['enum_form_string'] = $enum_form_string;
+
+        return $this;
+    }
+    /**
+     * 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()
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
+}
+
+
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body3.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body3.php
new file mode 100644
index 00000000000..53088b0754f
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body3.php
@@ -0,0 +1,805 @@
+<?php
+/**
+ * Body3
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+
+use \ArrayAccess;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * Body3 Class Doc Comment
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+class Body3 implements ModelInterface, ArrayAccess
+{
+    const DISCRIMINATOR = null;
+
+    /**
+      * The original name of the model.
+      *
+      * @var string
+      */
+    protected static $openAPIModelName = 'body_3';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPITypes = [
+        'integer' => 'int',
+        'int32' => 'int',
+        'int64' => 'int',
+        'number' => 'float',
+        'float' => 'float',
+        'double' => 'double',
+        'string' => 'string',
+        'pattern_without_delimiter' => 'string',
+        'byte' => 'string',
+        'binary' => '\SplFileObject',
+        'date' => '\DateTime',
+        'date_time' => '\DateTime',
+        'password' => 'string',
+        'callback' => 'string'
+    ];
+
+    /**
+      * Array of property to format mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPIFormats = [
+        'integer' => 'int32',
+        'int32' => 'int32',
+        'int64' => 'int64',
+        'number' => null,
+        'float' => 'float',
+        'double' => 'double',
+        'string' => null,
+        'pattern_without_delimiter' => null,
+        'byte' => 'byte',
+        'binary' => 'binary',
+        'date' => 'date',
+        'date_time' => 'date-time',
+        'password' => 'password',
+        'callback' => null
+    ];
+
+    /**
+     * Array of property to type mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPITypes()
+    {
+        return self::$openAPITypes;
+    }
+
+    /**
+     * Array of property to format mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPIFormats()
+    {
+        return self::$openAPIFormats;
+    }
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @var string[]
+     */
+    protected static $attributeMap = [
+        'integer' => 'integer',
+        'int32' => 'int32',
+        'int64' => 'int64',
+        'number' => 'number',
+        'float' => 'float',
+        'double' => 'double',
+        'string' => 'string',
+        'pattern_without_delimiter' => 'pattern_without_delimiter',
+        'byte' => 'byte',
+        'binary' => 'binary',
+        'date' => 'date',
+        'date_time' => 'dateTime',
+        'password' => 'password',
+        'callback' => 'callback'
+    ];
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @var string[]
+     */
+    protected static $setters = [
+        'integer' => 'setInteger',
+        'int32' => 'setInt32',
+        'int64' => 'setInt64',
+        'number' => 'setNumber',
+        'float' => 'setFloat',
+        'double' => 'setDouble',
+        'string' => 'setString',
+        'pattern_without_delimiter' => 'setPatternWithoutDelimiter',
+        'byte' => 'setByte',
+        'binary' => 'setBinary',
+        'date' => 'setDate',
+        'date_time' => 'setDateTime',
+        'password' => 'setPassword',
+        'callback' => 'setCallback'
+    ];
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @var string[]
+     */
+    protected static $getters = [
+        'integer' => 'getInteger',
+        'int32' => 'getInt32',
+        'int64' => 'getInt64',
+        'number' => 'getNumber',
+        'float' => 'getFloat',
+        'double' => 'getDouble',
+        'string' => 'getString',
+        'pattern_without_delimiter' => 'getPatternWithoutDelimiter',
+        'byte' => 'getByte',
+        'binary' => 'getBinary',
+        'date' => 'getDate',
+        'date_time' => 'getDateTime',
+        'password' => 'getPassword',
+        'callback' => 'getCallback'
+    ];
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @return array
+     */
+    public static function attributeMap()
+    {
+        return self::$attributeMap;
+    }
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @return array
+     */
+    public static function setters()
+    {
+        return self::$setters;
+    }
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @return array
+     */
+    public static function getters()
+    {
+        return self::$getters;
+    }
+
+    /**
+     * The original name of the model.
+     *
+     * @return string
+     */
+    public function getModelName()
+    {
+        return self::$openAPIModelName;
+    }
+
+    
+
+    
+
+    /**
+     * Associative array for storing property values
+     *
+     * @var mixed[]
+     */
+    protected $container = [];
+
+    /**
+     * Constructor
+     *
+     * @param mixed[] $data Associated array of property values
+     *                      initializing the model
+     */
+    public function __construct(array $data = null)
+    {
+        $this->container['integer'] = isset($data['integer']) ? $data['integer'] : null;
+        $this->container['int32'] = isset($data['int32']) ? $data['int32'] : null;
+        $this->container['int64'] = isset($data['int64']) ? $data['int64'] : null;
+        $this->container['number'] = isset($data['number']) ? $data['number'] : null;
+        $this->container['float'] = isset($data['float']) ? $data['float'] : null;
+        $this->container['double'] = isset($data['double']) ? $data['double'] : null;
+        $this->container['string'] = isset($data['string']) ? $data['string'] : null;
+        $this->container['pattern_without_delimiter'] = isset($data['pattern_without_delimiter']) ? $data['pattern_without_delimiter'] : null;
+        $this->container['byte'] = isset($data['byte']) ? $data['byte'] : null;
+        $this->container['binary'] = isset($data['binary']) ? $data['binary'] : null;
+        $this->container['date'] = isset($data['date']) ? $data['date'] : null;
+        $this->container['date_time'] = isset($data['date_time']) ? $data['date_time'] : null;
+        $this->container['password'] = isset($data['password']) ? $data['password'] : null;
+        $this->container['callback'] = isset($data['callback']) ? $data['callback'] : null;
+    }
+
+    /**
+     * Show all the invalid properties with reasons.
+     *
+     * @return array invalid properties with reasons
+     */
+    public function listInvalidProperties()
+    {
+        $invalidProperties = [];
+
+        if (!is_null($this->container['integer']) && ($this->container['integer'] > 100)) {
+            $invalidProperties[] = "invalid value for 'integer', must be smaller than or equal to 100.";
+        }
+
+        if (!is_null($this->container['integer']) && ($this->container['integer'] < 10)) {
+            $invalidProperties[] = "invalid value for 'integer', must be bigger than or equal to 10.";
+        }
+
+        if (!is_null($this->container['int32']) && ($this->container['int32'] > 200)) {
+            $invalidProperties[] = "invalid value for 'int32', must be smaller than or equal to 200.";
+        }
+
+        if (!is_null($this->container['int32']) && ($this->container['int32'] < 20)) {
+            $invalidProperties[] = "invalid value for 'int32', must be bigger than or equal to 20.";
+        }
+
+        if ($this->container['number'] === null) {
+            $invalidProperties[] = "'number' can't be null";
+        }
+        if (($this->container['number'] > 543.2)) {
+            $invalidProperties[] = "invalid value for 'number', must be smaller than or equal to 543.2.";
+        }
+
+        if (($this->container['number'] < 32.1)) {
+            $invalidProperties[] = "invalid value for 'number', must be bigger than or equal to 32.1.";
+        }
+
+        if (!is_null($this->container['float']) && ($this->container['float'] > 987.6)) {
+            $invalidProperties[] = "invalid value for 'float', must be smaller than or equal to 987.6.";
+        }
+
+        if ($this->container['double'] === null) {
+            $invalidProperties[] = "'double' can't be null";
+        }
+        if (($this->container['double'] > 123.4)) {
+            $invalidProperties[] = "invalid value for 'double', must be smaller than or equal to 123.4.";
+        }
+
+        if (($this->container['double'] < 67.8)) {
+            $invalidProperties[] = "invalid value for 'double', must be bigger than or equal to 67.8.";
+        }
+
+        if (!is_null($this->container['string']) && !preg_match("/[a-z]/i", $this->container['string'])) {
+            $invalidProperties[] = "invalid value for 'string', must be conform to the pattern /[a-z]/i.";
+        }
+
+        if ($this->container['pattern_without_delimiter'] === null) {
+            $invalidProperties[] = "'pattern_without_delimiter' can't be null";
+        }
+        if (!preg_match("/^[A-Z].*/", $this->container['pattern_without_delimiter'])) {
+            $invalidProperties[] = "invalid value for 'pattern_without_delimiter', must be conform to the pattern /^[A-Z].*/.";
+        }
+
+        if ($this->container['byte'] === null) {
+            $invalidProperties[] = "'byte' can't be null";
+        }
+        if (!is_null($this->container['password']) && (mb_strlen($this->container['password']) > 64)) {
+            $invalidProperties[] = "invalid value for 'password', the character length must be smaller than or equal to 64.";
+        }
+
+        if (!is_null($this->container['password']) && (mb_strlen($this->container['password']) < 10)) {
+            $invalidProperties[] = "invalid value for 'password', the character length must be bigger than or equal to 10.";
+        }
+
+        return $invalidProperties;
+    }
+
+    /**
+     * Validate all the properties in the model
+     * return true if all passed
+     *
+     * @return bool True if all properties are valid
+     */
+    public function valid()
+    {
+        return count($this->listInvalidProperties()) === 0;
+    }
+
+
+    /**
+     * Gets integer
+     *
+     * @return int|null
+     */
+    public function getInteger()
+    {
+        return $this->container['integer'];
+    }
+
+    /**
+     * Sets integer
+     *
+     * @param int|null $integer None
+     *
+     * @return $this
+     */
+    public function setInteger($integer)
+    {
+
+        if (!is_null($integer) && ($integer > 100)) {
+            throw new \InvalidArgumentException('invalid value for $integer when calling Body3., must be smaller than or equal to 100.');
+        }
+        if (!is_null($integer) && ($integer < 10)) {
+            throw new \InvalidArgumentException('invalid value for $integer when calling Body3., must be bigger than or equal to 10.');
+        }
+
+        $this->container['integer'] = $integer;
+
+        return $this;
+    }
+
+    /**
+     * Gets int32
+     *
+     * @return int|null
+     */
+    public function getInt32()
+    {
+        return $this->container['int32'];
+    }
+
+    /**
+     * Sets int32
+     *
+     * @param int|null $int32 None
+     *
+     * @return $this
+     */
+    public function setInt32($int32)
+    {
+
+        if (!is_null($int32) && ($int32 > 200)) {
+            throw new \InvalidArgumentException('invalid value for $int32 when calling Body3., must be smaller than or equal to 200.');
+        }
+        if (!is_null($int32) && ($int32 < 20)) {
+            throw new \InvalidArgumentException('invalid value for $int32 when calling Body3., must be bigger than or equal to 20.');
+        }
+
+        $this->container['int32'] = $int32;
+
+        return $this;
+    }
+
+    /**
+     * Gets int64
+     *
+     * @return int|null
+     */
+    public function getInt64()
+    {
+        return $this->container['int64'];
+    }
+
+    /**
+     * Sets int64
+     *
+     * @param int|null $int64 None
+     *
+     * @return $this
+     */
+    public function setInt64($int64)
+    {
+        $this->container['int64'] = $int64;
+
+        return $this;
+    }
+
+    /**
+     * Gets number
+     *
+     * @return float
+     */
+    public function getNumber()
+    {
+        return $this->container['number'];
+    }
+
+    /**
+     * Sets number
+     *
+     * @param float $number None
+     *
+     * @return $this
+     */
+    public function setNumber($number)
+    {
+
+        if (($number > 543.2)) {
+            throw new \InvalidArgumentException('invalid value for $number when calling Body3., must be smaller than or equal to 543.2.');
+        }
+        if (($number < 32.1)) {
+            throw new \InvalidArgumentException('invalid value for $number when calling Body3., must be bigger than or equal to 32.1.');
+        }
+
+        $this->container['number'] = $number;
+
+        return $this;
+    }
+
+    /**
+     * Gets float
+     *
+     * @return float|null
+     */
+    public function getFloat()
+    {
+        return $this->container['float'];
+    }
+
+    /**
+     * Sets float
+     *
+     * @param float|null $float None
+     *
+     * @return $this
+     */
+    public function setFloat($float)
+    {
+
+        if (!is_null($float) && ($float > 987.6)) {
+            throw new \InvalidArgumentException('invalid value for $float when calling Body3., must be smaller than or equal to 987.6.');
+        }
+
+        $this->container['float'] = $float;
+
+        return $this;
+    }
+
+    /**
+     * Gets double
+     *
+     * @return double
+     */
+    public function getDouble()
+    {
+        return $this->container['double'];
+    }
+
+    /**
+     * Sets double
+     *
+     * @param double $double None
+     *
+     * @return $this
+     */
+    public function setDouble($double)
+    {
+
+        if (($double > 123.4)) {
+            throw new \InvalidArgumentException('invalid value for $double when calling Body3., must be smaller than or equal to 123.4.');
+        }
+        if (($double < 67.8)) {
+            throw new \InvalidArgumentException('invalid value for $double when calling Body3., must be bigger than or equal to 67.8.');
+        }
+
+        $this->container['double'] = $double;
+
+        return $this;
+    }
+
+    /**
+     * Gets string
+     *
+     * @return string|null
+     */
+    public function getString()
+    {
+        return $this->container['string'];
+    }
+
+    /**
+     * Sets string
+     *
+     * @param string|null $string None
+     *
+     * @return $this
+     */
+    public function setString($string)
+    {
+
+        if (!is_null($string) && (!preg_match("/[a-z]/i", $string))) {
+            throw new \InvalidArgumentException("invalid value for $string when calling Body3., must conform to the pattern /[a-z]/i.");
+        }
+
+        $this->container['string'] = $string;
+
+        return $this;
+    }
+
+    /**
+     * Gets pattern_without_delimiter
+     *
+     * @return string
+     */
+    public function getPatternWithoutDelimiter()
+    {
+        return $this->container['pattern_without_delimiter'];
+    }
+
+    /**
+     * Sets pattern_without_delimiter
+     *
+     * @param string $pattern_without_delimiter None
+     *
+     * @return $this
+     */
+    public function setPatternWithoutDelimiter($pattern_without_delimiter)
+    {
+
+        if ((!preg_match("/^[A-Z].*/", $pattern_without_delimiter))) {
+            throw new \InvalidArgumentException("invalid value for $pattern_without_delimiter when calling Body3., must conform to the pattern /^[A-Z].*/.");
+        }
+
+        $this->container['pattern_without_delimiter'] = $pattern_without_delimiter;
+
+        return $this;
+    }
+
+    /**
+     * Gets byte
+     *
+     * @return string
+     */
+    public function getByte()
+    {
+        return $this->container['byte'];
+    }
+
+    /**
+     * Sets byte
+     *
+     * @param string $byte None
+     *
+     * @return $this
+     */
+    public function setByte($byte)
+    {
+        $this->container['byte'] = $byte;
+
+        return $this;
+    }
+
+    /**
+     * Gets binary
+     *
+     * @return \SplFileObject|null
+     */
+    public function getBinary()
+    {
+        return $this->container['binary'];
+    }
+
+    /**
+     * Sets binary
+     *
+     * @param \SplFileObject|null $binary None
+     *
+     * @return $this
+     */
+    public function setBinary($binary)
+    {
+        $this->container['binary'] = $binary;
+
+        return $this;
+    }
+
+    /**
+     * Gets date
+     *
+     * @return \DateTime|null
+     */
+    public function getDate()
+    {
+        return $this->container['date'];
+    }
+
+    /**
+     * Sets date
+     *
+     * @param \DateTime|null $date None
+     *
+     * @return $this
+     */
+    public function setDate($date)
+    {
+        $this->container['date'] = $date;
+
+        return $this;
+    }
+
+    /**
+     * Gets date_time
+     *
+     * @return \DateTime|null
+     */
+    public function getDateTime()
+    {
+        return $this->container['date_time'];
+    }
+
+    /**
+     * Sets date_time
+     *
+     * @param \DateTime|null $date_time None
+     *
+     * @return $this
+     */
+    public function setDateTime($date_time)
+    {
+        $this->container['date_time'] = $date_time;
+
+        return $this;
+    }
+
+    /**
+     * Gets password
+     *
+     * @return string|null
+     */
+    public function getPassword()
+    {
+        return $this->container['password'];
+    }
+
+    /**
+     * Sets password
+     *
+     * @param string|null $password None
+     *
+     * @return $this
+     */
+    public function setPassword($password)
+    {
+        if (!is_null($password) && (mb_strlen($password) > 64)) {
+            throw new \InvalidArgumentException('invalid length for $password when calling Body3., must be smaller than or equal to 64.');
+        }
+        if (!is_null($password) && (mb_strlen($password) < 10)) {
+            throw new \InvalidArgumentException('invalid length for $password when calling Body3., must be bigger than or equal to 10.');
+        }
+
+        $this->container['password'] = $password;
+
+        return $this;
+    }
+
+    /**
+     * Gets callback
+     *
+     * @return string|null
+     */
+    public function getCallback()
+    {
+        return $this->container['callback'];
+    }
+
+    /**
+     * Sets callback
+     *
+     * @param string|null $callback None
+     *
+     * @return $this
+     */
+    public function setCallback($callback)
+    {
+        $this->container['callback'] = $callback;
+
+        return $this;
+    }
+    /**
+     * 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()
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
+}
+
+
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body4.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body4.php
new file mode 100644
index 00000000000..c6422aed5ed
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body4.php
@@ -0,0 +1,333 @@
+<?php
+/**
+ * Body4
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+
+use \ArrayAccess;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * Body4 Class Doc Comment
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+class Body4 implements ModelInterface, ArrayAccess
+{
+    const DISCRIMINATOR = null;
+
+    /**
+      * The original name of the model.
+      *
+      * @var string
+      */
+    protected static $openAPIModelName = 'body_4';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPITypes = [
+        'param' => 'string',
+        'param2' => 'string'
+    ];
+
+    /**
+      * Array of property to format mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPIFormats = [
+        'param' => null,
+        'param2' => null
+    ];
+
+    /**
+     * Array of property to type mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPITypes()
+    {
+        return self::$openAPITypes;
+    }
+
+    /**
+     * Array of property to format mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPIFormats()
+    {
+        return self::$openAPIFormats;
+    }
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @var string[]
+     */
+    protected static $attributeMap = [
+        'param' => 'param',
+        'param2' => 'param2'
+    ];
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @var string[]
+     */
+    protected static $setters = [
+        'param' => 'setParam',
+        'param2' => 'setParam2'
+    ];
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @var string[]
+     */
+    protected static $getters = [
+        'param' => 'getParam',
+        'param2' => 'getParam2'
+    ];
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @return array
+     */
+    public static function attributeMap()
+    {
+        return self::$attributeMap;
+    }
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @return array
+     */
+    public static function setters()
+    {
+        return self::$setters;
+    }
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @return array
+     */
+    public static function getters()
+    {
+        return self::$getters;
+    }
+
+    /**
+     * The original name of the model.
+     *
+     * @return string
+     */
+    public function getModelName()
+    {
+        return self::$openAPIModelName;
+    }
+
+    
+
+    
+
+    /**
+     * Associative array for storing property values
+     *
+     * @var mixed[]
+     */
+    protected $container = [];
+
+    /**
+     * Constructor
+     *
+     * @param mixed[] $data Associated array of property values
+     *                      initializing the model
+     */
+    public function __construct(array $data = null)
+    {
+        $this->container['param'] = isset($data['param']) ? $data['param'] : null;
+        $this->container['param2'] = isset($data['param2']) ? $data['param2'] : null;
+    }
+
+    /**
+     * Show all the invalid properties with reasons.
+     *
+     * @return array invalid properties with reasons
+     */
+    public function listInvalidProperties()
+    {
+        $invalidProperties = [];
+
+        if ($this->container['param'] === null) {
+            $invalidProperties[] = "'param' can't be null";
+        }
+        if ($this->container['param2'] === null) {
+            $invalidProperties[] = "'param2' can't be null";
+        }
+        return $invalidProperties;
+    }
+
+    /**
+     * Validate all the properties in the model
+     * return true if all passed
+     *
+     * @return bool True if all properties are valid
+     */
+    public function valid()
+    {
+        return count($this->listInvalidProperties()) === 0;
+    }
+
+
+    /**
+     * Gets param
+     *
+     * @return string
+     */
+    public function getParam()
+    {
+        return $this->container['param'];
+    }
+
+    /**
+     * Sets param
+     *
+     * @param string $param field1
+     *
+     * @return $this
+     */
+    public function setParam($param)
+    {
+        $this->container['param'] = $param;
+
+        return $this;
+    }
+
+    /**
+     * Gets param2
+     *
+     * @return string
+     */
+    public function getParam2()
+    {
+        return $this->container['param2'];
+    }
+
+    /**
+     * Sets param2
+     *
+     * @param string $param2 field2
+     *
+     * @return $this
+     */
+    public function setParam2($param2)
+    {
+        $this->container['param2'] = $param2;
+
+        return $this;
+    }
+    /**
+     * 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()
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
+}
+
+
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body5.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body5.php
new file mode 100644
index 00000000000..94349744759
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Body5.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ * Body5
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+
+use \ArrayAccess;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * Body5 Class Doc Comment
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+class Body5 implements ModelInterface, ArrayAccess
+{
+    const DISCRIMINATOR = null;
+
+    /**
+      * The original name of the model.
+      *
+      * @var string
+      */
+    protected static $openAPIModelName = 'body_5';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPITypes = [
+        'additional_metadata' => 'string',
+        'required_file' => '\SplFileObject'
+    ];
+
+    /**
+      * Array of property to format mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPIFormats = [
+        'additional_metadata' => null,
+        'required_file' => 'binary'
+    ];
+
+    /**
+     * Array of property to type mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPITypes()
+    {
+        return self::$openAPITypes;
+    }
+
+    /**
+     * Array of property to format mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPIFormats()
+    {
+        return self::$openAPIFormats;
+    }
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @var string[]
+     */
+    protected static $attributeMap = [
+        'additional_metadata' => 'additionalMetadata',
+        'required_file' => 'requiredFile'
+    ];
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @var string[]
+     */
+    protected static $setters = [
+        'additional_metadata' => 'setAdditionalMetadata',
+        'required_file' => 'setRequiredFile'
+    ];
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @var string[]
+     */
+    protected static $getters = [
+        'additional_metadata' => 'getAdditionalMetadata',
+        'required_file' => 'getRequiredFile'
+    ];
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @return array
+     */
+    public static function attributeMap()
+    {
+        return self::$attributeMap;
+    }
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @return array
+     */
+    public static function setters()
+    {
+        return self::$setters;
+    }
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @return array
+     */
+    public static function getters()
+    {
+        return self::$getters;
+    }
+
+    /**
+     * The original name of the model.
+     *
+     * @return string
+     */
+    public function getModelName()
+    {
+        return self::$openAPIModelName;
+    }
+
+    
+
+    
+
+    /**
+     * Associative array for storing property values
+     *
+     * @var mixed[]
+     */
+    protected $container = [];
+
+    /**
+     * Constructor
+     *
+     * @param mixed[] $data Associated array of property values
+     *                      initializing the model
+     */
+    public function __construct(array $data = null)
+    {
+        $this->container['additional_metadata'] = isset($data['additional_metadata']) ? $data['additional_metadata'] : null;
+        $this->container['required_file'] = isset($data['required_file']) ? $data['required_file'] : null;
+    }
+
+    /**
+     * Show all the invalid properties with reasons.
+     *
+     * @return array invalid properties with reasons
+     */
+    public function listInvalidProperties()
+    {
+        $invalidProperties = [];
+
+        if ($this->container['required_file'] === null) {
+            $invalidProperties[] = "'required_file' can't be null";
+        }
+        return $invalidProperties;
+    }
+
+    /**
+     * Validate all the properties in the model
+     * return true if all passed
+     *
+     * @return bool True if all properties are valid
+     */
+    public function valid()
+    {
+        return count($this->listInvalidProperties()) === 0;
+    }
+
+
+    /**
+     * Gets additional_metadata
+     *
+     * @return string|null
+     */
+    public function getAdditionalMetadata()
+    {
+        return $this->container['additional_metadata'];
+    }
+
+    /**
+     * Sets additional_metadata
+     *
+     * @param string|null $additional_metadata Additional data to pass to server
+     *
+     * @return $this
+     */
+    public function setAdditionalMetadata($additional_metadata)
+    {
+        $this->container['additional_metadata'] = $additional_metadata;
+
+        return $this;
+    }
+
+    /**
+     * Gets required_file
+     *
+     * @return \SplFileObject
+     */
+    public function getRequiredFile()
+    {
+        return $this->container['required_file'];
+    }
+
+    /**
+     * Sets required_file
+     *
+     * @param \SplFileObject $required_file file to upload
+     *
+     * @return $this
+     */
+    public function setRequiredFile($required_file)
+    {
+        $this->container['required_file'] = $required_file;
+
+        return $this;
+    }
+    /**
+     * 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()
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
+}
+
+
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
index 22739a7c632..24f83aef548 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
index 6ca8d0d3ba1..1eeb4be5d37 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
index cf236825c47..1da9729f5b4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
index fc33d211666..df7d62205cf 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
index db1f712f0c0..106184d21a4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
index f8924d7fb86..098dd5d56eb 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
index 029fcdc3e2d..6a8dd35aa41 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
index eb66f0ab957..4099f2dc6ad 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
index c8c091cabce..56bda31a5c4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
index aa04c170043..0fe2d61e2ef 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
index 45fe3b5a53d..54decec82d8 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
index feb8fdc6e2e..e8ac48225ac 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
index 85059a73774..21b845841c3 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
index 34295f3473e..33d6f8c6cc4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
index 4107964b5ef..e522a954b6d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
index 95966b3b40a..d93f7ae5a8b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
index baa7267b757..f474cff3dae 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
index ba27a1ea33a..182627efc21 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
index 5c2038ff584..00df339f7e3 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
index 20284b07dda..fd451a880cc 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
index fa525b1e5ce..3d6e3a119bb 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
index baa76be7d96..dff244bd604 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
index fe5f8434527..fe7b1ae607c 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
index ec7262c9d44..c28577aebe0 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
index 3ab9f16e3e0..71a7f65bd7b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
index 4ca0ed8ca30..c8235528f02 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
index 7dd63e03130..3a0aaa94c9e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
index d3665902cae..d7837757f8f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/StringBooleanMap.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
index 26b27adfe3c..c0306a00864 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
index 80def29e5aa..13202ead6a1 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
index 024969dcd6a..95830e8b257 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
index b79a751b98d..7df4931b53b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
index 60e051fd066..126ac5cfbee 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
index 71cdaf6cf2b..4cd1d46fb7e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
index 83fd23fb10f..245d1a616b9 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
index 5ea98485e93..dae232e528e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
index 6a4ced913c7..3a5f9ff1943 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
index 4eaabc82ce4..629ee0f5657 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
index 5e984bac6be..559d559c627 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
index 7579695f18a..525eb6d7738 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
index cb64b823911..c8a38c1bcc0 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index d21fde8b686..d61a5a33184 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
index fb80798ecd2..964c72fd86b 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
index 1cb5018cdb3..c32c301b7cc 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body1Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body1Test.php
new file mode 100644
index 00000000000..f8ae7d61fbf
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body1Test.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Body1Test
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Please update the test case below to test the model.
+ */
+
+namespace OpenAPI\Client;
+
+/**
+ * Body1Test Class Doc Comment
+ *
+ * @category    Class
+ * @description Body1
+ * @package     OpenAPI\Client
+ * @author      OpenAPI Generator team
+ * @link        https://openapi-generator.tech
+ */
+class Body1Test extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running any test case
+     */
+    public static function setUpBeforeClass()
+    {
+    }
+
+    /**
+     * Setup before running each test case
+     */
+    public function setUp()
+    {
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public function tearDown()
+    {
+    }
+
+    /**
+     * Clean up after running all test cases
+     */
+    public static function tearDownAfterClass()
+    {
+    }
+
+    /**
+     * Test "Body1"
+     */
+    public function testBody1()
+    {
+    }
+
+    /**
+     * Test attribute "additional_metadata"
+     */
+    public function testPropertyAdditionalMetadata()
+    {
+    }
+
+    /**
+     * Test attribute "file"
+     */
+    public function testPropertyFile()
+    {
+    }
+}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body2Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body2Test.php
new file mode 100644
index 00000000000..1a677c869ab
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body2Test.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Body2Test
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Please update the test case below to test the model.
+ */
+
+namespace OpenAPI\Client;
+
+/**
+ * Body2Test Class Doc Comment
+ *
+ * @category    Class
+ * @description Body2
+ * @package     OpenAPI\Client
+ * @author      OpenAPI Generator team
+ * @link        https://openapi-generator.tech
+ */
+class Body2Test extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running any test case
+     */
+    public static function setUpBeforeClass()
+    {
+    }
+
+    /**
+     * Setup before running each test case
+     */
+    public function setUp()
+    {
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public function tearDown()
+    {
+    }
+
+    /**
+     * Clean up after running all test cases
+     */
+    public static function tearDownAfterClass()
+    {
+    }
+
+    /**
+     * Test "Body2"
+     */
+    public function testBody2()
+    {
+    }
+
+    /**
+     * Test attribute "enum_form_string_array"
+     */
+    public function testPropertyEnumFormStringArray()
+    {
+    }
+
+    /**
+     * Test attribute "enum_form_string"
+     */
+    public function testPropertyEnumFormString()
+    {
+    }
+}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body3Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body3Test.php
new file mode 100644
index 00000000000..797e5d7b419
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body3Test.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Body3Test
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Please update the test case below to test the model.
+ */
+
+namespace OpenAPI\Client;
+
+/**
+ * Body3Test Class Doc Comment
+ *
+ * @category    Class
+ * @description Body3
+ * @package     OpenAPI\Client
+ * @author      OpenAPI Generator team
+ * @link        https://openapi-generator.tech
+ */
+class Body3Test extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running any test case
+     */
+    public static function setUpBeforeClass()
+    {
+    }
+
+    /**
+     * Setup before running each test case
+     */
+    public function setUp()
+    {
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public function tearDown()
+    {
+    }
+
+    /**
+     * Clean up after running all test cases
+     */
+    public static function tearDownAfterClass()
+    {
+    }
+
+    /**
+     * Test "Body3"
+     */
+    public function testBody3()
+    {
+    }
+
+    /**
+     * Test attribute "integer"
+     */
+    public function testPropertyInteger()
+    {
+    }
+
+    /**
+     * Test attribute "int32"
+     */
+    public function testPropertyInt32()
+    {
+    }
+
+    /**
+     * Test attribute "int64"
+     */
+    public function testPropertyInt64()
+    {
+    }
+
+    /**
+     * Test attribute "number"
+     */
+    public function testPropertyNumber()
+    {
+    }
+
+    /**
+     * Test attribute "float"
+     */
+    public function testPropertyFloat()
+    {
+    }
+
+    /**
+     * Test attribute "double"
+     */
+    public function testPropertyDouble()
+    {
+    }
+
+    /**
+     * Test attribute "string"
+     */
+    public function testPropertyString()
+    {
+    }
+
+    /**
+     * Test attribute "pattern_without_delimiter"
+     */
+    public function testPropertyPatternWithoutDelimiter()
+    {
+    }
+
+    /**
+     * Test attribute "byte"
+     */
+    public function testPropertyByte()
+    {
+    }
+
+    /**
+     * Test attribute "binary"
+     */
+    public function testPropertyBinary()
+    {
+    }
+
+    /**
+     * Test attribute "date"
+     */
+    public function testPropertyDate()
+    {
+    }
+
+    /**
+     * Test attribute "date_time"
+     */
+    public function testPropertyDateTime()
+    {
+    }
+
+    /**
+     * Test attribute "password"
+     */
+    public function testPropertyPassword()
+    {
+    }
+
+    /**
+     * Test attribute "callback"
+     */
+    public function testPropertyCallback()
+    {
+    }
+}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body4Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body4Test.php
new file mode 100644
index 00000000000..6a41f83c0ff
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body4Test.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Body4Test
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Please update the test case below to test the model.
+ */
+
+namespace OpenAPI\Client;
+
+/**
+ * Body4Test Class Doc Comment
+ *
+ * @category    Class
+ * @description Body4
+ * @package     OpenAPI\Client
+ * @author      OpenAPI Generator team
+ * @link        https://openapi-generator.tech
+ */
+class Body4Test extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running any test case
+     */
+    public static function setUpBeforeClass()
+    {
+    }
+
+    /**
+     * Setup before running each test case
+     */
+    public function setUp()
+    {
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public function tearDown()
+    {
+    }
+
+    /**
+     * Clean up after running all test cases
+     */
+    public static function tearDownAfterClass()
+    {
+    }
+
+    /**
+     * Test "Body4"
+     */
+    public function testBody4()
+    {
+    }
+
+    /**
+     * Test attribute "param"
+     */
+    public function testPropertyParam()
+    {
+    }
+
+    /**
+     * Test attribute "param2"
+     */
+    public function testPropertyParam2()
+    {
+    }
+}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body5Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body5Test.php
new file mode 100644
index 00000000000..0237c53ed30
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Body5Test.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Body5Test
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Please update the test case below to test the model.
+ */
+
+namespace OpenAPI\Client;
+
+/**
+ * Body5Test Class Doc Comment
+ *
+ * @category    Class
+ * @description Body5
+ * @package     OpenAPI\Client
+ * @author      OpenAPI Generator team
+ * @link        https://openapi-generator.tech
+ */
+class Body5Test extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running any test case
+     */
+    public static function setUpBeforeClass()
+    {
+    }
+
+    /**
+     * Setup before running each test case
+     */
+    public function setUp()
+    {
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public function tearDown()
+    {
+    }
+
+    /**
+     * Clean up after running all test cases
+     */
+    public static function tearDownAfterClass()
+    {
+    }
+
+    /**
+     * Test "Body5"
+     */
+    public function testBody5()
+    {
+    }
+
+    /**
+     * Test attribute "additional_metadata"
+     */
+    public function testPropertyAdditionalMetadata()
+    {
+    }
+
+    /**
+     * Test attribute "required_file"
+     */
+    public function testPropertyRequiredFile()
+    {
+    }
+}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/BodyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/BodyTest.php
new file mode 100644
index 00000000000..969c9765f0c
--- /dev/null
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/BodyTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * BodyTest
+ *
+ * PHP version 5
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI 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
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Please update the test case below to test the model.
+ */
+
+namespace OpenAPI\Client;
+
+/**
+ * BodyTest Class Doc Comment
+ *
+ * @category    Class
+ * @description Body
+ * @package     OpenAPI\Client
+ * @author      OpenAPI Generator team
+ * @link        https://openapi-generator.tech
+ */
+class BodyTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Setup before running any test case
+     */
+    public static function setUpBeforeClass()
+    {
+    }
+
+    /**
+     * Setup before running each test case
+     */
+    public function setUp()
+    {
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public function tearDown()
+    {
+    }
+
+    /**
+     * Clean up after running all test cases
+     */
+    public static function tearDownAfterClass()
+    {
+    }
+
+    /**
+     * Test "Body"
+     */
+    public function testBody()
+    {
+    }
+
+    /**
+     * Test attribute "name"
+     */
+    public function testPropertyName()
+    {
+    }
+
+    /**
+     * Test attribute "status"
+     */
+    public function testPropertyStatus()
+    {
+    }
+}
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
index 98617bd6d05..6a5a64b35fe 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
index 9e455fcd171..ac6d86256e5 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
index f5a53a69cf2..90d1d7ecec2 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
index 42610c61c4b..2e99417165f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
index 02c5d3edb10..dc6e21a9164 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
index eaa42fdefd4..606d1d893fa 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
index 9d07ad0c9c6..4dd023d49fd 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
index 86c236f8745..f63230dd96d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
index e3805b23319..4745ed774a2 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
index ab0ebb13744..199abb9d64f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
index 55a77ce6cbb..222dcbf7476 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
index b74fab7c8a1..59d86e07c52 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
index 081cda4e456..14b62d06498 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
index b17f229c293..e1d6d387eb0 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index f25f42275d8..549d7c2b22a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
index 6ce3b5fa858..4ed9337429d 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
index c6973b2fb20..57f40a4eebf 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
index f255740833d..06bd2e0b0ed 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
index 1e2d76868ec..6f74d72309a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
index 5ea57e93e22..8b2438ecd9e 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
index 46bb91b7148..4429560cdd1 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
index b93d84f6886..110dd3b7ba4 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
index 02b0ab97d77..19d711a05e7 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
index cfaeb328cc4..0bad57c383a 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
index 91aada21a12..f1174c4cbab 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
index 6c20dccad2c..a4af9363e4f 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
index 2ab7476aa7d..575efea2387 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/StringBooleanMapTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
index cfa1e08113f..a1943d337ef 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
index 354a5b512f8..a92d738c4eb 100644
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.2.2-SNAPSHOT
+ * OpenAPI Generator version: 3.2.3-SNAPSHOT
  */
 
 /**
diff --git a/samples/server/petstore-security-test/lumen/.gitignore b/samples/server/petstore-security-test/lumen/.gitignore
new file mode 100644
index 00000000000..390a8878ede
--- /dev/null
+++ b/samples/server/petstore-security-test/lumen/.gitignore
@@ -0,0 +1,8 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
\ No newline at end of file
diff --git a/samples/server/petstore-security-test/php-slim/.gitignore b/samples/server/petstore-security-test/php-slim/.gitignore
index 23a42ca8d8a..390a8878ede 100644
--- a/samples/server/petstore-security-test/php-slim/.gitignore
+++ b/samples/server/petstore-security-test/php-slim/.gitignore
@@ -1,3 +1,5 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
 composer.phar
 /vendor/
 
diff --git a/samples/server/petstore-security-test/php-slim/.htaccess b/samples/server/petstore-security-test/php-slim/.htaccess
index e47b5fb8a0c..f6a2ceb3952 100644
--- a/samples/server/petstore-security-test/php-slim/.htaccess
+++ b/samples/server/petstore-security-test/php-slim/.htaccess
@@ -1,5 +1,6 @@
 <IfModule mod_rewrite.c>
     RewriteEngine On
     RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^(.*)$ index.php?_url=/$1 [QSA,L]
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule ^ index.php [QSA,L]
 </IfModule>
\ No newline at end of file
diff --git a/samples/server/petstore-security-test/php-slim/README.md b/samples/server/petstore-security-test/php-slim/README.md
index 8a2df551ce7..337746cd020 100644
--- a/samples/server/petstore-security-test/php-slim/README.md
+++ b/samples/server/petstore-security-test/php-slim/README.md
@@ -1,12 +1,58 @@
-# OpenAPI generated server
+# php-base - PHP Slim Server library for OpenAPI Petstore *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
 
-## Overview
-This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the
-[OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub.  This
-is an example of building a PHP Slim server.
+[Slim Framework Documentation](https://www.slimframework.com/docs/)
 
-This example uses the [Slim Framework](http://www.slimframework.com/).  To see how to make this your own, please take a look at the template here:
+## Requirements
+
+* Web server with URL rewriting
+* PHP 5.5 or newer
+
+This package contains `.htaccess` for Apache configuration.
+If you use another server(Nginx, HHVM, IIS, lighttpd) check out [Web Servers](https://www.slimframework.com/docs/v3/start/web-servers.html) doc.
+
+## Installation via [Composer](https://getcomposer.org/)
+
+Navigate into your project's root directory and execute the bash command shown below.
+This command downloads the Slim Framework and its third-party dependencies into your project's `vendor/` directory.
+```bash
+$ composer install
+```
+
+## Start devserver
+
+Run the following command in terminal to start localhost web server, assuming `./php-slim-server/` is public-accessible directory with `index.php` file:
+```bash
+$ php -S localhost:8888 -t php-slim-server
+```
+> **Warning** This web server was designed to aid application development.
+> It may also be useful for testing purposes or for application demonstrations that are run in controlled environments.
+> It is not intended to be a full-featured web server. It should not be used on a public network.
+
+## Run tests
+
+This package uses PHPUnit 4.8 for unit testing.
+[Test folder](test) contains templates which you can fill with real test assertions.
+How to write tests read at [PHPUnit Manual - Chapter 2. Writing Tests for PHPUnit](https://phpunit.de/manual/4.8/en/writing-tests-for-phpunit.html).
+
+Command | Tool | Target
+---- | ---- | ----
+`$ composer test` | PHPUnit | All tests
+`$ composer run test-apis` | PHPUnit | Apis tests
+`$ composer run test-models` | PHPUnit | Models tests
+
+## API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*FakeApi* | **testCodeInjectEndRnNR** | **PUT** /fake | To test code injection *_/ ' \" =end -- \\r\\n \\n \\r
+
+
+## Models
+
+* OpenAPIServer\Model\ModelReturn
 
-[TEMPLATES](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/resources/php-slim-server/)
 
 ## Authentication
+
diff --git a/samples/server/petstore-security-test/php-slim/composer.lock b/samples/server/petstore-security-test/php-slim/composer.lock
new file mode 100644
index 00000000000..fcf4c150619
--- /dev/null
+++ b/samples/server/petstore-security-test/php-slim/composer.lock
@@ -0,0 +1,1822 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "7abeaa62669cac171aa0692df2e1943b",
+    "packages": [
+        {
+            "name": "container-interop/container-interop",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/container-interop/container-interop.git",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "shasum": ""
+            },
+            "require": {
+                "psr/container": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Interop\\Container\\": "src/Interop/Container/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
+            "homepage": "https://github.com/container-interop/container-interop",
+            "time": "2017-02-14T19:40:03+00:00"
+        },
+        {
+            "name": "http-interop/http-factory",
+            "version": "0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/http-interop/http-factory.git",
+                "reference": "c2587cc0a6f74987fefb5b8074acfd32c69a4b0f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/http-interop/http-factory/zipball/c2587cc0a6f74987fefb5b8074acfd32c69a4b0f",
+                "reference": "c2587cc0a6f74987fefb5b8074acfd32c69a4b0f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Interop\\Http\\Factory\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "abandoned": "psr/http-factory",
+            "time": "2017-03-24T14:48:51+00:00"
+        },
+        {
+            "name": "nikic/fast-route",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/FastRoute.git",
+                "reference": "181d480e08d9476e61381e04a71b34dc0432e812"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812",
+                "reference": "181d480e08d9476e61381e04a71b34dc0432e812",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35|~5.7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "FastRoute\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov",
+                    "email": "nikic@php.net"
+                }
+            ],
+            "description": "Fast request router for PHP",
+            "keywords": [
+                "router",
+                "routing"
+            ],
+            "time": "2018-02-13T20:26:39+00:00"
+        },
+        {
+            "name": "pimple/pimple",
+            "version": "v3.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/silexphp/Pimple.git",
+                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32",
+                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "psr/container": "^1.0"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "^3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Pimple": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Pimple, a simple Dependency Injection Container",
+            "homepage": "http://pimple.sensiolabs.org",
+            "keywords": [
+                "container",
+                "dependency injection"
+            ],
+            "time": "2018-01-21T07:42:36+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "time": "2017-02-14T16:28:37+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06T14:39:51+00:00"
+        },
+        {
+            "name": "psr/http-server-handler",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-server-handler.git",
+                "reference": "439d92054dc06097f2406ec074a2627839955a02"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/439d92054dc06097f2406ec074a2627839955a02",
+                "reference": "439d92054dc06097f2406ec074a2627839955a02",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP server-side request handler",
+            "keywords": [
+                "handler",
+                "http",
+                "http-interop",
+                "psr",
+                "psr-15",
+                "psr-7",
+                "request",
+                "response",
+                "server"
+            ],
+            "time": "2018-01-22T17:04:15+00:00"
+        },
+        {
+            "name": "psr/http-server-middleware",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-server-middleware.git",
+                "reference": "ea17eb1fb2c8df6db919cc578451a8013c6a0ae5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/ea17eb1fb2c8df6db919cc578451a8013c6a0ae5",
+                "reference": "ea17eb1fb2c8df6db919cc578451a8013c6a0ae5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "psr/http-message": "^1.0",
+                "psr/http-server-handler": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP server-side middleware",
+            "keywords": [
+                "http",
+                "http-interop",
+                "middleware",
+                "psr",
+                "psr-15",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2018-01-22T17:08:31+00:00"
+        },
+        {
+            "name": "slim/slim",
+            "version": "3.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/slimphp/Slim.git",
+                "reference": "d8aabeacc3688b25e2f2dd2db91df91ec6fdd748"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/d8aabeacc3688b25e2f2dd2db91df91ec6fdd748",
+                "reference": "d8aabeacc3688b25e2f2dd2db91df91ec6fdd748",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "^1.2",
+                "nikic/fast-route": "^1.0",
+                "php": ">=5.5.0",
+                "pimple/pimple": "^3.0",
+                "psr/container": "^1.0",
+                "psr/http-message": "^1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0",
+                "squizlabs/php_codesniffer": "^2.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Slim\\": "Slim"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Rob Allen",
+                    "email": "rob@akrabat.com",
+                    "homepage": "http://akrabat.com"
+                },
+                {
+                    "name": "Josh Lockhart",
+                    "email": "hello@joshlockhart.com",
+                    "homepage": "https://joshlockhart.com"
+                },
+                {
+                    "name": "Gabriel Manricks",
+                    "email": "gmanricks@me.com",
+                    "homepage": "http://gabrielmanricks.com"
+                },
+                {
+                    "name": "Andrew Smith",
+                    "email": "a.smith@silentworks.co.uk",
+                    "homepage": "http://silentworks.co.uk"
+                }
+            ],
+            "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
+            "homepage": "https://slimframework.com",
+            "keywords": [
+                "api",
+                "framework",
+                "micro",
+                "router"
+            ],
+            "time": "2018-04-19T19:29:08+00:00"
+        },
+        {
+            "name": "tuupola/callable-handler",
+            "version": "0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tuupola/callable-handler.git",
+                "reference": "5141efa1e974687a3fa53338811a988198f50662"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tuupola/callable-handler/zipball/5141efa1e974687a3fa53338811a988198f50662",
+                "reference": "5141efa1e974687a3fa53338811a988198f50662",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "psr/http-server-middleware": "^1.0"
+            },
+            "require-dev": {
+                "codedungeon/phpunit-result-printer": "^0.4.4",
+                "overtrue/phplint": "^1.0",
+                "phpunit/phpunit": "^6.5",
+                "squizlabs/php_codesniffer": "^3.2",
+                "tuupola/http-factory": "^0.3.0",
+                "zendframework/zend-diactoros": "^1.6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Tuupola\\Middleware\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mika Tuupola",
+                    "email": "tuupola@appelsiini.net",
+                    "homepage": "https://appelsiini.net/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Compatibility layer for PSR-7 double pass and PSR-15 middlewares.",
+            "homepage": "https://github.com/tuupola/callable-handler",
+            "keywords": [
+                "middleware",
+                "psr-15",
+                "psr-7"
+            ],
+            "time": "2018-01-23T04:07:25+00:00"
+        },
+        {
+            "name": "tuupola/http-factory",
+            "version": "0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tuupola/http-factory.git",
+                "reference": "57b2e19ff3f4af0bbee4e31fd282689be351f1ad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tuupola/http-factory/zipball/57b2e19ff3f4af0bbee4e31fd282689be351f1ad",
+                "reference": "57b2e19ff3f4af0bbee4e31fd282689be351f1ad",
+                "shasum": ""
+            },
+            "require": {
+                "http-interop/http-factory": "^0.3.0"
+            },
+            "require-dev": {
+                "http-interop/http-factory-tests": "^0.3.0",
+                "overtrue/phplint": "^0.2.1",
+                "phpunit/phpunit": "^5.7",
+                "squizlabs/php_codesniffer": "^3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Tuupola\\Http\\Factory\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mika Tuupola",
+                    "email": "tuupola@appelsiini.net",
+                    "homepage": "http://www.appelsiini.net/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Lightweight autodiscovering PSR-17 HTTP factories",
+            "homepage": "https://github.com/tuupola/http-factory",
+            "keywords": [
+                "http",
+                "psr-17",
+                "psr-7"
+            ],
+            "time": "2017-07-15T22:03:15+00:00"
+        },
+        {
+            "name": "tuupola/slim-basic-auth",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tuupola/slim-basic-auth.git",
+                "reference": "b169fba3113059548e3a2ac4096b1b08616b070e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tuupola/slim-basic-auth/zipball/b169fba3113059548e3a2ac4096b1b08616b070e",
+                "reference": "b169fba3113059548e3a2ac4096b1b08616b070e",
+                "shasum": ""
+            },
+            "require": {
+                "http-interop/http-factory": "^0.3.0",
+                "php": "^7.1",
+                "psr/http-message": "^1.0",
+                "psr/http-server-middleware": "^1.0",
+                "tuupola/callable-handler": "^0.3.0",
+                "tuupola/http-factory": "^0.3.0"
+            },
+            "require-dev": {
+                "codedungeon/phpunit-result-printer": "^0.6.0",
+                "equip/dispatch": "^2.0",
+                "overtrue/phplint": "^0.2.4",
+                "phpstan/phpstan": "^0.9.2",
+                "phpunit/phpunit": "^7.0",
+                "squizlabs/php_codesniffer": "^3.2",
+                "zendframework/zend-diactoros": "^1.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Tuupola\\Middleware\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mika Tuupola",
+                    "email": "tuupola@appelsiini.net",
+                    "homepage": "https://appelsiini.net/"
+                }
+            ],
+            "description": "PSR-7 and PSR-15 HTTP Basic Authentication Middleware",
+            "homepage": "https://appelsiini.net/projects/slim-basic-auth",
+            "keywords": [
+                "auth",
+                "middleware",
+                "psr-15",
+                "psr-7"
+            ],
+            "time": "2018-05-06T05:41:44+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "^6.2.3",
+                "squizlabs/php_codesniffer": "^3.0.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-07-22T11:58:36+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2017-09-11T18:02:19+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "4.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "phpdocumentor/reflection-common": "^1.0.0",
+                "phpdocumentor/type-resolver": "^0.4.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "doctrine/instantiator": "~1.0.5",
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^6.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2017-11-30T07:14:17+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2017-07-14T14:27:02+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2018-08-05T17:53:17+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "^1.3.2",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-10-06T15:47:00+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2017-11-27T13:52:08+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-02-26T11:10:40+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-12-04T08:55:13+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.8.36",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517",
+                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "~2.1",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.2.2",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.3",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.8.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-06-21T08:07:12+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-10-02T06:51:40+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-01-29T09:50:25+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2017-05-22T07:24:03+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-08-18T05:49:44+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-06-17T09:04:28+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12T03:26:01+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-10-03T07:41:43+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-06-21T13:59:46+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "time": "2018-08-06T14:22:27+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v3.4.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/810af2d35fc72b6cf5c01116806d2b65ccaaf2e2",
+                "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "conflict": {
+                "symfony/console": "<3.4"
+            },
+            "require-dev": {
+                "symfony/console": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-07-26T11:19:56+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2018-01-29T19:49:41+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "RC",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.5"
+    },
+    "platform-dev": []
+}
diff --git a/samples/server/petstore-security-test/silex/SwaggerServer/.gitignore b/samples/server/petstore-security-test/silex/SwaggerServer/.gitignore
new file mode 100644
index 00000000000..390a8878ede
--- /dev/null
+++ b/samples/server/petstore-security-test/silex/SwaggerServer/.gitignore
@@ -0,0 +1,8 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
\ No newline at end of file
diff --git a/samples/server/petstore/java-msf4j/.openapi-generator-ignore b/samples/server/petstore/java-msf4j/.openapi-generator-ignore
new file mode 100644
index 00000000000..7484ee590a3
--- /dev/null
+++ b/samples/server/petstore/java-msf4j/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# 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 OpenAPI Generator 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
+# This 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/java-msf4j/.openapi-generator/VERSION b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION
index 096bf47efe3..4395ff59232 100644
--- a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 5b24bbcf8bb..7d9e784b789 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -34,12 +34,12 @@ public class AnotherFakeApi  {
     @Path("/dummy")
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
-    @io.swagger.annotations.ApiOperation(value = "To test special tags", notes = "To test special tags", response = Client.class, tags={ "$another-fake?", })
+    @io.swagger.annotations.ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    public Response testSpecialTags(@ApiParam(value = "client model" ,required=true) Client client
+    public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) Client client
 )
     throws NotFoundException {
-        return delegate.testSpecialTags(client);
+        return delegate.call123testSpecialTags(client);
     }
 }
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index 11a505717d2..ccce96eba56 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -18,6 +18,6 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public abstract class AnotherFakeApiService {
-    public abstract Response testSpecialTags(Client client
+    public abstract Response call123testSpecialTags(Client client
  ) throws NotFoundException;
 }
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
index fd1699a7c5f..876d1a151e3 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
@@ -11,7 +11,9 @@ import java.math.BigDecimal;
 import org.openapitools.model.Client;
 import java.util.Date;
 import java.io.File;
+import org.openapitools.model.FileSchemaTestClass;
 import java.util.Map;
+import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.OuterComposite;
 import org.openapitools.model.User;
 
@@ -43,10 +45,10 @@ public class FakeApi  {
     @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
-    public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) Boolean booleanPostBody
+    public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) Boolean body
 )
     throws NotFoundException {
-        return delegate.fakeOuterBooleanSerialize(booleanPostBody);
+        return delegate.fakeOuterBooleanSerialize(body);
     }
     @POST
     @Path("/outer/composite")
@@ -85,6 +87,18 @@ public class FakeApi  {
         return delegate.fakeOuterStringSerialize(body);
     }
     @PUT
+    @Path("/body-with-file-schema")
+    @Consumes({ "application/json" })
+    
+    @io.swagger.annotations.ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", response = Void.class, tags={ "fake", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
+    public Response testBodyWithFileSchema(@ApiParam(value = "" ,required=true) FileSchemaTestClass fileSchemaTestClass
+)
+    throws NotFoundException {
+        return delegate.testBodyWithFileSchema(fileSchemaTestClass);
+    }
+    @PUT
     @Path("/body-with-query-params")
     @Consumes({ "application/json" })
     
@@ -120,22 +134,22 @@ public class FakeApi  {
         @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 testEndpointParameters(@ApiParam(value = "None", required=true)  @FormParam("number")  BigDecimal number
-,@ApiParam(value = "None", required=true)  @FormParam("double")  Double _double
-,@ApiParam(value = "None", required=true)  @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter
-,@ApiParam(value = "None", required=true)  @FormParam("byte")  byte[] _byte
-,@ApiParam(value = "None", allowableValues="range=[10, 100]")  @FormParam("integer")  Integer integer
-,@ApiParam(value = "None", allowableValues="range=[20, 200]")  @FormParam("int32")  Integer int32
-,@ApiParam(value = "None")  @FormParam("int64")  Long int64
-,@ApiParam(value = "None")  @FormParam("float")  Float _float
-,@ApiParam(value = "None")  @FormParam("string")  String string
+    public Response testEndpointParameters(@ApiParam(value = "None", required=true, defaultValue="null")  @DefaultValue("null") @FormParam("number")  BigDecimal number
+,@ApiParam(value = "None", required=true, defaultValue="null")  @DefaultValue("null") @FormParam("double")  Double _double
+,@ApiParam(value = "None", required=true, defaultValue="null")  @DefaultValue("null") @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter
+,@ApiParam(value = "None", required=true, defaultValue="null")  @DefaultValue("null") @FormParam("byte")  byte[] _byte
+,@ApiParam(value = "None", defaultValue="null")  @DefaultValue("null") @FormParam("integer")  Integer integer
+,@ApiParam(value = "None", defaultValue="null")  @DefaultValue("null") @FormParam("int32")  Integer int32
+,@ApiParam(value = "None", defaultValue="null")  @DefaultValue("null") @FormParam("int64")  Long int64
+,@ApiParam(value = "None", defaultValue="null")  @DefaultValue("null") @FormParam("float")  Float _float
+,@ApiParam(value = "None", defaultValue="null")  @DefaultValue("null") @FormParam("string")  String string
 ,
             @FormDataParam("binary") InputStream binaryInputStream,
             @FormDataParam("binary") FileInfo binaryDetail
-,@ApiParam(value = "None")  @FormParam("date")  Date date
-,@ApiParam(value = "None")  @FormParam("dateTime")  Date dateTime
-,@ApiParam(value = "None")  @FormParam("password")  String password
-,@ApiParam(value = "None")  @FormParam("callback")  String paramCallback
+,@ApiParam(value = "None", defaultValue="null")  @DefaultValue("null") @FormParam("date")  Date date
+,@ApiParam(value = "None", defaultValue="null")  @DefaultValue("null") @FormParam("dateTime")  Date dateTime
+,@ApiParam(value = "None", defaultValue="null")  @DefaultValue("null") @FormParam("password")  String password
+,@ApiParam(value = "None", defaultValue="null")  @DefaultValue("null") @FormParam("callback")  String paramCallback
 )
     throws NotFoundException {
         return delegate.testEndpointParameters(number,_double,patternWithoutDelimiter,_byte,integer,int32,int64,_float,string,binaryInputStream, binaryDetail,date,dateTime,password,paramCallback);
@@ -155,8 +169,8 @@ public class FakeApi  {
 ,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString
 ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger
 ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble
-,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $")  @FormParam("enum_form_string_array")  List<String> enumFormStringArray
-,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)")  @FormParam("enum_form_string")  String enumFormString
+,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$")  @DefaultValue("$") @FormParam("enum_form_string_array")  List<String> enumFormStringArray
+,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")  @DefaultValue("-efg") @FormParam("enum_form_string")  String enumFormString
 )
     throws NotFoundException {
         return delegate.testEnumParameters(enumHeaderStringArray,enumHeaderString,enumQueryStringArray,enumQueryString,enumQueryInteger,enumQueryDouble,enumFormStringArray,enumFormString);
@@ -168,7 +182,7 @@ public class FakeApi  {
     @io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) String requestBody
+    public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) Map<String, String> requestBody
 )
     throws NotFoundException {
         return delegate.testInlineAdditionalProperties(requestBody);
@@ -180,10 +194,31 @@ public class FakeApi  {
     @io.swagger.annotations.ApiOperation(value = "test json serialization of form data", notes = "", response = Void.class, tags={ "fake", })
     @io.swagger.annotations.ApiResponses(value = { 
         @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    public Response testJsonFormData(@ApiParam(value = "field1", required=true)  @FormParam("param")  String param
-,@ApiParam(value = "field2", required=true)  @FormParam("param2")  String param2
+    public Response testJsonFormData(@ApiParam(value = "field1", required=true, defaultValue="null")  @DefaultValue("null") @FormParam("param")  String param
+,@ApiParam(value = "field2", required=true, defaultValue="null")  @DefaultValue("null") @FormParam("param2")  String param2
 )
     throws NotFoundException {
         return delegate.testJsonFormData(param,param2);
     }
+    @POST
+    @Path("/{petId}/uploadImageWithRequiredFile")
+    @Consumes({ "multipart/form-data" })
+    @Produces({ "application/json" })
+    @io.swagger.annotations.ApiOperation(value = "uploads an image (required)", 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 uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update",required=true) @PathParam("petId") Long petId
+,
+            @FormDataParam("requiredFile") InputStream requiredFileInputStream,
+            @FormDataParam("requiredFile") FileInfo requiredFileDetail
+,@ApiParam(value = "Additional data to pass to server", defaultValue="null")@FormDataParam("additionalMetadata")  String additionalMetadata
+)
+    throws NotFoundException {
+        return delegate.uploadFileWithRequiredFile(petId,requiredFileInputStream, requiredFileDetail,additionalMetadata);
+    }
 }
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java
index 7ace08f487d..9647200f6f0 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -10,7 +10,9 @@ import java.math.BigDecimal;
 import org.openapitools.model.Client;
 import java.util.Date;
 import java.io.File;
+import org.openapitools.model.FileSchemaTestClass;
 import java.util.Map;
+import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.OuterComposite;
 import org.openapitools.model.User;
 
@@ -24,13 +26,15 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public abstract class FakeApiService {
-    public abstract Response fakeOuterBooleanSerialize(Boolean booleanPostBody
+    public abstract Response fakeOuterBooleanSerialize(Boolean body
  ) throws NotFoundException;
     public abstract Response fakeOuterCompositeSerialize(OuterComposite outerComposite
  ) throws NotFoundException;
     public abstract Response fakeOuterNumberSerialize(BigDecimal body
  ) throws NotFoundException;
     public abstract Response fakeOuterStringSerialize(String body
+ ) throws NotFoundException;
+    public abstract Response testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass
  ) throws NotFoundException;
     public abstract Response testBodyWithQueryParams(String query
  ,User user
@@ -61,9 +65,13 @@ public abstract class FakeApiService {
  ,List<String> enumFormStringArray
  ,String enumFormString
  ) throws NotFoundException;
-    public abstract Response testInlineAdditionalProperties(String requestBody
+    public abstract Response testInlineAdditionalProperties(Map<String, String> requestBody
  ) throws NotFoundException;
     public abstract Response testJsonFormData(String param
  ,String param2
+ ) throws NotFoundException;
+    public abstract Response uploadFileWithRequiredFile(Long petId
+ ,InputStream requiredFileInputStream, FileInfo requiredFileDetail
+ ,String additionalMetadata
  ) throws NotFoundException;
 }
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java
index dbce159ab07..e4b54cbab65 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java
@@ -157,8 +157,8 @@ public class PetApi  {
     @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
+,@ApiParam(value = "Updated name of the pet", defaultValue="null")  @DefaultValue("null") @FormParam("name")  String name
+,@ApiParam(value = "Updated status of the pet", defaultValue="null")  @DefaultValue("null") @FormParam("status")  String status
 )
     throws NotFoundException {
         return delegate.updatePetWithForm(petId,name,status);
@@ -176,7 +176,7 @@ public class PetApi  {
     @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
+,@ApiParam(value = "Additional data to pass to server", defaultValue="null")@FormDataParam("additionalMetadata")  String additionalMetadata
 ,
             @FormDataParam("file") InputStream fileInputStream,
             @FormDataParam("file") FileInfo fileDetail
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java
index c657b4ee376..0a093d51ba9 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java
@@ -69,7 +69,7 @@ public class StoreApi  {
         @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, allowableValues="range=[1, 5]") @PathParam("order_id") Long orderId
+    public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("order_id") Long orderId
 )
     throws NotFoundException {
         return delegate.getOrderById(orderId);
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AnimalFarm.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AnimalFarm.java
new file mode 100644
index 00000000000..fd690d2791c
--- /dev/null
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/AnimalFarm.java
@@ -0,0 +1,50 @@
+package org.openapitools.model;
+
+import java.util.Objects;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.model.Animal;
+
+/**
+ * AnimalFarm
+ */
+
+public class AnimalFarm extends ArrayList<Animal>  {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    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(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Cat.java
index 1f551dd586c..4a180ffed1e 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Cat.java
@@ -25,7 +25,7 @@ public class Cat extends Animal  {
    * @return declawed
   **/
   @ApiModelProperty(value = "")
-  public Boolean isDeclawed() {
+  public Boolean getDeclawed() {
     return declawed;
   }
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java
index ad415532b6c..01c730beb10 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -41,7 +41,7 @@ public class EnumArrays   {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + text + "'");
     }
   }
 
@@ -75,10 +75,10 @@ public class EnumArrays   {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + text + "'");
     }
   }
-
+ 
   @JsonProperty("array_enum")
   private List<ArrayEnumEnum> arrayEnum = null;
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumClass.java
index a9e44e5da95..92745f9c254 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumClass.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumClass.java
@@ -35,7 +35,7 @@ public enum EnumClass {
         return b;
       }
     }
-    return null;
+    throw new IllegalArgumentException("Unexpected value '" + text + "'");
   }
 }
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumTest.java
index baeca0e7c1c..5819202313a 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/EnumTest.java
@@ -42,7 +42,7 @@ public class EnumTest   {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + text + "'");
     }
   }
 
@@ -78,7 +78,7 @@ public class EnumTest   {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + text + "'");
     }
   }
 
@@ -112,7 +112,7 @@ public class EnumTest   {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + text + "'");
     }
   }
 
@@ -146,7 +146,7 @@ public class EnumTest   {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + text + "'");
     }
   }
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
new file mode 100644
index 00000000000..4e05197cd03
--- /dev/null
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -0,0 +1,107 @@
+package org.openapitools.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * FileSchemaTestClass
+ */
+
+public class FileSchemaTestClass   {
+  @JsonProperty("file")
+  private java.io.File file = null;
+
+  @JsonProperty("files")
+  private List<java.io.File> files = null;
+
+  public FileSchemaTestClass file(java.io.File file) {
+    this.file = file;
+    return this;
+  }
+
+   /**
+   * Get file
+   * @return file
+  **/
+  @ApiModelProperty(value = "")
+  public java.io.File getFile() {
+    return file;
+  }
+
+  public void setFile(java.io.File file) {
+    this.file = file;
+  }
+
+  public FileSchemaTestClass files(List<java.io.File> files) {
+    this.files = files;
+    return this;
+  }
+
+  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
+    if (this.files == null) {
+      this.files = new ArrayList<java.io.File>();
+    }
+    this.files.add(filesItem);
+    return this;
+  }
+
+   /**
+   * Get files
+   * @return files
+  **/
+  @ApiModelProperty(value = "")
+  public List<java.io.File> getFiles() {
+    return files;
+  }
+
+  public void setFiles(List<java.io.File> files) {
+    this.files = files;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
+    return Objects.equals(this.file, fileSchemaTestClass.file) &&
+        Objects.equals(this.files, fileSchemaTestClass.files);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(file, files);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FileSchemaTestClass {\n");
+    
+    sb.append("    file: ").append(toIndentedString(file)).append("\n");
+    sb.append("    files: ").append(toIndentedString(files)).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/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MapTest.java
index f57655fee85..a836094ca56 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MapTest.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -45,13 +46,19 @@ public class MapTest   {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + text + "'");
     }
   }
-
+ 
   @JsonProperty("map_of_enum_string")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  @JsonProperty("direct_map")
+  private Map<String, Boolean> directMap = null;
+
+  @JsonProperty("indirect_map")
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -104,6 +111,50 @@ public class MapTest   {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -115,12 +166,14 @@ public class MapTest   {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
   @Override
@@ -130,6 +183,8 @@ public class MapTest   {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Order.java
index 859e49bbaff..aa1bea44ccc 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Order.java
@@ -54,7 +54,7 @@ public class Order   {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + text + "'");
     }
   }
 
@@ -164,7 +164,7 @@ public class Order   {
    * @return complete
   **/
   @ApiModelProperty(value = "")
-  public Boolean isComplete() {
+  public Boolean getComplete() {
     return complete;
   }
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/OuterEnum.java
index 234c92ff244..60fb9d936d2 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/OuterEnum.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/OuterEnum.java
@@ -35,7 +35,7 @@ public enum OuterEnum {
         return b;
       }
     }
-    return null;
+    throw new IllegalArgumentException("Unexpected value '" + text + "'");
   }
 }
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java
index 25a332997ad..18c5d342849 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java
@@ -60,7 +60,7 @@ public class Pet   {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + text + "'");
     }
   }
 
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/StringBooleanMap.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/StringBooleanMap.java
new file mode 100644
index 00000000000..2e29c971f48
--- /dev/null
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/StringBooleanMap.java
@@ -0,0 +1,49 @@
+package org.openapitools.model;
+
+import java.util.Objects;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean>  {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\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(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index 16e377cce92..071e285e33c 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -19,7 +19,7 @@ import javax.ws.rs.core.SecurityContext;
 
 public class AnotherFakeApiServiceImpl extends AnotherFakeApiService {
     @Override
-    public Response testSpecialTags(Client client
+    public Response call123testSpecialTags(Client client
  ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index f2efccf5d1d..583ea8ee1db 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -7,7 +7,9 @@ import java.math.BigDecimal;
 import org.openapitools.model.Client;
 import java.util.Date;
 import java.io.File;
+import org.openapitools.model.FileSchemaTestClass;
 import java.util.Map;
+import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.OuterComposite;
 import org.openapitools.model.User;
 
@@ -25,7 +27,7 @@ import javax.ws.rs.core.SecurityContext;
 
 public class FakeApiServiceImpl extends FakeApiService {
     @Override
-    public Response fakeOuterBooleanSerialize(Boolean booleanPostBody
+    public Response fakeOuterBooleanSerialize(Boolean body
  ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
@@ -44,6 +46,12 @@ public class FakeApiServiceImpl extends FakeApiService {
     }
     @Override
     public Response fakeOuterStringSerialize(String body
+ ) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass
  ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
@@ -94,7 +102,7 @@ public class FakeApiServiceImpl extends FakeApiService {
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response testInlineAdditionalProperties(String requestBody
+    public Response testInlineAdditionalProperties(Map<String, String> requestBody
  ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
@@ -102,6 +110,14 @@ public class FakeApiServiceImpl extends FakeApiService {
     @Override
     public Response testJsonFormData(String param
 , String param2
+ ) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
+    public Response uploadFileWithRequiredFile(Long petId
+, InputStream requiredFileInputStream, FileInfo requiredFileDetail
+, String additionalMetadata
  ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
diff --git a/samples/server/petstore/java-pkmst/.openapi-generator-ignore b/samples/server/petstore/java-pkmst/.openapi-generator-ignore
new file mode 100644
index 00000000000..7484ee590a3
--- /dev/null
+++ b/samples/server/petstore/java-pkmst/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# 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 OpenAPI Generator 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
+# This 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/java-pkmst/.openapi-generator/VERSION b/samples/server/petstore/java-pkmst/.openapi-generator/VERSION
index 096bf47efe3..4395ff59232 100644
--- a/samples/server/petstore/java-pkmst/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-pkmst/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-pkmst/Readme.md b/samples/server/petstore/java-pkmst/Readme.md
index ebef7835e7c..9867e11590b 100644
--- a/samples/server/petstore/java-pkmst/Readme.md
+++ b/samples/server/petstore/java-pkmst/Readme.md
@@ -17,20 +17,20 @@ g)Allow you to integrate with tracing server (Example Zipkin)
 h)Allow you to capture log in your microservice and send to Log management server (Ex ELK or splunk)
 i)Allow you to configure Oauth2 security based authorization for your microservice
 
- Additonal Features
+ Additional Features
  j)generate sample cucumber file and dependency to drive your Behaviour driven development.
- k)generate gatling based perfromance test , which can be excuted via build pipeline like jenkins etc.
+ k)generate gatling based performance test, which can be excuted via build pipeline like jenkins etc.
  
  
 Working:
-Using swagger specification you can convert any definition to spring boot microservice.
+Using OpenAPI specification you can convert any definition to spring boot microservice.
 It has the integration with the below services:
 eureka registry, zipkin , spring boot admin, circuit breaker.
 
 By default only the circuit breaker annotation is enabled. But one has to write the fallback method. The needed dependency for it is also been enabled. To generate the integration and 
 related configuration for eureka, zipkin, spring boot admin one has two options:
 
-1) When generating from UI one has to provide vendor extensions inside the swagger specification as below:
+1) When generating from UI one has to provide vendor extensions inside the OpenAPI specification as below:
 swagger: "2.0"
 info:
   description: "This is a sample Product Catalogue Server.\
@@ -43,11 +43,11 @@ info:
     springBootAdminUri: "http://localhost:8000"
     pkmstInterceptor: "true"
     
-PLease note the vendor extensions are inside the info tag of the swagger specification. All the tags are case sensitive. Once given all the related configuration and the dependency 
+PLease note the vendor extensions are inside the info tag of the OpenAPI specification. All the tags are case sensitive. Once given all the related configuration and the dependency
 will be enabled.
 
 2) When generating from the maven plugin one has to provide configuration inside pom as below:
-inside the swagger codegen maven plugin under the configuration section 
+inside the openapi generator maven plugin under the configuration section
 
 						<configuration>
 							<inputSpec>product-openapi.yaml</inputSpec>
@@ -136,7 +136,7 @@ HttpLogging filter is provided for logging in the request and response. Can be f
 Spring security is also provided to secure the resources. Please modify according to your needs.
 
 First run:
-Import the project in to the eclipse. Run the app as an spring boot application.The project will run on http://localhost:8008
+Import the project in to the eclipse. Run the app as a spring boot application.The project will run on http://localhost:8008
 Swagger ui available on:
 http://localhost:8008/swagger-ui.html
 If all the configurations have been enabled(depending on the port) below are some of the URls to access:
@@ -152,4 +152,4 @@ Pkmst examples
 https://github.com/ProKarma-Inc/pkmst-getting-started-examples
 
 Pkmst Extensions
-https://github.com/ProKarma-Inc/pkmst-extention
\ No newline at end of file
+https://github.com/ProKarma-Inc/pkmst-extention
diff --git a/samples/server/petstore/java-pkmst/pom.xml b/samples/server/petstore/java-pkmst/pom.xml
index 5ca43f8a6f0..8a62b880bf6 100644
--- a/samples/server/petstore/java-pkmst/pom.xml
+++ b/samples/server/petstore/java-pkmst/pom.xml
@@ -52,10 +52,10 @@
             <enabled>false</enabled>
          </snapshots>
       </repository>
-	  <repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-	  </repository>
+      <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+      </repository>
    </repositories>
    <dependencies>
       <dependency>
@@ -83,35 +83,35 @@
       <!-- dependency for zipkin tracing with sleuth -->
       <!-- if you only want sleuth -->
       <!-- <dependency>
-		        <groupId>org.springframework.cloud</groupId>
-		        <artifactId>spring-cloud-starter-sleuth</artifactId>
-			   </dependency> -->
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-sleuth</artifactId>
+               </dependency> -->
       <!-- Sleuth with Zipkin via Spring Cloud Stream -->
       <!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-sleuth-stream</artifactId>
-			</dependency> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-sleuth</artifactId>
-			</dependency> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-stream-binder-rabbit</artifactId>
-			</dependency> -->
+            </dependency> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-sleuth</artifactId>
+            </dependency> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-stream-binder-rabbit</artifactId>
+            </dependency> -->
       <!-- Spring Cloud Sleuth Stream Zipkin Collector -->
       <!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>
-			</dependency> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-sleuth</artifactId>
-			</dependency> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-stream-binder-rabbit</artifactId>
-			</dependency> -->
+            </dependency> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-sleuth</artifactId>
+            </dependency> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-stream-binder-rabbit</artifactId>
+            </dependency> -->
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-actuator</artifactId>
       </dependency>
       <dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-jetty</artifactId>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-jetty</artifactId>
       </dependency>
       <!--<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-hystrix-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-bus-amqp</artifactId>
-		</dependency>-->
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-netflix-hystrix-stream</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bus-amqp</artifactId>
+        </dependency>-->
       <dependency>
          <groupId>org.springframework.cloud</groupId>
          <artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
@@ -229,11 +229,11 @@
          <groupId>org.springframework</groupId>
          <artifactId>spring-test</artifactId>
       </dependency>
-	  <dependency>
-			<groupId>org.threeten</groupId>
-			<artifactId>threetenbp</artifactId>
-			<version>1.3.6</version>
-	  </dependency>
+      <dependency>
+            <groupId>org.threeten</groupId>
+            <artifactId>threetenbp</artifactId>
+            <version>1.3.6</version>
+      </dependency>
    </dependencies>
    <dependencyManagement>
       <dependencies>
@@ -263,7 +263,7 @@
                         <!-- classes that include the name CucumberTest, as an example -->
                         <exclude>**/*CucumberTest*.java</exclude>
                         <!-- classes in a package whose last segment is named cucumber, as
-							an example -->
+                            an example -->
                         <exclude>**/cucumber/*.java</exclude>
                      </excludes>
                   </configuration>
@@ -275,28 +275,28 @@
                   <version>${scala-maven-plugin.version}</version>
                </plugin>
                <!--Enable for Gatling -->
-					<!-- <plugin>
-						<groupId>io.gatling</groupId>
-						<artifactId>gatling-maven-plugin</artifactId>
-						<version>${gatling-plugin.version}</version>
-						<configuration>
-							Run Multiple Simulations
-							<runMultipleSimulations>true</runMultipleSimulations>
-							<includes>
-								<simulationClass>testapi</simulationClass>
-								
-							</includes>
-						</configuration>
-						<executions>
-							<execution>
-								<phase>integration-test</phase>
-								<id>gatling</id>
-								<goals>
-									<goal>execute</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>-->
+                    <!-- <plugin>
+                        <groupId>io.gatling</groupId>
+                        <artifactId>gatling-maven-plugin</artifactId>
+                        <version>${gatling-plugin.version}</version>
+                        <configuration>
+                            Run Multiple Simulations
+                            <runMultipleSimulations>true</runMultipleSimulations>
+                            <includes>
+                                <simulationClass>testapi</simulationClass>
+                                
+                            </includes>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <id>gatling</id>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>-->
                <plugin>
                   <groupId>org.springframework.boot</groupId>
                   <artifactId>spring-boot-maven-plugin</artifactId>
@@ -350,9 +350,9 @@
                            <version>2.19.1</version>
                         </plugin>
                         <plugin>
-						   <groupId>org.apache.maven.plugins</groupId>
-						   <artifactId>maven-pmd-plugin</artifactId>
-						</plugin>
+                           <groupId>org.apache.maven.plugins</groupId>
+                           <artifactId>maven-pmd-plugin</artifactId>
+                        </plugin>
                      </reportPlugins>
                   </configuration>
                </plugin>
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/config/swagger/SwaggerDocumentationConfig.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/config/swagger/OpenAPIDocumentationConfig.java
similarity index 98%
rename from samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/config/swagger/SwaggerDocumentationConfig.java
rename to samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/config/swagger/OpenAPIDocumentationConfig.java
index 67599c9bb45..dac5a9cdd15 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/config/swagger/SwaggerDocumentationConfig.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/config/swagger/OpenAPIDocumentationConfig.java
@@ -20,7 +20,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  */
 @EnableSwagger2
 @Configuration
-public class SwaggerDocumentationConfig {
+public class OpenAPIDocumentationConfig {
 
     public static final String DEFAULT_INCLUDE_PATTERN = "/pkmst/.*";
 	 @Bean
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java
index ae6b11d018f..2c6ab41a0ca 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java
@@ -1,6 +1,6 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (3.0.0-SNAPSHOT).
- * https://github.com/swagger-api/swagger-codegen
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.0-SNAPSHOT).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 package com.prokarma.pkmst.controller;
@@ -128,7 +128,7 @@ public interface PetApi {
     @RequestMapping(value = "/pet/{petId}",
         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, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
+    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", defaultValue="null") @RequestPart(value="name", required=false)  String name,@ApiParam(value = "Updated status of the pet", defaultValue="null") @RequestPart(value="status", required=false)  String status, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
 
 
     @ApiOperation(value = "uploads an image", notes = "", response = ModelApiResponse.class, authorizations = {
@@ -143,6 +143,6 @@ public interface PetApi {
         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, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
+    ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet to update",required=true ) @PathVariable("petId") Long petId,@ApiParam(value = "Additional data to pass to server", defaultValue="null") @RequestPart(value="additionalMetadata", required=false)  String additionalMetadata,@ApiParam(value = "file detail")  @RequestPart("file") MultipartFile file, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
 
 }
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java
index 28752172722..efd55c865be 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApiController.java
@@ -50,18 +50,48 @@ public class PetApiController implements PetApi {
     public ResponseEntity<List<Pet>> findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold")  @RequestParam(value = "status", required = true) List<String> status,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
         // do some magic!
+
+        if (accept != null && accept.contains("application/json")) {
+            return new ResponseEntity<List<Pet>>(objectMapper.readValue("", List.class), HttpStatus.OK);
+        }
+
+
+        if (accept != null && accept.contains("application/xml")) {
+            return new ResponseEntity<List<Pet>>(objectMapper.readValue("", List.class), HttpStatus.OK);
+        }
+
         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,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
         // do some magic!
+
+        if (accept != null && accept.contains("application/json")) {
+            return new ResponseEntity<List<Pet>>(objectMapper.readValue("", List.class), HttpStatus.OK);
+        }
+
+
+        if (accept != null && accept.contains("application/xml")) {
+            return new ResponseEntity<List<Pet>>(objectMapper.readValue("", List.class), HttpStatus.OK);
+        }
+
         return new ResponseEntity<List<Pet>>(HttpStatus.OK);
     }
 
     public ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",required=true ) @PathVariable("petId") Long petId,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
         // do some magic!
+
+        if (accept != null && accept.contains("application/json")) {
+            return new ResponseEntity<Pet>(objectMapper.readValue("", Pet.class), HttpStatus.OK);
+        }
+
+
+        if (accept != null && accept.contains("application/xml")) {
+            return new ResponseEntity<Pet>(objectMapper.readValue("", Pet.class), HttpStatus.OK);
+        }
+
         return new ResponseEntity<Pet>(HttpStatus.OK);
     }
 
@@ -72,18 +102,23 @@ public class PetApiController implements PetApi {
     }
 
     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,
+        @ApiParam(value = "Updated name of the pet", defaultValue="null") @RequestPart(value="name", required=false)  String name,
+        @ApiParam(value = "Updated status of the pet", defaultValue="null") @RequestPart(value="status", required=false)  String status,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
         // 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 = "Additional data to pass to server", defaultValue="null") @RequestPart(value="additionalMetadata", required=false)  String additionalMetadata,
         @ApiParam(value = "file detail")  @RequestPart("file") MultipartFile file,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
         // do some magic!
+
+        if (accept != null && accept.contains("application/json")) {
+            return new ResponseEntity<ModelApiResponse>(objectMapper.readValue("", ModelApiResponse.class), HttpStatus.OK);
+        }
+
         return new ResponseEntity<ModelApiResponse>(HttpStatus.OK);
     }
 
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
index be3ff14ebf6..7c630ee61a3 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
@@ -1,6 +1,6 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (3.0.0-SNAPSHOT).
- * https://github.com/swagger-api/swagger-codegen
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.0-SNAPSHOT).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 package com.prokarma.pkmst.controller;
@@ -58,7 +58,7 @@ public interface StoreApi {
     @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, allowableValues="{min=1, max=5}" ) @PathVariable("orderId") Long orderId, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
+    ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId, @RequestHeader(value = "Accept", required = false) String accept) throws Exception;
 
 
     @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store", })
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java
index 6c5faee23f2..16af6cd0225 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApiController.java
@@ -44,15 +44,35 @@ public class StoreApiController implements StoreApi {
         return new ResponseEntity<Map<String, Integer>>(HttpStatus.OK);
     }
 
-    public ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true, allowableValues="{min=1, max=5}" ) @PathVariable("orderId") Long orderId,
+    public ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") Long orderId,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
         // do some magic!
+
+        if (accept != null && accept.contains("application/json")) {
+            return new ResponseEntity<Order>(objectMapper.readValue("", Order.class), HttpStatus.OK);
+        }
+
+
+        if (accept != null && accept.contains("application/xml")) {
+            return new ResponseEntity<Order>(objectMapper.readValue("", Order.class), HttpStatus.OK);
+        }
+
         return new ResponseEntity<Order>(HttpStatus.OK);
     }
 
     public ResponseEntity<Order> placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true )   @RequestBody Order order,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
         // do some magic!
+
+        if (accept != null && accept.contains("application/json")) {
+            return new ResponseEntity<Order>(objectMapper.readValue("", Order.class), HttpStatus.OK);
+        }
+
+
+        if (accept != null && accept.contains("application/xml")) {
+            return new ResponseEntity<Order>(objectMapper.readValue("", Order.class), HttpStatus.OK);
+        }
+
         return new ResponseEntity<Order>(HttpStatus.OK);
     }
 
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java
index f81441045eb..7f19b8793c6 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java
@@ -1,6 +1,6 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (3.0.0-SNAPSHOT).
- * https://github.com/swagger-api/swagger-codegen
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.0-SNAPSHOT).
+ * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 package com.prokarma.pkmst.controller;
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java
index 8ba2847e32e..3dc6cf94c8f 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApiController.java
@@ -60,6 +60,16 @@ public class UserApiController implements UserApi {
     public ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true ) @PathVariable("username") String username,
         @RequestHeader(value = "Accept", required = false) String accept) throws Exception {
         // do some magic!
+
+        if (accept != null && accept.contains("application/json")) {
+            return new ResponseEntity<User>(objectMapper.readValue("", User.class), HttpStatus.OK);
+        }
+
+
+        if (accept != null && accept.contains("application/xml")) {
+            return new ResponseEntity<User>(objectMapper.readValue("", User.class), HttpStatus.OK);
+        }
+
         return new ResponseEntity<User>(HttpStatus.OK);
     }
 
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Order.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Order.java
index b35a9f4352d..fdd99f797c9 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Order.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Order.java
@@ -60,7 +60,7 @@ public class Order   {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + text + "'");
     }
   }
 
@@ -170,7 +170,7 @@ public class Order   {
    * @return complete
   **/
   @ApiModelProperty(value = "")
-  public Boolean isComplete() {
+  public Boolean getComplete() {
     return complete;
   }
 
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Pet.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Pet.java
index 567928272c3..f5cb40a2b1b 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Pet.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/model/Pet.java
@@ -68,7 +68,7 @@ public class Pet   {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + text + "'");
     }
   }
 
diff --git a/samples/server/petstore/java-pkmst/src/main/resources/application-dev.yml b/samples/server/petstore/java-pkmst/src/main/resources/application-dev.yml
index fecadb4b3ab..13ef356233c 100644
--- a/samples/server/petstore/java-pkmst/src/main/resources/application-dev.yml
+++ b/samples/server/petstore/java-pkmst/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
 # Discovery Server Access
 server:
-  port: -1
+  port: 8080
 
 # Spring Actuator
 management:
diff --git a/samples/server/petstore/java-pkmst/src/main/resources/application-local.yml b/samples/server/petstore/java-pkmst/src/main/resources/application-local.yml
index c314f6e7a30..57e184773b0 100644
--- a/samples/server/petstore/java-pkmst/src/main/resources/application-local.yml
+++ b/samples/server/petstore/java-pkmst/src/main/resources/application-local.yml
@@ -1,6 +1,6 @@
 # Discovery Server Access
 server:
-  port: -1
+  port: 8080
 
 # Spring Actuator
 management:
diff --git a/samples/server/petstore/java-vertx/async/.openapi-generator/VERSION b/samples/server/petstore/java-vertx/async/.openapi-generator/VERSION
index 096bf47efe3..4395ff59232 100644
--- a/samples/server/petstore/java-vertx/async/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-vertx/async/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/model/Order.java b/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/model/Order.java
index 1815414b55d..f34e4c0ff4f 100644
--- a/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/model/Order.java
+++ b/samples/server/petstore/java-vertx/async/src/main/java/org/openapitools/server/api/model/Order.java
@@ -99,7 +99,7 @@ public class Order   {
 
     
   @JsonProperty("complete")
-  public Boolean isComplete() {
+  public Boolean getComplete() {
     return complete;
   }
   public void setComplete(Boolean complete) {
diff --git a/samples/server/petstore/java-vertx/async/src/main/resources/openapi.json b/samples/server/petstore/java-vertx/async/src/main/resources/openapi.json
index eeb13a4729f..fab44c6d95a 100644
--- a/samples/server/petstore/java-vertx/async/src/main/resources/openapi.json
+++ b/samples/server/petstore/java-vertx/async/src/main/resources/openapi.json
@@ -112,13 +112,14 @@
           "in" : "query",
           "description" : "Status values that need to be considered for filter",
           "required" : true,
+          "style" : "form",
           "explode" : false,
           "schema" : {
             "type" : "array",
             "items" : {
               "type" : "string",
-              "default" : "available",
-              "enum" : [ "available", "pending", "sold" ]
+              "enum" : [ "available", "pending", "sold" ],
+              "default" : "available"
             }
           }
         } ],
@@ -168,6 +169,7 @@
           "in" : "query",
           "description" : "Tags to filter by",
           "required" : true,
+          "style" : "form",
           "explode" : false,
           "schema" : {
             "type" : "array",
diff --git a/samples/server/petstore/java-vertx/rx/.openapi-generator/VERSION b/samples/server/petstore/java-vertx/rx/.openapi-generator/VERSION
index 096bf47efe3..4395ff59232 100644
--- a/samples/server/petstore/java-vertx/rx/.openapi-generator/VERSION
+++ b/samples/server/petstore/java-vertx/rx/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
\ No newline at end of file
+3.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/model/Order.java b/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/model/Order.java
index 1815414b55d..f34e4c0ff4f 100644
--- a/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/model/Order.java
+++ b/samples/server/petstore/java-vertx/rx/src/main/java/org/openapitools/server/api/model/Order.java
@@ -99,7 +99,7 @@ public class Order   {
 
     
   @JsonProperty("complete")
-  public Boolean isComplete() {
+  public Boolean getComplete() {
     return complete;
   }
   public void setComplete(Boolean complete) {
diff --git a/samples/server/petstore/java-vertx/rx/src/main/resources/openapi.json b/samples/server/petstore/java-vertx/rx/src/main/resources/openapi.json
index eeb13a4729f..fab44c6d95a 100644
--- a/samples/server/petstore/java-vertx/rx/src/main/resources/openapi.json
+++ b/samples/server/petstore/java-vertx/rx/src/main/resources/openapi.json
@@ -112,13 +112,14 @@
           "in" : "query",
           "description" : "Status values that need to be considered for filter",
           "required" : true,
+          "style" : "form",
           "explode" : false,
           "schema" : {
             "type" : "array",
             "items" : {
               "type" : "string",
-              "default" : "available",
-              "enum" : [ "available", "pending", "sold" ]
+              "enum" : [ "available", "pending", "sold" ],
+              "default" : "available"
             }
           }
         } ],
@@ -168,6 +169,7 @@
           "in" : "query",
           "description" : "Tags to filter by",
           "required" : true,
+          "style" : "form",
           "explode" : false,
           "schema" : {
             "type" : "array",
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/RestApplication.java
index 72dba3b836f..96b916f7cdc 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/RestApplication.java
+++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/RestApplication.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
   // Add implementation-specific details here
 }
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/RestApplication.java
index a82cb9c3fad..05e47844145 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/RestApplication.java
+++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/RestApplication.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 }
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/RestApplication.java
index 14822d37179..4b18e7088cb 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/RestApplication.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/RestApplication.java
@@ -10,7 +10,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/RestApplication.java
index 14822d37179..4b18e7088cb 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/RestApplication.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/RestApplication.java
@@ -10,7 +10,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/RestApplication.java
index 14822d37179..4b18e7088cb 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/RestApplication.java
+++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/RestApplication.java
@@ -10,7 +10,7 @@ import org.openapitools.api.impl.PetApiServiceImpl;
 import org.openapitools.api.impl.StoreApiServiceImpl;
 import org.openapitools.api.impl.UserApiServiceImpl;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/RestApplication.java
index a82cb9c3fad..05e47844145 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/RestApplication.java
+++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/RestApplication.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 }
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION
index 4395ff59232..105bb87d77b 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.0-SNAPSHOT
\ No newline at end of file
+3.2.2-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 9ffada31ae8..58abe9915cb 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java
index f5d49a3c4b2..3ea215fd3de 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java
@@ -2,6 +2,8 @@ package org.openapitools.model;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 19b4fb8672a..43d65d72f38 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 67f1a62787a..f29bd99493a 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java
index 6c812b8b684..249f75701be 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.model.ReadOnlyFirst;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java
index b2cc76b7b8d..db53f3c49bd 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java
index 134779f46fc..501e9c7d2c2 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java
index 4eb21f49a58..b31e9f551c8 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java
index 373ea29aa25..87a1c546c19 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java
index 83c5ac4e182..56914b24020 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java
index 3cf495a7b15..79c4f948f92 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java
index 7a93f0b748b..a2003eef8b9 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import java.io.Serializable;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java
index 42348dcdc91..ce852c9d3e0 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.OuterEnum;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 3acdf447102..0ba22995c7a 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import java.io.Serializable;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
index 62bac3f6625..2d4ff70310f 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 40af1963426..22181446330 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java
index 2961088997d..d0e0137e210 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index cc446a6fce4..627a928a17b 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java
index c5fbe95d9f6..362ea187e75 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 339ae0912fd..57705be9cd5 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java
index e5585db2da5..4d0ad8278e4 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java
index 6fa1ec2f4c8..7dfe13b2cb9 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java
@@ -1,6 +1,7 @@
 package org.openapitools.model;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java
index 9aa6bc73749..bec8bbd4669 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java
index f2b772249ae..4351bf39098 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java
index c4c046c8953..37d163744cb 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.io.Serializable;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java
index bdb345ac05f..6b669e30995 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.model.Category;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index b7349f0a256..02c8630a47f 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java
index 5668baa8c70..d57dd6da2b2 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java
index ced9e763c59..3c8f6153974 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java
index 47bd2cde5d3..2e0a3d03321 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java
index c9b3afbbf90..b98d35a4e93 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/")
+@ApplicationPath("/v2")
 public class RestApplication extends Application {
 
 }
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md
index c9d1e8b6db8..ab90726d33f 100644
--- a/samples/server/petstore/kotlin-server/ktor/README.md
+++ b/samples/server/petstore/kotlin-server/ktor/README.md
@@ -2,7 +2,7 @@
 
 This is a sample server Petstore server. For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.
 
-Generated by OpenAPI Generator 3.2.2-SNAPSHOT.
+Generated by OpenAPI Generator 3.2.3-SNAPSHOT.
 
 ## Requires
 
diff --git a/samples/server/petstore/php-laravel/.gitignore b/samples/server/petstore/php-laravel/.gitignore
new file mode 100644
index 00000000000..286a6119198
--- /dev/null
+++ b/samples/server/petstore/php-laravel/.gitignore
@@ -0,0 +1,19 @@
+# ref: https://github.com/github/gitignore/blob/master/Laravel.gitignore
+
+vendor/
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# Laravel 4 specific
+bootstrap/compiled.php
+app/storage/
+
+# Laravel 5 & Lumen specific
+public/storage
+public/hot
+storage/*.key
+.env
+Homestead.yaml
+Homestead.json
+/.vagrant
\ No newline at end of file
diff --git a/samples/server/petstore/php-lumen/.gitignore b/samples/server/petstore/php-lumen/.gitignore
new file mode 100644
index 00000000000..390a8878ede
--- /dev/null
+++ b/samples/server/petstore/php-lumen/.gitignore
@@ -0,0 +1,8 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
\ No newline at end of file
diff --git a/samples/server/petstore/php-lumen/.openapi-generator/VERSION b/samples/server/petstore/php-lumen/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/php-lumen/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-lumen/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/.gitignore b/samples/server/petstore/php-silex/OpenAPIServer/.gitignore
new file mode 100644
index 00000000000..390a8878ede
--- /dev/null
+++ b/samples/server/petstore/php-silex/OpenAPIServer/.gitignore
@@ -0,0 +1,8 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
\ No newline at end of file
diff --git a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim/.gitignore b/samples/server/petstore/php-slim/.gitignore
index 23a42ca8d8a..390a8878ede 100644
--- a/samples/server/petstore/php-slim/.gitignore
+++ b/samples/server/petstore/php-slim/.gitignore
@@ -1,3 +1,5 @@
+# ref: https://github.com/github/gitignore/blob/master/Composer.gitignore
+
 composer.phar
 /vendor/
 
diff --git a/samples/server/petstore/php-slim/.htaccess b/samples/server/petstore/php-slim/.htaccess
index e47b5fb8a0c..f6a2ceb3952 100644
--- a/samples/server/petstore/php-slim/.htaccess
+++ b/samples/server/petstore/php-slim/.htaccess
@@ -1,5 +1,6 @@
 <IfModule mod_rewrite.c>
     RewriteEngine On
     RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^(.*)$ index.php?_url=/$1 [QSA,L]
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule ^ index.php [QSA,L]
 </IfModule>
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim/.openapi-generator/VERSION b/samples/server/petstore/php-slim/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/php-slim/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-slim/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-slim/README.md b/samples/server/petstore/php-slim/README.md
index 9847411dd75..85f8dfa9803 100644
--- a/samples/server/petstore/php-slim/README.md
+++ b/samples/server/petstore/php-slim/README.md
@@ -1,14 +1,128 @@
-# OpenAPI generated server
+# php-base - PHP Slim Server library for OpenAPI Petstore
 
-## Overview
-This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the
-[OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub.  This
-is an example of building a PHP Slim server.
+[Slim Framework Documentation](https://www.slimframework.com/docs/)
 
-This example uses the [Slim Framework](http://www.slimframework.com/).  To see how to make this your own, please take a look at the template here:
+## Requirements
+
+* Web server with URL rewriting
+* PHP 5.5 or newer
+
+This package contains `.htaccess` for Apache configuration.
+If you use another server(Nginx, HHVM, IIS, lighttpd) check out [Web Servers](https://www.slimframework.com/docs/v3/start/web-servers.html) doc.
+
+## Installation via [Composer](https://getcomposer.org/)
+
+Navigate into your project's root directory and execute the bash command shown below.
+This command downloads the Slim Framework and its third-party dependencies into your project's `vendor/` directory.
+```bash
+$ composer install
+```
+
+## Start devserver
+
+Run the following command in terminal to start localhost web server, assuming `./php-slim-server/` is public-accessible directory with `index.php` file:
+```bash
+$ php -S localhost:8888 -t php-slim-server
+```
+> **Warning** This web server was designed to aid application development.
+> It may also be useful for testing purposes or for application demonstrations that are run in controlled environments.
+> It is not intended to be a full-featured web server. It should not be used on a public network.
+
+## Run tests
+
+This package uses PHPUnit 4.8 for unit testing.
+[Test folder](test) contains templates which you can fill with real test assertions.
+How to write tests read at [PHPUnit Manual - Chapter 2. Writing Tests for PHPUnit](https://phpunit.de/manual/4.8/en/writing-tests-for-phpunit.html).
+
+Command | Tool | Target
+---- | ---- | ----
+`$ composer test` | PHPUnit | All tests
+`$ composer run test-apis` | PHPUnit | Apis tests
+`$ composer run test-models` | PHPUnit | Models tests
+
+## API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*AnotherFakeApi* | **call123TestSpecialTags** | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | **fakeOuterBooleanSerialize** | **POST** /fake/outer/boolean | 
+*FakeApi* | **fakeOuterCompositeSerialize** | **POST** /fake/outer/composite | 
+*FakeApi* | **fakeOuterNumberSerialize** | **POST** /fake/outer/number | 
+*FakeApi* | **fakeOuterStringSerialize** | **POST** /fake/outer/string | 
+*FakeApi* | **testBodyWithFileSchema** | **PUT** /fake/body-with-file-schema | 
+*FakeApi* | **testBodyWithQueryParams** | **PUT** /fake/body-with-query-params | 
+*FakeApi* | **testClientModel** | **PATCH** /fake | To test \"client\" model
+*FakeApi* | **testEndpointParameters** | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
+*FakeApi* | **testEnumParameters** | **GET** /fake | To test enum parameters
+*FakeApi* | **testInlineAdditionalProperties** | **POST** /fake/inline-additionalProperties | test inline additionalProperties
+*FakeApi* | **testJsonFormData** | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeClassnameTags123Api* | **testClassname** | **PATCH** /fake_classname_test | To test class name in snake case
+*PetApi* | **addPet** | **POST** /pet | Add a new pet to the store
+*PetApi* | **findPetsByStatus** | **GET** /pet/findByStatus | Finds Pets by status
+*PetApi* | **findPetsByTags** | **GET** /pet/findByTags | Finds Pets by tags
+*PetApi* | **updatePet** | **PUT** /pet | Update an existing pet
+*PetApi* | **deletePet** | **DELETE** /pet/{petId} | Deletes a pet
+*PetApi* | **getPetById** | **GET** /pet/{petId} | Find pet by ID
+*PetApi* | **updatePetWithForm** | **POST** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | **uploadFile** | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | **uploadFileWithRequiredFile** | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+*StoreApi* | **getInventory** | **GET** /store/inventory | Returns pet inventories by status
+*StoreApi* | **placeOrder** | **POST** /store/order | Place an order for a pet
+*StoreApi* | **deleteOrder** | **DELETE** /store/order/{order_id} | Delete purchase order by ID
+*StoreApi* | **getOrderById** | **GET** /store/order/{order_id} | Find purchase order by ID
+*UserApi* | **createUser** | **POST** /user | Create user
+*UserApi* | **createUsersWithArrayInput** | **POST** /user/createWithArray | Creates list of users with given input array
+*UserApi* | **createUsersWithListInput** | **POST** /user/createWithList | Creates list of users with given input array
+*UserApi* | **loginUser** | **GET** /user/login | Logs user into the system
+*UserApi* | **logoutUser** | **GET** /user/logout | Logs out current logged in user session
+*UserApi* | **deleteUser** | **DELETE** /user/{username} | Delete user
+*UserApi* | **getUserByName** | **GET** /user/{username} | Get user by user name
+*UserApi* | **updateUser** | **PUT** /user/{username} | Updated user
+
+
+## Models
+
+* OpenAPIServer\Model\AdditionalPropertiesClass
+* OpenAPIServer\Model\Animal
+* OpenAPIServer\Model\AnimalFarm
+* OpenAPIServer\Model\ApiResponse
+* OpenAPIServer\Model\ArrayOfArrayOfNumberOnly
+* OpenAPIServer\Model\ArrayOfNumberOnly
+* OpenAPIServer\Model\ArrayTest
+* OpenAPIServer\Model\Capitalization
+* OpenAPIServer\Model\Cat
+* OpenAPIServer\Model\Category
+* OpenAPIServer\Model\ClassModel
+* OpenAPIServer\Model\Client
+* OpenAPIServer\Model\Dog
+* OpenAPIServer\Model\EnumArrays
+* OpenAPIServer\Model\EnumClass
+* OpenAPIServer\Model\EnumTest
+* OpenAPIServer\Model\File
+* OpenAPIServer\Model\FileSchemaTestClass
+* OpenAPIServer\Model\FormatTest
+* OpenAPIServer\Model\HasOnlyReadOnly
+* OpenAPIServer\Model\MapTest
+* OpenAPIServer\Model\MixedPropertiesAndAdditionalPropertiesClass
+* OpenAPIServer\Model\Model200Response
+* OpenAPIServer\Model\ModelList
+* OpenAPIServer\Model\ModelReturn
+* OpenAPIServer\Model\Name
+* OpenAPIServer\Model\NumberOnly
+* OpenAPIServer\Model\Order
+* OpenAPIServer\Model\OuterComposite
+* OpenAPIServer\Model\OuterEnum
+* OpenAPIServer\Model\Pet
+* OpenAPIServer\Model\ReadOnlyFirst
+* OpenAPIServer\Model\SpecialModelName
+* OpenAPIServer\Model\StringBooleanMap
+* OpenAPIServer\Model\Tag
+* OpenAPIServer\Model\User
 
-[TEMPLATES](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/resources/php-slim-server/)
 
 ## Authentication
-> Important! To make Basic Authentication work you need to implement `authenticator` function in [SlimRouter](lib/SlimRouter.php) class.  
-> Documentation [tuupola/slim-basic-auth](https://github.com/tuupola/slim-basic-auth)
+
+> Important! To make Basic Authentication work you need to implement `authenticator` function in [SlimRouter](lib/SlimRouter.php) class.
+> Documentation [tuupola/slim-basic-auth](https://github.com/tuupola/slim-basic-auth#readme)
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore b/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore
new file mode 100644
index 00000000000..20b7b989760
--- /dev/null
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore
@@ -0,0 +1,54 @@
+# ref: https://github.com/github/gitignore/blob/master/Symfony.gitignore
+
+# Cache and logs (Symfony2)
+/app/cache/*
+/app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
+
+# Email spool folder
+/app/spool/*
+
+# Cache, session files and logs (Symfony3)
+/var/cache/*
+/var/logs/*
+/var/sessions/*
+!var/cache/.gitkeep
+!var/logs/.gitkeep
+!var/sessions/.gitkeep
+
+# Parameters
+/app/config/parameters.yml
+/app/config/parameters.ini
+
+# Managed by Composer
+/app/bootstrap.php.cache
+/var/bootstrap.php.cache
+/bin/*
+!bin/console
+!bin/symfony_requirements
+/vendor/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
+
+# Build data
+/build/
+
+# Composer PHAR
+/composer.phar
+
+# Backup entities generated with doctrine:generate:entities command
+**/Entity/*~
+
+# Embedded web-server pid file
+/.web-server-pid
+
+# From root gitignore
+/Tests/cache/
+/Tests/logs/
\ No newline at end of file
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/config/services.yml b/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/config/services.yml
index f40b2d5104d..9e514b20a04 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/config/services.yml
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Resources/config/services.yml
@@ -14,10 +14,10 @@ services:
         class: OpenAPI\Server\Model\ModelSerializer
 
     open_apiserver.service.serializer:
-        class: %open_apiserver.serializer%
+        class: '%open_apiserver.serializer%'
 
     open_apiserver.service.validator:
-        class: %open_apiserver.validator%
+        class: '%open_apiserver.validator%'
 
     open_apiserver.controller.pet:
         class: OpenAPI\Server\Controller\PetController
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json
index c8d0976f845..51c7a53bbc3 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json
@@ -22,7 +22,7 @@
         "ext-mbstring": "*",
         "symfony/validator": "*",
         "jms/serializer-bundle": "*",
-        "symfony/framework-bundle": "^2.3|^3.0"
+        "symfony/framework-bundle": "^2.3|^3.0|^4.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8",
diff --git a/samples/server/petstore/php-ze-ph/.gitignore b/samples/server/petstore/php-ze-ph/.gitignore
new file mode 100644
index 00000000000..be88ab49679
--- /dev/null
+++ b/samples/server/petstore/php-ze-ph/.gitignore
@@ -0,0 +1,26 @@
+# ref: https://github.com/github/gitignore/blob/master/ZendFramework.gitignore
+
+# Composer files
+composer.phar
+vendor/
+
+# Local configs
+config/autoload/*.local.php
+
+# Binary gettext files
+*.mo
+
+# Data
+data/logs/
+data/cache/
+data/sessions/
+data/tmp/
+temp/
+
+#Doctrine 2
+data/DoctrineORMModule/Proxy/
+data/DoctrineORMModule/cache/
+
+# Legacy ZF1
+demos/
+extras/documentation
\ No newline at end of file
diff --git a/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION b/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION
+++ b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
index c9edcf8e18f..16135f6c1b9 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
index a81586c56df..0dc69f8b729 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 20de19236b8..3345ca6a47d 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
index fa3e94a9560..504242fe0ca 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
index 0afdc6da7c6..1fff8e8cc43 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
index 401eca19013..b99000814d0 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
index c717ecc4efe..69f390aed0f 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
index 6b81ed3b6d4..92c4daf45e1 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index b78309a1ffe..9a9a71b7cb5 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
index be9bc326212..ec7d0063618 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
index 768dcac99d5..53d2f599fb9 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
index cd9d6dd6e92..3df32aad945 100644
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
+++ b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
index ab40d27772b..61431ea85d4 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
index 2c84d051010..38d0315da29 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 5238fe51512..fa87aa0bcf2 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
index e7bbfa7e45e..6ab9fdbf2ec 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
index 2ea7d02cd18..eddc8802119 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
index 5a242843dcb..e9f50afe562 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
index ab40d27772b..61431ea85d4 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
index 2c84d051010..38d0315da29 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 5238fe51512..fa87aa0bcf2 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
index e7bbfa7e45e..6ab9fdbf2ec 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
index 2ea7d02cd18..eddc8802119 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
index 5a242843dcb..e9f50afe562 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 75f6b34c39b..214b09cdaa9 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
index 0b9d68e3fad..a59c37e8cdd 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index e11d896ee3d..316dd3a85b8 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
index e28cdd3245d..bb97823f386 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
index 831cf89a256..f556b2de413 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
index d91b6be8a67..e1736ef903a 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
index ab40d27772b..61431ea85d4 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
index 2c84d051010..38d0315da29 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 5238fe51512..fa87aa0bcf2 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
index e7bbfa7e45e..6ab9fdbf2ec 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
index 2ea7d02cd18..eddc8802119 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
index 5a242843dcb..e9f50afe562 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 0ba273fbe7a..9e3a8209204 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
index eb0fc8c56c7..e6f64e57c45 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index e0a283a5e1c..f6c6a3b6952 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
index bc3fec3fdee..79dcdef1faa 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
index 11e28670d17..36c248cc8ec 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
index 3991b8655ed..0f35f7d547f 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
index 1f6aa39bd89..68ddcc57de8 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
index 885d3f734ad..115fe4da570 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index 6c6a37426ad..1d5c47f13e2 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
index 68c094fe45d..697853f4f0b 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
index 03f566072ba..89e2625b25b 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
index 76892be7eac..0979c6a167b 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
index c717ecc4efe..69f390aed0f 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
index d72046838f0..dc4f99559b1 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index b78309a1ffe..9a9a71b7cb5 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
index f0540d6db41..e85be920ee0 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
index 768dcac99d5..53d2f599fb9 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
index cd9d6dd6e92..3df32aad945 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/.openapi-generator/VERSION b/samples/server/petstore/springboot/.openapi-generator/VERSION
index 105bb87d77b..c791c986fbb 100644
--- a/samples/server/petstore/springboot/.openapi-generator/VERSION
+++ b/samples/server/petstore/springboot/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.2-SNAPSHOT
\ No newline at end of file
+3.2.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
index c717ecc4efe..69f390aed0f 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
index e8fbec09a9c..ee8b20fcd4b 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
index b78309a1ffe..9a9a71b7cb5 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
index be9bc326212..ec7d0063618 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
index 768dcac99d5..53d2f599fb9 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
index cd9d6dd6e92..3df32aad945 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.2-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.2.3-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */