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

bin/flaskConnexion-python2.sh

@@ -27,7 +27,7 @@ fi
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 #ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l python-flask -o samples/server/petstore/flaskConnexion-python2 -DsupportPython2=true"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/flaskConnexion -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l python-flask -o samples/server/petstore/flaskConnexion-python2 -c bin/supportPython2.json"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/flaskConnexion -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l python-flask -o samples/server/petstore/flaskConnexion-python2 -c bin/supportPython2.json -D service"
 
 rm -rf samples/server/petstore/flaskConnexion-python2/*
-java $JAVA_OPTS -Dservice -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/flaskConnexion.sh

@@ -26,7 +26,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/flaskConnexion -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l python-flask -o samples/server/petstore/flaskConnexion "
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/flaskConnexion -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l python-flask -o samples/server/petstore/flaskConnexion -Dservice"
 
 rm -rf samples/server/petstore/flaskConnexion/*
-java $JAVA_OPTS -Dservice -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/go-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/swagger-codegen/src/main/resources/go-server -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l go-server -o samples/server/petstore/go-api-server -DpackageName=petstoreserver  --additional-properties hideGenerationTimestamp=true"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/go-server -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l go-server -o samples/server/petstore/go-api-server -DpackageName=petstoreserver  --additional-properties hideGenerationTimestamp=true -Dservice"
 
-java $JAVA_OPTS -Dservice -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/javascript-es6-petstore.sh

@@ -26,7 +26,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript \
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript/es6 \
 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript \
 -o samples/client/petstore/javascript-es6 \
 --additional-properties useEs6=true"

bin/javascript-petstore.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples/client/petstore/javascript"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples/client/petstore/javascript  -DappName=PetstoreClient"
 
-java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/javascript-promise-es6-petstore.sh

@@ -26,7 +26,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript \
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript/es6 \
 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript \
 -o samples/client/petstore/javascript-promise-es6 \
 --additional-properties useEs6=true \

bin/javascript-promise-petstore.sh

@@ -26,9 +26,12 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript \
--i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript \
+ags="$@ generate \
+-t modules/swagger-codegen/src/main/resources/Javascript \
+-i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml \
+-l javascript \
 -o samples/client/petstore/javascript-promise \
---additional-properties usePromises=true"
+--additional-properties usePromises=true \
+-DappName=PetstoreClient"
 
-java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/nodejs-petstore-google-cloud-functions.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l nodejs-server --additional-properties=googleCloudFunctions=true -o samples/server/petstore/nodejs-google-cloud-functions"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l nodejs-server --additional-properties=googleCloudFunctions=true -o samples/server/petstore/nodejs-google-cloud-functions -Dservice"
 
-java $JAVA_OPTS -Dservice -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/nodejs-petstore-server.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/nodejs -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l nodejs-server -o samples/server/petstore/nodejs"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/nodejs -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l nodejs-server -o samples/server/petstore/nodejs -Dservice"
 
-java $JAVA_OPTS -Dservice -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/objc-petstore-coredata.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -DapiDocs=false,modelDocs=false -o samples/client/petstore/objc/core-data --additional-properties coreData=true"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -D apiDocs=false -D modelDocs=false -o samples/client/petstore/objc/core-data --additional-properties coreData=true -D appName=PetstoreClient"
 
-java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/objc-petstore.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc/default"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc/default -D appName=PetstoreClient"
 
-java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/security/javascript-petstore.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript -i modules/swagger-codegen/src/test/resources/2_0/petstore-security-test.yaml -l javascript -o samples/client/petstore-security-test/javascript"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript -i modules/swagger-codegen/src/test/resources/2_0/petstore-security-test.yaml -l javascript -o samples/client/petstore-security-test/javascript  -DappName=PetstoreClient"
 
-java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/windows/javascript-petstore.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript -DappName=PetstoreClient
 
-java -DappName=PetstoreClient %JAVA_OPTS% -jar %executable% %ags%
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/javascript-promise-petstore.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript-promise --additional-properties usePromises=true
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript-promise --additional-properties usePromises=true -DappName=PetstoreClient
 
-java -DappName=PetstoreClient %JAVA_OPTS% -jar %executable% %ags%
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/objc-petstore.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l objc -o samples\client\petstore\objc\default
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l objc -o samples\client\petstore\objc\default -DappName=PetstoreClient
 
-java %JAVA_OPTS% -DappName=PetstoreClient -jar %executable% %ags%
+java %JAVA_OPTS% -jar %executable% %ags%

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java

@@ -12,6 +12,9 @@ import org.slf4j.LoggerFactory;
 import static io.swagger.codegen.config.CodegenConfiguratorUtils.*;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * User: lanwen
  * Date: 24.03.15
@@ -48,8 +51,8 @@ public class Generate implements Runnable {
     private String auth;
 
     @Option(name = {"-D"}, title = "system properties", description = "sets specified system properties in " +
-            "the format of name=value,name=value")
-    private String systemProperties;
+            "the format of name=value,name=value (or multiple options, each with name=value)")
+    private List<String> systemProperties = new ArrayList<>();
 
     @Option(name = {"-c", "--config"}, title = "configuration file", description = "Path to json configuration file. " +
             "File content should be in a json format {\"optionKey\":\"optionValue\", \"optionKey1\":\"optionValue1\"...} " +
@@ -229,7 +232,7 @@ public class Generate implements Runnable {
             configurator.setRemoveOperationIdPrefix(removeOperationIdPrefix);
         }
 
-        applySystemPropertiesKvp(systemProperties, configurator);
+        applySystemPropertiesKvpList(systemProperties, configurator);
         applyInstantiationTypesKvp(instantiationTypes, configurator);
         applyImportMappingsKvp(importMappings, configurator);
         applyTypeMappingsKvp(typeMappings, configurator);

modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java

@@ -114,6 +114,15 @@ public class GenerateTest {
             times = 1;
         }};
 
+        setupAndRunGenericTest("-Dhello=world,foo=bar");
+
+        new FullVerifications() {{
+            configurator.addSystemProperty("hello", "world");
+            times = 1;
+            configurator.addSystemProperty("foo", "bar");
+            times = 1;
+        }};
+
         setupAndRunGenericTest("-D", "hello=world,key=,foo=bar");
 
         new FullVerifications() {{
@@ -121,8 +130,41 @@ public class GenerateTest {
             times = 1;
             configurator.addSystemProperty("foo", "bar");
             times = 1;
-            configurator.addSystemProperty("key", anyString);
-            times = 0;
+            configurator.addSystemProperty("key", "");
+            times = 1;
+        }};
+
+        setupAndRunGenericTest("-D", "hello=world,key,foo=bar");
+
+        new FullVerifications() {{
+            configurator.addSystemProperty("hello", "world");
+            times = 1;
+            configurator.addSystemProperty("foo", "bar");
+            times = 1;
+            configurator.addSystemProperty("key", "");
+            times = 1;
+        }};
+
+        setupAndRunGenericTest("-D", "hello=world", "-D", "key", "-D", "foo=bar");
+
+        new FullVerifications() {{
+            configurator.addSystemProperty("hello", "world");
+            times = 1;
+            configurator.addSystemProperty("foo", "bar");
+            times = 1;
+            configurator.addSystemProperty("key", "");
+            times = 1;
+        }};
+
+        setupAndRunGenericTest("-Dhello=world", "-Dkey", "-Dfoo=bar");
+
+        new FullVerifications() {{
+            configurator.addSystemProperty("hello", "world");
+            times = 1;
+            configurator.addSystemProperty("foo", "bar");
+            times = 1;
+            configurator.addSystemProperty("key", "");
+            times = 1;
         }};
     }
 
@@ -183,8 +225,8 @@ public class GenerateTest {
             times = 1;
             configurator.addInstantiationType("foo", "bar");
             times = 1;
-            configurator.addInstantiationType("key", anyString);
-            times = 0;
+            configurator.addInstantiationType("key", "");
+            times = 1;
         }};
     }
 
@@ -197,8 +239,8 @@ public class GenerateTest {
             times = 1;
             configurator.addTypeMapping("foo", "bar");
             times = 1;
-            configurator.addTypeMapping("key", anyString);
-            times = 0;
+            configurator.addTypeMapping("key", "");
+            times = 1;
         }};
     }
 
@@ -211,8 +253,8 @@ public class GenerateTest {
             times = 1;
             configurator.addAdditionalProperty("foo", "bar");
             times = 1;
-            configurator.addAdditionalProperty("key", anyString);
-            times = 0;
+            configurator.addAdditionalProperty("key", "");
+            times = 1;
         }};
     }
 
@@ -241,8 +283,8 @@ public class GenerateTest {
             times = 1;
             configurator.addImportMapping("foo", "bar");
             times = 1;
-            configurator.addImportMapping("key", anyString);
-            times = 0;
+            configurator.addImportMapping("key", "");
+            times = 1;
         }};
     }
 

modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/utils/OptionUtilsTest.java

@@ -2,12 +2,12 @@ package io.swagger.codegen.cmd.utils;
 
 import io.swagger.codegen.utils.OptionUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
+import static java.util.Arrays.asList;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
@@ -16,39 +16,40 @@ public class OptionUtilsTest {
 
     @Test
     public void splitCommaSeparatedList() throws Exception {
-        doCommaSeparatedListTest("a,b,c", Arrays.asList("a", "b", "c"));
-        doCommaSeparatedListTest("a,,c", Arrays.asList("a", "c"));
-        doCommaSeparatedListTest("", new ArrayList<String>());
-        doCommaSeparatedListTest(null, new ArrayList<String>());
+        doCommaSeparatedListTest("a,b,c", asList("a", "b", "c"));
+        doCommaSeparatedListTest("a,,c", asList("a", "c"));
+        doCommaSeparatedListTest("", emptyList());
+        doCommaSeparatedListTest(null, emptyList());
     }
 
     @Test
     public void testParseCommaSeparatedTuples() throws Exception {
-        doTupleListTest("a=1,b=2,c=3", Arrays.asList(Pair.of("a", "1"), Pair.of("b", "2"), Pair.of("c", "3")));
-        doTupleListTest("a=1,,c=3", Arrays.asList(Pair.of("a", "1"), Pair.of("c", "3")));
-        doTupleListTest("a=1,xyz,c=3", Arrays.asList(Pair.of("a", "1"), Pair.of("c", "3")));
-        doTupleListTest("a=1,=,c=3", Arrays.asList(Pair.of("a", "1"), Pair.of("c", "3")));
-        doTupleListTest("", new ArrayList<Pair<String, String>>());
-        doTupleListTest(null, new ArrayList<Pair<String, String>>());
+        doTupleListTest("a=1,b=2,c=3", asList(Pair.of("a", "1"), Pair.of("b", "2"), Pair.of("c", "3")));
+        doTupleListTest("xyz", asList(Pair.of("xyz", "")));
+        doTupleListTest("a=1,,c=3", asList(Pair.of("a", "1"), Pair.of("c", "3")));
+        doTupleListTest("a=1,xyz=,c=3", asList(Pair.of("a", "1"), Pair.of("xyz", ""), Pair.of("c", "3")));
+        doTupleListTest("a=1,xyz,c=3", asList(Pair.of("a", "1"), Pair.of("xyz", ""), Pair.of("c", "3")));
+        doTupleListTest("a=1,=,c=3", asList(Pair.of("a", "1"), Pair.of("c", "3")));
+        doTupleListTest("", emptyPairList());
+        doTupleListTest(null, emptyPairList());
     }
-
+    
     private static void doTupleListTest(String input, List<Pair<String, String>> expectedResults) {
         final List<Pair<String, String>> result = OptionUtils.parseCommaSeparatedTuples(input);
         assertNotNull(result);
-        assertEquals(result.size(), expectedResults.size());
-        for (int i = 0; i < expectedResults.size(); i++) {
-            final Pair<String, String> actualPair = result.get(i);
-            final Pair<String, String> expected = expectedResults.get(i);
-            assertEquals(actualPair, expected);
-        }
+        assertEquals(result, expectedResults);
     }
 
     private static void doCommaSeparatedListTest(String csvStr, List<String> expectedResults) {
         final List<String> result = OptionUtils.splitCommaSeparatedList(csvStr);
         assertNotNull(result);
-        assertEquals(result.size(), expectedResults.size());
-        for (int i = 0; i < expectedResults.size(); i++) {
-            assertEquals(result.get(i), expectedResults.get(i));
-        }
+        assertEquals(result, expectedResults);
+    }
+    private static List<Pair<String,String>> emptyPairList() {
+        return Collections.emptyList();
+    }
+    
+    private static List<String> emptyList() {
+        return Collections.emptyList();
     }
 }

modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfiguratorUtils.java

@@ -16,6 +16,12 @@ import java.util.*;
  */
 public final class CodegenConfiguratorUtils {
 
+    public static void applySystemPropertiesKvpList(List<String> systemProperties, CodegenConfigurator configurator) {
+        for(String propString : systemProperties) {
+            applySystemPropertiesKvp(propString, configurator);
+        }
+    }
+
     public static void applySystemPropertiesKvp(String systemProperties, CodegenConfigurator configurator) {
         final Map<String, String> map = createMapFromKeyValuePairs(systemProperties);
         for (Map.Entry<String, String> entry : map.entrySet()) {
@@ -81,6 +87,4 @@ public final class CodegenConfiguratorUtils {
 
         return result;
     }
-    
-    
 }

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

@@ -433,6 +433,10 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
 
     @Override
     public String toParamName(String name) {
+        // don't do name =removeNonNameElementToCamelCase(name); // this breaks connexion, which does not modify param names before sending them
+        if (reservedWords.contains(name)) {
+            return escapeReservedWord(name);
+        }
         // Param name is already sanitized in swagger spec processing
         return name;
     }

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

@@ -105,7 +105,8 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         modelTestTemplateFiles.put("model_test.mustache", ".js");
         apiTemplateFiles.put("api.mustache", ".js");
         apiTestTemplateFiles.put("api_test.mustache", ".js");
-        embeddedTemplateDir = templateDir = "Javascript";
+        // subfolder Javascript/es6
+        embeddedTemplateDir = templateDir = "Javascript" + File.separator + "es6";
         apiPackage = "api";
         modelPackage = "model";
         modelDocTemplateFiles.put("model_doc.mustache", ".md");

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

@@ -235,6 +235,7 @@ public class Swift3Codegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("APIHelper.mustache", sourceFolder, "APIHelper.swift"));
         supportingFiles.add(new SupportingFile("AlamofireImplementations.mustache", sourceFolder,
                 "AlamofireImplementations.swift"));
+        supportingFiles.add(new SupportingFile("Configuration.mustache", sourceFolder, "Configuration.swift"));
         supportingFiles.add(new SupportingFile("Extensions.mustache", sourceFolder, "Extensions.swift"));
         supportingFiles.add(new SupportingFile("Models.mustache", sourceFolder, "Models.swift"));
         supportingFiles.add(new SupportingFile("APIs.mustache", sourceFolder, "APIs.swift"));

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

@@ -29,14 +29,11 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
     public static final String NPM_VERSION = "npmVersion";
     public static final String NPM_REPOSITORY = "npmRepository";
     public static final String SNAPSHOT = "snapshot";
-    public static final String USE_OPAQUE_TOKEN = "useOpaqueToken";
-    public static final String INJECTION_TOKEN = "injectionToken";
     public static final String WITH_INTERFACES = "withInterfaces";
 
     protected String npmName = null;
     protected String npmVersion = "1.0.0";
     protected String npmRepository = null;
-    protected String injectionToken = "InjectionToken<string>";
 
     public TypeScriptAngular2ClientCodegen() {
         super();
@@ -55,7 +52,6 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
         this.cliOptions.add(new CliOption(NPM_VERSION, "The version of your npm package"));
         this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json"));
         this.cliOptions.add(new CliOption(SNAPSHOT, "When setting this property to true the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm", BooleanProperty.TYPE).defaultValue(Boolean.FALSE.toString()));
-        this.cliOptions.add(new CliOption(USE_OPAQUE_TOKEN, "When setting this property to true, OpaqueToken is used instead of InjectionToken", BooleanProperty.TYPE).defaultValue(Boolean.FALSE.toString()));
         this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", BooleanProperty.TYPE).defaultValue(Boolean.FALSE.toString()));
     }
 
@@ -92,11 +88,6 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
             addNpmPackageGeneration();
         }
 
-        if(additionalProperties.containsKey(USE_OPAQUE_TOKEN) && Boolean.valueOf(additionalProperties.get(USE_OPAQUE_TOKEN).toString())) {
-            this.setOpaqueToken();
-        }
-        additionalProperties.put(INJECTION_TOKEN, this.injectionToken);
-
         if(additionalProperties.containsKey(WITH_INTERFACES)) {
             boolean withInterfaces = Boolean.parseBoolean(additionalProperties.get(WITH_INTERFACES).toString());
             if (withInterfaces) {
@@ -338,7 +329,4 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
         return camelize(name);
     }
 
-    public void setOpaqueToken() {
-        this.injectionToken = "OpaqueToken";
-    }
 }

modules/swagger-codegen/src/main/java/io/swagger/codegen/utils/OptionUtils.java

