Merge branch 'master' of https://github.com/swagger-api/swagger-codegen

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java

@@ -90,6 +90,7 @@ public class CodegenParameter {
         output.collectionFormat = this.collectionFormat;
         output.isCollectionFormatMulti = this.isCollectionFormatMulti;
         output.description = this.description;
+        output.unescapedDescription = this.unescapedDescription;
         output.baseType = this.baseType;
         output.isFormParam = this.isFormParam;
         output.isQueryParam = this.isQueryParam;

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java

@@ -11,6 +11,7 @@ public class CodegenProperty implements Cloneable {
           datatypeWithEnum, dataFormat, name, min, max, defaultValue, defaultValueWithParam,
           baseType, containerType, title;
 
+    /** The 'description' string without escape charcters needed by some programming languages/targets */
     public String unescapedDescription;
 
     /**

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

@@ -14,8 +14,6 @@ import static java.util.UUID.randomUUID;
 
 public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
 
-    protected String sourceFolder = "src" + File.separator + packageName;
-
     private final String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}";
 
     @SuppressWarnings("hiding")
@@ -24,6 +22,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
     public AspNetCoreServerCodegen() {
         super();
 
+        setSourceFolder("src");
         outputFolder = "generated-code" + File.separator + this.getName();
 
         modelTemplateFiles.put("model.mustache", ".cs");
@@ -91,38 +90,53 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
         apiPackage = packageName + ".Controllers";
         modelPackage = packageName + ".Models";
 
+        String packageFolder = sourceFolder + File.separator + packageName;
+
         supportingFiles.add(new SupportingFile("NuGet.Config", "", "NuGet.Config"));
         supportingFiles.add(new SupportingFile("global.json", "", "global.json"));
         supportingFiles.add(new SupportingFile("build.sh.mustache", "", "build.sh"));
         supportingFiles.add(new SupportingFile("build.bat.mustache", "", "build.bat"));
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("Solution.mustache", "", this.packageName + ".sln"));
-        supportingFiles.add(new SupportingFile("Dockerfile.mustache", this.sourceFolder, "Dockerfile"));
+        supportingFiles.add(new SupportingFile("Dockerfile.mustache", packageFolder, "Dockerfile"));
-        supportingFiles.add(new SupportingFile("gitignore", this.sourceFolder, ".gitignore"));
+        supportingFiles.add(new SupportingFile("gitignore", packageFolder, ".gitignore"));
-        supportingFiles.add(new SupportingFile("appsettings.json", this.sourceFolder, "appsettings.json"));
+        supportingFiles.add(new SupportingFile("appsettings.json", packageFolder, "appsettings.json"));
 
-        supportingFiles.add(new SupportingFile("project.json.mustache", this.sourceFolder, "project.json"));
+        supportingFiles.add(new SupportingFile("project.json.mustache", packageFolder, "project.json"));
-        supportingFiles.add(new SupportingFile("Startup.mustache", this.sourceFolder, "Startup.cs"));
+        supportingFiles.add(new SupportingFile("Startup.mustache", packageFolder, "Startup.cs"));
-        supportingFiles.add(new SupportingFile("Program.mustache", this.sourceFolder, "Program.cs"));
+        supportingFiles.add(new SupportingFile("Program.mustache", packageFolder, "Program.cs"));
-        supportingFiles.add(new SupportingFile("web.config", this.sourceFolder, "web.config"));
+        supportingFiles.add(new SupportingFile("web.config", packageFolder, "web.config"));
 
-        supportingFiles.add(new SupportingFile("Project.xproj.mustache", this.sourceFolder, this.packageName + ".xproj"));
+        supportingFiles.add(new SupportingFile("Project.xproj.mustache", packageFolder, this.packageName + ".xproj"));
 
-        supportingFiles.add(new SupportingFile("Properties" + File.separator + "launchSettings.json", this.sourceFolder + File.separator + "Properties", "launchSettings.json"));
+        supportingFiles.add(new SupportingFile("Properties" + File.separator + "launchSettings.json", packageFolder + File.separator + "Properties", "launchSettings.json"));
 
-        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "README.md", this.sourceFolder + File.separator + "wwwroot", "README.md"));
+        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "README.md", packageFolder + File.separator + "wwwroot", "README.md"));
-        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "index.html", this.sourceFolder + File.separator + "wwwroot", "index.html"));
+        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "index.html", packageFolder + File.separator + "wwwroot", "index.html"));
-        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "web.config", this.sourceFolder + File.separator + "wwwroot", "web.config"));
+        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "web.config", packageFolder + File.separator + "wwwroot", "web.config"));
+    }
+
+    @Override
+    public void setSourceFolder(final String sourceFolder) {
+        if(sourceFolder == null) {
+            LOGGER.warn("No sourceFolder specified, using default");
+            this.sourceFolder =  "src" + File.separator + this.packageName;
+        } else if(!sourceFolder.equals("src") && !sourceFolder.startsWith("src")) {
+            LOGGER.warn("ASP.NET Core requires source code exists under src. Adjusting.");
+            this.sourceFolder =  "src" + File.separator + sourceFolder;
+        } else {
+            this.sourceFolder = sourceFolder;
+        }
     }
 
     @Override
     public String apiFileFolder() {
-        return outputFolder + File.separator + sourceFolder + File.separator + "Controllers";
+        return outputFolder + File.separator + sourceFolder + File.separator + packageName + File.separator + "Controllers";
     }
 
     @Override
     public String modelFileFolder() {
-        return outputFolder + File.separator + sourceFolder + File.separator + "Models";
+        return outputFolder + File.separator + sourceFolder + File.separator + packageName + File.separator  + "Models";
     }
 
     @Override

modules/swagger-codegen/src/main/resources/htmlDocs/bodyParam.mustache

@@ -1,3 +1,3 @@
 {{#isBodyParam}}<div class="param">{{baseName}} {{#baseType}}<a href="#{{baseType}}">{{baseType}}</a>{{/baseType}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
 
-      <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; {{description}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}</div>{{/isBodyParam}}
+      <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; {{unescapedDescription}} {{#defaultValue}}default: {{{defaultValue}}}{{/defaultValue}}</div>{{/isBodyParam}}

modules/swagger-codegen/src/main/resources/htmlDocs/formParam.mustache

@@ -1,3 +1,3 @@
 {{#isFormParam}}<div class="param">{{baseName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
 
-      <div class="param-desc"><span class="param-type">Form Parameter</span> &mdash; {{description}} {{#defaultValue}}default: {{{defaultValue}}} {{/defaultValue}}{{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}</div>{{/isFormParam}}
+      <div class="param-desc"><span class="param-type">Form Parameter</span> &mdash; {{unescapedDescription}} {{#defaultValue}}default: {{{defaultValue}}} {{/defaultValue}}{{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}</div>{{/isFormParam}}

modules/swagger-codegen/src/main/resources/htmlDocs/headerParam.mustache

@@ -1,3 +1,3 @@
 {{#isHeaderParam}}<div class="param">{{baseName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
 
-      <div class="param-desc"><span class="param-type">Header Parameter</span> &mdash; {{description}} {{#defaultValue}}default: {{{defaultValue}}} {{/defaultValue}}{{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}</div>{{/isHeaderParam}}
+      <div class="param-desc"><span class="param-type">Header Parameter</span> &mdash; {{unescapedDescription}} {{#defaultValue}}default: {{{defaultValue}}} {{/defaultValue}}{{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}</div>{{/isHeaderParam}}

modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache

@@ -165,9 +165,9 @@
   {{#model}}
   <div class="model">
     <h3 class="field-label"><a name="{{name}}">{{name}} - {{title}}</a> <a class="up" href="#__Models">Up</a></h3>
-    <div class='model-description'>{{description}}</div>
+    <div class='model-description'>{{unescapedDescription}}</div>
     <div class="field-items">
-      {{#vars}}<div class="param">{{name}} {{^required}}(optional){{/required}}</div><div class="param-desc"><span class="param-type">{{^isPrimitiveType}}<a href="#{{complexType}}">{{datatype}}</a>{{/isPrimitiveType}}</span> {{description}} {{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}</div>
+      {{#vars}}<div class="param">{{name}} {{^required}}(optional){{/required}}</div><div class="param-desc"><span class="param-type">{{^isPrimitiveType}}<a href="#{{complexType}}">{{datatype}}</a>{{/isPrimitiveType}}</span> {{unescapedDescription}} {{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}</div>
       {{#isEnum}}
         <div class="param-enum-header">Enum:</div>
         {{#_enum}}<div class="param-enum">{{this}}</div>{{/_enum}}

modules/swagger-codegen/src/main/resources/htmlDocs/pathParam.mustache

@@ -1,3 +1,3 @@
 {{#isPathParam}}<div class="param">{{baseName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
 
-      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; {{description}} {{#defaultValue}}default: {{{defaultValue}}} {{/defaultValue}}{{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}</div>{{/isPathParam}}
+      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; {{unescapedDescription}} {{#defaultValue}}default: {{{defaultValue}}} {{/defaultValue}}{{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}</div>{{/isPathParam}}

modules/swagger-codegen/src/main/resources/htmlDocs/queryParam.mustache

@@ -1,3 +1,3 @@
 {{#isQueryParam}}<div class="param">{{baseName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}</div>
 
-      <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash; {{description}} {{#defaultValue}}default: {{{defaultValue}}} {{/defaultValue}}{{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}</div>{{/isQueryParam}}
+      <div class="param-desc"><span class="param-type">Query Parameter</span> &mdash; {{unescapedDescription}} {{#defaultValue}}default: {{{defaultValue}}} {{/defaultValue}}{{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}</div>{{/isQueryParam}}

modules/swagger-codegen/src/main/resources/htmlDocs2/sample_android.mustache

@@ -5,7 +5,7 @@ public class {{{classname}}}Example {
     public static void main(String[] args) {
         {{{classname}}} apiInstance = new {{{classname}}}();
         {{#allParams}}
-        {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
+        {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{unescapedDescription}}}
         {{/allParams}}
         try {
             {{#returnType}}{{{returnType}}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}

modules/swagger-codegen/src/main/resources/htmlDocs2/sample_csharp.mustache

@@ -25,10 +25,10 @@ namespace Example
             var apiInstance = new {{classname}}();
             {{#allParams}}
             {{#isPrimitiveType}}
-            var {{paramName}} = {{example}};  // {{{dataType}}} | {{{description}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+            var {{paramName}} = {{example}};  // {{{dataType}}} | {{{unescapedDescription}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
             {{/isPrimitiveType}}
             {{^isPrimitiveType}}
-            var {{paramName}} = new {{{dataType}}}(); // {{{dataType}}} | {{{description}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+            var {{paramName}} = new {{{dataType}}}(); // {{{dataType}}} | {{{unescapedDescription}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
             {{/isPrimitiveType}}
             {{/allParams}}
 

modules/swagger-codegen/src/main/resources/htmlDocs2/sample_java.mustache

@@ -28,7 +28,7 @@ public class {{{classname}}}Example {
 
         {{{classname}}} apiInstance = new {{{classname}}}();
         {{#allParams}}
-        {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
+        {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{unescapedDescription}}}
         {{/allParams}}
         try {
             {{#returnType}}{{{returnType}}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}

modules/swagger-codegen/src/main/resources/htmlDocs2/sample_js.mustache

@@ -19,10 +19,10 @@ var {{{name}}} = defaultClient.authentications['{{{name}}}'];
 
 var api = new {{{jsModuleName}}}.{{{classname}}}(){{#hasParams}}
 {{#vendorExtensions.x-codegen-hasRequiredParams}}{{#allParams}}{{#required}}
-var {{{paramName}}} = {{{example}}}; // {{=< >=}}{<&dataType>}<={{ }}=> {{{description}}}
+var {{{paramName}}} = {{{example}}}; // {{=< >=}}{<&dataType>}<={{ }}=> {{{unescapedDescription}}}
 {{/required}}{{/allParams}}{{/vendorExtensions.x-codegen-hasRequiredParams}}{{#hasOptionalParams}}
 var opts = { {{#allParams}}{{^required}}
-  '{{{paramName}}}': {{{example}}}{{#vendorExtensions.x-codegen-hasMoreOptional}},{{/vendorExtensions.x-codegen-hasMoreOptional}} // {{=< >=}}{<&dataType>}<={{ }}=> {{{description}}}{{/required}}{{/allParams}}
+  '{{{paramName}}}': {{{example}}}{{#vendorExtensions.x-codegen-hasMoreOptional}},{{/vendorExtensions.x-codegen-hasMoreOptional}} // {{=< >=}}{<&dataType>}<={{ }}=> {{{unescapedDescription}}}{{/required}}{{/allParams}}
 };{{/hasOptionalParams}}{{/hasParams}}
 {{#usePromises}}
 api.{{{operationId}}}({{#allParams}}{{#required}}{{{paramName}}}{{#vendorExtensions.x-codegen-hasMoreRequired}}, {{/vendorExtensions.x-codegen-hasMoreRequired}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{{#vendorExtensions.x-codegen-hasRequiredParams}}, {{/vendorExtensions.x-codegen-hasRequiredParams}}opts{{/hasOptionalParams}}).then(function({{#returnType}}data{{/returnType}}) {

modules/swagger-codegen/src/main/resources/htmlDocs2/sample_objc.mustache

@@ -13,7 +13,7 @@
 [apiConfig setAccessToken:@"YOUR_ACCESS_TOKEN"];
 {{/isOAuth}}{{/authMethods}}
 {{/hasAuthMethods}}
-{{#allParams}}{{{dataType}}} *{{paramName}} = {{{example}}}; // {{{description}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+{{#allParams}}{{{dataType}}} *{{paramName}} = {{{example}}}; // {{{unescapedDescription}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
 {{/allParams}}
 
 {{classname}} *apiInstance = [[{{classname}} alloc] init];

modules/swagger-codegen/src/main/resources/htmlDocs2/sample_perl.mustache

@@ -14,7 +14,7 @@ ${{{perlModuleName}}}::Configuration::access_token = 'YOUR_ACCESS_TOKEN';{{/isOA
 {{/hasAuthMethods}}
 
 my $api_instance = {{perlModuleName}}::{{classname}}->new();
-{{#allParams}}my ${{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}{{{perlModuleName}}}::Object::{{dataType}}->new(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; # {{{dataType}}} | {{{description}}}
+{{#allParams}}my ${{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}{{{perlModuleName}}}::Object::{{dataType}}->new(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; # {{{dataType}}} | {{{unescapedDescription}}}
 {{/allParams}}
 
 eval { 

modules/swagger-codegen/src/main/resources/htmlDocs2/sample_php.mustache

@@ -13,7 +13,7 @@ require_once(__DIR__ . '/vendor/autoload.php');
 {{/hasAuthMethods}}
 
 $api_instance = new Swagger\Client\Api\{{classname}}();
-{{#allParams}}${{paramName}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
+{{#allParams}}${{paramName}} = {{{example}}}; // {{{dataType}}} | {{{unescapedDescription}}}
 {{/allParams}}
 
 try {

modules/swagger-codegen/src/main/resources/htmlDocs2/sample_python.mustache

@@ -17,7 +17,7 @@ from pprint import pprint
 
 # create an instance of the API class
 api_instance = {{{pythonPackageName}}}.{{{classname}}}()
-{{#allParams}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{description}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
+{{#allParams}}{{paramName}} = {{{example}}} # {{{dataType}}} | {{{unescapedDescription}}}{{^required}} (optional){{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}}
 {{/allParams}}
 
 try: 

samples/html/index.html

@@ -356,18 +356,18 @@ font-style: italic;
     <h3 class="field-label">Example data</h3>
     <div class="example-data-content-type">Content-Type: application/json</div>
     <pre class="example"><code>[ {
-  "tags" : [ {
+  "photoUrls" : [ "aeiou" ],
-    "id" : 123456789,
+  "name" : "doggie",
-    "name" : "aeiou"
-  } ],
   "id" : 123456789,
   "category" : {
-    "id" : 123456789,
+    "name" : "aeiou",
-    "name" : "aeiou"
+    "id" : 123456789
   },
-  "status" : "aeiou",
+  "tags" : [ {
-  "name" : "doggie",
+    "name" : "aeiou",
-  "photoUrls" : [ "aeiou" ]
+    "id" : 123456789
+  } ],
+  "status" : "aeiou"
 } ]</code></pre>
 
     <h3 class="field-label">Produces</h3>
@@ -429,18 +429,18 @@ font-style: italic;
     <h3 class="field-label">Example data</h3>
     <div class="example-data-content-type">Content-Type: application/json</div>
     <pre class="example"><code>[ {
-  "tags" : [ {
+  "photoUrls" : [ "aeiou" ],
-    "id" : 123456789,
+  "name" : "doggie",
-    "name" : "aeiou"
-  } ],
   "id" : 123456789,
   "category" : {
-    "id" : 123456789,
+    "name" : "aeiou",
-    "name" : "aeiou"
+    "id" : 123456789
   },
-  "status" : "aeiou",
+  "tags" : [ {
-  "name" : "doggie",
+    "name" : "aeiou",
-  "photoUrls" : [ "aeiou" ]
+    "id" : 123456789
+  } ],
+  "status" : "aeiou"
 } ]</code></pre>
 
     <h3 class="field-label">Produces</h3>
@@ -502,18 +502,18 @@ font-style: italic;
     <h3 class="field-label">Example data</h3>
     <div class="example-data-content-type">Content-Type: application/json</div>
     <pre class="example"><code>{
-  "tags" : [ {
+  "photoUrls" : [ "aeiou" ],
-    "id" : 123456789,
+  "name" : "doggie",
-    "name" : "aeiou"
-  } ],
   "id" : 123456789,
   "category" : {
-    "id" : 123456789,
+    "name" : "aeiou",
-    "name" : "aeiou"
+    "id" : 123456789
   },
-  "status" : "aeiou",
+  "tags" : [ {
-  "name" : "doggie",
+    "name" : "aeiou",
-  "photoUrls" : [ "aeiou" ]
+    "id" : 123456789
+  } ],
+  "status" : "aeiou"
 }</code></pre>
 
     <h3 class="field-label">Produces</h3>
@@ -679,9 +679,9 @@ font-style: italic;
     <h3 class="field-label">Example data</h3>
     <div class="example-data-content-type">Content-Type: application/json</div>
     <pre class="example"><code>{
-  "message" : "aeiou",
   "code" : 123,
-  "type" : "aeiou"
+  "type" : "aeiou",
+  "message" : "aeiou"
 }</code></pre>
 
     <h3 class="field-label">Produces</h3>
@@ -818,12 +818,12 @@ font-style: italic;
     <h3 class="field-label">Example data</h3>
     <div class="example-data-content-type">Content-Type: application/json</div>
     <pre class="example"><code>{
-  "id" : 123456789,
   "petId" : 123456789,
-  "complete" : true,
-  "status" : "aeiou",
   "quantity" : 123,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00"
+  "id" : 123456789,
+  "shipDate" : "2000-01-23T04:56:07.000+00:00",
+  "complete" : true,
+  "status" : "aeiou"
 }</code></pre>
 
     <h3 class="field-label">Produces</h3>
@@ -887,12 +887,12 @@ font-style: italic;
     <h3 class="field-label">Example data</h3>
     <div class="example-data-content-type">Content-Type: application/json</div>
     <pre class="example"><code>{
-  "id" : 123456789,
   "petId" : 123456789,
-  "complete" : true,
-  "status" : "aeiou",
   "quantity" : 123,
-  "shipDate" : "2000-01-23T04:56:07.000+00:00"
+  "id" : 123456789,
+  "shipDate" : "2000-01-23T04:56:07.000+00:00",
+  "complete" : true,
+  "status" : "aeiou"
 }</code></pre>
 
     <h3 class="field-label">Produces</h3>
@@ -1109,14 +1109,14 @@ font-style: italic;
     <h3 class="field-label">Example data</h3>
     <div class="example-data-content-type">Content-Type: application/json</div>
     <pre class="example"><code>{
-  "id" : 123456789,
-  "lastName" : "aeiou",
-  "phone" : "aeiou",
-  "username" : "aeiou",
-  "email" : "aeiou",
-  "userStatus" : 123,
   "firstName" : "aeiou",
-  "password" : "aeiou"
+  "lastName" : "aeiou",
+  "password" : "aeiou",
+  "userStatus" : 123,
+  "phone" : "aeiou",
+  "id" : 123456789,
+  "email" : "aeiou",
+  "username" : "aeiou"
 }</code></pre>
 
     <h3 class="field-label">Produces</h3>

samples/html2/index.html

@@ -1858,8 +1858,8 @@ except ApiException as e:
   "type" : "array",
   "items" : {
     "type" : "string",
-    "default" : "available",
+    "enum" : [ "available", "pending", "sold" ],
-    "enum" : [ "available", "pending", "sold" ]
+    "default" : "available"
   },
   "collectionFormat" : "csv"
 };
@@ -3924,8 +3924,7 @@ except ApiException as e:
   "in" : "path",
   "description" : "ID of the order that needs to be deleted",
   "required" : true,
-  "type" : "string",
+  "type" : "string"
-  "minimum" : 1.0
 };
 													var schema = schemaWrapper;
 
@@ -7113,7 +7112,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2017-01-16T09:17:32.398-08:00
+              Generated 2017-01-24T11:58:21.560-05:00
             </div>
           </div>
       </div>