Merge remote-tracking branch 'origin/master' into 2.3.0

README.md

@@ -709,6 +709,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you
 - [Balance Internet](https://www.balanceinternet.com.au/)
 - [beemo](http://www.beemo.eu)
 - [bitly](https://bitly.com)
+- [Box](https://box.com)
 - [Bufferfly Network](https://www.butterflynetinc.com/)
 - [Cachet Financial](http://www.cachetfinancial.com/)
 - [carpolo](http://www.carpolo.co/)

bin/security/typescript-jquery-all.sh

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+
+echo "Typescript jquery Petstore API client (default setting)"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-security-test.yaml -l typescript-jquery -o samples/client/petstore-security-test/typescript-jquery/default"
+java $JAVA_OPTS -jar $executable $ags
+
+echo "Typescript jquery Petstore API client with npm setting"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-security-test.yaml -l typescript-jquery -c bin/typescript-petstore-npm.json -o samples/client/petstore-security-test/typescript-jquery/npm"
+java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

@@ -101,7 +101,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
                 "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
                 "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
                 "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
-                "native", "super", "while")
+                "native", "super", "while", "null")
         );
 
         languageSpecificPrimitives = new HashSet<String>(
@@ -511,6 +511,12 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
 
     @Override
     public String toModelName(final String name) {
+        // We need to check if import-mapping has a different model for this class, so we use it
+        // instead of the auto-generated one.
+        if (importMapping.containsKey(name)) {
+            return importMapping.get(name);
+        }
+
         final String sanitizedName = sanitizeName(name);
 
         String nameWithPrefixSuffix = sanitizedName;

modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache

@@ -62,6 +62,7 @@ public class ApiClient {
 
     private InputStream sslCaCert;
     private boolean verifyingSsl;
+    private KeyManager[] keyManagers;
 
     private OkHttpClient httpClient;
     private JSON json;
@@ -200,6 +201,27 @@ public class ApiClient {
         return this;
     }
 
+    public KeyManager[] getKeyManagers() {
+        return keyManagers;
+    }
+
+    /**
+     * Configure client keys to use for authorization in an SSL session.
+     * Use null to reset to default.
+     *
+     * @param managers The KeyManagers to use
+     * @return ApiClient
+     */
+    public ApiClient setKeyManagers(KeyManager[] managers) {
+        this.keyManagers = managers;
+        applySslSettings();
+        return this;
+    }
+
+    public DateFormat getDateFormat() {
+        return dateFormat;
+    }
+
     public ApiClient setDateFormat(DateFormat dateFormat) {
         this.json.setDateFormat(dateFormat);
         return this;
@@ -1046,7 +1068,6 @@ public class ApiClient {
      */
     private void applySslSettings() {
         try {
-            KeyManager[] keyManagers = null;
             TrustManager[] trustManagers = null;
             HostnameVerifier hostnameVerifier = null;
             if (!verifyingSsl) {

modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache

@@ -25,6 +25,10 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
     this.value = value;
   }
 
+  public {{{dataType}}} getValue() {
+    return value;
+  }
+
   @Override
 {{#jackson}}
   @JsonValue

modules/swagger-codegen/src/main/resources/Java/modelInnerEnum.mustache

@@ -26,6 +26,10 @@
       this.value = value;
     }
 
+    public {{{datatype}}} getValue() {
+      return value;
+    }
+
     @Override
 {{#jackson}}
     @JsonValue

modules/swagger-codegen/src/main/resources/Javascript/api_doc.mustache

@@ -22,7 +22,7 @@ Method | HTTP request | Description
 ```javascript
 var {{{moduleName}}} = require('{{{projectName}}}');
 {{#hasAuthMethods}}
-var defaultClient = {{{moduleName}}}.ApiClient.default;
+var defaultClient = {{{moduleName}}}.ApiClient.instance;
 {{#authMethods}}{{#isBasic}}
 // Configure HTTP basic authorization: {{{name}}}
 var {{{name}}} = defaultClient.authentications['{{{name}}}'];

modules/swagger-codegen/src/main/resources/Javascript/licenseInfo.mustache

@@ -2,11 +2,18 @@
  * {{{appName}}}
  * {{{appDescription}}}
  *
- * {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
+ {{#version}}
- * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+ * OpenAPI spec version: {{{version}}}
+ {{/version}}
+ {{#infoEmail}}
+ * Contact: {{{infoEmail}}}
+ {{/infoEmail}}
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
+ *
+ * Swagger Codegen version: {{{generatorVersion}}}
+ *
  * Do not edit the class manually.
  *
  */

modules/swagger-codegen/src/main/resources/python/api_client.mustache

@@ -88,6 +88,8 @@ class ApiClient(object):
                    _return_http_data_only=None, collection_formats=None, _preload_content=True,
                    _request_timeout=None):
 
+        config = Configuration()
+
         # header parameters
         header_params = header_params or {}
         header_params.update(self.default_headers)
@@ -104,8 +106,9 @@ class ApiClient(object):
             path_params = self.parameters_to_tuples(path_params,
                                                     collection_formats)
             for k, v in path_params:
+                # specified safe chars, encode everything
                 resource_path = resource_path.replace(
-                    '{%s}' % k, quote(str(v), safe=''))  # no safe chars, encode everything
+                    '{%s}' % k, quote(str(v), safe=config.safe_chars_for_path_param))
 
         # query parameters
         if query_params:

modules/swagger-codegen/src/main/resources/python/configuration.mustache

@@ -69,6 +69,8 @@ class Configuration(object):
 
         # Proxy URL
         self.proxy = None
+        # Safe chars for path_param
+        self.safe_chars_for_path_param = ''
 
     @property
     def logger_file(self):

modules/swagger-codegen/src/main/resources/typescript-jquery/api.mustache

@@ -255,7 +255,7 @@ export class {{classname}} {
 
         let dfd = $.Deferred();
         $.ajax(requestOptions).then(
-            (data: {{{returnType}}}, textStatus: string, jqXHR: JQueryXHR) =>
+            (data: {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}any{{/returnType}}, textStatus: string, jqXHR: JQueryXHR) =>
                 dfd.resolve({ response: jqXHR, body: data }),
             (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
                 dfd.reject({ response: xhr, body: errorThrown })

modules/swagger-codegen/src/test/java/io/swagger/codegen/java/AbstractJavaCodegenTest.java

@@ -39,4 +39,14 @@ public class AbstractJavaCodegenTest {
         Assert.assertEquals("propertyClass", fakeJavaCodegen.toVarName("__class"));
     }
 
+    @Test
+    public void toModelNameShouldUseProvidedMapping() throws Exception {
+        fakeJavaCodegen.importMapping().put("json_myclass", "com.test.MyClass");
+        Assert.assertEquals("com.test.MyClass", fakeJavaCodegen.toModelName("json_myclass"));
+    }
+
+    @Test
+    public void toModelNameUsesPascalCase() throws Exception {
+        Assert.assertEquals("JsonAnotherclass", fakeJavaCodegen.toModelName("json_anotherclass"));
+    }
 }

samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java

@@ -127,6 +127,7 @@ public class ApiClient {
 
     private InputStream sslCaCert;
     private boolean verifyingSsl;
+    private KeyManager[] keyManagers;
 
     private OkHttpClient httpClient;
     private JSON json;
@@ -273,6 +274,23 @@ public class ApiClient {
         return this;
     }
 
+    public KeyManager[] getKeyManagers() {
+        return keyManagers;
+    }
+
+    /**
+     * Configure client keys to use for authorization in an SSL session.
+     * Use null to reset to default.
+     *
+     * @param managers The KeyManagers to use
+     * @return ApiClient
+     */
+    public ApiClient setKeyManagers(KeyManager[] managers) {
+        this.keyManagers = managers;
+        applySslSettings();
+        return this;
+    }
+
     public DateFormat getDateFormat() {
         return dateFormat;
     }
@@ -1262,7 +1280,6 @@ public class ApiClient {
      */
     private void applySslSettings() {
         try {
-            KeyManager[] keyManagers = null;
             TrustManager[] trustManagers = null;
             HostnameVerifier hostnameVerifier = null;
             if (!verifyingSsl) {

samples/client/petstore-security-test/python/.swagger-codegen/VERSION

@@ -0,0 +1 @@
+2.2.3-SNAPSHOT

samples/client/petstore-security-test/python/petstore_api/api_client.py

@@ -96,6 +96,8 @@ class ApiClient(object):
                    _return_http_data_only=None, collection_formats=None, _preload_content=True,
                    _request_timeout=None):
 
+        config = Configuration()
+
         # header parameters
         header_params = header_params or {}
         header_params.update(self.default_headers)
@@ -112,8 +114,9 @@ class ApiClient(object):
             path_params = self.parameters_to_tuples(path_params,
                                                     collection_formats)
             for k, v in path_params:
+                # specified safe chars, encode everything
                 resource_path = resource_path.replace(
-                    '{%s}' % k, quote(str(v), safe=''))  # no safe chars, encode everything
+                    '{%s}' % k, quote(str(v), safe=config.safe_chars_for_path_param))
 
         # query parameters
         if query_params:

samples/client/petstore-security-test/python/petstore_api/configuration.py

@@ -78,6 +78,8 @@ class Configuration(object):
 
         # Proxy URL
         self.proxy = None
+        # Safe chars for path_param
+        self.safe_chars_for_path_param = ''
 
     @property
     def logger_file(self):

samples/client/petstore-security-test/typescript-jquery/default/.swagger-codegen-ignore

@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# 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

samples/client/petstore-security-test/typescript-jquery/default/.swagger-codegen/VERSION

@@ -0,0 +1 @@
+2.2.3-SNAPSHOT

samples/client/petstore-security-test/typescript-jquery/default/api.ts

@@ -0,0 +1,155 @@
+import * as $ from 'jquery';
+
+let defaultBasePath = 'https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r';
+
+// ===============================================
+// This file is autogenerated - Please do not edit
+// ===============================================
+
+/* tslint:disable:no-unused-variable */
+
+    /**
+    * Model for testing reserved words  *_/ ' \" =end -- \\r\\n \\n \\r
+    */
+export class ModelReturn {
+        /**
+        * property description  *_/ ' \" =end -- \\r\\n \\n \\r
+        */
+    'return': number;
+}
+
+
+export interface Authentication {
+    /**
+    * Apply authentication settings to header and query params.
+    */
+    applyToRequest(requestOptions: JQueryAjaxSettings): void;
+}
+
+export class HttpBasicAuth implements Authentication {
+    public username: string;
+    public password: string;
+    applyToRequest(requestOptions: any): void {
+        requestOptions.username = this.username;
+        requestOptions.password = this.password;
+    }
+}
+
+export class ApiKeyAuth implements Authentication {
+    public apiKey: string;
+
+    constructor(private location: string, private paramName: string) {
+    }
+
+    applyToRequest(requestOptions: JQueryAjaxSettings): void {
+        requestOptions.headers[this.paramName] = this.apiKey;
+    }
+}
+
+export class OAuth implements Authentication {
+    public accessToken: string;
+
+    applyToRequest(requestOptions: JQueryAjaxSettings): void {
+        requestOptions.headers["Authorization"] = "Bearer " + this.accessToken;
+    }
+}
+
+export class VoidAuth implements Authentication {
+    public username: string;
+    public password: string;
+    applyToRequest(requestOptions: JQueryAjaxSettings): void {
+        // Do nothing
+    }
+}
+
+export enum FakeApiApiKeys {
+    api_key,
+}
+
+export class FakeApi {
+    protected basePath = defaultBasePath;
+    protected defaultHeaders : any = {};
+
+    protected authentications = {
+        'default': <Authentication>new VoidAuth(),
+        'api_key': new ApiKeyAuth('header', 'api_key  */ &#39; &quot; &#x3D;end -- \r\n \n \r'),
+        'petstore_auth': new OAuth(),
+    }
+
+    constructor(basePath?: string);
+    constructor(basePathOrUsername: string, password?: string, basePath?: string) {
+        if (password) {
+            if (basePath) {
+                this.basePath = basePath;
+            }
+        } else {
+            if (basePathOrUsername) {
+                this.basePath = basePathOrUsername
+            }
+        }
+    }
+
+    public setApiKey(key: FakeApiApiKeys, value: string) {
+        this.authentications[FakeApiApiKeys[key]].apiKey = value;
+    }
+
+    set accessToken(token: string) {
+        this.authentications.petstore_auth.accessToken = token;
+    }
+    private extendObj<T1, T2 extends T1>(objA: T2, objB: T2): T1|T2 {
+        for(let key in objB){
+            if(objB.hasOwnProperty(key)){
+            objA[key] = objB[key];
+            }
+        }
+        return objA;
+    }
+
+    /**
+     * To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     * 
+     * @param test code inject * &#39; &quot; &#x3D;end  rn n r To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     */
+    public testCodeInjectEndRnNR (test code inject * &#39; &quot; &#x3D;end  rn n r?: string) : JQueryPromise<{ response: JQueryXHR; body?: any;  }> {
+        let localVarPath = this.basePath + '/fake';
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+
+
+
+        localVarPath = localVarPath + "?" + $.param(queryParameters);
+
+
+        let reqHasFile = false;
+        let reqDict = {};
+        let reqFormData = new FormData();
+        if (test code inject * &#39; &quot; &#x3D;end  rn n r !== undefined) {
+            reqFormData.append('test code inject */ &#39; &quot; &#x3D;end -- \r\n \n \r', test code inject * &#39; &quot; &#x3D;end  rn n r);
+            reqDict['test code inject */ &#39; &quot; &#x3D;end -- \r\n \n \r'] = test code inject * &#39; &quot; &#x3D;end  rn n r;
+        }
+
+
+        let requestOptions: JQueryAjaxSettings = {
+            url: localVarPath,
+            type: 'PUT',
+            headers: headerParams,
+            processData: false
+        };
+
+        if (Object.keys(reqDict).length) {
+            requestOptions.data = reqHasFile ? reqFormData : JSON.stringify(reqDict);
+            requestOptions.contentType = reqHasFile ? false : 'application/json; charset=utf-8';
+        }
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        let dfd = $.Deferred();
+        $.ajax(requestOptions).then(
+            (data: any, textStatus: string, jqXHR: JQueryXHR) =>
+                dfd.resolve({ response: jqXHR, body: data }),
+            (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
+                dfd.reject({ response: xhr, body: errorThrown })
+        );
+        return dfd.promise();
+    }
+}

samples/client/petstore-security-test/typescript-jquery/default/git_push.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+

samples/client/petstore-security-test/typescript-jquery/npm/.swagger-codegen-ignore

@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# 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

samples/client/petstore-security-test/typescript-jquery/npm/.swagger-codegen/VERSION

@@ -0,0 +1 @@
+2.2.3-SNAPSHOT

samples/client/petstore-security-test/typescript-jquery/npm/api.ts

@@ -0,0 +1,155 @@
+import * as $ from 'jquery';
+
+let defaultBasePath = 'https://petstore.swagger.io *_/ ' \" =end -- \\r\\n \\n \\r/v2 *_/ ' \" =end -- \\r\\n \\n \\r';
+
+// ===============================================
+// This file is autogenerated - Please do not edit
+// ===============================================
+
+/* tslint:disable:no-unused-variable */
+
+    /**
+    * Model for testing reserved words  *_/ ' \" =end -- \\r\\n \\n \\r
+    */
+export class ModelReturn {
+        /**
+        * property description  *_/ ' \" =end -- \\r\\n \\n \\r
+        */
+    'return': number;
+}
+
+
+export interface Authentication {
+    /**
+    * Apply authentication settings to header and query params.
+    */
+    applyToRequest(requestOptions: JQueryAjaxSettings): void;
+}
+
+export class HttpBasicAuth implements Authentication {
+    public username: string;
+    public password: string;
+    applyToRequest(requestOptions: any): void {
+        requestOptions.username = this.username;
+        requestOptions.password = this.password;
+    }
+}
+
+export class ApiKeyAuth implements Authentication {
+    public apiKey: string;
+
+    constructor(private location: string, private paramName: string) {
+    }
+
+    applyToRequest(requestOptions: JQueryAjaxSettings): void {
+        requestOptions.headers[this.paramName] = this.apiKey;
+    }
+}
+
+export class OAuth implements Authentication {
+    public accessToken: string;
+
+    applyToRequest(requestOptions: JQueryAjaxSettings): void {
+        requestOptions.headers["Authorization"] = "Bearer " + this.accessToken;
+    }
+}
+
+export class VoidAuth implements Authentication {
+    public username: string;
+    public password: string;
+    applyToRequest(requestOptions: JQueryAjaxSettings): void {
+        // Do nothing
+    }
+}
+
+export enum FakeApiApiKeys {
+    api_key,
+}
+
+export class FakeApi {
+    protected basePath = defaultBasePath;
+    protected defaultHeaders : any = {};
+
+    protected authentications = {
+        'default': <Authentication>new VoidAuth(),
+        'api_key': new ApiKeyAuth('header', 'api_key  */ &#39; &quot; &#x3D;end -- \r\n \n \r'),
+        'petstore_auth': new OAuth(),
+    }
+
+    constructor(basePath?: string);
+    constructor(basePathOrUsername: string, password?: string, basePath?: string) {
+        if (password) {
+            if (basePath) {
+                this.basePath = basePath;
+            }
+        } else {
+            if (basePathOrUsername) {
+                this.basePath = basePathOrUsername
+            }
+        }
+    }
+
+    public setApiKey(key: FakeApiApiKeys, value: string) {
+        this.authentications[FakeApiApiKeys[key]].apiKey = value;
+    }
+
+    set accessToken(token: string) {
+        this.authentications.petstore_auth.accessToken = token;
+    }
+    private extendObj<T1, T2 extends T1>(objA: T2, objB: T2): T1|T2 {
+        for(let key in objB){
+            if(objB.hasOwnProperty(key)){
+            objA[key] = objB[key];
+            }
+        }
+        return objA;
+    }
+
+    /**
+     * To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     * 
+     * @param test code inject * &#39; &quot; &#x3D;end  rn n r To test code injection *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
+     */
+    public testCodeInjectEndRnNR (test code inject * &#39; &quot; &#x3D;end  rn n r?: string) : JQueryPromise<{ response: JQueryXHR; body?: any;  }> {
+        let localVarPath = this.basePath + '/fake';
+        let queryParameters: any = {};
+        let headerParams: any = this.extendObj({}, this.defaultHeaders);
+
+
+
+        localVarPath = localVarPath + "?" + $.param(queryParameters);
+
+
+        let reqHasFile = false;
+        let reqDict = {};
+        let reqFormData = new FormData();
+        if (test code inject * &#39; &quot; &#x3D;end  rn n r !== undefined) {
+            reqFormData.append('test code inject */ &#39; &quot; &#x3D;end -- \r\n \n \r', test code inject * &#39; &quot; &#x3D;end  rn n r);
+            reqDict['test code inject */ &#39; &quot; &#x3D;end -- \r\n \n \r'] = test code inject * &#39; &quot; &#x3D;end  rn n r;
+        }
+
+
+        let requestOptions: JQueryAjaxSettings = {
+            url: localVarPath,
+            type: 'PUT',
+            headers: headerParams,
+            processData: false
+        };
+
+        if (Object.keys(reqDict).length) {
+            requestOptions.data = reqHasFile ? reqFormData : JSON.stringify(reqDict);
+            requestOptions.contentType = reqHasFile ? false : 'application/json; charset=utf-8';
+        }
+
+        this.authentications.default.applyToRequest(requestOptions);
+
+        let dfd = $.Deferred();
+        $.ajax(requestOptions).then(
+            (data: any, textStatus: string, jqXHR: JQueryXHR) =>
+                dfd.resolve({ response: jqXHR, body: data }),
+            (xhr: JQueryXHR, textStatus: string, errorThrown: string) =>
+                dfd.reject({ response: xhr, body: errorThrown })
+        );
+        return dfd.promise();
+    }
+}

samples/client/petstore-security-test/typescript-jquery/npm/git_push.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+

samples/client/petstore-security-test/typescript-jquery/npm/package.json

@@ -0,0 +1,22 @@
+{
+    "name": "@swagger/angular2-typescript-petstore",
+    "version": "0.0.1",
+    "description": "JQuery client for @swagger/angular2-typescript-petstore",
+    "main": "api.js",
+    "scripts": {
+        "build": "tsc"
+    },
+    "author": "Swagger Codegen Contributors",
+    "license": "MIT",
+    "dependencies": {
+        "bluebird": "^3.3.5",
+        "request": "^2.72.0"
+    },
+    "devDependencies": {
+        "typescript": "^1.8.10",
+        "typings": "^0.8.1"
+    },
+    "publishConfig":{
+        "registry":"https://skimdb.npmjs.com/registry"
+    }
+}

samples/client/petstore-security-test/typescript-jquery/npm/tsconfig.json

@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "noImplicitAny": false,
+        "suppressImplicitAnyIndexErrors": true,
+        "target": "ES5",
+        "moduleResolution": "node",
+        "removeComments": true,
+        "sourceMap": true,
+        "noLib": false,
+        "declaration": true
+    },
+    "files": [
+        "api.ts",
+        "typings/main.d.ts"
+    ]
+}
+

samples/client/petstore-security-test/typescript-jquery/npm/typings.json

@@ -0,0 +1,10 @@
+{
+    "ambientDependencies": {
+        "bluebird": "registry:dt/bluebird#2.0.0+20160319051630",
+        "core-js": "registry:dt/core-js#0.0.0+20160317120654",
+        "node": "registry:dt/node#4.0.0+20160423143914"
+    },
+    "dependencies": {
+        "request": "registry:npm/request#2.69.0+20160304121250"
+    }
+}

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumClass.java

@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java

@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java

@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java

@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterEnum.java

@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java

@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumClass.java

@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumTest.java

@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MapTest.java

@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Order.java

@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/OuterEnum.java

@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Pet.java

@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumClass.java

@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumTest.java

@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/MapTest.java

@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Order.java

@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/OuterEnum.java

@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Pet.java

@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumClass.java

@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java

@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MapTest.java

@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Order.java

@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/OuterEnum.java

@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Pet.java

@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java

@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java

@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java

@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java

@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/OuterEnum.java

@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java

@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/okhttp-gson-parcelableModel/.swagger-codegen/VERSION

@@ -0,0 +1 @@
+2.3.0-SNAPSHOT

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/ApiClient.java

@@ -61,6 +61,7 @@ public class ApiClient {
 
     private InputStream sslCaCert;
     private boolean verifyingSsl;
+    private KeyManager[] keyManagers;
 
     private OkHttpClient httpClient;
     private JSON json;
@@ -195,6 +196,27 @@ public class ApiClient {
         return this;
     }
 
+    public KeyManager[] getKeyManagers() {
+        return keyManagers;
+    }
+
+    /**
+     * Configure client keys to use for authorization in an SSL session.
+     * Use null to reset to default.
+     *
+     * @param managers The KeyManagers to use
+     * @return ApiClient
+     */
+    public ApiClient setKeyManagers(KeyManager[] managers) {
+        this.keyManagers = managers;
+        applySslSettings();
+        return this;
+    }
+
+    public DateFormat getDateFormat() {
+        return dateFormat;
+    }
+
     public ApiClient setDateFormat(DateFormat dateFormat) {
         this.json.setDateFormat(dateFormat);
         return this;
@@ -1027,7 +1049,6 @@ public class ApiClient {
      */
     private void applySslSettings() {
         try {
-            KeyManager[] keyManagers = null;
             TrustManager[] trustManagers = null;
             HostnameVerifier hostnameVerifier = null;
             if (!verifyingSsl) {

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -43,6 +43,10 @@ public class EnumArrays implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -68,6 +72,10 @@ public class EnumArrays implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumClass.java

@@ -39,6 +39,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumTest.java

@@ -45,6 +45,10 @@ public class EnumTest implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -70,6 +74,10 @@ public class EnumTest implements Parcelable {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -95,6 +103,10 @@ public class EnumTest implements Parcelable {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MapTest.java

@@ -47,6 +47,10 @@ public class MapTest implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java

@@ -57,6 +57,10 @@ public class Order implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterEnum.java

@@ -39,6 +39,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Pet.java

@@ -63,6 +63,10 @@ public class Pet implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java

@@ -61,6 +61,7 @@ public class ApiClient {
 
     private InputStream sslCaCert;
     private boolean verifyingSsl;
+    private KeyManager[] keyManagers;
 
     private OkHttpClient httpClient;
     private JSON json;
@@ -195,6 +196,30 @@ public class ApiClient {
         return this;
     }
 
+<<<<<<< HEAD
+=======
+    public KeyManager[] getKeyManagers() {
+        return keyManagers;
+    }
+
+    /**
+     * Configure client keys to use for authorization in an SSL session.
+     * Use null to reset to default.
+     *
+     * @param managers The KeyManagers to use
+     * @return ApiClient
+     */
+    public ApiClient setKeyManagers(KeyManager[] managers) {
+        this.keyManagers = managers;
+        applySslSettings();
+        return this;
+    }
+
+    public DateFormat getDateFormat() {
+        return dateFormat;
+    }
+
+>>>>>>> origin/master
     public ApiClient setDateFormat(DateFormat dateFormat) {
         this.json.setDateFormat(dateFormat);
         return this;
@@ -1027,7 +1052,6 @@ public class ApiClient {
      */
     private void applySslSettings() {
         try {
-            KeyManager[] keyManagers = null;
             TrustManager[] trustManagers = null;
             HostnameVerifier hostnameVerifier = null;
             if (!verifyingSsl) {

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -66,6 +70,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java

@@ -37,6 +37,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java

@@ -43,6 +43,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -68,6 +72,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -93,6 +101,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java

@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java

@@ -55,6 +55,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/OuterEnum.java

@@ -37,6 +37,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java

@@ -61,6 +61,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumClass.java

@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumTest.java

@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MapTest.java

@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Order.java

@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/OuterEnum.java

@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Pet.java

@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumClass.java

@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumTest.java

@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MapTest.java

@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Order.java

@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/OuterEnum.java

@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {

samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Pet.java

@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -66,6 +70,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumClass.java

@@ -37,6 +37,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java

@@ -43,6 +43,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -68,6 +72,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -93,6 +101,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java

@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java

@@ -55,6 +55,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/OuterEnum.java

@@ -37,6 +37,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);

samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java

@@ -61,6 +61,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);