@@ -2,28 +2,29 @@ package io.swagger.codegen.utils;
 
 import org.apache.commons.lang3.tuple.Pair;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import joptsimple.internal.Strings;
 
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 public class OptionUtils {
 
-    public static List<Pair<String, String>> parseCommaSeparatedTuples(String input) {
+    public static List<Pair<String, String>> parseCommaSeparatedTuples(final String input) {
 
-        List<Pair<String, String>> results = new ArrayList<Pair<String, String>>();
+        final List<Pair<String, String>> results = new ArrayList<Pair<String, String>>();
 
         final List<String> tuples = splitCommaSeparatedList(input);
 
         for (String tuple : tuples) {
             int ix = tuple.indexOf('=');
-            if (ix > 0 && ix < tuple.length() - 1) {
+            if (ix > 0 && ix <= tuple.length() - 1) {
                 final Pair<String, String> pair = Pair.of(tuple.substring(0, ix), tuple.substring(ix + 1));
                 results.add(pair);
+            } else if (ix < 0){
+                final Pair<String, String> pair = Pair.of(tuple, "");
+                results.add(pair);
             }
         }
-        //Strings.isNullOrEmpty(input)
+
         return results;
     }
    

modules/swagger-codegen/src/main/resources/Javascript/es6/ApiClient.mustache

@@ -347,7 +347,7 @@ export default class ApiClient {
             data = response.text;
         }
 
-        return exports.convertToType(data, returnType);
+        return ApiClient.convertToType(data, returnType);
     }
 
     {{#emitJSDoc}}{{^usePromises}}/**
@@ -449,7 +449,7 @@ export default class ApiClient {
         }
 
         {{#usePromises}}return new Promise((resolve, reject) => {
-            request.end(function(error, response) {
+            request.end((error, response) => {
                 if (error) {
                     reject(error);
                 } else {
@@ -521,7 +521,7 @@ export default class ApiClient {
             case 'String':
                 return String(data);
             case 'Date':
-                return this.parseDate(String(data));
+                return ApiClient.parseDate(String(data));
             case 'Blob':
                 return data;
             default:
@@ -536,7 +536,7 @@ export default class ApiClient {
                     var itemType = type[0];
 
                     return data.map((item) => {
-                        return exports.convertToType(item, itemType);
+                        return ApiClient.convertToType(item, itemType);
                     });
                 } else if (typeof type === 'object') {
                     // for plain object type like: {'String': 'Integer'}
@@ -552,8 +552,8 @@ export default class ApiClient {
                     var result = {};
                     for (var k in data) {
                         if (data.hasOwnProperty(k)) {
-                            var key = exports.convertToType(k, keyType);
-                            var value = exports.convertToType(data[k], valueType);
+                            var key = ApiClient.convertToType(k, keyType);
+                            var value = ApiClient.convertToType(data[k], valueType);
                             result[key] = value;
                         }
                     }
@@ -575,12 +575,12 @@ export default class ApiClient {
         if (Array.isArray(data)) {
             for (var i = 0; i < data.length; i++) {
                 if (data.hasOwnProperty(i))
-                    obj[i] = exports.convertToType(data[i], itemType);
+                    obj[i] = ApiClient.convertToType(data[i], itemType);
             }
         } else {
             for (var k in data) {
                 if (data.hasOwnProperty(k))
-                    obj[k] = exports.convertToType(data[k], itemType);
+                    obj[k] = ApiClient.convertToType(data[k], itemType);
             }
         }
     };

modules/swagger-codegen/src/main/resources/Javascript/es6/partial_model_generic.mustache

@@ -20,7 +20,7 @@ export default class {{classname}} {
     constructor({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) {
         {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}
         this = new Array();
-        Object.setPrototypeOf(this, exports);{{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}
+        Object.setPrototypeOf(this, {{classname}});{{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}
 
         {{#useInheritance}}
         {{#parentModel}}{{classname}}.call(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});{{/parentModel}}
@@ -41,7 +41,7 @@ export default class {{classname}} {
     */{{/emitJSDoc}}
     static constructFromObject(data, obj) {
         if (data){{! TODO: support polymorphism: discriminator property on data determines class to instantiate.}} {
-            obj = obj || new exports();
+            obj = obj || new {{classname}}();
 
             {{#parent}}{{^parentModel}}ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-itemType}}');{{/parentModel}}
             {{/parent}}

modules/swagger-codegen/src/main/resources/cpprest/model-source.mustache

@@ -9,11 +9,26 @@ namespace {{this}} {
 
 {{classname}}::{{classname}}()
 {
-    {{#vars}}{{^isInherited}}{{#isNotContainer}}{{#isPrimitiveType}}m_{{name}} = {{{defaultValue}}};
-    {{/isPrimitiveType}}{{^isPrimitiveType}}{{#isString}}m_{{name}} = {{{defaultValue}}};
-    {{/isString}}{{#isDateTime}}m_{{name}} = {{{defaultValue}}};
-    {{/isDateTime}}{{/isPrimitiveType}}{{/isNotContainer}}{{^required}}m_{{name}}IsSet = false;
-    {{/required}}{{/isInherited}}{{/vars}}
+    {{#vars}}
+    {{^isInherited}}
+    {{#isNotContainer}}
+    {{#isPrimitiveType}}
+    m_{{name}} = {{{defaultValue}}};
+    {{/isPrimitiveType}}
+    {{^isPrimitiveType}}
+    {{#isString}}
+    m_{{name}} = {{{defaultValue}}};
+    {{/isString}}
+    {{#isDateTime}}
+    m_{{name}} = {{{defaultValue}}};
+    {{/isDateTime}}
+    {{/isPrimitiveType}}
+    {{/isNotContainer}}
+    {{^required}}
+    m_{{name}}IsSet = false;
+    {{/required}}
+    {{/isInherited}}
+    {{/vars}}
 }
 
 {{classname}}::~{{classname}}()
@@ -27,59 +42,108 @@ void {{classname}}::validate()
 
 web::json::value {{classname}}::toJson() const
 {
-    {{#parent}}web::json::value val = this->{{{parent}}}::toJson(); {{/parent}}
-    {{^parent}}web::json::value val = web::json::value::object();{{/parent}}
+    {{#parent}}
+    web::json::value val = this->{{{parent}}}::toJson();
+    {{/parent}}
+    {{^parent}}
+    web::json::value val = web::json::value::object();
+    {{/parent}}
 
-    {{#vars}}{{^isInherited}}{{#isPrimitiveType}}{{^isListContainer}}{{^required}}if(m_{{name}}IsSet)
+    {{#vars}}
+    {{^isInherited}}
+    {{#isPrimitiveType}}
+    {{^isListContainer}}
+    {{^required}}
+    if(m_{{name}}IsSet)
     {
         val[U("{{baseName}}")] = ModelBase::toJson(m_{{name}});
     }
-    {{/required}}{{#required}}val[U("{{baseName}}")] = ModelBase::toJson(m_{{name}});
-    {{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{#isListContainer}}{
+    {{/required}}
+    {{#required}}
+    val[U("{{baseName}}")] = ModelBase::toJson(m_{{name}});
+    {{/required}}
+    {{/isListContainer}}
+    {{/isPrimitiveType}}
+    {{#isListContainer}}
+    {
         std::vector<web::json::value> jsonArray;
         for( auto& item : m_{{name}} )
         {
             jsonArray.push_back(ModelBase::toJson(item));
         }
-        {{#required}}val[U("{{baseName}}")] = web::json::value::array(jsonArray);
-        {{/required}}{{^required}}
+        {{#required}}
+        val[U("{{baseName}}")] = web::json::value::array(jsonArray);
+        {{/required}}
+        {{^required}}
         if(jsonArray.size() > 0)
         {
             val[U("{{baseName}}")] = web::json::value::array(jsonArray);
         }
         {{/required}}
     }
-    {{/isListContainer}}{{^isListContainer}}{{^isPrimitiveType}}{{^required}}if(m_{{name}}IsSet)
+    {{/isListContainer}}
+    {{^isListContainer}}
+    {{^isPrimitiveType}}
+    {{^required}}
+    if(m_{{name}}IsSet)
     {
         val[U("{{baseName}}")] = ModelBase::toJson(m_{{name}});
     }
-    {{/required}}{{#required}}val[U("{{baseName}}")] = ModelBase::toJson(m_{{name}});
-    {{/required}}{{/isPrimitiveType}}{{/isListContainer}}{{/isInherited}}{{/vars}}
+    {{/required}}
+    {{#required}}
+    val[U("{{baseName}}")] = ModelBase::toJson(m_{{name}});
+    {{/required}}
+    {{/isPrimitiveType}}
+    {{/isListContainer}}
+    {{/isInherited}}
+    {{/vars}}
 
     return val;
 }
 
 void {{classname}}::fromJson(web::json::value& val)
 {
-    {{#parent}}this->{{{parent}}}::fromJson(val); {{/parent}}
+    {{#parent}}
+    this->{{{parent}}}::fromJson(val);
 
-    {{#vars}}{{^isInherited}}{{#isPrimitiveType}}{{^isListContainer}}{{^required}}if(val.has_field(U("{{baseName}}")))
+    {{/parent}}
+    {{#vars}}
+    {{^isInherited}}
+    {{#isPrimitiveType}}
+    {{^isListContainer}}
+    {{^required}}
+    if(val.has_field(U("{{baseName}}")))
     {
         {{setter}}(ModelBase::{{baseType}}FromJson(val[U("{{baseName}}")]));
     }
-    {{/required}}{{#required}}{{setter}}(ModelBase::{{baseType}}FromJson(val[U("{{baseName}}")]));
-    {{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{#isListContainer}}{
+    {{/required}}
+    {{#required}}
+    {{setter}}(ModelBase::{{baseType}}FromJson(val[U("{{baseName}}")]));
+    {{/required}}
+    {{/isListContainer}}
+    {{/isPrimitiveType}}
+    {{#isListContainer}}
+    {
         m_{{name}}.clear();
         std::vector<web::json::value> jsonArray;
-        {{^required}}if(val.has_field(U("{{baseName}}")))
+        {{^required}}
+        if(val.has_field(U("{{baseName}}")))
         {
         {{/required}}
         for( auto& item : val[U("{{baseName}}")].as_array() )
         {
-            {{#isPrimitiveType}}m_{{name}}.push_back(ModelBase::{{items.baseType}}FromJson(item));
-            {{/isPrimitiveType}}{{^isPrimitiveType}}{{#items.isString}}m_{{name}}.push_back(ModelBase::stringFromJson(item));
-            {{/items.isString}}{{^items.isString}}{{#items.isDateTime}}m_{{name}}.push_back(ModelBase::dateFromJson(item));
-            {{/items.isDateTime}}{{^items.isDateTime}}
+            {{#isPrimitiveType}}
+            m_{{name}}.push_back(ModelBase::{{items.baseType}}FromJson(item));
+            {{/isPrimitiveType}}
+            {{^isPrimitiveType}}
+            {{#items.isString}}
+            m_{{name}}.push_back(ModelBase::stringFromJson(item));
+            {{/items.isString}}
+            {{^items.isString}}
+            {{#items.isDateTime}}
+            m_{{name}}.push_back(ModelBase::dateFromJson(item));
+            {{/items.isDateTime}}
+            {{^items.isDateTime}}
             if(item.is_null())
             {
                 m_{{name}}.push_back( {{{items.datatype}}}(nullptr) );
@@ -90,31 +154,63 @@ void {{classname}}::fromJson(web::json::value& val)
                 newItem->fromJson(item);
                 m_{{name}}.push_back( newItem );
             }
-            {{/items.isDateTime}}{{/items.isString}}{{/isPrimitiveType}}
+            {{/items.isDateTime}}
+            {{/items.isString}}
+            {{/isPrimitiveType}}
         }
         {{^required}}
         }
         {{/required}}
     }
-    {{/isListContainer}}{{^isListContainer}}{{^isPrimitiveType}}{{^required}}if(val.has_field(U("{{baseName}}")))
+    {{/isListContainer}}
+    {{^isListContainer}}
+    {{^isPrimitiveType}}
+    {{^required}}
+    if(val.has_field(U("{{baseName}}")))
     {
-        {{#isString}}{{setter}}(ModelBase::stringFromJson(val[U("{{baseName}}")]));
-        {{/isString}}{{^isString}}{{#isDateTime}}{{setter}}(ModelBase::dateFromJson(val[U("{{baseName}}")]));
-        {{/isDateTime}}{{^isDateTime}}if(!val[U("{{baseName}}")].is_null())
+        {{#isString}}
+        {{setter}}(ModelBase::stringFromJson(val[U("{{baseName}}")]));
+        {{/isString}}
+        {{^isString}}
+        {{#isDateTime}}
+        {{setter}}(ModelBase::dateFromJson(val[U("{{baseName}}")]));
+        {{/isDateTime}}
+        {{^isDateTime}}
+        if(!val[U("{{baseName}}")].is_null())
         {
             {{{datatype}}} newItem({{{defaultValue}}});
             newItem->fromJson(val[U("{{baseName}}")]);
             {{setter}}( newItem );
         }
-        {{/isDateTime}}{{/isString}}
+        {{/isDateTime}}
+        {{/isString}}
     }
-    {{/required}}{{#required}}{{#isString}}{{setter}}(ModelBase::stringFromJson(val[U("{{baseName}}")]));
-    {{/isString}}{{^isString}}{{#isDateTime}}{{setter}}(ModelBase::dateFromJson(val[U("{{baseName}}")]));
-    {{/isDateTime}}{{^isDateTime}}{{#vendorExtensions.x-codegen-file}}{{setter}}(ModelBase::fileFromJson(val[U("{{baseName}}")]));
-    {{/vendorExtensions.x-codegen-file}}{{^vendorExtensions.x-codegen-file}}{{{datatype}}} new{{name}}({{{defaultValue}}});
+    {{/required}}
+    {{#required}}
+    {{#isString}}
+    {{setter}}(ModelBase::stringFromJson(val[U("{{baseName}}")]));
+    {{/isString}}
+    {{^isString}}
+    {{#isDateTime}}
+    {{setter}}
+    (ModelBase::dateFromJson(val[U("{{baseName}}")]));
+    {{/isDateTime}}
+    {{^isDateTime}}
+    {{#vendorExtensions.x-codegen-file}}
+    {{setter}}(ModelBase::fileFromJson(val[U("{{baseName}}")]));
+    {{/vendorExtensions.x-codegen-file}}
+    {{^vendorExtensions.x-codegen-file}}
+    {{{datatype}}} new{{name}}({{{defaultValue}}});
     new{{name}}->fromJson(val[U("{{baseName}}")]);
     {{setter}}( new{{name}} );
-    {{/vendorExtensions.x-codegen-file}}{{/isDateTime}}{{/isString}}{{/required}}{{/isPrimitiveType}}{{/isListContainer}}{{/isInherited}}{{/vars}}
+    {{/vendorExtensions.x-codegen-file}}
+    {{/isDateTime}}
+    {{/isString}}
+    {{/required}}
+    {{/isPrimitiveType}}
+    {{/isListContainer}}
+    {{/isInherited}}
+    {{/vars}}
 }
 
 void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix) const
@@ -125,12 +221,22 @@ void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, co
         namePrefix += U(".");
     }
 
-    {{#vars}}{{#isPrimitiveType}}{{^isListContainer}}{{^required}}if(m_{{name}}IsSet)
+    {{#vars}}
+    {{#isPrimitiveType}}
+    {{^isListContainer}}
+    {{^required}}
+    if(m_{{name}}IsSet)
     {
         multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
     }
-    {{/required}}{{#required}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
-    {{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{#isListContainer}}{
+    {{/required}}
+    {{#required}}
+    multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
+    {{/required}}
+    {{/isListContainer}}
+    {{/isPrimitiveType}}
+    {{#isListContainer}}
+    {
         std::vector<web::json::value> jsonArray;
         for( auto& item : m_{{name}} )
         {
@@ -144,7 +250,11 @@ void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, co
         }
         {{/required}}
     }
-    {{/isListContainer}}{{^isListContainer}}{{^isPrimitiveType}}{{^required}}if(m_{{name}}IsSet)
+    {{/isListContainer}}
+    {{^isListContainer}}
+    {{^isPrimitiveType}}
+    {{^required}}
+    if(m_{{name}}IsSet)
     {
         {{#isString}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
         {{/isString}}{{^isString}}{{#isDateTime}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
@@ -154,11 +264,28 @@ void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, co
         }
         {{/isDateTime}}{{/isString}}
     }
-    {{/required}}{{#required}}{{#isString}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
-    {{/isString}}{{^isString}}{{#isDateTime}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
-    {{/isDateTime}}{{^isDateTime}}{{#vendorExtensions.x-codegen-file}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
-    {{/vendorExtensions.x-codegen-file}}{{^vendorExtensions.x-codegen-file}}m_{{name}}->toMultipart(multipart, U("{{baseName}}."));
-    {{/vendorExtensions.x-codegen-file}}{{/isDateTime}}{{/isString}}{{/required}}{{/isPrimitiveType}}{{/isListContainer}}{{/vars}}
+    {{/required}}
+    {{#required}}
+    {{#isString}}
+    multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
+    {{/isString}}
+    {{^isString}}
+    {{#isDateTime}}
+    multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
+    {{/isDateTime}}
+    {{^isDateTime}}
+    {{#vendorExtensions.x-codegen-file}}
+    multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
+    {{/vendorExtensions.x-codegen-file}}
+    {{^vendorExtensions.x-codegen-file}}
+    m_{{name}}->toMultipart(multipart, U("{{baseName}}."));
+    {{/vendorExtensions.x-codegen-file}}
+    {{/isDateTime}}
+    {{/isString}}
+    {{/required}}
+    {{/isPrimitiveType}}
+    {{/isListContainer}}
+    {{/vars}}
 }
 
 void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix)
@@ -169,24 +296,43 @@ void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
         namePrefix += U(".");
     }
 
-    {{#vars}}{{#isPrimitiveType}}{{^isListContainer}}{{^required}}if(multipart->hasContent(U("{{baseName}}")))
+    {{#vars}}
+    {{#isPrimitiveType}}
+    {{^isListContainer}}
+    {{^required}}
+    if(multipart->hasContent(U("{{baseName}}")))
     {
         {{setter}}(ModelBase::{{baseType}}FromHttpContent(multipart->getContent(U("{{baseName}}"))));
     }
-    {{/required}}{{#required}}{{setter}}(ModelBase::{{baseType}}FromHttpContent(multipart->getContent(U("{{baseName}}"))));
-    {{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{#isListContainer}}{
+    {{/required}}
+    {{#required}}
+    {{setter}}(ModelBase::{{baseType}}FromHttpContent(multipart->getContent(U("{{baseName}}"))));
+    {{/required}}
+    {{/isListContainer}}
+    {{/isPrimitiveType}}
+    {{#isListContainer}}
+    {
         m_{{name}}.clear();
-        {{^required}}if(multipart->hasContent(U("{{baseName}}")))
+        {{^required}}
+        if(multipart->hasContent(U("{{baseName}}")))
         {
         {{/required}}
 
         web::json::value jsonArray = web::json::value::parse(ModelBase::stringFromHttpContent(multipart->getContent(U("{{baseName}}"))));
         for( auto& item : jsonArray.as_array() )
         {
-            {{#isPrimitiveType}}m_{{name}}.push_back(ModelBase::{{items.baseType}}FromJson(item));
-            {{/isPrimitiveType}}{{^isPrimitiveType}}{{#items.isString}}m_{{name}}.push_back(ModelBase::stringFromJson(item));
-            {{/items.isString}}{{^items.isString}}{{#items.isDateTime}}m_{{name}}.push_back(ModelBase::dateFromJson(item));
-            {{/items.isDateTime}}{{^items.isDateTime}}
+            {{#isPrimitiveType}}
+            m_{{name}}.push_back(ModelBase::{{items.baseType}}FromJson(item));
+            {{/isPrimitiveType}}
+            {{^isPrimitiveType}}
+            {{#items.isString}}
+            m_{{name}}.push_back(ModelBase::stringFromJson(item));
+            {{/items.isString}}
+            {{^items.isString}}
+            {{#items.isDateTime}}
+            m_{{name}}.push_back(ModelBase::dateFromJson(item));
+            {{/items.isDateTime}}
+            {{^items.isDateTime}}
             if(item.is_null())
             {
                 m_{{name}}.push_back( {{{items.datatype}}}(nullptr) );
@@ -197,60 +343,99 @@ void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
                 newItem->fromJson(item);
                 m_{{name}}.push_back( newItem );
             }
-            {{/items.isDateTime}}{{/items.isString}}{{/isPrimitiveType}}
+            {{/items.isDateTime}}
+            {{/items.isString}}
+            {{/isPrimitiveType}}
         }
         {{^required}}
         }
         {{/required}}
     }
-    {{/isListContainer}}{{^isListContainer}}{{^isPrimitiveType}}{{^required}}if(multipart->hasContent(U("{{baseName}}")))
+    {{/isListContainer}}
+    {{^isListContainer}}
+    {{^isPrimitiveType}}
+    {{^required}}
+    if(multipart->hasContent(U("{{baseName}}")))
     {
-        {{#isString}}{{setter}}(ModelBase::stringFromHttpContent(multipart->getContent(U("{{baseName}}"))));
-        {{/isString}}{{^isString}}{{#isDateTime}}{{setter}}(ModelBase::dateFromHttpContent(multipart->getContent(U("{{baseName}}"))));
-        {{/isDateTime}}{{^isDateTime}}if(multipart->hasContent(U("{{baseName}}")))
+        {{#isString}}
+        {{setter}}(ModelBase::stringFromHttpContent(multipart->getContent(U("{{baseName}}"))));
+        {{/isString}}
+        {{^isString}}
+        {{#isDateTime}}
+        {{setter}}(ModelBase::dateFromHttpContent(multipart->getContent(U("{{baseName}}"))));
+        {{/isDateTime}}
+        {{^isDateTime}}
+        if(multipart->hasContent(U("{{baseName}}")))
         {
             {{{datatype}}} newItem({{{defaultValue}}});
             newItem->fromMultiPart(multipart, U("{{baseName}}."));
             {{setter}}( newItem );
         }
-        {{/isDateTime}}{{/isString}}
+        {{/isDateTime}}
+        {{/isString}}
     }
-    {{/required}}{{#required}}{{#isString}}{{setter}}(ModelBase::stringFromHttpContent(multipart->getContent(U("{{baseName}}"))));
-    {{/isString}}{{^isString}}{{#isDateTime}}{{setter}}(ModelBase::dateFromHttpContent(multipart->getContent(U("{{baseName}}"))));
-    {{/isDateTime}}{{^isDateTime}}{{#vendorExtensions.x-codegen-file}}{{setter}}(multipart->getContent(U("{{baseName}}")));
-    {{/vendorExtensions.x-codegen-file}}{{^vendorExtensions.x-codegen-file}}{{{datatype}}} new{{name}}({{{defaultValue}}});
+    {{/required}}
+    {{#required}}
+    {{#isString}}
+    {{setter}}(ModelBase::stringFromHttpContent(multipart->getContent(U("{{baseName}}"))));
+    {{/isString}}
+    {{^isString}}
+    {{#isDateTime}}
+    {{setter}}(ModelBase::dateFromHttpContent(multipart->getContent(U("{{baseName}}"))));
+    {{/isDateTime}}
+    {{^isDateTime}}
+    {{#vendorExtensions.x-codegen-file}}
+    {{setter}}(multipart->getContent(U("{{baseName}}")));
+    {{/vendorExtensions.x-codegen-file}}
+    {{^vendorExtensions.x-codegen-file}}
+    {{{datatype}}} new{{name}}({{{defaultValue}}});
     new{{name}}->fromMultiPart(multipart, U("{{baseName}}."));
     {{setter}}( new{{name}} );
-    {{/vendorExtensions.x-codegen-file}}{{/isDateTime}}{{/isString}}{{/required}}{{/isPrimitiveType}}{{/isListContainer}}{{/vars}}
+    {{/vendorExtensions.x-codegen-file}}
+    {{/isDateTime}}
+    {{/isString}}
+    {{/required}}
+    {{/isPrimitiveType}}
+    {{/isListContainer}}
+    {{/vars}}
 }
 
-
-{{#vars}}{{^isInherited}}{{^isNotContainer}}{{{datatype}}}& {{classname}}::{{getter}}()
+{{#vars}}
+{{^isInherited}}
+{{^isNotContainer}}
+{{{datatype}}}& {{classname}}::{{getter}}()
 {
     return m_{{name}};
 }
-{{/isNotContainer}}{{#isNotContainer}}{{{datatype}}} {{classname}}::{{getter}}() const
+
+{{/isNotContainer}}
+{{#isNotContainer}}
+{{{datatype}}} {{classname}}::{{getter}}() const
 {
     return m_{{name}};
 }
+
 void {{classname}}::{{setter}}({{{datatype}}} value)
 {
     m_{{name}} = value;
     {{^required}}m_{{name}}IsSet = true;{{/required}}
 }
+
 {{/isNotContainer}}
-{{^required}}bool {{classname}}::{{baseName}}IsSet() const
+{{^required}}
+bool {{classname}}::{{baseName}}IsSet() const
 {
     return m_{{name}}IsSet;
 }
+
 void {{classname}}::unset{{name}}()
 {
     m_{{name}}IsSet = false;
 }
+
 {{/required}}
 {{/isInherited}}
 {{/vars}}
-
 {{#modelNamespaceDeclarations}}
 }
 {{/modelNamespaceDeclarations}}

modules/swagger-codegen/src/main/resources/swift3/Configuration.mustache

@@ -0,0 +1,15 @@
+// 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"
+    
+}

modules/swagger-codegen/src/main/resources/swift3/Extensions.mustache

@@ -68,7 +68,7 @@ extension Data: JSONEncodable {
 
 private let dateFormatter: DateFormatter = {
     let fmt = DateFormatter()
-    fmt.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
+    fmt.dateFormat = Configuration.dateFormat
     fmt.locale = Locale(identifier: "en_US_POSIX")
     return fmt
 }()

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

@@ -164,7 +164,7 @@ export class {{classname}} {
         // to determine the Content-Type header
         let consumes: string[] = [
             {{#consumes}}
-            '{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}
+            '{{{mediaType}}}'{{#hasMore}},{{/hasMore}}
             {{/consumes}}
         ];
         let canConsumeForm = this.canConsumeForm(consumes);
@@ -182,7 +182,7 @@ export class {{classname}} {
         // to determine the Accept header
         let produces: string[] = [
             {{#produces}}
-            '{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}
+            '{{{mediaType}}}'{{#hasMore}},{{/hasMore}}
             {{/produces}}
         ];
 

modules/swagger-codegen/src/main/resources/typescript-angular2/variables.mustache

@@ -1,9 +1,9 @@
-import { {{{injectionToken}}} } from '@angular/core';
+import { OpaqueToken } from '@angular/core';
 
-export const BASE_PATH = new {{{injectionToken}}}('basePath');
+export const BASE_PATH = new OpaqueToken('basePath');
 export const COLLECTION_FORMATS = {
     'csv': ',',
     'tsv': '   ',
     'ssv': ' ',
     'pipes': '|'
-}
+}

modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngular2ClientOptionsProvider.java

@@ -36,7 +36,6 @@ public class TypeScriptAngular2ClientOptionsProvider implements OptionsProvider
                 .put(TypeScriptAngular2ClientCodegen.WITH_INTERFACES, Boolean.FALSE.toString())
                 .put(TypeScriptAngular2ClientCodegen.NPM_REPOSITORY, NPM_REPOSITORY)
                 .put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE)
-                .put(TypeScriptAngular2ClientCodegen.USE_OPAQUE_TOKEN, Boolean.FALSE.toString())
                 .build();
     }
 

samples/client/petstore-security-test/javascript/src/ApiClient.js

@@ -173,12 +173,15 @@
    * @returns {Boolean} <code>true</code> if <code>param</code> represents a file.
    */
   exports.prototype.isFileParam = function(param) {
-    // fs.ReadStream in Node.js (but not in runtime like browserify)
-    if (typeof window === 'undefined' &&
-        typeof require === 'function' &&
-        require('fs') &&
-        param instanceof require('fs').ReadStream) {
-      return true;
+    // fs.ReadStream in Node.js and Electron (but not in runtime like browserify)
+    if (typeof require === 'function') {
+      var fs;
+      try {
+        fs = require('fs');
+      } catch (err) {}
+      if (fs && fs.ReadStream && param instanceof fs.ReadStream) {
+        return true;
+      }
     }
     // Buffer in Node.js
     if (typeof Buffer === 'function' && param instanceof Buffer) {

samples/client/petstore/cpprest/model/ApiResponse.cpp

@@ -27,7 +27,6 @@ ApiResponse::ApiResponse()
     m_TypeIsSet = false;
     m_Message = U("");
     m_MessageIsSet = false;
-    
 }
 
 ApiResponse::~ApiResponse()
@@ -41,7 +40,6 @@ void ApiResponse::validate()
 
 web::json::value ApiResponse::toJson() const
 {
-    
     web::json::value val = web::json::value::object();
 
     if(m_CodeIsSet)
@@ -56,15 +54,12 @@ web::json::value ApiResponse::toJson() const
     {
         val[U("message")] = ModelBase::toJson(m_Message);
     }
-    
 
     return val;
 }
 
 void ApiResponse::fromJson(web::json::value& val)
 {
-    
-
     if(val.has_field(U("code")))
     {
         setCode(ModelBase::int32_tFromJson(val[U("code")]));
@@ -72,14 +67,11 @@ void ApiResponse::fromJson(web::json::value& val)
     if(val.has_field(U("type")))
     {
         setType(ModelBase::stringFromJson(val[U("type")]));
-        
     }
     if(val.has_field(U("message")))
     {
         setMessage(ModelBase::stringFromJson(val[U("message")]));
-        
     }
-    
 }
 
 void ApiResponse::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix) const
@@ -104,7 +96,6 @@ void ApiResponse::toMultipart(std::shared_ptr<MultipartFormData> multipart, cons
         multipart->add(ModelBase::toHttpContent(namePrefix + U("message"), m_Message));
         
     }
-    
 }
 
 void ApiResponse::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix)
@@ -122,64 +113,71 @@ void ApiResponse::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, co
     if(multipart->hasContent(U("type")))
     {
         setType(ModelBase::stringFromHttpContent(multipart->getContent(U("type"))));
-        
     }
     if(multipart->hasContent(U("message")))
     {
         setMessage(ModelBase::stringFromHttpContent(multipart->getContent(U("message"))));
-        
     }
-    
 }
 
-
 int32_t ApiResponse::getCode() const
 {
     return m_Code;
 }
+
 void ApiResponse::setCode(int32_t value)
 {
     m_Code = value;
     m_CodeIsSet = true;
 }
+
 bool ApiResponse::codeIsSet() const
 {
     return m_CodeIsSet;
 }
+
 void ApiResponse::unsetCode()
 {
     m_CodeIsSet = false;
 }
+
 utility::string_t ApiResponse::getType() const
 {
     return m_Type;
 }
+
 void ApiResponse::setType(utility::string_t value)
 {
     m_Type = value;
     m_TypeIsSet = true;
 }
+
 bool ApiResponse::typeIsSet() const
 {
     return m_TypeIsSet;
 }
+
 void ApiResponse::unsetType()
 {
     m_TypeIsSet = false;
 }
+
 utility::string_t ApiResponse::getMessage() const
 {
     return m_Message;
 }
+
 void ApiResponse::setMessage(utility::string_t value)
 {
     m_Message = value;
     m_MessageIsSet = true;
 }
+
 bool ApiResponse::messageIsSet() const
 {
     return m_MessageIsSet;
 }
+
 void ApiResponse::unsetMessage()
 {
     m_MessageIsSet = false;

samples/client/petstore/cpprest/model/Category.cpp

@@ -25,7 +25,6 @@ Category::Category()
     m_IdIsSet = false;
     m_Name = U("");
     m_NameIsSet = false;
-    
 }
 
 Category::~Category()
@@ -39,7 +38,6 @@ void Category::validate()
 
 web::json::value Category::toJson() const
 {
-    
     web::json::value val = web::json::value::object();
 
     if(m_IdIsSet)
@@ -50,15 +48,12 @@ web::json::value Category::toJson() const
     {
         val[U("name")] = ModelBase::toJson(m_Name);
     }
-    
 
     return val;
 }
 
 void Category::fromJson(web::json::value& val)
 {
-    
-
     if(val.has_field(U("id")))
     {
         setId(ModelBase::int64_tFromJson(val[U("id")]));
@@ -66,9 +61,7 @@ void Category::fromJson(web::json::value& val)
     if(val.has_field(U("name")))
     {
         setName(ModelBase::stringFromJson(val[U("name")]));
-        
     }
-    
 }
 
 void Category::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix) const
@@ -88,7 +81,6 @@ void Category::toMultipart(std::shared_ptr<MultipartFormData> multipart, const u
         multipart->add(ModelBase::toHttpContent(namePrefix + U("name"), m_Name));
         
     }
-    
 }
 
 void Category::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix)
@@ -106,42 +98,46 @@ void Category::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const
     if(multipart->hasContent(U("name")))
     {
         setName(ModelBase::stringFromHttpContent(multipart->getContent(U("name"))));
-        
     }
-    
 }
 
-
 int64_t Category::getId() const
 {
     return m_Id;
 }
+
 void Category::setId(int64_t value)
 {
     m_Id = value;
     m_IdIsSet = true;
 }
+
 bool Category::idIsSet() const
 {
     return m_IdIsSet;
 }
+
 void Category::unsetId()
 {
     m_IdIsSet = false;
 }
+
 utility::string_t Category::getName() const
 {
     return m_Name;
 }
+
 void Category::setName(utility::string_t value)
 {
     m_Name = value;
     m_NameIsSet = true;
 }
+
 bool Category::nameIsSet() const
 {
     return m_NameIsSet;
 }
+
 void Category::unsetName()
 {
     m_NameIsSet = false;

samples/client/petstore/cpprest/model/Order.cpp

@@ -33,7 +33,6 @@ Order::Order()
     m_StatusIsSet = false;
     m_Complete = false;
     m_CompleteIsSet = false;
-    
 }
 
 Order::~Order()
@@ -47,7 +46,6 @@ void Order::validate()
 
 web::json::value Order::toJson() const
 {
-    
     web::json::value val = web::json::value::object();
 
     if(m_IdIsSet)
@@ -74,15 +72,12 @@ web::json::value Order::toJson() const
     {
         val[U("complete")] = ModelBase::toJson(m_Complete);
     }
-    
 
     return val;
 }
 
 void Order::fromJson(web::json::value& val)
 {
-    
-
     if(val.has_field(U("id")))
     {
         setId(ModelBase::int64_tFromJson(val[U("id")]));
@@ -98,18 +93,15 @@ void Order::fromJson(web::json::value& val)
     if(val.has_field(U("shipDate")))
     {
         setShipDate(ModelBase::dateFromJson(val[U("shipDate")]));
-        
     }
     if(val.has_field(U("status")))
     {
         setStatus(ModelBase::stringFromJson(val[U("status")]));
-        
     }
     if(val.has_field(U("complete")))
     {
         setComplete(ModelBase::boolFromJson(val[U("complete")]));
     }
-    
 }
 
 void Order::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix) const
@@ -146,7 +138,6 @@ void Order::toMultipart(std::shared_ptr<MultipartFormData> multipart, const util
     {
         multipart->add(ModelBase::toHttpContent(namePrefix + U("complete"), m_Complete));
     }
-    
 }
 
 void Order::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix)
@@ -172,119 +163,138 @@ void Order::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const ut
     if(multipart->hasContent(U("shipDate")))
     {
         setShipDate(ModelBase::dateFromHttpContent(multipart->getContent(U("shipDate"))));
-        
     }
     if(multipart->hasContent(U("status")))
     {
         setStatus(ModelBase::stringFromHttpContent(multipart->getContent(U("status"))));
-        
     }
     if(multipart->hasContent(U("complete")))
     {
         setComplete(ModelBase::boolFromHttpContent(multipart->getContent(U("complete"))));
     }
-    
 }
 
-
 int64_t Order::getId() const
 {
     return m_Id;
 }
+
 void Order::setId(int64_t value)
 {
     m_Id = value;
     m_IdIsSet = true;
 }
+
 bool Order::idIsSet() const
 {
     return m_IdIsSet;
 }
+
 void Order::unsetId()
 {
     m_IdIsSet = false;
 }
+
 int64_t Order::getPetId() const
 {
     return m_PetId;
 }
+
 void Order::setPetId(int64_t value)
 {
     m_PetId = value;
     m_PetIdIsSet = true;
 }
+
 bool Order::petIdIsSet() const
 {
     return m_PetIdIsSet;
 }
+
 void Order::unsetPetId()
 {
     m_PetIdIsSet = false;
 }
+
 int32_t Order::getQuantity() const
 {
     return m_Quantity;
 }
+
 void Order::setQuantity(int32_t value)
 {
     m_Quantity = value;
     m_QuantityIsSet = true;
 }
+
 bool Order::quantityIsSet() const
 {
     return m_QuantityIsSet;
 }
+
 void Order::unsetQuantity()
 {
     m_QuantityIsSet = false;
 }
+
 utility::datetime Order::getShipDate() const
 {
     return m_ShipDate;
 }
+
 void Order::setShipDate(utility::datetime value)
 {
     m_ShipDate = value;
     m_ShipDateIsSet = true;
 }
+
 bool Order::shipDateIsSet() const
 {
     return m_ShipDateIsSet;
 }
+
 void Order::unsetShipDate()
 {
     m_ShipDateIsSet = false;
 }
+
 utility::string_t Order::getStatus() const
 {
     return m_Status;
 }
+
 void Order::setStatus(utility::string_t value)
 {
     m_Status = value;
     m_StatusIsSet = true;
 }
+
 bool Order::statusIsSet() const
 {
     return m_StatusIsSet;
 }
+
 void Order::unsetStatus()
 {
     m_StatusIsSet = false;
 }
+
 bool Order::getComplete() const
 {
     return m_Complete;
 }
+
 void Order::setComplete(bool value)
 {
     m_Complete = value;
     m_CompleteIsSet = true;
 }
+
 bool Order::completeIsSet() const
 {
     return m_CompleteIsSet;
 }
+
 void Order::unsetComplete()
 {
     m_CompleteIsSet = false;

samples/client/petstore/cpprest/model/Pet.cpp

@@ -28,7 +28,6 @@ Pet::Pet()
     m_TagsIsSet = false;
     m_Status = U("");
     m_StatusIsSet = false;
-    
 }
 
 Pet::~Pet()
@@ -42,7 +41,6 @@ void Pet::validate()
 
 web::json::value Pet::toJson() const
 {
-    
     web::json::value val = web::json::value::object();
 
     if(m_IdIsSet)
@@ -61,14 +59,13 @@ web::json::value Pet::toJson() const
             jsonArray.push_back(ModelBase::toJson(item));
         }
         val[U("photoUrls")] = web::json::value::array(jsonArray);
-            }
+    }
     {
         std::vector<web::json::value> jsonArray;
         for( auto& item : m_Tags )
         {
             jsonArray.push_back(ModelBase::toJson(item));
         }
-        
         if(jsonArray.size() > 0)
         {
             val[U("tags")] = web::json::value::array(jsonArray);
@@ -78,15 +75,12 @@ web::json::value Pet::toJson() const
     {
         val[U("status")] = ModelBase::toJson(m_Status);
     }
-    
 
     return val;
 }
 
 void Pet::fromJson(web::json::value& val)
 {
-    
-
     if(val.has_field(U("id")))
     {
         setId(ModelBase::int64_tFromJson(val[U("id")]));
@@ -99,16 +93,14 @@ void Pet::fromJson(web::json::value& val)
             newItem->fromJson(val[U("category")]);
             setCategory( newItem );
         }
-        
     }
     setName(ModelBase::stringFromJson(val[U("name")]));
     {
         m_PhotoUrls.clear();
         std::vector<web::json::value> jsonArray;
-                for( auto& item : val[U("photoUrls")].as_array() )
+        for( auto& item : val[U("photoUrls")].as_array() )
         {
             m_PhotoUrls.push_back(ModelBase::stringFromJson(item));
-            
         }
     }
     {
@@ -118,7 +110,6 @@ void Pet::fromJson(web::json::value& val)
         {
         for( auto& item : val[U("tags")].as_array() )
         {
-            
             if(item.is_null())
             {
                 m_Tags.push_back( std::shared_ptr<Tag>(nullptr) );
@@ -129,16 +120,13 @@ void Pet::fromJson(web::json::value& val)
                 newItem->fromJson(item);
                 m_Tags.push_back( newItem );
             }
-            
         }
         }
     }
     if(val.has_field(U("status")))
     {
         setStatus(ModelBase::stringFromJson(val[U("status")]));
-        
     }
-    
 }
 
 void Pet::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix) const
@@ -187,7 +175,6 @@ void Pet::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utilit
         multipart->add(ModelBase::toHttpContent(namePrefix + U("status"), m_Status));
         
     }
-    
 }
 
 void Pet::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix)
@@ -210,17 +197,15 @@ void Pet::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const util
             newItem->fromMultiPart(multipart, U("category."));
             setCategory( newItem );
         }
-        
     }
     setName(ModelBase::stringFromHttpContent(multipart->getContent(U("name"))));
     {
         m_PhotoUrls.clear();
-        
+
         web::json::value jsonArray = web::json::value::parse(ModelBase::stringFromHttpContent(multipart->getContent(U("photoUrls"))));
         for( auto& item : jsonArray.as_array() )
         {
             m_PhotoUrls.push_back(ModelBase::stringFromJson(item));
-            
         }
     }
     {
@@ -231,7 +216,6 @@ void Pet::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const util
         web::json::value jsonArray = web::json::value::parse(ModelBase::stringFromHttpContent(multipart->getContent(U("tags"))));
         for( auto& item : jsonArray.as_array() )
         {
-            
             if(item.is_null())
             {
                 m_Tags.push_back( std::shared_ptr<Tag>(nullptr) );
@@ -242,91 +226,104 @@ void Pet::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const util
                 newItem->fromJson(item);
                 m_Tags.push_back( newItem );
             }
-            
         }
         }
     }
     if(multipart->hasContent(U("status")))
     {
         setStatus(ModelBase::stringFromHttpContent(multipart->getContent(U("status"))));
-        
     }
-    
 }
 
-
 int64_t Pet::getId() const
 {
     return m_Id;
 }
+
 void Pet::setId(int64_t value)
 {
     m_Id = value;
     m_IdIsSet = true;
 }
+
 bool Pet::idIsSet() const
 {
     return m_IdIsSet;
 }
+
 void Pet::unsetId()
 {
     m_IdIsSet = false;
 }
+
 std::shared_ptr<Category> Pet::getCategory() const
 {
     return m_Category;
 }
+
 void Pet::setCategory(std::shared_ptr<Category> value)
 {
     m_Category = value;
     m_CategoryIsSet = true;
 }
+
 bool Pet::categoryIsSet() const
 {
     return m_CategoryIsSet;
 }
+
 void Pet::unsetCategory()
 {
     m_CategoryIsSet = false;
 }
+
 utility::string_t Pet::getName() const
 {
     return m_Name;
 }
+
 void Pet::setName(utility::string_t value)
 {
     m_Name = value;
     
 }
+
 std::vector<utility::string_t>& Pet::getPhotoUrls()
 {
     return m_PhotoUrls;
 }
+
 std::vector<std::shared_ptr<Tag>>& Pet::getTags()
 {
     return m_Tags;
 }
+
 bool Pet::tagsIsSet() const
 {
     return m_TagsIsSet;
 }
+
 void Pet::unsetTags()
 {
     m_TagsIsSet = false;
 }
+
 utility::string_t Pet::getStatus() const
 {
     return m_Status;
 }
+
 void Pet::setStatus(utility::string_t value)
 {
     m_Status = value;
     m_StatusIsSet = true;
 }
+
 bool Pet::statusIsSet() const
 {
     return m_StatusIsSet;
 }
+
 void Pet::unsetStatus()
 {
     m_StatusIsSet = false;

samples/client/petstore/cpprest/model/Tag.cpp

@@ -25,7 +25,6 @@ Tag::Tag()
     m_IdIsSet = false;
     m_Name = U("");
     m_NameIsSet = false;
-    
 }
 
 Tag::~Tag()
@@ -39,7 +38,6 @@ void Tag::validate()
 
 web::json::value Tag::toJson() const
 {
-    
     web::json::value val = web::json::value::object();
 
     if(m_IdIsSet)
@@ -50,15 +48,12 @@ web::json::value Tag::toJson() const
     {
         val[U("name")] = ModelBase::toJson(m_Name);
     }
-    
 
     return val;
 }
 
 void Tag::fromJson(web::json::value& val)
 {
-    
-
     if(val.has_field(U("id")))
     {
         setId(ModelBase::int64_tFromJson(val[U("id")]));
@@ -66,9 +61,7 @@ void Tag::fromJson(web::json::value& val)
     if(val.has_field(U("name")))
     {
         setName(ModelBase::stringFromJson(val[U("name")]));
-        
     }
-    
 }
 
 void Tag::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix) const
@@ -88,7 +81,6 @@ void Tag::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utilit
         multipart->add(ModelBase::toHttpContent(namePrefix + U("name"), m_Name));
         
     }
-    
 }
 
 void Tag::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix)
@@ -106,42 +98,46 @@ void Tag::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const util
     if(multipart->hasContent(U("name")))
     {
         setName(ModelBase::stringFromHttpContent(multipart->getContent(U("name"))));
-        
     }
-    
 }
 
-
 int64_t Tag::getId() const
 {
     return m_Id;
 }
+
 void Tag::setId(int64_t value)
 {
     m_Id = value;
     m_IdIsSet = true;
 }
+
 bool Tag::idIsSet() const
 {
     return m_IdIsSet;
 }
+
 void Tag::unsetId()
 {
     m_IdIsSet = false;
 }
+
 utility::string_t Tag::getName() const
 {
     return m_Name;
 }
+
 void Tag::setName(utility::string_t value)
 {
     m_Name = value;
     m_NameIsSet = true;
 }
+
 bool Tag::nameIsSet() const
 {
     return m_NameIsSet;
 }
+
 void Tag::unsetName()
 {
     m_NameIsSet = false;

samples/client/petstore/cpprest/model/User.cpp

@@ -37,7 +37,6 @@ User::User()
     m_PhoneIsSet = false;
     m_UserStatus = 0;
     m_UserStatusIsSet = false;
-    
 }
 
 User::~User()
@@ -51,7 +50,6 @@ void User::validate()
 
 web::json::value User::toJson() const
 {
-    
     web::json::value val = web::json::value::object();
 
     if(m_IdIsSet)
@@ -86,15 +84,12 @@ web::json::value User::toJson() const
     {
         val[U("userStatus")] = ModelBase::toJson(m_UserStatus);
     }
-    
 
     return val;
 }
 
 void User::fromJson(web::json::value& val)
 {
-    
-
     if(val.has_field(U("id")))
     {
         setId(ModelBase::int64_tFromJson(val[U("id")]));
@@ -102,38 +97,31 @@ void User::fromJson(web::json::value& val)
     if(val.has_field(U("username")))
     {
         setUsername(ModelBase::stringFromJson(val[U("username")]));
-        
     }
     if(val.has_field(U("firstName")))
     {
         setFirstName(ModelBase::stringFromJson(val[U("firstName")]));
-        
     }
     if(val.has_field(U("lastName")))
     {
         setLastName(ModelBase::stringFromJson(val[U("lastName")]));
-        
     }
     if(val.has_field(U("email")))
     {
         setEmail(ModelBase::stringFromJson(val[U("email")]));
-        
     }
     if(val.has_field(U("password")))
     {
         setPassword(ModelBase::stringFromJson(val[U("password")]));
-        
     }
     if(val.has_field(U("phone")))
     {
         setPhone(ModelBase::stringFromJson(val[U("phone")]));
-        
     }
     if(val.has_field(U("userStatus")))
     {
         setUserStatus(ModelBase::int32_tFromJson(val[U("userStatus")]));
     }
-    
 }
 
 void User::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix) const
@@ -182,7 +170,6 @@ void User::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utili
     {
         multipart->add(ModelBase::toHttpContent(namePrefix + U("userStatus"), m_UserStatus));
     }
-    
 }
 
 void User::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix)
@@ -200,173 +187,196 @@ void User::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const uti
     if(multipart->hasContent(U("username")))
     {
         setUsername(ModelBase::stringFromHttpContent(multipart->getContent(U("username"))));
-        
     }
     if(multipart->hasContent(U("firstName")))
     {
         setFirstName(ModelBase::stringFromHttpContent(multipart->getContent(U("firstName"))));
-        
     }
     if(multipart->hasContent(U("lastName")))
     {
         setLastName(ModelBase::stringFromHttpContent(multipart->getContent(U("lastName"))));
-        
     }
     if(multipart->hasContent(U("email")))
     {
         setEmail(ModelBase::stringFromHttpContent(multipart->getContent(U("email"))));
-        
     }
     if(multipart->hasContent(U("password")))
     {
         setPassword(ModelBase::stringFromHttpContent(multipart->getContent(U("password"))));
-        
     }
     if(multipart->hasContent(U("phone")))
     {
         setPhone(ModelBase::stringFromHttpContent(multipart->getContent(U("phone"))));
-        
     }
     if(multipart->hasContent(U("userStatus")))
     {
         setUserStatus(ModelBase::int32_tFromHttpContent(multipart->getContent(U("userStatus"))));
     }
-    
 }
 
-
 int64_t User::getId() const
 {
     return m_Id;
 }
+
 void User::setId(int64_t value)
 {
     m_Id = value;
     m_IdIsSet = true;
 }
+
 bool User::idIsSet() const
 {
     return m_IdIsSet;
 }
+
 void User::unsetId()
 {
     m_IdIsSet = false;
 }
+
 utility::string_t User::getUsername() const
 {
     return m_Username;
 }
+
 void User::setUsername(utility::string_t value)
 {
     m_Username = value;
     m_UsernameIsSet = true;
 }
+
 bool User::usernameIsSet() const
 {
     return m_UsernameIsSet;
 }
+
 void User::unsetUsername()
 {
     m_UsernameIsSet = false;
 }
+
 utility::string_t User::getFirstName() const
 {
     return m_FirstName;
 }
+
 void User::setFirstName(utility::string_t value)
 {
     m_FirstName = value;
     m_FirstNameIsSet = true;
 }
+
 bool User::firstNameIsSet() const
 {
     return m_FirstNameIsSet;
 }
+
 void User::unsetFirstName()
 {
     m_FirstNameIsSet = false;
 }
+
 utility::string_t User::getLastName() const
 {
     return m_LastName;
 }
+
 void User::setLastName(utility::string_t value)
 {
     m_LastName = value;
     m_LastNameIsSet = true;
 }
+
 bool User::lastNameIsSet() const
 {
     return m_LastNameIsSet;
 }
+
 void User::unsetLastName()
 {
     m_LastNameIsSet = false;
 }
+
 utility::string_t User::getEmail() const
 {
     return m_Email;
 }
+
 void User::setEmail(utility::string_t value)
 {
     m_Email = value;
     m_EmailIsSet = true;
 }
+
 bool User::emailIsSet() const
 {
     return m_EmailIsSet;
 }
+
 void User::unsetEmail()
 {
     m_EmailIsSet = false;
 }
+
 utility::string_t User::getPassword() const
 {
     return m_Password;
 }
+
 void User::setPassword(utility::string_t value)
 {
     m_Password = value;
     m_PasswordIsSet = true;
 }
+
 bool User::passwordIsSet() const
 {
     return m_PasswordIsSet;
 }
+
 void User::unsetPassword()
 {
     m_PasswordIsSet = false;
 }
+
 utility::string_t User::getPhone() const
 {
     return m_Phone;
 }
+
 void User::setPhone(utility::string_t value)
 {
     m_Phone = value;
     m_PhoneIsSet = true;
 }
+
 bool User::phoneIsSet() const
 {
     return m_PhoneIsSet;
 }
+
 void User::unsetPhone()
 {
     m_PhoneIsSet = false;
 }
+
 int32_t User::getUserStatus() const
 {
     return m_UserStatus;
 }
+
 void User::setUserStatus(int32_t value)
 {
     m_UserStatus = value;
     m_UserStatusIsSet = true;
 }
+
 bool User::userStatusIsSet() const
 {
     return m_UserStatusIsSet;
 }
+
 void User::unsetUserStatus()
 {
     m_UserStatusIsSet = false;

samples/client/petstore/javascript-es6/README.md

@@ -82,6 +82,7 @@ Class | Method | HTTP request | Description
 *SwaggerPetstore.FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
 *SwaggerPetstore.FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 *SwaggerPetstore.FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*SwaggerPetstore.FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
 *SwaggerPetstore.Fake_classname_tags123Api* | [**testClassname**](docs/Fake_classname_tags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *SwaggerPetstore.PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *SwaggerPetstore.PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet

samples/client/petstore/javascript-es6/docs/FakeApi.md

@@ -11,6 +11,7 @@ Method | HTTP request | Description
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
 [**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 [**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
 
 
 <a name="fakeOuterBooleanSerialize"></a>
@@ -23,22 +24,21 @@ Test serialization of outer boolean types
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterBoolean() // OuterBoolean | Input boolean as post body
 };
 
-var callback = function(error, data, response) {
+apiInstance.fakeOuterBooleanSerialize(opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.fakeOuterBooleanSerialize(opts, callback);
+});
 ```
 
 ### Parameters
@@ -70,22 +70,21 @@ Test serialization of object with outer number type
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterComposite() // OuterComposite | Input composite as post body
 };
 
-var callback = function(error, data, response) {
+apiInstance.fakeOuterCompositeSerialize(opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.fakeOuterCompositeSerialize(opts, callback);
+});
 ```
 
 ### Parameters
@@ -117,22 +116,21 @@ Test serialization of outer number types
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterNumber() // OuterNumber | Input number as post body
 };
 
-var callback = function(error, data, response) {
+apiInstance.fakeOuterNumberSerialize(opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.fakeOuterNumberSerialize(opts, callback);
+});
 ```
 
 ### Parameters
@@ -164,22 +162,21 @@ Test serialization of outer string types
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'body': new SwaggerPetstore.OuterString() // OuterString | Input string as post body
 };
 
-var callback = function(error, data, response) {
+apiInstance.fakeOuterStringSerialize(opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.fakeOuterStringSerialize(opts, callback);
+});
 ```
 
 ### Parameters
@@ -211,21 +208,20 @@ To test \&quot;client\&quot; model
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var body = new SwaggerPetstore.Client(); // Client | client model
+let body = new SwaggerPetstore.Client(); // Client | client model
 
 
-var callback = function(error, data, response) {
+apiInstance.testClientModel(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.testClientModel(body, callback);
+});
 ```
 
 ### Parameters
@@ -257,25 +253,25 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure HTTP basic authorization: http_basic_test
-var http_basic_test = defaultClient.authentications['http_basic_test'];
+let http_basic_test = defaultClient.authentications['http_basic_test'];
 http_basic_test.username = 'YOUR USERNAME';
 http_basic_test.password = 'YOUR PASSWORD';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var _number = 3.4; // Number | None
+let _number = 3.4; // Number | None
 
-var _double = 1.2; // Number | None
+let _double = 1.2; // Number | None
 
-var patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
+let patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 
-var _byte = B; // Blob | None
+let _byte = B; // Blob | None
 
-var opts = { 
+let opts = { 
   'integer': 56, // Number | None
   'int32': 56, // Number | None
   'int64': 789, // Number | None
@@ -288,14 +284,13 @@ var opts = {
   'callback': "callback_example" // String | None
 };
 
-var callback = function(error, data, response) {
+apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts, callback);
+});
 ```
 
 ### Parameters
@@ -340,11 +335,11 @@ To test enum parameters
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.FakeApi();
+let apiInstance = new SwaggerPetstore.FakeApi();
 
-var opts = { 
+let opts = { 
   'enumFormStringArray': ["enumFormStringArray_example"], // [String] | Form parameter enum test (string array)
   'enumFormString': "-efg", // String | Form parameter enum test (string)
   'enumHeaderStringArray': ["enumHeaderStringArray_example"], // [String] | Header parameter enum test (string array)
@@ -355,14 +350,13 @@ var opts = {
   'enumQueryDouble': 1.2 // Number | Query parameter enum test (double)
 };
 
-var callback = function(error, data, response) {
+apiInstance.testEnumParameters(opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.testEnumParameters(opts, callback);
+});
 ```
 
 ### Parameters
@@ -391,3 +385,51 @@ No authorization required
  - **Content-Type**: */*
  - **Accept**: */*
 
+<a name="testJsonFormData"></a>
+# **testJsonFormData**
+> testJsonFormData(param, param2)
+
+test json serialization of form data
+
+
+
+### Example
+```javascript
+import SwaggerPetstore from 'swagger_petstore';
+
+let apiInstance = new SwaggerPetstore.FakeApi();
+
+let param = "param_example"; // String | field1
+
+let param2 = "param2_example"; // String | field2
+
+
+apiInstance.testJsonFormData(param, param2, (error, data, response) => {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully.');
+  }
+});
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **param** | **String**| field1 | 
+ **param2** | **String**| field2 | 
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+

samples/client/petstore/javascript-es6/docs/Fake_classname_tags123Api.md

@@ -15,21 +15,20 @@ To test class name in snake case
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.Fake_classname_tags123Api();
+let apiInstance = new SwaggerPetstore.Fake_classname_tags123Api();
 
-var body = new SwaggerPetstore.Client(); // Client | client model
+let body = new SwaggerPetstore.Client(); // Client | client model
 
 
-var callback = function(error, data, response) {
+apiInstance.testClassname(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.testClassname(body, callback);
+});
 ```
 
 ### Parameters

samples/client/petstore/javascript-es6/docs/PetApi.md

@@ -24,26 +24,25 @@ Add a new pet to the store
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
+let body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
 
 
-var callback = function(error, data, response) {
+apiInstance.addPet(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.addPet(body, callback);
+});
 ```
 
 ### Parameters
@@ -75,29 +74,28 @@ Deletes a pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | Pet id to delete
+let petId = 789; // Number | Pet id to delete
 
-var opts = { 
+let opts = { 
   'apiKey': "apiKey_example" // String | 
 };
 
-var callback = function(error, data, response) {
+apiInstance.deletePet(petId, opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.deletePet(petId, opts, callback);
+});
 ```
 
 ### Parameters
@@ -130,26 +128,25 @@ Multiple status values can be provided with comma separated strings
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var status = ["status_example"]; // [String] | Status values that need to be considered for filter
+let status = ["status_example"]; // [String] | Status values that need to be considered for filter
 
 
-var callback = function(error, data, response) {
+apiInstance.findPetsByStatus(status, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.findPetsByStatus(status, callback);
+});
 ```
 
 ### Parameters
@@ -181,26 +178,25 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var tags = ["tags_example"]; // [String] | Tags to filter by
+let tags = ["tags_example"]; // [String] | Tags to filter by
 
 
-var callback = function(error, data, response) {
+apiInstance.findPetsByTags(tags, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.findPetsByTags(tags, callback);
+});
 ```
 
 ### Parameters
@@ -232,28 +228,27 @@ Returns a single pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure API key authorization: api_key
-var api_key = defaultClient.authentications['api_key'];
+let api_key = defaultClient.authentications['api_key'];
 api_key.apiKey = 'YOUR API KEY';
 // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
 //api_key.apiKeyPrefix = 'Token';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | ID of pet to return
+let petId = 789; // Number | ID of pet to return
 
 
-var callback = function(error, data, response) {
+apiInstance.getPetById(petId, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.getPetById(petId, callback);
+});
 ```
 
 ### Parameters
@@ -285,26 +280,25 @@ Update an existing pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
+let body = new SwaggerPetstore.Pet(); // Pet | Pet object that needs to be added to the store
 
 
-var callback = function(error, data, response) {
+apiInstance.updatePet(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.updatePet(body, callback);
+});
 ```
 
 ### Parameters
@@ -336,30 +330,29 @@ Updates a pet in the store with form data
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | ID of pet that needs to be updated
+let petId = 789; // Number | ID of pet that needs to be updated
 
-var opts = { 
+let opts = { 
   'name': "name_example", // String | Updated name of the pet
   'status': "status_example" // String | Updated status of the pet
 };
 
-var callback = function(error, data, response) {
+apiInstance.updatePetWithForm(petId, opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.updatePetWithForm(petId, opts, callback);
+});
 ```
 
 ### Parameters
@@ -393,30 +386,29 @@ uploads an image
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure OAuth2 access token for authorization: petstore_auth
-var petstore_auth = defaultClient.authentications['petstore_auth'];
+let petstore_auth = defaultClient.authentications['petstore_auth'];
 petstore_auth.accessToken = 'YOUR ACCESS TOKEN';
 
-var apiInstance = new SwaggerPetstore.PetApi();
+let apiInstance = new SwaggerPetstore.PetApi();
 
-var petId = 789; // Number | ID of pet to update
+let petId = 789; // Number | ID of pet to update
 
-var opts = { 
+let opts = { 
   'additionalMetadata': "additionalMetadata_example", // String | Additional data to pass to server
   'file': "/path/to/file.txt" // File | file to upload
 };
 
-var callback = function(error, data, response) {
+apiInstance.uploadFile(petId, opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.uploadFile(petId, opts, callback);
+});
 ```
 
 ### Parameters

samples/client/petstore/javascript-es6/docs/StoreApi.md

@@ -20,21 +20,20 @@ For valid response try integer IDs with value < 1000. Anything above 1000 or
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
+let apiInstance = new SwaggerPetstore.StoreApi();
 
-var orderId = "orderId_example"; // String | ID of the order that needs to be deleted
+let orderId = "orderId_example"; // String | ID of the order that needs to be deleted
 
 
-var callback = function(error, data, response) {
+apiInstance.deleteOrder(orderId, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.deleteOrder(orderId, callback);
+});
 ```
 
 ### Parameters
@@ -66,25 +65,24 @@ Returns a map of status codes to quantities
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
-var defaultClient = SwaggerPetstore.ApiClient.instance;
+import SwaggerPetstore from 'swagger_petstore';
+let defaultClient = SwaggerPetstore.ApiClient.instance;
 
 // Configure API key authorization: api_key
-var api_key = defaultClient.authentications['api_key'];
+let api_key = defaultClient.authentications['api_key'];
 api_key.apiKey = 'YOUR API KEY';
 // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
 //api_key.apiKeyPrefix = 'Token';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
+let apiInstance = new SwaggerPetstore.StoreApi();
 
-var callback = function(error, data, response) {
+apiInstance.getInventory((error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.getInventory(callback);
+});
 ```
 
 ### Parameters
@@ -113,21 +111,20 @@ For valid response try integer IDs with value <= 5 or > 10. Other val
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
+let apiInstance = new SwaggerPetstore.StoreApi();
 
-var orderId = 789; // Number | ID of pet that needs to be fetched
+let orderId = 789; // Number | ID of pet that needs to be fetched
 
 
-var callback = function(error, data, response) {
+apiInstance.getOrderById(orderId, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.getOrderById(orderId, callback);
+});
 ```
 
 ### Parameters
@@ -159,21 +156,20 @@ Place an order for a pet
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.StoreApi();
+let apiInstance = new SwaggerPetstore.StoreApi();
 
-var body = new SwaggerPetstore.Order(); // Order | order placed for purchasing the pet
+let body = new SwaggerPetstore.Order(); // Order | order placed for purchasing the pet
 
 
-var callback = function(error, data, response) {
+apiInstance.placeOrder(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.placeOrder(body, callback);
+});
 ```
 
 ### Parameters

samples/client/petstore/javascript-es6/docs/UserApi.md

@@ -24,21 +24,20 @@ This can only be done by the logged in user.
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var body = new SwaggerPetstore.User(); // User | Created user object
+let body = new SwaggerPetstore.User(); // User | Created user object
 
 
-var callback = function(error, data, response) {
+apiInstance.createUser(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.createUser(body, callback);
+});
 ```
 
 ### Parameters
@@ -70,21 +69,20 @@ Creates list of users with given input array
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var body = [new SwaggerPetstore.User()]; // [User] | List of user object
+let body = [new SwaggerPetstore.User()]; // [User] | List of user object
 
 
-var callback = function(error, data, response) {
+apiInstance.createUsersWithArrayInput(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.createUsersWithArrayInput(body, callback);
+});
 ```
 
 ### Parameters
@@ -116,21 +114,20 @@ Creates list of users with given input array
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var body = [new SwaggerPetstore.User()]; // [User] | List of user object
+let body = [new SwaggerPetstore.User()]; // [User] | List of user object
 
 
-var callback = function(error, data, response) {
+apiInstance.createUsersWithListInput(body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.createUsersWithListInput(body, callback);
+});
 ```
 
 ### Parameters
@@ -162,21 +159,20 @@ This can only be done by the logged in user.
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | The name that needs to be deleted
+let username = "username_example"; // String | The name that needs to be deleted
 
 
-var callback = function(error, data, response) {
+apiInstance.deleteUser(username, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.deleteUser(username, callback);
+});
 ```
 
 ### Parameters
@@ -208,21 +204,20 @@ Get user by user name
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. 
+let username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. 
 
 
-var callback = function(error, data, response) {
+apiInstance.getUserByName(username, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.getUserByName(username, callback);
+});
 ```
 
 ### Parameters
@@ -254,23 +249,22 @@ Logs user into the system
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | The user name for login
+let username = "username_example"; // String | The user name for login
 
-var password = "password_example"; // String | The password for login in clear text
+let password = "password_example"; // String | The password for login in clear text
 
 
-var callback = function(error, data, response) {
+apiInstance.loginUser(username, password, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully. Returned data: ' + data);
   }
-};
-apiInstance.loginUser(username, password, callback);
+});
 ```
 
 ### Parameters
@@ -303,18 +297,17 @@ Logs out current logged in user session
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var callback = function(error, data, response) {
+apiInstance.logoutUser((error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.logoutUser(callback);
+});
 ```
 
 ### Parameters
@@ -343,23 +336,22 @@ This can only be done by the logged in user.
 
 ### Example
 ```javascript
-var SwaggerPetstore = require('swagger_petstore');
+import SwaggerPetstore from 'swagger_petstore';
 
-var apiInstance = new SwaggerPetstore.UserApi();
+let apiInstance = new SwaggerPetstore.UserApi();
 
-var username = "username_example"; // String | name that need to be deleted
+let username = "username_example"; // String | name that need to be deleted
 
-var body = new SwaggerPetstore.User(); // User | Updated user object
+let body = new SwaggerPetstore.User(); // User | Updated user object
 
 
-var callback = function(error, data, response) {
+apiInstance.updateUser(username, body, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
     console.log('API called successfully.');
   }
-};
-apiInstance.updateUser(username, body, callback);
+});
 ```
 
 ### Parameters

samples/client/petstore/javascript-es6/package.json

@@ -5,17 +5,22 @@
   "license": "Unlicense",
   "main": "src/index.js",
   "scripts": {
-    "test": "./node_modules/mocha/bin/mocha --recursive"
+    "test": "mocha --compilers js:babel-core/register --recursive"
   },
   "browser": {
     "fs": false
   },
   "dependencies": {
+    "babel": "^6.23.0",
+    "babel-cli": "^6.24.1",
     "superagent": "3.5.2"
   },
   "devDependencies": {
+    "babel-core": "6.18.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-stage-0": "^6.24.1",
+    "expect.js": "~0.3.1",
     "mocha": "~2.3.4",
-    "sinon": "1.17.3",
-    "expect.js": "~0.3.1"
+    "sinon": "1.17.3"
   }
 }

samples/client/petstore/javascript-es6/src/api/FakeApi.js

@@ -7,45 +7,35 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Client', 'model/OuterBoolean', 'model/OuterComposite', 'model/OuterNumber', 'model/OuterString'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/Client'), require('../model/OuterBoolean'), require('../model/OuterComposite'), require('../model/OuterNumber'), require('../model/OuterString'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import Client from '../model/Client';
+import OuterBoolean from '../model/OuterBoolean';
+import OuterComposite from '../model/OuterComposite';
+import OuterNumber from '../model/OuterNumber';
+import OuterString from '../model/OuterString';
+
+/**
+* Fake service.
+* @module api/FakeApi
+* @version 1.0.0
+*/
+export default class FakeApi {
+
+    /**
+    * Constructs a new FakeApi. 
+    * @alias module:api/FakeApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.FakeApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Client, root.SwaggerPetstore.OuterBoolean, root.SwaggerPetstore.OuterComposite, root.SwaggerPetstore.OuterNumber, root.SwaggerPetstore.OuterString);
-  }
-}(this, function(ApiClient, Client, OuterBoolean, OuterComposite, OuterNumber, OuterString) {
-  'use strict';
-
-  /**
-   * Fake service.
-   * @module api/FakeApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new FakeApi. 
-   * @alias module:api/FakeApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
     /**
@@ -63,30 +53,28 @@
      * @param {module:api/FakeApi~fakeOuterBooleanSerializeCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/OuterBoolean}
      */
-    this.fakeOuterBooleanSerialize = function(opts, callback) {
+    fakeOuterBooleanSerialize(opts, callback) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterBoolean;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterBoolean;
 
       return this.apiClient.callApi(
         '/fake/outer/boolean', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -106,30 +94,28 @@
      * @param {module:api/FakeApi~fakeOuterCompositeSerializeCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/OuterComposite}
      */
-    this.fakeOuterCompositeSerialize = function(opts, callback) {
+    fakeOuterCompositeSerialize(opts, callback) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterComposite;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterComposite;
 
       return this.apiClient.callApi(
         '/fake/outer/composite', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -149,30 +135,28 @@
      * @param {module:api/FakeApi~fakeOuterNumberSerializeCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/OuterNumber}
      */
-    this.fakeOuterNumberSerialize = function(opts, callback) {
+    fakeOuterNumberSerialize(opts, callback) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterNumber;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterNumber;
 
       return this.apiClient.callApi(
         '/fake/outer/number', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -192,30 +176,28 @@
      * @param {module:api/FakeApi~fakeOuterStringSerializeCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/OuterString}
      */
-    this.fakeOuterStringSerialize = function(opts, callback) {
+    fakeOuterStringSerialize(opts, callback) {
       opts = opts || {};
-      var postBody = opts['body'];
+      let postBody = opts['body'];
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = [];
-      var returnType = OuterString;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = [];
+      let returnType = OuterString;
 
       return this.apiClient.callApi(
         '/fake/outer/string', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -235,8 +217,8 @@
      * @param {module:api/FakeApi~testClientModelCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Client}
      */
-    this.testClientModel = function(body, callback) {
-      var postBody = body;
+    testClientModel(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -244,25 +226,23 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = ['application/json'];
-      var accepts = ['application/json'];
-      var returnType = Client;
+      let authNames = [];
+      let contentTypes = ['application/json'];
+      let accepts = ['application/json'];
+      let returnType = Client;
 
       return this.apiClient.callApi(
         '/fake', 'PATCH',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -295,9 +275,9 @@
      * @param {String} opts.callback None
      * @param {module:api/FakeApi~testEndpointParametersCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.testEndpointParameters = function(_number, _double, patternWithoutDelimiter, _byte, opts, callback) {
+    testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts, callback) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter '_number' is set
       if (_number === undefined || _number === null) {
@@ -320,15 +300,13 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
         'integer': opts['integer'],
         'int32': opts['int32'],
         'int64': opts['int64'],
@@ -345,14 +323,14 @@
         'callback': opts['callback']
       };
 
-      var authNames = ['http_basic_test'];
-      var contentTypes = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
-      var accepts = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
-      var returnType = null;
+      let authNames = ['http_basic_test'];
+      let contentTypes = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
+      let accepts = ['application/xml; charset=utf-8', 'application/json; charset=utf-8'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/fake', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -379,45 +357,91 @@
      * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double)
      * @param {module:api/FakeApi~testEnumParametersCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.testEnumParameters = function(opts, callback) {
+    testEnumParameters(opts, callback) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
+        'enum_query_string_array': this.apiClient.buildCollectionParam(opts['enumQueryStringArray'], 'csv'),
         'enum_query_string': opts['enumQueryString'],
-        'enum_query_integer': opts['enumQueryInteger'],
+        'enum_query_integer': opts['enumQueryInteger']
       };
-      var collectionQueryParams = {
-        'enum_query_string_array': {
-          value: opts['enumQueryStringArray'],
-          collectionFormat: 'csv'
-        },
-      };
-      var headerParams = {
+      let headerParams = {
         'enum_header_string_array': opts['enumHeaderStringArray'],
         'enum_header_string': opts['enumHeaderString']
       };
-      var formParams = {
+      let formParams = {
         'enum_form_string_array': this.apiClient.buildCollectionParam(opts['enumFormStringArray'], 'csv'),
         'enum_form_string': opts['enumFormString'],
         'enum_query_double': opts['enumQueryDouble']
       };
 
-      var authNames = [];
-      var contentTypes = ['*/*'];
-      var accepts = ['*/*'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = ['*/*'];
+      let accepts = ['*/*'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/fake', 'GET',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
-  };
 
-  return exports;
-}));
+    /**
+     * Callback function to receive the result of the testJsonFormData operation.
+     * @callback module:api/FakeApi~testJsonFormDataCallback
+     * @param {String} error Error message, if any.
+     * @param data This operation does not return a value.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * test json serialization of form data
+     * 
+     * @param {String} param field1
+     * @param {String} param2 field2
+     * @param {module:api/FakeApi~testJsonFormDataCallback} callback The callback function, accepting three arguments: error, data, response
+     */
+    testJsonFormData(param, param2, callback) {
+      let postBody = null;
+
+      // verify the required parameter 'param' is set
+      if (param === undefined || param === null) {
+        throw new Error("Missing the required parameter 'param' when calling testJsonFormData");
+      }
+
+      // verify the required parameter 'param2' is set
+      if (param2 === undefined || param2 === null) {
+        throw new Error("Missing the required parameter 'param2' when calling testJsonFormData");
+      }
+
+
+      let pathParams = {
+      };
+      let queryParams = {
+      };
+      let headerParams = {
+      };
+      let formParams = {
+        'param': param,
+        'param2': param2
+      };
+
+      let authNames = [];
+      let contentTypes = ['application/json'];
+      let accepts = [];
+      let returnType = null;
+
+      return this.apiClient.callApi(
+        '/fake/jsonFormData', 'GET',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, callback
+      );
+    }
+
+
+}

samples/client/petstore/javascript-es6/src/api/Fake_classname_tags123Api.js

@@ -7,45 +7,31 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Client'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/Client'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import Client from '../model/Client';
+
+/**
+* Fake_classname_tags123 service.
+* @module api/Fake_classname_tags123Api
+* @version 1.0.0
+*/
+export default class Fake_classname_tags123Api {
+
+    /**
+    * Constructs a new Fake_classname_tags123Api. 
+    * @alias module:api/Fake_classname_tags123Api
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.Fake_classname_tags123Api = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Client);
-  }
-}(this, function(ApiClient, Client) {
-  'use strict';
-
-  /**
-   * Fake_classname_tags123 service.
-   * @module api/Fake_classname_tags123Api
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new Fake_classname_tags123Api. 
-   * @alias module:api/Fake_classname_tags123Api
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
     /**
@@ -62,8 +48,8 @@
      * @param {module:api/Fake_classname_tags123Api~testClassnameCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Client}
      */
-    this.testClassname = function(body, callback) {
-      var postBody = body;
+    testClassname(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -71,29 +57,26 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = ['application/json'];
-      var accepts = ['application/json'];
-      var returnType = Client;
+      let authNames = [];
+      let contentTypes = ['application/json'];
+      let accepts = ['application/json'];
+      let returnType = Client;
 
       return this.apiClient.callApi(
         '/fake_classname_test', 'PATCH',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
-  };
 
-  return exports;
-}));
+
+}

samples/client/petstore/javascript-es6/src/api/PetApi.js

@@ -7,45 +7,32 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/ApiResponse', 'model/Pet'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/ApiResponse'), require('../model/Pet'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import ApiResponse from '../model/ApiResponse';
+import Pet from '../model/Pet';
+
+/**
+* Pet service.
+* @module api/PetApi
+* @version 1.0.0
+*/
+export default class PetApi {
+
+    /**
+    * Constructs a new PetApi. 
+    * @alias module:api/PetApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.PetApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.ApiResponse, root.SwaggerPetstore.Pet);
-  }
-}(this, function(ApiClient, ApiResponse, Pet) {
-  'use strict';
-
-  /**
-   * Pet service.
-   * @module api/PetApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new PetApi. 
-   * @alias module:api/PetApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
     /**
@@ -62,8 +49,8 @@
      * @param {module:model/Pet} body Pet object that needs to be added to the store
      * @param {module:api/PetApi~addPetCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.addPet = function(body, callback) {
-      var postBody = body;
+    addPet(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -71,25 +58,23 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['application/json', 'application/xml'];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['application/json', 'application/xml'];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -110,9 +95,9 @@
      * @param {String} opts.apiKey 
      * @param {module:api/PetApi~deletePetCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.deletePet = function(petId, opts, callback) {
+    deletePet(petId, opts, callback) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -120,27 +105,25 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
-      };
-      var headerParams = {
+      let headerParams = {
         'api_key': opts['apiKey']
       };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet/{petId}', 'DELETE',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -160,8 +143,8 @@
      * @param {module:api/PetApi~findPetsByStatusCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link Array.<module:model/Pet>}
      */
-    this.findPetsByStatus = function(status, callback) {
-      var postBody = null;
+    findPetsByStatus(status, callback) {
+      let postBody = null;
 
       // verify the required parameter 'status' is set
       if (status === undefined || status === null) {
@@ -169,29 +152,24 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
+        'status': this.apiClient.buildCollectionParam(status, 'csv')
       };
-      var collectionQueryParams = {
-        'status': {
-          value: status,
-          collectionFormat: 'csv'
-        },
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = [Pet];
+      let authNames = ['petstore_auth'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = [Pet];
 
       return this.apiClient.callApi(
         '/pet/findByStatus', 'GET',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -211,8 +189,8 @@
      * @param {module:api/PetApi~findPetsByTagsCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link Array.<module:model/Pet>}
      */
-    this.findPetsByTags = function(tags, callback) {
-      var postBody = null;
+    findPetsByTags(tags, callback) {
+      let postBody = null;
 
       // verify the required parameter 'tags' is set
       if (tags === undefined || tags === null) {
@@ -220,29 +198,24 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
+        'tags': this.apiClient.buildCollectionParam(tags, 'csv')
       };
-      var collectionQueryParams = {
-        'tags': {
-          value: tags,
-          collectionFormat: 'csv'
-        },
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = [Pet];
+      let authNames = ['petstore_auth'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = [Pet];
 
       return this.apiClient.callApi(
         '/pet/findByTags', 'GET',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -262,8 +235,8 @@
      * @param {module:api/PetApi~getPetByIdCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Pet}
      */
-    this.getPetById = function(petId, callback) {
-      var postBody = null;
+    getPetById(petId, callback) {
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -271,26 +244,24 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['api_key'];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = Pet;
+      let authNames = ['api_key'];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = Pet;
 
       return this.apiClient.callApi(
         '/pet/{petId}', 'GET',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -309,8 +280,8 @@
      * @param {module:model/Pet} body Pet object that needs to be added to the store
      * @param {module:api/PetApi~updatePetCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.updatePet = function(body, callback) {
-      var postBody = body;
+    updatePet(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -318,25 +289,23 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['application/json', 'application/xml'];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['application/json', 'application/xml'];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet', 'PUT',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -358,9 +327,9 @@
      * @param {String} opts.status Updated status of the pet
      * @param {module:api/PetApi~updatePetWithFormCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.updatePetWithForm = function(petId, opts, callback) {
+    updatePetWithForm(petId, opts, callback) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -368,28 +337,26 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
         'name': opts['name'],
         'status': opts['status']
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['application/x-www-form-urlencoded'];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['application/x-www-form-urlencoded'];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/pet/{petId}', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -412,9 +379,9 @@
      * @param {module:api/PetApi~uploadFileCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/ApiResponse}
      */
-    this.uploadFile = function(petId, opts, callback) {
+    uploadFile(petId, opts, callback) {
       opts = opts || {};
-      var postBody = null;
+      let postBody = null;
 
       // verify the required parameter 'petId' is set
       if (petId === undefined || petId === null) {
@@ -422,32 +389,29 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'petId': petId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
         'additionalMetadata': opts['additionalMetadata'],
         'file': opts['file']
       };
 
-      var authNames = ['petstore_auth'];
-      var contentTypes = ['multipart/form-data'];
-      var accepts = ['application/json'];
-      var returnType = ApiResponse;
+      let authNames = ['petstore_auth'];
+      let contentTypes = ['multipart/form-data'];
+      let accepts = ['application/json'];
+      let returnType = ApiResponse;
 
       return this.apiClient.callApi(
         '/pet/{petId}/uploadImage', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
-  };
 
-  return exports;
-}));
+
+}

samples/client/petstore/javascript-es6/src/api/StoreApi.js

@@ -7,45 +7,31 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Order'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/Order'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import Order from '../model/Order';
+
+/**
+* Store service.
+* @module api/StoreApi
+* @version 1.0.0
+*/
+export default class StoreApi {
+
+    /**
+    * Constructs a new StoreApi. 
+    * @alias module:api/StoreApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.StoreApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Order);
-  }
-}(this, function(ApiClient, Order) {
-  'use strict';
-
-  /**
-   * Store service.
-   * @module api/StoreApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new StoreApi. 
-   * @alias module:api/StoreApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
     /**
@@ -62,8 +48,8 @@
      * @param {String} orderId ID of the order that needs to be deleted
      * @param {module:api/StoreApi~deleteOrderCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.deleteOrder = function(orderId, callback) {
-      var postBody = null;
+    deleteOrder(orderId, callback) {
+      let postBody = null;
 
       // verify the required parameter 'orderId' is set
       if (orderId === undefined || orderId === null) {
@@ -71,26 +57,24 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'order_id': orderId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/store/order/{order_id}', 'DELETE',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -109,29 +93,27 @@
      * @param {module:api/StoreApi~getInventoryCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link Object.<String, {'String': 'Number'}>}
      */
-    this.getInventory = function(callback) {
-      var postBody = null;
+    getInventory(callback) {
+      let postBody = null;
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = ['api_key'];
-      var contentTypes = [];
-      var accepts = ['application/json'];
-      var returnType = {'String': 'Number'};
+      let authNames = ['api_key'];
+      let contentTypes = [];
+      let accepts = ['application/json'];
+      let returnType = {'String': 'Number'};
 
       return this.apiClient.callApi(
         '/store/inventory', 'GET',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -151,8 +133,8 @@
      * @param {module:api/StoreApi~getOrderByIdCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Order}
      */
-    this.getOrderById = function(orderId, callback) {
-      var postBody = null;
+    getOrderById(orderId, callback) {
+      let postBody = null;
 
       // verify the required parameter 'orderId' is set
       if (orderId === undefined || orderId === null) {
@@ -160,26 +142,24 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'order_id': orderId
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = Order;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = Order;
 
       return this.apiClient.callApi(
         '/store/order/{order_id}', 'GET',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -199,8 +179,8 @@
      * @param {module:api/StoreApi~placeOrderCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Order}
      */
-    this.placeOrder = function(body, callback) {
-      var postBody = body;
+    placeOrder(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -208,29 +188,26 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = Order;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = Order;
 
       return this.apiClient.callApi(
         '/store/order', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
-  };
 
-  return exports;
-}));
+
+}

samples/client/petstore/javascript-es6/src/api/UserApi.js

@@ -7,45 +7,31 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/User'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('../model/User'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from "../ApiClient";
+import User from '../model/User';
+
+/**
+* User service.
+* @module api/UserApi
+* @version 1.0.0
+*/
+export default class UserApi {
+
+    /**
+    * Constructs a new UserApi. 
+    * @alias module:api/UserApi
+    * @class
+    * @param {module:ApiClient} apiClient Optional API client implementation to use,
+    * default to {@link module:ApiClient#instance} if unspecified.
+    */
+    constructor(apiClient) {
+        this.apiClient = apiClient || ApiClient.instance;
     }
-    root.SwaggerPetstore.UserApi = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.User);
-  }
-}(this, function(ApiClient, User) {
-  'use strict';
-
-  /**
-   * User service.
-   * @module api/UserApi
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new UserApi. 
-   * @alias module:api/UserApi
-   * @class
-   * @param {module:ApiClient} apiClient Optional API client implementation to use,
-   * default to {@link module:ApiClient#instance} if unspecified.
-   */
-  var exports = function(apiClient) {
-    this.apiClient = apiClient || ApiClient.instance;
 
 
     /**
@@ -62,8 +48,8 @@
      * @param {module:model/User} body Created user object
      * @param {module:api/UserApi~createUserCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.createUser = function(body, callback) {
-      var postBody = body;
+    createUser(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -71,25 +57,23 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -108,8 +92,8 @@
      * @param {Array.<module:model/User>} body List of user object
      * @param {module:api/UserApi~createUsersWithArrayInputCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.createUsersWithArrayInput = function(body, callback) {
-      var postBody = body;
+    createUsersWithArrayInput(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -117,25 +101,23 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/createWithArray', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -154,8 +136,8 @@
      * @param {Array.<module:model/User>} body List of user object
      * @param {module:api/UserApi~createUsersWithListInputCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.createUsersWithListInput = function(body, callback) {
-      var postBody = body;
+    createUsersWithListInput(body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'body' is set
       if (body === undefined || body === null) {
@@ -163,25 +145,23 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/createWithList', 'POST',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -200,8 +180,8 @@
      * @param {String} username The name that needs to be deleted
      * @param {module:api/UserApi~deleteUserCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.deleteUser = function(username, callback) {
-      var postBody = null;
+    deleteUser(username, callback) {
+      let postBody = null;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -209,26 +189,24 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'username': username
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/{username}', 'DELETE',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -248,8 +226,8 @@
      * @param {module:api/UserApi~getUserByNameCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/User}
      */
-    this.getUserByName = function(username, callback) {
-      var postBody = null;
+    getUserByName(username, callback) {
+      let postBody = null;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -257,26 +235,24 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'username': username
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = User;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = User;
 
       return this.apiClient.callApi(
         '/user/{username}', 'GET',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -297,8 +273,8 @@
      * @param {module:api/UserApi~loginUserCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link 'String'}
      */
-    this.loginUser = function(username, password, callback) {
-      var postBody = null;
+    loginUser(username, password, callback) {
+      let postBody = null;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -311,27 +287,25 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
         'username': username,
-        'password': password,
+        'password': password
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = 'String';
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = 'String';
 
       return this.apiClient.callApi(
         '/user/login', 'GET',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -349,29 +323,27 @@
      * 
      * @param {module:api/UserApi~logoutUserCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.logoutUser = function(callback) {
-      var postBody = null;
+    logoutUser(callback) {
+      let postBody = null;
 
 
-      var pathParams = {
+      let pathParams = {
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/logout', 'GET',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
@@ -391,8 +363,8 @@
      * @param {module:model/User} body Updated user object
      * @param {module:api/UserApi~updateUserCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    this.updateUser = function(username, body, callback) {
-      var postBody = body;
+    updateUser(username, body, callback) {
+      let postBody = body;
 
       // verify the required parameter 'username' is set
       if (username === undefined || username === null) {
@@ -405,30 +377,27 @@
       }
 
 
-      var pathParams = {
+      let pathParams = {
         'username': username
       };
-      var queryParams = {
+      let queryParams = {
       };
-      var collectionQueryParams = {
+      let headerParams = {
       };
-      var headerParams = {
-      };
-      var formParams = {
+      let formParams = {
       };
 
-      var authNames = [];
-      var contentTypes = [];
-      var accepts = ['application/xml', 'application/json'];
-      var returnType = null;
+      let authNames = [];
+      let contentTypes = [];
+      let accepts = ['application/xml', 'application/json'];
+      let returnType = null;
 
       return this.apiClient.callApi(
         '/user/{username}', 'PUT',
-        pathParams, queryParams, collectionQueryParams, headerParams, formParams, postBody,
+        pathParams, queryParams, headerParams, formParams, postBody,
         authNames, contentTypes, accepts, returnType, callback
       );
     }
-  };
 
-  return exports;
-}));
+
+}

samples/client/petstore/javascript-es6/src/index.js

@@ -7,267 +7,336 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/AdditionalPropertiesClass', 'model/Animal', 'model/AnimalFarm', 'model/ApiResponse', 'model/ArrayOfArrayOfNumberOnly', 'model/ArrayOfNumberOnly', 'model/ArrayTest', 'model/Capitalization', 'model/Category', 'model/ClassModel', 'model/Client', 'model/EnumArrays', 'model/EnumClass', 'model/EnumTest', 'model/FormatTest', 'model/HasOnlyReadOnly', 'model/List', 'model/MapTest', 'model/MixedPropertiesAndAdditionalPropertiesClass', 'model/Model200Response', 'model/ModelReturn', 'model/Name', 'model/NumberOnly', 'model/Order', 'model/OuterBoolean', 'model/OuterComposite', 'model/OuterEnum', 'model/OuterNumber', 'model/OuterString', 'model/Pet', 'model/ReadOnlyFirst', 'model/SpecialModelName', 'model/Tag', 'model/User', 'model/Cat', 'model/Dog', 'api/FakeApi', 'api/Fake_classname_tags123Api', 'api/PetApi', 'api/StoreApi', 'api/UserApi'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('./ApiClient'), require('./model/AdditionalPropertiesClass'), require('./model/Animal'), require('./model/AnimalFarm'), require('./model/ApiResponse'), require('./model/ArrayOfArrayOfNumberOnly'), require('./model/ArrayOfNumberOnly'), require('./model/ArrayTest'), require('./model/Capitalization'), require('./model/Category'), require('./model/ClassModel'), require('./model/Client'), require('./model/EnumArrays'), require('./model/EnumClass'), require('./model/EnumTest'), require('./model/FormatTest'), require('./model/HasOnlyReadOnly'), require('./model/List'), require('./model/MapTest'), require('./model/MixedPropertiesAndAdditionalPropertiesClass'), require('./model/Model200Response'), require('./model/ModelReturn'), require('./model/Name'), require('./model/NumberOnly'), require('./model/Order'), require('./model/OuterBoolean'), require('./model/OuterComposite'), require('./model/OuterEnum'), require('./model/OuterNumber'), require('./model/OuterString'), require('./model/Pet'), require('./model/ReadOnlyFirst'), require('./model/SpecialModelName'), require('./model/Tag'), require('./model/User'), require('./model/Cat'), require('./model/Dog'), require('./api/FakeApi'), require('./api/Fake_classname_tags123Api'), require('./api/PetApi'), require('./api/StoreApi'), require('./api/UserApi'));
-  }
-}(function(ApiClient, AdditionalPropertiesClass, Animal, AnimalFarm, ApiResponse, ArrayOfArrayOfNumberOnly, ArrayOfNumberOnly, ArrayTest, Capitalization, Category, ClassModel, Client, EnumArrays, EnumClass, EnumTest, FormatTest, HasOnlyReadOnly, List, MapTest, MixedPropertiesAndAdditionalPropertiesClass, Model200Response, ModelReturn, Name, NumberOnly, Order, OuterBoolean, OuterComposite, OuterEnum, OuterNumber, OuterString, Pet, ReadOnlyFirst, SpecialModelName, Tag, User, Cat, Dog, FakeApi, Fake_classname_tags123Api, PetApi, StoreApi, UserApi) {
-  'use strict';
 
-  /**
-   * This_spec_is_mainly_for_testing_Petstore_server_and_contains_fake_endpoints_models__Please_do_not_use_this_for_any_other_purpose__Special_characters__.<br>
-   * The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
-   * <p>
-   * An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
-   * <pre>
-   * var SwaggerPetstore = require('index'); // See note below*.
-   * var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
-   * var yyyModel = new SwaggerPetstore.Yyy(); // Construct a model instance.
-   * yyyModel.someProperty = 'someValue';
-   * ...
-   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
-   * ...
-   * </pre>
-   * <em>*NOTE: For a top-level AMD script, use require(['index'], function(){...})
-   * and put the application logic within the callback function.</em>
-   * </p>
-   * <p>
-   * A non-AMD browser application (discouraged) might do something like this:
-   * <pre>
-   * var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
-   * var yyy = new SwaggerPetstore.Yyy(); // Construct a model instance.
-   * yyyModel.someProperty = 'someValue';
-   * ...
-   * var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
-   * ...
-   * </pre>
-   * </p>
-   * @module index
-   * @version 1.0.0
-   */
-  var exports = {
+import ApiClient from './ApiClient';
+import AdditionalPropertiesClass from './model/AdditionalPropertiesClass';
+import Animal from './model/Animal';
+import AnimalFarm from './model/AnimalFarm';
+import ApiResponse from './model/ApiResponse';
+import ArrayOfArrayOfNumberOnly from './model/ArrayOfArrayOfNumberOnly';
+import ArrayOfNumberOnly from './model/ArrayOfNumberOnly';
+import ArrayTest from './model/ArrayTest';
+import Capitalization from './model/Capitalization';
+import Category from './model/Category';
+import ClassModel from './model/ClassModel';
+import Client from './model/Client';
+import EnumArrays from './model/EnumArrays';
+import EnumClass from './model/EnumClass';
+import EnumTest from './model/EnumTest';
+import FormatTest from './model/FormatTest';
+import HasOnlyReadOnly from './model/HasOnlyReadOnly';
+import List from './model/List';
+import MapTest from './model/MapTest';
+import MixedPropertiesAndAdditionalPropertiesClass from './model/MixedPropertiesAndAdditionalPropertiesClass';
+import Model200Response from './model/Model200Response';
+import ModelReturn from './model/ModelReturn';
+import Name from './model/Name';
+import NumberOnly from './model/NumberOnly';
+import Order from './model/Order';
+import OuterBoolean from './model/OuterBoolean';
+import OuterComposite from './model/OuterComposite';
+import OuterEnum from './model/OuterEnum';
+import OuterNumber from './model/OuterNumber';
+import OuterString from './model/OuterString';
+import Pet from './model/Pet';
+import ReadOnlyFirst from './model/ReadOnlyFirst';
+import SpecialModelName from './model/SpecialModelName';
+import Tag from './model/Tag';
+import User from './model/User';
+import Cat from './model/Cat';
+import Dog from './model/Dog';
+import FakeApi from './api/FakeApi';
+import Fake_classname_tags123Api from './api/Fake_classname_tags123Api';
+import PetApi from './api/PetApi';
+import StoreApi from './api/StoreApi';
+import UserApi from './api/UserApi';
+
+
+/**
+* This_spec_is_mainly_for_testing_Petstore_server_and_contains_fake_endpoints_models__Please_do_not_use_this_for_any_other_purpose__Special_characters__.<br>
+* The <code>index</code> module provides access to constructors for all the classes which comprise the public API.
+* <p>
+* An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
+* <pre>
+* var SwaggerPetstore = require('index'); // See note below*.
+* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
+* var yyyModel = new SwaggerPetstore.Yyy(); // Construct a model instance.
+* yyyModel.someProperty = 'someValue';
+* ...
+* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+* ...
+* </pre>
+* <em>*NOTE: For a top-level AMD script, use require(['index'], function(){...})
+* and put the application logic within the callback function.</em>
+* </p>
+* <p>
+* A non-AMD browser application (discouraged) might do something like this:
+* <pre>
+* var xxxSvc = new SwaggerPetstore.XxxApi(); // Allocate the API class we're going to use.
+* var yyy = new SwaggerPetstore.Yyy(); // Construct a model instance.
+* yyyModel.someProperty = 'someValue';
+* ...
+* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+* ...
+* </pre>
+* </p>
+* @module index
+* @version 1.0.0
+*/
+export {
     /**
      * The ApiClient constructor.
      * @property {module:ApiClient}
      */
-    ApiClient: ApiClient,
+    ApiClient,
+
     /**
      * The AdditionalPropertiesClass model constructor.
      * @property {module:model/AdditionalPropertiesClass}
      */
-    AdditionalPropertiesClass: AdditionalPropertiesClass,
+    AdditionalPropertiesClass,
+
     /**
      * The Animal model constructor.
      * @property {module:model/Animal}
      */
-    Animal: Animal,
+    Animal,
+
     /**
      * The AnimalFarm model constructor.
      * @property {module:model/AnimalFarm}
      */
-    AnimalFarm: AnimalFarm,
+    AnimalFarm,
+
     /**
      * The ApiResponse model constructor.
      * @property {module:model/ApiResponse}
      */
-    ApiResponse: ApiResponse,
+    ApiResponse,
+
     /**
      * The ArrayOfArrayOfNumberOnly model constructor.
      * @property {module:model/ArrayOfArrayOfNumberOnly}
      */
-    ArrayOfArrayOfNumberOnly: ArrayOfArrayOfNumberOnly,
+    ArrayOfArrayOfNumberOnly,
+
     /**
      * The ArrayOfNumberOnly model constructor.
      * @property {module:model/ArrayOfNumberOnly}
      */
-    ArrayOfNumberOnly: ArrayOfNumberOnly,
+    ArrayOfNumberOnly,
+
     /**
      * The ArrayTest model constructor.
      * @property {module:model/ArrayTest}
      */
-    ArrayTest: ArrayTest,
+    ArrayTest,
+
     /**
      * The Capitalization model constructor.
      * @property {module:model/Capitalization}
      */
-    Capitalization: Capitalization,
+    Capitalization,
+
     /**
      * The Category model constructor.
      * @property {module:model/Category}
      */
-    Category: Category,
+    Category,
+
     /**
      * The ClassModel model constructor.
      * @property {module:model/ClassModel}
      */
-    ClassModel: ClassModel,
+    ClassModel,
+
     /**
      * The Client model constructor.
      * @property {module:model/Client}
      */
-    Client: Client,
+    Client,
+
     /**
      * The EnumArrays model constructor.
      * @property {module:model/EnumArrays}
      */
-    EnumArrays: EnumArrays,
+    EnumArrays,
+
     /**
      * The EnumClass model constructor.
      * @property {module:model/EnumClass}
      */
-    EnumClass: EnumClass,
+    EnumClass,
+
     /**
      * The EnumTest model constructor.
      * @property {module:model/EnumTest}
      */
-    EnumTest: EnumTest,
+    EnumTest,
+
     /**
      * The FormatTest model constructor.
      * @property {module:model/FormatTest}
      */
-    FormatTest: FormatTest,
+    FormatTest,
+
     /**
      * The HasOnlyReadOnly model constructor.
      * @property {module:model/HasOnlyReadOnly}
      */
-    HasOnlyReadOnly: HasOnlyReadOnly,
+    HasOnlyReadOnly,
+
     /**
      * The List model constructor.
      * @property {module:model/List}
      */
-    List: List,
+    List,
+
     /**
      * The MapTest model constructor.
      * @property {module:model/MapTest}
      */
-    MapTest: MapTest,
+    MapTest,
+
     /**
      * The MixedPropertiesAndAdditionalPropertiesClass model constructor.
      * @property {module:model/MixedPropertiesAndAdditionalPropertiesClass}
      */
-    MixedPropertiesAndAdditionalPropertiesClass: MixedPropertiesAndAdditionalPropertiesClass,
+    MixedPropertiesAndAdditionalPropertiesClass,
+
     /**
      * The Model200Response model constructor.
      * @property {module:model/Model200Response}
      */
-    Model200Response: Model200Response,
+    Model200Response,
+
     /**
      * The ModelReturn model constructor.
      * @property {module:model/ModelReturn}
      */
-    ModelReturn: ModelReturn,
+    ModelReturn,
+
     /**
      * The Name model constructor.
      * @property {module:model/Name}
      */
-    Name: Name,
+    Name,
+
     /**
      * The NumberOnly model constructor.
      * @property {module:model/NumberOnly}
      */
-    NumberOnly: NumberOnly,
+    NumberOnly,
+
     /**
      * The Order model constructor.
      * @property {module:model/Order}
      */
-    Order: Order,
+    Order,
+
     /**
      * The OuterBoolean model constructor.
      * @property {module:model/OuterBoolean}
      */
-    OuterBoolean: OuterBoolean,
+    OuterBoolean,
+
     /**
      * The OuterComposite model constructor.
      * @property {module:model/OuterComposite}
      */
-    OuterComposite: OuterComposite,
+    OuterComposite,
+
     /**
      * The OuterEnum model constructor.
      * @property {module:model/OuterEnum}
      */
-    OuterEnum: OuterEnum,
+    OuterEnum,
+
     /**
      * The OuterNumber model constructor.
      * @property {module:model/OuterNumber}
      */
-    OuterNumber: OuterNumber,
+    OuterNumber,
+
     /**
      * The OuterString model constructor.
      * @property {module:model/OuterString}
      */
-    OuterString: OuterString,
+    OuterString,
+
     /**
      * The Pet model constructor.
      * @property {module:model/Pet}
      */
-    Pet: Pet,
+    Pet,
+
     /**
      * The ReadOnlyFirst model constructor.
      * @property {module:model/ReadOnlyFirst}
      */
-    ReadOnlyFirst: ReadOnlyFirst,
+    ReadOnlyFirst,
+
     /**
      * The SpecialModelName model constructor.
      * @property {module:model/SpecialModelName}
      */
-    SpecialModelName: SpecialModelName,
+    SpecialModelName,
+
     /**
      * The Tag model constructor.
      * @property {module:model/Tag}
      */
-    Tag: Tag,
+    Tag,
+
     /**
      * The User model constructor.
      * @property {module:model/User}
      */
-    User: User,
+    User,
+
     /**
      * The Cat model constructor.
      * @property {module:model/Cat}
      */
-    Cat: Cat,
+    Cat,
+
     /**
      * The Dog model constructor.
      * @property {module:model/Dog}
      */
-    Dog: Dog,
-    /**
-     * The FakeApi service constructor.
-     * @property {module:api/FakeApi}
-     */
-    FakeApi: FakeApi,
-    /**
-     * The Fake_classname_tags123Api service constructor.
-     * @property {module:api/Fake_classname_tags123Api}
-     */
-    Fake_classname_tags123Api: Fake_classname_tags123Api,
-    /**
-     * The PetApi service constructor.
-     * @property {module:api/PetApi}
-     */
-    PetApi: PetApi,
-    /**
-     * The StoreApi service constructor.
-     * @property {module:api/StoreApi}
-     */
-    StoreApi: StoreApi,
-    /**
-     * The UserApi service constructor.
-     * @property {module:api/UserApi}
-     */
-    UserApi: UserApi
-  };
+    Dog,
 
-  return exports;
-}));
+    /**
+    * The FakeApi service constructor.
+    * @property {module:api/FakeApi}
+    */
+    FakeApi,
+
+    /**
+    * The Fake_classname_tags123Api service constructor.
+    * @property {module:api/Fake_classname_tags123Api}
+    */
+    Fake_classname_tags123Api,
+
+    /**
+    * The PetApi service constructor.
+    * @property {module:api/PetApi}
+    */
+    PetApi,
+
+    /**
+    * The StoreApi service constructor.
+    * @property {module:api/StoreApi}
+    */
+    StoreApi,
+
+    /**
+    * The UserApi service constructor.
+    * @property {module:api/UserApi}
+    */
+    UserApi
+};

samples/client/petstore/javascript-es6/src/model/AdditionalPropertiesClass.js

@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The AdditionalPropertiesClass model module.
+* @module model/AdditionalPropertiesClass
+* @version 1.0.0
+*/
+export default class AdditionalPropertiesClass {
+    /**
+    * Constructs a new <code>AdditionalPropertiesClass</code>.
+    * @alias module:model/AdditionalPropertiesClass
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.AdditionalPropertiesClass = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>AdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/AdditionalPropertiesClass} obj Optional instance to populate.
+    * @return {module:model/AdditionalPropertiesClass} The populated <code>AdditionalPropertiesClass</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new AdditionalPropertiesClass();
 
+            
+            
+            
 
-
-  /**
-   * The AdditionalPropertiesClass model module.
-   * @module model/AdditionalPropertiesClass
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>AdditionalPropertiesClass</code>.
-   * @alias module:model/AdditionalPropertiesClass
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>AdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/AdditionalPropertiesClass} obj Optional instance to populate.
-   * @return {module:model/AdditionalPropertiesClass} The populated <code>AdditionalPropertiesClass</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('map_property')) {
-        obj['map_property'] = ApiClient.convertToType(data['map_property'], {'String': 'String'});
-      }
-      if (data.hasOwnProperty('map_of_map_property')) {
-        obj['map_of_map_property'] = ApiClient.convertToType(data['map_of_map_property'], {'String': {'String': 'String'}});
-      }
+            if (data.hasOwnProperty('map_property')) {
+                obj['map_property'] = ApiClient.convertToType(data['map_property'], {'String': 'String'});
+            }
+            if (data.hasOwnProperty('map_of_map_property')) {
+                obj['map_of_map_property'] = ApiClient.convertToType(data['map_of_map_property'], {'String': {'String': 'String'}});
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Object.<String, String>} map_property
-   */
-  exports.prototype['map_property'] = undefined;
-  /**
-   * @member {Object.<String, Object.<String, String>>} map_of_map_property
-   */
-  exports.prototype['map_of_map_property'] = undefined;
+    /**
+    * @member {Object.<String, String>} map_property
+    */
+    map_property = undefined;
+    /**
+    * @member {Object.<String, Object.<String, String>>} map_of_map_property
+    */
+    map_of_map_property = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/Animal.js

@@ -7,86 +7,83 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Animal model module.
+* @module model/Animal
+* @version 1.0.0
+*/
+export default class Animal {
+    /**
+    * Constructs a new <code>Animal</code>.
+    * @alias module:model/Animal
+    * @class
+    * @param className {String} 
+    */
+
+    constructor(className) {
+        
+
+        
+        
+
+        this['className'] = className;
+
+        
     }
-    root.SwaggerPetstore.Animal = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Animal</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Animal} obj Optional instance to populate.
+    * @return {module:model/Animal} The populated <code>Animal</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Animal();
 
+            
+            
+            
 
-
-  /**
-   * The Animal model module.
-   * @module model/Animal
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Animal</code>.
-   * @alias module:model/Animal
-   * @class
-   * @param className {String} 
-   */
-  var exports = function(className) {
-    var _this = this;
-
-    _this['className'] = className;
-
-  };
-
-  /**
-   * Constructs a <code>Animal</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Animal} obj Optional instance to populate.
-   * @return {module:model/Animal} The populated <code>Animal</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('className')) {
-        obj['className'] = ApiClient.convertToType(data['className'], 'String');
-      }
-      if (data.hasOwnProperty('color')) {
-        obj['color'] = ApiClient.convertToType(data['color'], 'String');
-      }
+            if (data.hasOwnProperty('className')) {
+                obj['className'] = ApiClient.convertToType(data['className'], 'String');
+            }
+            if (data.hasOwnProperty('color')) {
+                obj['color'] = ApiClient.convertToType(data['color'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} className
-   */
-  exports.prototype['className'] = undefined;
-  /**
-   * @member {String} color
-   * @default 'red'
-   */
-  exports.prototype['color'] = 'red';
+    /**
+    * @member {String} className
+    */
+    className = undefined;
+    /**
+    * @member {String} color
+    * @default 'red'
+    */
+    color = 'red';
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/AnimalFarm.js

@@ -7,73 +7,72 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The AnimalFarm model module.
+* @module model/AnimalFarm
+* @version 1.0.0
+*/
+export default class AnimalFarm {
+    /**
+    * Constructs a new <code>AnimalFarm</code>.
+    * @alias module:model/AnimalFarm
+    * @class
+    * @extends Array
+    */
+
+    constructor() {
+        
+        this = new Array();
+        Object.setPrototypeOf(this, AnimalFarm);
+
+        
+        
+
+        
+
+        return this;
     }
-    root.SwaggerPetstore.AnimalFarm = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>AnimalFarm</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/AnimalFarm} obj Optional instance to populate.
+    * @return {module:model/AnimalFarm} The populated <code>AnimalFarm</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new AnimalFarm();
 
+            ApiClient.constructFromObject(data, obj, 'Animal');
 
+            
+            
 
-  /**
-   * The AnimalFarm model module.
-   * @module model/AnimalFarm
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>AnimalFarm</code>.
-   * @alias module:model/AnimalFarm
-   * @class
-   * @extends Array
-   */
-  var exports = function() {
-    var _this = this;
-    _this = new Array();
-    Object.setPrototypeOf(_this, exports);
-
-    return _this;
-  };
-
-  /**
-   * Constructs a <code>AnimalFarm</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/AnimalFarm} obj Optional instance to populate.
-   * @return {module:model/AnimalFarm} The populated <code>AnimalFarm</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-      ApiClient.constructFromObject(data, obj, 'Animal');
-
+        }
+        return obj;
     }
-    return obj;
-  }
 
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/ApiResponse.js

@@ -7,92 +7,88 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ApiResponse model module.
+* @module model/ApiResponse
+* @version 1.0.0
+*/
+export default class ApiResponse {
+    /**
+    * Constructs a new <code>ApiResponse</code>.
+    * @alias module:model/ApiResponse
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ApiResponse = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ApiResponse</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ApiResponse} obj Optional instance to populate.
+    * @return {module:model/ApiResponse} The populated <code>ApiResponse</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ApiResponse();
 
+            
+            
+            
 
-
-  /**
-   * The ApiResponse model module.
-   * @module model/ApiResponse
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ApiResponse</code>.
-   * @alias module:model/ApiResponse
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>ApiResponse</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ApiResponse} obj Optional instance to populate.
-   * @return {module:model/ApiResponse} The populated <code>ApiResponse</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('code')) {
-        obj['code'] = ApiClient.convertToType(data['code'], 'Number');
-      }
-      if (data.hasOwnProperty('type')) {
-        obj['type'] = ApiClient.convertToType(data['type'], 'String');
-      }
-      if (data.hasOwnProperty('message')) {
-        obj['message'] = ApiClient.convertToType(data['message'], 'String');
-      }
+            if (data.hasOwnProperty('code')) {
+                obj['code'] = ApiClient.convertToType(data['code'], 'Number');
+            }
+            if (data.hasOwnProperty('type')) {
+                obj['type'] = ApiClient.convertToType(data['type'], 'String');
+            }
+            if (data.hasOwnProperty('message')) {
+                obj['message'] = ApiClient.convertToType(data['message'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} code
-   */
-  exports.prototype['code'] = undefined;
-  /**
-   * @member {String} type
-   */
-  exports.prototype['type'] = undefined;
-  /**
-   * @member {String} message
-   */
-  exports.prototype['message'] = undefined;
+    /**
+    * @member {Number} code
+    */
+    code = undefined;
+    /**
+    * @member {String} type
+    */
+    type = undefined;
+    /**
+    * @member {String} message
+    */
+    message = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/ArrayOfArrayOfNumberOnly.js

@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ArrayOfArrayOfNumberOnly model module.
+* @module model/ArrayOfArrayOfNumberOnly
+* @version 1.0.0
+*/
+export default class ArrayOfArrayOfNumberOnly {
+    /**
+    * Constructs a new <code>ArrayOfArrayOfNumberOnly</code>.
+    * @alias module:model/ArrayOfArrayOfNumberOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ArrayOfArrayOfNumberOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ArrayOfArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ArrayOfArrayOfNumberOnly} obj Optional instance to populate.
+    * @return {module:model/ArrayOfArrayOfNumberOnly} The populated <code>ArrayOfArrayOfNumberOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ArrayOfArrayOfNumberOnly();
 
+            
+            
+            
 
-
-  /**
-   * The ArrayOfArrayOfNumberOnly model module.
-   * @module model/ArrayOfArrayOfNumberOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ArrayOfArrayOfNumberOnly</code>.
-   * @alias module:model/ArrayOfArrayOfNumberOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ArrayOfArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ArrayOfArrayOfNumberOnly} obj Optional instance to populate.
-   * @return {module:model/ArrayOfArrayOfNumberOnly} The populated <code>ArrayOfArrayOfNumberOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('ArrayArrayNumber')) {
-        obj['ArrayArrayNumber'] = ApiClient.convertToType(data['ArrayArrayNumber'], [['Number']]);
-      }
+            if (data.hasOwnProperty('ArrayArrayNumber')) {
+                obj['ArrayArrayNumber'] = ApiClient.convertToType(data['ArrayArrayNumber'], [['Number']]);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Array.<Array.<Number>>} ArrayArrayNumber
-   */
-  exports.prototype['ArrayArrayNumber'] = undefined;
+    /**
+    * @member {Array.<Array.<Number>>} ArrayArrayNumber
+    */
+    ArrayArrayNumber = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/ArrayOfNumberOnly.js

@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ArrayOfNumberOnly model module.
+* @module model/ArrayOfNumberOnly
+* @version 1.0.0
+*/
+export default class ArrayOfNumberOnly {
+    /**
+    * Constructs a new <code>ArrayOfNumberOnly</code>.
+    * @alias module:model/ArrayOfNumberOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ArrayOfNumberOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ArrayOfNumberOnly} obj Optional instance to populate.
+    * @return {module:model/ArrayOfNumberOnly} The populated <code>ArrayOfNumberOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ArrayOfNumberOnly();
 
+            
+            
+            
 
-
-  /**
-   * The ArrayOfNumberOnly model module.
-   * @module model/ArrayOfNumberOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ArrayOfNumberOnly</code>.
-   * @alias module:model/ArrayOfNumberOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ArrayOfNumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ArrayOfNumberOnly} obj Optional instance to populate.
-   * @return {module:model/ArrayOfNumberOnly} The populated <code>ArrayOfNumberOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('ArrayNumber')) {
-        obj['ArrayNumber'] = ApiClient.convertToType(data['ArrayNumber'], ['Number']);
-      }
+            if (data.hasOwnProperty('ArrayNumber')) {
+                obj['ArrayNumber'] = ApiClient.convertToType(data['ArrayNumber'], ['Number']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Array.<Number>} ArrayNumber
-   */
-  exports.prototype['ArrayNumber'] = undefined;
+    /**
+    * @member {Array.<Number>} ArrayNumber
+    */
+    ArrayNumber = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/ArrayTest.js

@@ -7,92 +7,89 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/ReadOnlyFirst'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./ReadOnlyFirst'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import ReadOnlyFirst from './ReadOnlyFirst';
+
+
+
+
+
+/**
+* The ArrayTest model module.
+* @module model/ArrayTest
+* @version 1.0.0
+*/
+export default class ArrayTest {
+    /**
+    * Constructs a new <code>ArrayTest</code>.
+    * @alias module:model/ArrayTest
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ArrayTest = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.ReadOnlyFirst);
-  }
-}(this, function(ApiClient, ReadOnlyFirst) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ArrayTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ArrayTest} obj Optional instance to populate.
+    * @return {module:model/ArrayTest} The populated <code>ArrayTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ArrayTest();
 
+            
+            
+            
 
-
-  /**
-   * The ArrayTest model module.
-   * @module model/ArrayTest
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ArrayTest</code>.
-   * @alias module:model/ArrayTest
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>ArrayTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ArrayTest} obj Optional instance to populate.
-   * @return {module:model/ArrayTest} The populated <code>ArrayTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('array_of_string')) {
-        obj['array_of_string'] = ApiClient.convertToType(data['array_of_string'], ['String']);
-      }
-      if (data.hasOwnProperty('array_array_of_integer')) {
-        obj['array_array_of_integer'] = ApiClient.convertToType(data['array_array_of_integer'], [['Number']]);
-      }
-      if (data.hasOwnProperty('array_array_of_model')) {
-        obj['array_array_of_model'] = ApiClient.convertToType(data['array_array_of_model'], [[ReadOnlyFirst]]);
-      }
+            if (data.hasOwnProperty('array_of_string')) {
+                obj['array_of_string'] = ApiClient.convertToType(data['array_of_string'], ['String']);
+            }
+            if (data.hasOwnProperty('array_array_of_integer')) {
+                obj['array_array_of_integer'] = ApiClient.convertToType(data['array_array_of_integer'], [['Number']]);
+            }
+            if (data.hasOwnProperty('array_array_of_model')) {
+                obj['array_array_of_model'] = ApiClient.convertToType(data['array_array_of_model'], [[ReadOnlyFirst]]);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Array.<String>} array_of_string
-   */
-  exports.prototype['array_of_string'] = undefined;
-  /**
-   * @member {Array.<Array.<Number>>} array_array_of_integer
-   */
-  exports.prototype['array_array_of_integer'] = undefined;
-  /**
-   * @member {Array.<Array.<module:model/ReadOnlyFirst>>} array_array_of_model
-   */
-  exports.prototype['array_array_of_model'] = undefined;
+    /**
+    * @member {Array.<String>} array_of_string
+    */
+    array_of_string = undefined;
+    /**
+    * @member {Array.<Array.<Number>>} array_array_of_integer
+    */
+    array_array_of_integer = undefined;
+    /**
+    * @member {Array.<Array.<module:model/ReadOnlyFirst>>} array_array_of_model
+    */
+    array_array_of_model = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/Capitalization.js

@@ -7,117 +7,110 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Capitalization model module.
+* @module model/Capitalization
+* @version 1.0.0
+*/
+export default class Capitalization {
+    /**
+    * Constructs a new <code>Capitalization</code>.
+    * @alias module:model/Capitalization
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Capitalization = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Capitalization</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Capitalization} obj Optional instance to populate.
+    * @return {module:model/Capitalization} The populated <code>Capitalization</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Capitalization();
 
+            
+            
+            
 
-
-  /**
-   * The Capitalization model module.
-   * @module model/Capitalization
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Capitalization</code>.
-   * @alias module:model/Capitalization
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Capitalization</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Capitalization} obj Optional instance to populate.
-   * @return {module:model/Capitalization} The populated <code>Capitalization</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('smallCamel')) {
-        obj['smallCamel'] = ApiClient.convertToType(data['smallCamel'], 'String');
-      }
-      if (data.hasOwnProperty('CapitalCamel')) {
-        obj['CapitalCamel'] = ApiClient.convertToType(data['CapitalCamel'], 'String');
-      }
-      if (data.hasOwnProperty('small_Snake')) {
-        obj['small_Snake'] = ApiClient.convertToType(data['small_Snake'], 'String');
-      }
-      if (data.hasOwnProperty('Capital_Snake')) {
-        obj['Capital_Snake'] = ApiClient.convertToType(data['Capital_Snake'], 'String');
-      }
-      if (data.hasOwnProperty('SCA_ETH_Flow_Points')) {
-        obj['SCA_ETH_Flow_Points'] = ApiClient.convertToType(data['SCA_ETH_Flow_Points'], 'String');
-      }
-      if (data.hasOwnProperty('ATT_NAME')) {
-        obj['ATT_NAME'] = ApiClient.convertToType(data['ATT_NAME'], 'String');
-      }
+            if (data.hasOwnProperty('smallCamel')) {
+                obj['smallCamel'] = ApiClient.convertToType(data['smallCamel'], 'String');
+            }
+            if (data.hasOwnProperty('CapitalCamel')) {
+                obj['CapitalCamel'] = ApiClient.convertToType(data['CapitalCamel'], 'String');
+            }
+            if (data.hasOwnProperty('small_Snake')) {
+                obj['small_Snake'] = ApiClient.convertToType(data['small_Snake'], 'String');
+            }
+            if (data.hasOwnProperty('Capital_Snake')) {
+                obj['Capital_Snake'] = ApiClient.convertToType(data['Capital_Snake'], 'String');
+            }
+            if (data.hasOwnProperty('SCA_ETH_Flow_Points')) {
+                obj['SCA_ETH_Flow_Points'] = ApiClient.convertToType(data['SCA_ETH_Flow_Points'], 'String');
+            }
+            if (data.hasOwnProperty('ATT_NAME')) {
+                obj['ATT_NAME'] = ApiClient.convertToType(data['ATT_NAME'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} smallCamel
-   */
-  exports.prototype['smallCamel'] = undefined;
-  /**
-   * @member {String} CapitalCamel
-   */
-  exports.prototype['CapitalCamel'] = undefined;
-  /**
-   * @member {String} small_Snake
-   */
-  exports.prototype['small_Snake'] = undefined;
-  /**
-   * @member {String} Capital_Snake
-   */
-  exports.prototype['Capital_Snake'] = undefined;
-  /**
-   * @member {String} SCA_ETH_Flow_Points
-   */
-  exports.prototype['SCA_ETH_Flow_Points'] = undefined;
-  /**
-   * Name of the pet 
-   * @member {String} ATT_NAME
-   */
-  exports.prototype['ATT_NAME'] = undefined;
+    /**
+    * @member {String} smallCamel
+    */
+    smallCamel = undefined;
+    /**
+    * @member {String} CapitalCamel
+    */
+    CapitalCamel = undefined;
+    /**
+    * @member {String} small_Snake
+    */
+    small_Snake = undefined;
+    /**
+    * @member {String} Capital_Snake
+    */
+    Capital_Snake = undefined;
+    /**
+    * @member {String} SCA_ETH_Flow_Points
+    */
+    SCA_ETH_Flow_Points = undefined;
+    /**
+    * Name of the pet 
+    * @member {String} ATT_NAME
+    */
+    ATT_NAME = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/Cat.js

@@ -7,81 +7,78 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The Cat model module.
+* @module model/Cat
+* @version 1.0.0
+*/
+export default class Cat {
+    /**
+    * Constructs a new <code>Cat</code>.
+    * @alias module:model/Cat
+    * @class
+    * @extends module:model/Animal
+    * @param className {String} 
+    */
+
+    constructor(className) {
+        
+
+        Animal.call(this, className);
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Cat = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Cat</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Cat} obj Optional instance to populate.
+    * @return {module:model/Cat} The populated <code>Cat</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Cat();
 
+            
 
+            Animal.constructFromObject(data, obj);
+            
 
-  /**
-   * The Cat model module.
-   * @module model/Cat
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Cat</code>.
-   * @alias module:model/Cat
-   * @class
-   * @extends module:model/Animal
-   * @param className {String} 
-   */
-  var exports = function(className) {
-    var _this = this;
-    Animal.call(_this, className);
-
-  };
-
-  /**
-   * Constructs a <code>Cat</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Cat} obj Optional instance to populate.
-   * @return {module:model/Cat} The populated <code>Cat</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-      Animal.constructFromObject(data, obj);
-      if (data.hasOwnProperty('declawed')) {
-        obj['declawed'] = ApiClient.convertToType(data['declawed'], 'Boolean');
-      }
+            if (data.hasOwnProperty('declawed')) {
+                obj['declawed'] = ApiClient.convertToType(data['declawed'], 'Boolean');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  exports.prototype = Object.create(Animal.prototype);
-  exports.prototype.constructor = exports;
-
-  /**
-   * @member {Boolean} declawed
-   */
-  exports.prototype['declawed'] = undefined;
+    /**
+    * @member {Boolean} declawed
+    */
+    declawed = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/Category.js

@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Category model module.
+* @module model/Category
+* @version 1.0.0
+*/
+export default class Category {
+    /**
+    * Constructs a new <code>Category</code>.
+    * @alias module:model/Category
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Category = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Category</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Category} obj Optional instance to populate.
+    * @return {module:model/Category} The populated <code>Category</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Category();
 
+            
+            
+            
 
-
-  /**
-   * The Category model module.
-   * @module model/Category
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Category</code>.
-   * @alias module:model/Category
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Category</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Category} obj Optional instance to populate.
-   * @return {module:model/Category} The populated <code>Category</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'String');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {String} name
-   */
-  exports.prototype['name'] = undefined;
+    /**
+    * @member {Number} id
+    */
+    id = undefined;
+    /**
+    * @member {String} name
+    */
+    name = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/ClassModel.js

@@ -7,77 +7,75 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ClassModel model module.
+* @module model/ClassModel
+* @version 1.0.0
+*/
+export default class ClassModel {
+    /**
+    * Constructs a new <code>ClassModel</code>.
+    * Model for testing model with \&quot;_class\&quot; property
+    * @alias module:model/ClassModel
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ClassModel = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ClassModel</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ClassModel} obj Optional instance to populate.
+    * @return {module:model/ClassModel} The populated <code>ClassModel</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ClassModel();
 
+            
+            
+            
 
-
-  /**
-   * The ClassModel model module.
-   * @module model/ClassModel
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ClassModel</code>.
-   * Model for testing model with \&quot;_class\&quot; property
-   * @alias module:model/ClassModel
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ClassModel</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ClassModel} obj Optional instance to populate.
-   * @return {module:model/ClassModel} The populated <code>ClassModel</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('_class')) {
-        obj['_class'] = ApiClient.convertToType(data['_class'], 'String');
-      }
+            if (data.hasOwnProperty('_class')) {
+                obj['_class'] = ApiClient.convertToType(data['_class'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} _class
-   */
-  exports.prototype['_class'] = undefined;
+    /**
+    * @member {String} _class
+    */
+    _class = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/Client.js

@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Client model module.
+* @module model/Client
+* @version 1.0.0
+*/
+export default class Client {
+    /**
+    * Constructs a new <code>Client</code>.
+    * @alias module:model/Client
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Client = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Client</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Client} obj Optional instance to populate.
+    * @return {module:model/Client} The populated <code>Client</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Client();
 
+            
+            
+            
 
-
-  /**
-   * The Client model module.
-   * @module model/Client
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Client</code>.
-   * @alias module:model/Client
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>Client</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Client} obj Optional instance to populate.
-   * @return {module:model/Client} The populated <code>Client</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('client')) {
-        obj['client'] = ApiClient.convertToType(data['client'], 'String');
-      }
+            if (data.hasOwnProperty('client')) {
+                obj['client'] = ApiClient.convertToType(data['client'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} client
-   */
-  exports.prototype['client'] = undefined;
+    /**
+    * @member {String} client
+    */
+    client = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/Dog.js

@@ -7,81 +7,78 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The Dog model module.
+* @module model/Dog
+* @version 1.0.0
+*/
+export default class Dog {
+    /**
+    * Constructs a new <code>Dog</code>.
+    * @alias module:model/Dog
+    * @class
+    * @extends module:model/Animal
+    * @param className {String} 
+    */
+
+    constructor(className) {
+        
+
+        Animal.call(this, className);
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Dog = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Dog</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Dog} obj Optional instance to populate.
+    * @return {module:model/Dog} The populated <code>Dog</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Dog();
 
+            
 
+            Animal.constructFromObject(data, obj);
+            
 
-  /**
-   * The Dog model module.
-   * @module model/Dog
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Dog</code>.
-   * @alias module:model/Dog
-   * @class
-   * @extends module:model/Animal
-   * @param className {String} 
-   */
-  var exports = function(className) {
-    var _this = this;
-    Animal.call(_this, className);
-
-  };
-
-  /**
-   * Constructs a <code>Dog</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Dog} obj Optional instance to populate.
-   * @return {module:model/Dog} The populated <code>Dog</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-      Animal.constructFromObject(data, obj);
-      if (data.hasOwnProperty('breed')) {
-        obj['breed'] = ApiClient.convertToType(data['breed'], 'String');
-      }
+            if (data.hasOwnProperty('breed')) {
+                obj['breed'] = ApiClient.convertToType(data['breed'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  exports.prototype = Object.create(Animal.prototype);
-  exports.prototype.constructor = exports;
-
-  /**
-   * @member {String} breed
-   */
-  exports.prototype['breed'] = undefined;
+    /**
+    * @member {String} breed
+    */
+    breed = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/EnumArrays.js

@@ -7,118 +7,121 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The EnumArrays model module.
+* @module model/EnumArrays
+* @version 1.0.0
+*/
+export default class EnumArrays {
+    /**
+    * Constructs a new <code>EnumArrays</code>.
+    * @alias module:model/EnumArrays
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.EnumArrays = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>EnumArrays</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/EnumArrays} obj Optional instance to populate.
+    * @return {module:model/EnumArrays} The populated <code>EnumArrays</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new EnumArrays();
 
+            
+            
+            
 
-
-  /**
-   * The EnumArrays model module.
-   * @module model/EnumArrays
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>EnumArrays</code>.
-   * @alias module:model/EnumArrays
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>EnumArrays</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/EnumArrays} obj Optional instance to populate.
-   * @return {module:model/EnumArrays} The populated <code>EnumArrays</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('just_symbol')) {
-        obj['just_symbol'] = ApiClient.convertToType(data['just_symbol'], 'String');
-      }
-      if (data.hasOwnProperty('array_enum')) {
-        obj['array_enum'] = ApiClient.convertToType(data['array_enum'], ['String']);
-      }
+            if (data.hasOwnProperty('just_symbol')) {
+                obj['just_symbol'] = ApiClient.convertToType(data['just_symbol'], 'String');
+            }
+            if (data.hasOwnProperty('array_enum')) {
+                obj['array_enum'] = ApiClient.convertToType(data['array_enum'], ['String']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {module:model/EnumArrays.JustSymbolEnum} just_symbol
-   */
-  exports.prototype['just_symbol'] = undefined;
-  /**
-   * @member {Array.<module:model/EnumArrays.ArrayEnumEnum>} array_enum
-   */
-  exports.prototype['array_enum'] = undefined;
-
-
-  /**
-   * Allowed values for the <code>just_symbol</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.JustSymbolEnum = {
     /**
-     * value: ">="
-     * @const
-     */
-    "GREATER_THAN_OR_EQUAL_TO": ">=",
+    * @member {module:model/EnumArrays.JustSymbolEnum} just_symbol
+    */
+    just_symbol = undefined;
     /**
-     * value: "$"
-     * @const
-     */
-    "DOLLAR": "$"  };
+    * @member {Array.<module:model/EnumArrays.ArrayEnumEnum>} array_enum
+    */
+    array_enum = undefined;
+
+
+
+
+
 
-  /**
-   * Allowed values for the <code>arrayEnum</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.ArrayEnumEnum = {
     /**
-     * value: "fish"
-     * @const
-     */
-    "fish": "fish",
+    * Allowed values for the <code>just_symbol</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static JustSymbolEnum = {
+    
+        /**
+         * value: ">="
+         * @const
+         */
+        "GREATER_THAN_OR_EQUAL_TO": ">=",
+    
+        /**
+         * value: "$"
+         * @const
+         */
+        "DOLLAR": "$"    
+    };
+
     /**
-     * value: "crab"
-     * @const
-     */
-    "crab": "crab"  };
+    * Allowed values for the <code>arrayEnum</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static ArrayEnumEnum = {
+    
+        /**
+         * value: "fish"
+         * @const
+         */
+        "fish": "fish",
+    
+        /**
+         * value: "crab"
+         * @const
+         */
+        "crab": "crab"    
+    };
 
 
-  return exports;
-}));
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/EnumClass.js

@@ -7,63 +7,51 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+/**
+* Enum class EnumClass.
+* @enum {}
+* @readonly
+*/
+export default class EnumClass {
+    
+        /**
+         * value: "_abc"
+         * @const
+         */
+        _abc = "_abc";
+
+    
+        /**
+         * value: "-efg"
+         * @const
+         */
+        -efg = "-efg";
+
+    
+        /**
+         * value: "(xyz)"
+         * @const
+         */
+        (xyz) = "(xyz)";
+
+    
+
+    /**
+    * Returns a <code>EnumClass</code> enum value from a Javascript object name.
+    * @param {Object} data The plain JavaScript object containing the name of the enum value.
+    * @return {module:model/EnumClass} The enum <code>EnumClass</code> value.
+    */
+    static constructFromObject(object) {
+        return object;
     }
-    root.SwaggerPetstore.EnumClass = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
-
-
-  /**
-   * Enum class EnumClass.
-   * @enum {}
-   * @readonly
-   */
-  var exports = {
-    /**
-     * value: "_abc"
-     * @const
-     */
-    "_abc": "_abc",
-    /**
-     * value: "-efg"
-     * @const
-     */
-    "-efg": "-efg",
-    /**
-     * value: "(xyz)"
-     * @const
-     */
-    "(xyz)": "(xyz)"  };
-
-  /**
-   * Returns a <code>EnumClass</code> enum value from a Javascript object name.
-   * @param {Object} data The plain JavaScript object containing the name of the enum value.
-   * @return {module:model/EnumClass} The enum <code>EnumClass</code> value.
-   */
-  exports.constructFromObject = function(object) {
-    return object;
-  }
-
-  return exports;
-}));
+}
 
 

samples/client/petstore/javascript-es6/src/model/EnumTest.js

@@ -7,156 +7,162 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/OuterEnum'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./OuterEnum'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import OuterEnum from './OuterEnum';
+
+
+
+
+
+/**
+* The EnumTest model module.
+* @module model/EnumTest
+* @version 1.0.0
+*/
+export default class EnumTest {
+    /**
+    * Constructs a new <code>EnumTest</code>.
+    * @alias module:model/EnumTest
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.EnumTest = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.OuterEnum);
-  }
-}(this, function(ApiClient, OuterEnum) {
-  'use strict';
 
+    /**
+    * Constructs a <code>EnumTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/EnumTest} obj Optional instance to populate.
+    * @return {module:model/EnumTest} The populated <code>EnumTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new EnumTest();
 
+            
+            
+            
 
-
-  /**
-   * The EnumTest model module.
-   * @module model/EnumTest
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>EnumTest</code>.
-   * @alias module:model/EnumTest
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>EnumTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/EnumTest} obj Optional instance to populate.
-   * @return {module:model/EnumTest} The populated <code>EnumTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('enum_string')) {
-        obj['enum_string'] = ApiClient.convertToType(data['enum_string'], 'String');
-      }
-      if (data.hasOwnProperty('enum_integer')) {
-        obj['enum_integer'] = ApiClient.convertToType(data['enum_integer'], 'Number');
-      }
-      if (data.hasOwnProperty('enum_number')) {
-        obj['enum_number'] = ApiClient.convertToType(data['enum_number'], 'Number');
-      }
-      if (data.hasOwnProperty('outerEnum')) {
-        obj['outerEnum'] = OuterEnum.constructFromObject(data['outerEnum']);
-      }
+            if (data.hasOwnProperty('enum_string')) {
+                obj['enum_string'] = ApiClient.convertToType(data['enum_string'], 'String');
+            }
+            if (data.hasOwnProperty('enum_integer')) {
+                obj['enum_integer'] = ApiClient.convertToType(data['enum_integer'], 'Number');
+            }
+            if (data.hasOwnProperty('enum_number')) {
+                obj['enum_number'] = ApiClient.convertToType(data['enum_number'], 'Number');
+            }
+            if (data.hasOwnProperty('outerEnum')) {
+                obj['outerEnum'] = OuterEnum.constructFromObject(data['outerEnum']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {module:model/EnumTest.EnumStringEnum} enum_string
-   */
-  exports.prototype['enum_string'] = undefined;
-  /**
-   * @member {module:model/EnumTest.EnumIntegerEnum} enum_integer
-   */
-  exports.prototype['enum_integer'] = undefined;
-  /**
-   * @member {module:model/EnumTest.EnumNumberEnum} enum_number
-   */
-  exports.prototype['enum_number'] = undefined;
-  /**
-   * @member {module:model/OuterEnum} outerEnum
-   */
-  exports.prototype['outerEnum'] = undefined;
-
-
-  /**
-   * Allowed values for the <code>enum_string</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.EnumStringEnum = {
     /**
-     * value: "UPPER"
-     * @const
-     */
-    "UPPER": "UPPER",
+    * @member {module:model/EnumTest.EnumStringEnum} enum_string
+    */
+    enum_string = undefined;
     /**
-     * value: "lower"
-     * @const
-     */
-    "lower": "lower",
+    * @member {module:model/EnumTest.EnumIntegerEnum} enum_integer
+    */
+    enum_integer = undefined;
     /**
-     * value: ""
-     * @const
-     */
-    "empty": ""  };
-
-  /**
-   * Allowed values for the <code>enum_integer</code> property.
-   * @enum {Number}
-   * @readonly
-   */
-  exports.EnumIntegerEnum = {
+    * @member {module:model/EnumTest.EnumNumberEnum} enum_number
+    */
+    enum_number = undefined;
     /**
-     * value: 1
-     * @const
-     */
-    "1": 1,
-    /**
-     * value: -1
-     * @const
-     */
-    "-1": -1  };
-
-  /**
-   * Allowed values for the <code>enum_number</code> property.
-   * @enum {Number}
-   * @readonly
-   */
-  exports.EnumNumberEnum = {
-    /**
-     * value: 1.1
-     * @const
-     */
-    "1.1": 1.1,
-    /**
-     * value: -1.2
-     * @const
-     */
-    "-1.2": -1.2  };
+    * @member {module:model/OuterEnum} outerEnum
+    */
+    outerEnum = undefined;
 
 
-  return exports;
-}));
+
+
+
+
+    /**
+    * Allowed values for the <code>enum_string</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static EnumStringEnum = {
+    
+        /**
+         * value: "UPPER"
+         * @const
+         */
+        "UPPER": "UPPER",
+    
+        /**
+         * value: "lower"
+         * @const
+         */
+        "lower": "lower",
+    
+        /**
+         * value: ""
+         * @const
+         */
+        "empty": ""    
+    };
+
+    /**
+    * Allowed values for the <code>enum_integer</code> property.
+    * @enum {Number}
+    * @readonly
+    */
+    static EnumIntegerEnum = {
+    
+        /**
+         * value: 1
+         * @const
+         */
+        "1": 1,
+    
+        /**
+         * value: -1
+         * @const
+         */
+        "-1": -1    
+    };
+
+    /**
+    * Allowed values for the <code>enum_number</code> property.
+    * @enum {Number}
+    * @readonly
+    */
+    static EnumNumberEnum = {
+    
+        /**
+         * value: 1.1
+         * @const
+         */
+        "1.1": 1.1,
+    
+        /**
+         * value: -1.2
+         * @const
+         */
+        "-1.2": -1.2    
+    };
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/FormatTest.js

@@ -7,176 +7,162 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The FormatTest model module.
+* @module model/FormatTest
+* @version 1.0.0
+*/
+export default class FormatTest {
+    /**
+    * Constructs a new <code>FormatTest</code>.
+    * @alias module:model/FormatTest
+    * @class
+    * @param _number {Number} 
+    * @param _byte {Blob} 
+    * @param _date {Date} 
+    * @param password {String} 
+    */
+
+    constructor(_number, _byte, _date, password) {
+        
+
+        
+        
+
+        this['number'] = _number;this['byte'] = _byte;this['date'] = _date;this['password'] = password;
+
+        
     }
-    root.SwaggerPetstore.FormatTest = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>FormatTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/FormatTest} obj Optional instance to populate.
+    * @return {module:model/FormatTest} The populated <code>FormatTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new FormatTest();
 
+            
+            
+            
 
-
-  /**
-   * The FormatTest model module.
-   * @module model/FormatTest
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>FormatTest</code>.
-   * @alias module:model/FormatTest
-   * @class
-   * @param _number {Number} 
-   * @param _byte {Blob} 
-   * @param _date {Date} 
-   * @param password {String} 
-   */
-  var exports = function(_number, _byte, _date, password) {
-    var _this = this;
-
-
-
-
-    _this['number'] = _number;
-
-
-
-    _this['byte'] = _byte;
-
-    _this['date'] = _date;
-
-
-    _this['password'] = password;
-  };
-
-  /**
-   * Constructs a <code>FormatTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/FormatTest} obj Optional instance to populate.
-   * @return {module:model/FormatTest} The populated <code>FormatTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('integer')) {
-        obj['integer'] = ApiClient.convertToType(data['integer'], 'Number');
-      }
-      if (data.hasOwnProperty('int32')) {
-        obj['int32'] = ApiClient.convertToType(data['int32'], 'Number');
-      }
-      if (data.hasOwnProperty('int64')) {
-        obj['int64'] = ApiClient.convertToType(data['int64'], 'Number');
-      }
-      if (data.hasOwnProperty('number')) {
-        obj['number'] = ApiClient.convertToType(data['number'], 'Number');
-      }
-      if (data.hasOwnProperty('float')) {
-        obj['float'] = ApiClient.convertToType(data['float'], 'Number');
-      }
-      if (data.hasOwnProperty('double')) {
-        obj['double'] = ApiClient.convertToType(data['double'], 'Number');
-      }
-      if (data.hasOwnProperty('string')) {
-        obj['string'] = ApiClient.convertToType(data['string'], 'String');
-      }
-      if (data.hasOwnProperty('byte')) {
-        obj['byte'] = ApiClient.convertToType(data['byte'], 'Blob');
-      }
-      if (data.hasOwnProperty('binary')) {
-        obj['binary'] = ApiClient.convertToType(data['binary'], 'Blob');
-      }
-      if (data.hasOwnProperty('date')) {
-        obj['date'] = ApiClient.convertToType(data['date'], 'Date');
-      }
-      if (data.hasOwnProperty('dateTime')) {
-        obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
-      }
-      if (data.hasOwnProperty('uuid')) {
-        obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
-      }
-      if (data.hasOwnProperty('password')) {
-        obj['password'] = ApiClient.convertToType(data['password'], 'String');
-      }
+            if (data.hasOwnProperty('integer')) {
+                obj['integer'] = ApiClient.convertToType(data['integer'], 'Number');
+            }
+            if (data.hasOwnProperty('int32')) {
+                obj['int32'] = ApiClient.convertToType(data['int32'], 'Number');
+            }
+            if (data.hasOwnProperty('int64')) {
+                obj['int64'] = ApiClient.convertToType(data['int64'], 'Number');
+            }
+            if (data.hasOwnProperty('number')) {
+                obj['number'] = ApiClient.convertToType(data['number'], 'Number');
+            }
+            if (data.hasOwnProperty('float')) {
+                obj['float'] = ApiClient.convertToType(data['float'], 'Number');
+            }
+            if (data.hasOwnProperty('double')) {
+                obj['double'] = ApiClient.convertToType(data['double'], 'Number');
+            }
+            if (data.hasOwnProperty('string')) {
+                obj['string'] = ApiClient.convertToType(data['string'], 'String');
+            }
+            if (data.hasOwnProperty('byte')) {
+                obj['byte'] = ApiClient.convertToType(data['byte'], 'Blob');
+            }
+            if (data.hasOwnProperty('binary')) {
+                obj['binary'] = ApiClient.convertToType(data['binary'], 'Blob');
+            }
+            if (data.hasOwnProperty('date')) {
+                obj['date'] = ApiClient.convertToType(data['date'], 'Date');
+            }
+            if (data.hasOwnProperty('dateTime')) {
+                obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
+            }
+            if (data.hasOwnProperty('uuid')) {
+                obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
+            }
+            if (data.hasOwnProperty('password')) {
+                obj['password'] = ApiClient.convertToType(data['password'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} integer
-   */
-  exports.prototype['integer'] = undefined;
-  /**
-   * @member {Number} int32
-   */
-  exports.prototype['int32'] = undefined;
-  /**
-   * @member {Number} int64
-   */
-  exports.prototype['int64'] = undefined;
-  /**
-   * @member {Number} number
-   */
-  exports.prototype['number'] = undefined;
-  /**
-   * @member {Number} float
-   */
-  exports.prototype['float'] = undefined;
-  /**
-   * @member {Number} double
-   */
-  exports.prototype['double'] = undefined;
-  /**
-   * @member {String} string
-   */
-  exports.prototype['string'] = undefined;
-  /**
-   * @member {Blob} byte
-   */
-  exports.prototype['byte'] = undefined;
-  /**
-   * @member {Blob} binary
-   */
-  exports.prototype['binary'] = undefined;
-  /**
-   * @member {Date} date
-   */
-  exports.prototype['date'] = undefined;
-  /**
-   * @member {Date} dateTime
-   */
-  exports.prototype['dateTime'] = undefined;
-  /**
-   * @member {String} uuid
-   */
-  exports.prototype['uuid'] = undefined;
-  /**
-   * @member {String} password
-   */
-  exports.prototype['password'] = undefined;
+    /**
+    * @member {Number} integer
+    */
+    integer = undefined;
+    /**
+    * @member {Number} int32
+    */
+    int32 = undefined;
+    /**
+    * @member {Number} int64
+    */
+    int64 = undefined;
+    /**
+    * @member {Number} number
+    */
+    number = undefined;
+    /**
+    * @member {Number} float
+    */
+    float = undefined;
+    /**
+    * @member {Number} double
+    */
+    double = undefined;
+    /**
+    * @member {String} string
+    */
+    string = undefined;
+    /**
+    * @member {Blob} byte
+    */
+    byte = undefined;
+    /**
+    * @member {Blob} binary
+    */
+    binary = undefined;
+    /**
+    * @member {Date} date
+    */
+    date = undefined;
+    /**
+    * @member {Date} dateTime
+    */
+    dateTime = undefined;
+    /**
+    * @member {String} uuid
+    */
+    uuid = undefined;
+    /**
+    * @member {String} password
+    */
+    password = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/HasOnlyReadOnly.js

@@ -7,84 +7,81 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The HasOnlyReadOnly model module.
+* @module model/HasOnlyReadOnly
+* @version 1.0.0
+*/
+export default class HasOnlyReadOnly {
+    /**
+    * Constructs a new <code>HasOnlyReadOnly</code>.
+    * @alias module:model/HasOnlyReadOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.HasOnlyReadOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>HasOnlyReadOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/HasOnlyReadOnly} obj Optional instance to populate.
+    * @return {module:model/HasOnlyReadOnly} The populated <code>HasOnlyReadOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new HasOnlyReadOnly();
 
+            
+            
+            
 
-
-  /**
-   * The HasOnlyReadOnly model module.
-   * @module model/HasOnlyReadOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>HasOnlyReadOnly</code>.
-   * @alias module:model/HasOnlyReadOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>HasOnlyReadOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/HasOnlyReadOnly} obj Optional instance to populate.
-   * @return {module:model/HasOnlyReadOnly} The populated <code>HasOnlyReadOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('bar')) {
-        obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
-      }
-      if (data.hasOwnProperty('foo')) {
-        obj['foo'] = ApiClient.convertToType(data['foo'], 'String');
-      }
+            if (data.hasOwnProperty('bar')) {
+                obj['bar'] = ApiClient.convertToType(data['bar'], 'String');
+            }
+            if (data.hasOwnProperty('foo')) {
+                obj['foo'] = ApiClient.convertToType(data['foo'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} bar
-   */
-  exports.prototype['bar'] = undefined;
-  /**
-   * @member {String} foo
-   */
-  exports.prototype['foo'] = undefined;
+    /**
+    * @member {String} bar
+    */
+    bar = undefined;
+    /**
+    * @member {String} foo
+    */
+    foo = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/List.js

@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The List model module.
+* @module model/List
+* @version 1.0.0
+*/
+export default class List {
+    /**
+    * Constructs a new <code>List</code>.
+    * @alias module:model/List
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.List = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>List</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/List} obj Optional instance to populate.
+    * @return {module:model/List} The populated <code>List</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new List();
 
+            
+            
+            
 
-
-  /**
-   * The List model module.
-   * @module model/List
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>List</code>.
-   * @alias module:model/List
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>List</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/List} obj Optional instance to populate.
-   * @return {module:model/List} The populated <code>List</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('123-list')) {
-        obj['123-list'] = ApiClient.convertToType(data['123-list'], 'String');
-      }
+            if (data.hasOwnProperty('123-list')) {
+                obj['123-list'] = ApiClient.convertToType(data['123-list'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} 123-list
-   */
-  exports.prototype['123-list'] = undefined;
+    /**
+    * @member {String} 123-list
+    */
+    123-list = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/MapTest.js

@@ -7,101 +7,101 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
-    }
-    root.SwaggerPetstore.MapTest = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
+
+import ApiClient from '../ApiClient';
 
 
 
 
-  /**
-   * The MapTest model module.
-   * @module model/MapTest
-   * @version 1.0.0
-   */
 
-  /**
-   * Constructs a new <code>MapTest</code>.
-   * @alias module:model/MapTest
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>MapTest</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/MapTest} obj Optional instance to populate.
-   * @return {module:model/MapTest} The populated <code>MapTest</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('map_map_of_string')) {
-        obj['map_map_of_string'] = ApiClient.convertToType(data['map_map_of_string'], {'String': {'String': 'String'}});
-      }
-      if (data.hasOwnProperty('map_of_enum_string')) {
-        obj['map_of_enum_string'] = ApiClient.convertToType(data['map_of_enum_string'], {'String': 'String'});
-      }
-    }
-    return obj;
-  }
-
-  /**
-   * @member {Object.<String, Object.<String, String>>} map_map_of_string
-   */
-  exports.prototype['map_map_of_string'] = undefined;
-  /**
-   * @member {Object.<String, module:model/MapTest.InnerEnum>} map_of_enum_string
-   */
-  exports.prototype['map_of_enum_string'] = undefined;
-
-
-  /**
-   * Allowed values for the <code>inner</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.InnerEnum = {
+/**
+* The MapTest model module.
+* @module model/MapTest
+* @version 1.0.0
+*/
+export default class MapTest {
     /**
-     * value: "UPPER"
-     * @const
-     */
-    "UPPER": "UPPER",
+    * Constructs a new <code>MapTest</code>.
+    * @alias module:model/MapTest
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
+    }
+
     /**
-     * value: "lower"
-     * @const
-     */
-    "lower": "lower"  };
+    * Constructs a <code>MapTest</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/MapTest} obj Optional instance to populate.
+    * @return {module:model/MapTest} The populated <code>MapTest</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new MapTest();
+
+            
+            
+            
+
+            if (data.hasOwnProperty('map_map_of_string')) {
+                obj['map_map_of_string'] = ApiClient.convertToType(data['map_map_of_string'], {'String': {'String': 'String'}});
+            }
+            if (data.hasOwnProperty('map_of_enum_string')) {
+                obj['map_of_enum_string'] = ApiClient.convertToType(data['map_of_enum_string'], {'String': 'String'});
+            }
+        }
+        return obj;
+    }
+
+    /**
+    * @member {Object.<String, Object.<String, String>>} map_map_of_string
+    */
+    map_map_of_string = undefined;
+    /**
+    * @member {Object.<String, module:model/MapTest.InnerEnum>} map_of_enum_string
+    */
+    map_of_enum_string = undefined;
 
 
-  return exports;
-}));
+
+
+
+
+    /**
+    * Allowed values for the <code>inner</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static InnerEnum = {
+    
+        /**
+         * value: "UPPER"
+         * @const
+         */
+        "UPPER": "UPPER",
+    
+        /**
+         * value: "lower"
+         * @const
+         */
+        "lower": "lower"    
+    };
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js

@@ -7,92 +7,89 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/Animal'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./Animal'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import Animal from './Animal';
+
+
+
+
+
+/**
+* The MixedPropertiesAndAdditionalPropertiesClass model module.
+* @module model/MixedPropertiesAndAdditionalPropertiesClass
+* @version 1.0.0
+*/
+export default class MixedPropertiesAndAdditionalPropertiesClass {
+    /**
+    * Constructs a new <code>MixedPropertiesAndAdditionalPropertiesClass</code>.
+    * @alias module:model/MixedPropertiesAndAdditionalPropertiesClass
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.MixedPropertiesAndAdditionalPropertiesClass = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.Animal);
-  }
-}(this, function(ApiClient, Animal) {
-  'use strict';
 
+    /**
+    * Constructs a <code>MixedPropertiesAndAdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/MixedPropertiesAndAdditionalPropertiesClass} obj Optional instance to populate.
+    * @return {module:model/MixedPropertiesAndAdditionalPropertiesClass} The populated <code>MixedPropertiesAndAdditionalPropertiesClass</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new MixedPropertiesAndAdditionalPropertiesClass();
 
+            
+            
+            
 
-
-  /**
-   * The MixedPropertiesAndAdditionalPropertiesClass model module.
-   * @module model/MixedPropertiesAndAdditionalPropertiesClass
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>MixedPropertiesAndAdditionalPropertiesClass</code>.
-   * @alias module:model/MixedPropertiesAndAdditionalPropertiesClass
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>MixedPropertiesAndAdditionalPropertiesClass</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/MixedPropertiesAndAdditionalPropertiesClass} obj Optional instance to populate.
-   * @return {module:model/MixedPropertiesAndAdditionalPropertiesClass} The populated <code>MixedPropertiesAndAdditionalPropertiesClass</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('uuid')) {
-        obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
-      }
-      if (data.hasOwnProperty('dateTime')) {
-        obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
-      }
-      if (data.hasOwnProperty('map')) {
-        obj['map'] = ApiClient.convertToType(data['map'], {'String': Animal});
-      }
+            if (data.hasOwnProperty('uuid')) {
+                obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String');
+            }
+            if (data.hasOwnProperty('dateTime')) {
+                obj['dateTime'] = ApiClient.convertToType(data['dateTime'], 'Date');
+            }
+            if (data.hasOwnProperty('map')) {
+                obj['map'] = ApiClient.convertToType(data['map'], {'String': Animal});
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {String} uuid
-   */
-  exports.prototype['uuid'] = undefined;
-  /**
-   * @member {Date} dateTime
-   */
-  exports.prototype['dateTime'] = undefined;
-  /**
-   * @member {Object.<String, module:model/Animal>} map
-   */
-  exports.prototype['map'] = undefined;
+    /**
+    * @member {String} uuid
+    */
+    uuid = undefined;
+    /**
+    * @member {Date} dateTime
+    */
+    dateTime = undefined;
+    /**
+    * @member {Object.<String, module:model/Animal>} map
+    */
+    map = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/Model200Response.js

@@ -7,85 +7,82 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Model200Response model module.
+* @module model/Model200Response
+* @version 1.0.0
+*/
+export default class Model200Response {
+    /**
+    * Constructs a new <code>Model200Response</code>.
+    * Model for testing model name starting with number
+    * @alias module:model/Model200Response
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Model200Response = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Model200Response</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Model200Response} obj Optional instance to populate.
+    * @return {module:model/Model200Response} The populated <code>Model200Response</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Model200Response();
 
+            
+            
+            
 
-
-  /**
-   * The Model200Response model module.
-   * @module model/Model200Response
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Model200Response</code>.
-   * Model for testing model name starting with number
-   * @alias module:model/Model200Response
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Model200Response</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Model200Response} obj Optional instance to populate.
-   * @return {module:model/Model200Response} The populated <code>Model200Response</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'Number');
-      }
-      if (data.hasOwnProperty('class')) {
-        obj['class'] = ApiClient.convertToType(data['class'], 'String');
-      }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'Number');
+            }
+            if (data.hasOwnProperty('class')) {
+                obj['class'] = ApiClient.convertToType(data['class'], 'String');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} name
-   */
-  exports.prototype['name'] = undefined;
-  /**
-   * @member {String} class
-   */
-  exports.prototype['class'] = undefined;
+    /**
+    * @member {Number} name
+    */
+    name = undefined;
+    /**
+    * @member {String} class
+    */
+    class = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/ModelReturn.js

@@ -7,77 +7,75 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The ModelReturn model module.
+* @module model/ModelReturn
+* @version 1.0.0
+*/
+export default class ModelReturn {
+    /**
+    * Constructs a new <code>ModelReturn</code>.
+    * Model for testing reserved words
+    * @alias module:model/ModelReturn
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.ModelReturn = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>ModelReturn</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/ModelReturn} obj Optional instance to populate.
+    * @return {module:model/ModelReturn} The populated <code>ModelReturn</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new ModelReturn();
 
+            
+            
+            
 
-
-  /**
-   * The ModelReturn model module.
-   * @module model/ModelReturn
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>ModelReturn</code>.
-   * Model for testing reserved words
-   * @alias module:model/ModelReturn
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>ModelReturn</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/ModelReturn} obj Optional instance to populate.
-   * @return {module:model/ModelReturn} The populated <code>ModelReturn</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('return')) {
-        obj['return'] = ApiClient.convertToType(data['return'], 'Number');
-      }
+            if (data.hasOwnProperty('return')) {
+                obj['return'] = ApiClient.convertToType(data['return'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} return
-   */
-  exports.prototype['return'] = undefined;
+    /**
+    * @member {Number} return
+    */
+    return = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/Name.js

@@ -7,102 +7,97 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Name model module.
+* @module model/Name
+* @version 1.0.0
+*/
+export default class Name {
+    /**
+    * Constructs a new <code>Name</code>.
+    * Model for testing model name same as property name
+    * @alias module:model/Name
+    * @class
+    * @param name {Number} 
+    */
+
+    constructor(name) {
+        
+
+        
+        
+
+        this['name'] = name;
+
+        
     }
-    root.SwaggerPetstore.Name = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Name</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Name} obj Optional instance to populate.
+    * @return {module:model/Name} The populated <code>Name</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Name();
 
+            
+            
+            
 
-
-  /**
-   * The Name model module.
-   * @module model/Name
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Name</code>.
-   * Model for testing model name same as property name
-   * @alias module:model/Name
-   * @class
-   * @param name {Number} 
-   */
-  var exports = function(name) {
-    var _this = this;
-
-    _this['name'] = name;
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Name</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Name} obj Optional instance to populate.
-   * @return {module:model/Name} The populated <code>Name</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('name')) {
-        obj['name'] = ApiClient.convertToType(data['name'], 'Number');
-      }
-      if (data.hasOwnProperty('snake_case')) {
-        obj['snake_case'] = ApiClient.convertToType(data['snake_case'], 'Number');
-      }
-      if (data.hasOwnProperty('property')) {
-        obj['property'] = ApiClient.convertToType(data['property'], 'String');
-      }
-      if (data.hasOwnProperty('123Number')) {
-        obj['123Number'] = ApiClient.convertToType(data['123Number'], 'Number');
-      }
+            if (data.hasOwnProperty('name')) {
+                obj['name'] = ApiClient.convertToType(data['name'], 'Number');
+            }
+            if (data.hasOwnProperty('snake_case')) {
+                obj['snake_case'] = ApiClient.convertToType(data['snake_case'], 'Number');
+            }
+            if (data.hasOwnProperty('property')) {
+                obj['property'] = ApiClient.convertToType(data['property'], 'String');
+            }
+            if (data.hasOwnProperty('123Number')) {
+                obj['123Number'] = ApiClient.convertToType(data['123Number'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} name
-   */
-  exports.prototype['name'] = undefined;
-  /**
-   * @member {Number} snake_case
-   */
-  exports.prototype['snake_case'] = undefined;
-  /**
-   * @member {String} property
-   */
-  exports.prototype['property'] = undefined;
-  /**
-   * @member {Number} 123Number
-   */
-  exports.prototype['123Number'] = undefined;
+    /**
+    * @member {Number} name
+    */
+    name = undefined;
+    /**
+    * @member {Number} snake_case
+    */
+    snake_case = undefined;
+    /**
+    * @member {String} property
+    */
+    property = undefined;
+    /**
+    * @member {Number} 123Number
+    */
+    123Number = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/NumberOnly.js

@@ -7,76 +7,74 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The NumberOnly model module.
+* @module model/NumberOnly
+* @version 1.0.0
+*/
+export default class NumberOnly {
+    /**
+    * Constructs a new <code>NumberOnly</code>.
+    * @alias module:model/NumberOnly
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.NumberOnly = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>NumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/NumberOnly} obj Optional instance to populate.
+    * @return {module:model/NumberOnly} The populated <code>NumberOnly</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new NumberOnly();
 
+            
+            
+            
 
-
-  /**
-   * The NumberOnly model module.
-   * @module model/NumberOnly
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>NumberOnly</code>.
-   * @alias module:model/NumberOnly
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-  };
-
-  /**
-   * Constructs a <code>NumberOnly</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/NumberOnly} obj Optional instance to populate.
-   * @return {module:model/NumberOnly} The populated <code>NumberOnly</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('JustNumber')) {
-        obj['JustNumber'] = ApiClient.convertToType(data['JustNumber'], 'Number');
-      }
+            if (data.hasOwnProperty('JustNumber')) {
+                obj['JustNumber'] = ApiClient.convertToType(data['JustNumber'], 'Number');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} JustNumber
-   */
-  exports.prototype['JustNumber'] = undefined;
+    /**
+    * @member {Number} JustNumber
+    */
+    JustNumber = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/Order.js

@@ -7,140 +7,137 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The Order model module.
+* @module model/Order
+* @version 1.0.0
+*/
+export default class Order {
+    /**
+    * Constructs a new <code>Order</code>.
+    * @alias module:model/Order
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.Order = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>Order</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/Order} obj Optional instance to populate.
+    * @return {module:model/Order} The populated <code>Order</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Order();
 
+            
+            
+            
 
-
-  /**
-   * The Order model module.
-   * @module model/Order
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>Order</code>.
-   * @alias module:model/Order
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>Order</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/Order} obj Optional instance to populate.
-   * @return {module:model/Order} The populated <code>Order</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('id')) {
-        obj['id'] = ApiClient.convertToType(data['id'], 'Number');
-      }
-      if (data.hasOwnProperty('petId')) {
-        obj['petId'] = ApiClient.convertToType(data['petId'], 'Number');
-      }
-      if (data.hasOwnProperty('quantity')) {
-        obj['quantity'] = ApiClient.convertToType(data['quantity'], 'Number');
-      }
-      if (data.hasOwnProperty('shipDate')) {
-        obj['shipDate'] = ApiClient.convertToType(data['shipDate'], 'Date');
-      }
-      if (data.hasOwnProperty('status')) {
-        obj['status'] = ApiClient.convertToType(data['status'], 'String');
-      }
-      if (data.hasOwnProperty('complete')) {
-        obj['complete'] = ApiClient.convertToType(data['complete'], 'Boolean');
-      }
+            if (data.hasOwnProperty('id')) {
+                obj['id'] = ApiClient.convertToType(data['id'], 'Number');
+            }
+            if (data.hasOwnProperty('petId')) {
+                obj['petId'] = ApiClient.convertToType(data['petId'], 'Number');
+            }
+            if (data.hasOwnProperty('quantity')) {
+                obj['quantity'] = ApiClient.convertToType(data['quantity'], 'Number');
+            }
+            if (data.hasOwnProperty('shipDate')) {
+                obj['shipDate'] = ApiClient.convertToType(data['shipDate'], 'Date');
+            }
+            if (data.hasOwnProperty('status')) {
+                obj['status'] = ApiClient.convertToType(data['status'], 'String');
+            }
+            if (data.hasOwnProperty('complete')) {
+                obj['complete'] = ApiClient.convertToType(data['complete'], 'Boolean');
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {Number} id
-   */
-  exports.prototype['id'] = undefined;
-  /**
-   * @member {Number} petId
-   */
-  exports.prototype['petId'] = undefined;
-  /**
-   * @member {Number} quantity
-   */
-  exports.prototype['quantity'] = undefined;
-  /**
-   * @member {Date} shipDate
-   */
-  exports.prototype['shipDate'] = undefined;
-  /**
-   * Order Status
-   * @member {module:model/Order.StatusEnum} status
-   */
-  exports.prototype['status'] = undefined;
-  /**
-   * @member {Boolean} complete
-   * @default false
-   */
-  exports.prototype['complete'] = false;
-
-
-  /**
-   * Allowed values for the <code>status</code> property.
-   * @enum {String}
-   * @readonly
-   */
-  exports.StatusEnum = {
     /**
-     * value: "placed"
-     * @const
-     */
-    "placed": "placed",
+    * @member {Number} id
+    */
+    id = undefined;
     /**
-     * value: "approved"
-     * @const
-     */
-    "approved": "approved",
+    * @member {Number} petId
+    */
+    petId = undefined;
     /**
-     * value: "delivered"
-     * @const
-     */
-    "delivered": "delivered"  };
+    * @member {Number} quantity
+    */
+    quantity = undefined;
+    /**
+    * @member {Date} shipDate
+    */
+    shipDate = undefined;
+    /**
+    * Order Status
+    * @member {module:model/Order.StatusEnum} status
+    */
+    status = undefined;
+    /**
+    * @member {Boolean} complete
+    * @default false
+    */
+    complete = false;
 
 
-  return exports;
-}));
+
+
+
+
+    /**
+    * Allowed values for the <code>status</code> property.
+    * @enum {String}
+    * @readonly
+    */
+    static StatusEnum = {
+    
+        /**
+         * value: "placed"
+         * @const
+         */
+        "placed": "placed",
+    
+        /**
+         * value: "approved"
+         * @const
+         */
+        "approved": "approved",
+    
+        /**
+         * value: "delivered"
+         * @const
+         */
+        "delivered": "delivered"    
+    };
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/OuterBoolean.js

@@ -7,68 +7,67 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+
+
+
+/**
+* The OuterBoolean model module.
+* @module model/OuterBoolean
+* @version 1.0.0
+*/
+export default class OuterBoolean {
+    /**
+    * Constructs a new <code>OuterBoolean</code>.
+    * @alias module:model/OuterBoolean
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.OuterBoolean = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
 
+    /**
+    * Constructs a <code>OuterBoolean</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/OuterBoolean} obj Optional instance to populate.
+    * @return {module:model/OuterBoolean} The populated <code>OuterBoolean</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterBoolean();
 
+            
+            
+            
 
-
-  /**
-   * The OuterBoolean model module.
-   * @module model/OuterBoolean
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>OuterBoolean</code>.
-   * @alias module:model/OuterBoolean
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-  };
-
-  /**
-   * Constructs a <code>OuterBoolean</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/OuterBoolean} obj Optional instance to populate.
-   * @return {module:model/OuterBoolean} The populated <code>OuterBoolean</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
+        }
+        return obj;
     }
-    return obj;
-  }
 
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/OuterComposite.js

@@ -7,92 +7,91 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient', 'model/OuterBoolean', 'model/OuterNumber', 'model/OuterString'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'), require('./OuterBoolean'), require('./OuterNumber'), require('./OuterString'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+import OuterBoolean from './OuterBoolean';
+import OuterNumber from './OuterNumber';
+import OuterString from './OuterString';
+
+
+
+
+
+/**
+* The OuterComposite model module.
+* @module model/OuterComposite
+* @version 1.0.0
+*/
+export default class OuterComposite {
+    /**
+    * Constructs a new <code>OuterComposite</code>.
+    * @alias module:model/OuterComposite
+    * @class
+    */
+
+    constructor() {
+        
+
+        
+        
+
+        
+
+        
     }
-    root.SwaggerPetstore.OuterComposite = factory(root.SwaggerPetstore.ApiClient, root.SwaggerPetstore.OuterBoolean, root.SwaggerPetstore.OuterNumber, root.SwaggerPetstore.OuterString);
-  }
-}(this, function(ApiClient, OuterBoolean, OuterNumber, OuterString) {
-  'use strict';
 
+    /**
+    * Constructs a <code>OuterComposite</code> from a plain JavaScript object, optionally creating a new instance.
+    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+    * @param {Object} data The plain JavaScript object bearing properties of interest.
+    * @param {module:model/OuterComposite} obj Optional instance to populate.
+    * @return {module:model/OuterComposite} The populated <code>OuterComposite</code> instance.
+    */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterComposite();
 
+            
+            
+            
 
-
-  /**
-   * The OuterComposite model module.
-   * @module model/OuterComposite
-   * @version 1.0.0
-   */
-
-  /**
-   * Constructs a new <code>OuterComposite</code>.
-   * @alias module:model/OuterComposite
-   * @class
-   */
-  var exports = function() {
-    var _this = this;
-
-
-
-
-  };
-
-  /**
-   * Constructs a <code>OuterComposite</code> from a plain JavaScript object, optionally creating a new instance.
-   * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-   * @param {Object} data The plain JavaScript object bearing properties of interest.
-   * @param {module:model/OuterComposite} obj Optional instance to populate.
-   * @return {module:model/OuterComposite} The populated <code>OuterComposite</code> instance.
-   */
-  exports.constructFromObject = function(data, obj) {
-    if (data) {
-      obj = obj || new exports();
-
-      if (data.hasOwnProperty('my_number')) {
-        obj['my_number'] = OuterNumber.constructFromObject(data['my_number']);
-      }
-      if (data.hasOwnProperty('my_string')) {
-        obj['my_string'] = OuterString.constructFromObject(data['my_string']);
-      }
-      if (data.hasOwnProperty('my_boolean')) {
-        obj['my_boolean'] = OuterBoolean.constructFromObject(data['my_boolean']);
-      }
+            if (data.hasOwnProperty('my_number')) {
+                obj['my_number'] = OuterNumber.constructFromObject(data['my_number']);
+            }
+            if (data.hasOwnProperty('my_string')) {
+                obj['my_string'] = OuterString.constructFromObject(data['my_string']);
+            }
+            if (data.hasOwnProperty('my_boolean')) {
+                obj['my_boolean'] = OuterBoolean.constructFromObject(data['my_boolean']);
+            }
+        }
+        return obj;
     }
-    return obj;
-  }
 
-  /**
-   * @member {module:model/OuterNumber} my_number
-   */
-  exports.prototype['my_number'] = undefined;
-  /**
-   * @member {module:model/OuterString} my_string
-   */
-  exports.prototype['my_string'] = undefined;
-  /**
-   * @member {module:model/OuterBoolean} my_boolean
-   */
-  exports.prototype['my_boolean'] = undefined;
+    /**
+    * @member {module:model/OuterNumber} my_number
+    */
+    my_number = undefined;
+    /**
+    * @member {module:model/OuterString} my_string
+    */
+    my_string = undefined;
+    /**
+    * @member {module:model/OuterBoolean} my_boolean
+    */
+    my_boolean = undefined;
 
 
 
-  return exports;
-}));
+
+
+
+
+
+}
 
 

samples/client/petstore/javascript-es6/src/model/OuterEnum.js

@@ -7,63 +7,51 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- *
- * Swagger Codegen version: 2.3.0-SNAPSHOT
- *
  * Do not edit the class manually.
  *
  */
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['ApiClient'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('../ApiClient'));
-  } else {
-    // Browser globals (root is window)
-    if (!root.SwaggerPetstore) {
-      root.SwaggerPetstore = {};
+
+import ApiClient from '../ApiClient';
+
+
+/**
+* Enum class OuterEnum.
+* @enum {}
+* @readonly
+*/
+export default class OuterEnum {
+    
+        /**
+         * value: "placed"
+         * @const
+         */
+        placed = "placed";
+
+    
+        /**
+         * value: "approved"
+         * @const
+         */
+        approved = "approved";
+
+    
+        /**
+         * value: "delivered"
+         * @const
+         */
+        delivered = "delivered";
+
+    
+
+    /**
+    * Returns a <code>OuterEnum</code> enum value from a Javascript object name.
+    * @param {Object} data The plain JavaScript object containing the name of the enum value.
+    * @return {module:model/OuterEnum} The enum <code>OuterEnum</code> value.
+    */
+    static constructFromObject(object) {
+        return object;
     }
-    root.SwaggerPetstore.OuterEnum = factory(root.SwaggerPetstore.ApiClient);
-  }
-}(this, function(ApiClient) {
-  'use strict';
-
-
-  /**
-   * Enum class OuterEnum.
-   * @enum {}
-   * @readonly
-   */
-  var exports = {
-    /**
-     * value: "placed"
-     * @const
-     */
-    "placed": "placed",
-    /**
-     * value: "approved"
-     * @const
-     */
-    "approved": "approved",
-    /**
-     * value: "delivered"
-     * @const
-     */
-    "delivered": "delivered"  };
-
-  /**
-   * Returns a <code>OuterEnum</code> enum value from a Javascript object name.
-   * @param {Object} data The plain JavaScript object containing the name of the enum value.
-   * @return {module:model/OuterEnum} The enum <code>OuterEnum</code> value.
-   */
-  exports.constructFromObject = function(object) {
-    return object;
-  }
-
-  return exports;
-}));
+}