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

bin/csharp-dotnet2-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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l CsharpDotNet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l CsharpDotNet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient --additional-properties hideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags

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

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

@@ -22,6 +22,7 @@ import io.swagger.models.Operation;
 import io.swagger.models.Swagger;
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.ByteArrayProperty;
 import io.swagger.models.properties.DateProperty;
 import io.swagger.models.properties.DateTimeProperty;
 import io.swagger.models.properties.DoubleProperty;
@@ -113,7 +114,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         );
 
         languageSpecificPrimitives = new HashSet<String>(
-                Arrays.asList("String", "Boolean", "Number", "Array", "Object", "Date", "File")
+                Arrays.asList("String", "Boolean", "Number", "Array", "Object", "Date", "File", "Blob")
         );
         defaultIncludes = new HashSet<String>(languageSpecificPrimitives);
 
@@ -138,8 +139,8 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         typeMapping.put("object", "Object");
         typeMapping.put("integer", "Number");
         // binary not supported in JavaScript client right now, using String as a workaround
-        typeMapping.put("ByteArray", "String"); // I don't see ByteArray defined in the Swagger docs.
+        typeMapping.put("ByteArray", "Blob"); // I don't see ByteArray defined in the Swagger docs.
-        typeMapping.put("binary", "String");
+        typeMapping.put("binary", "Blob");
         typeMapping.put("UUID", "String");
 
         importMapping.clear();
@@ -652,7 +653,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
      * @return Normalized type
      */
     public String normalizeType(String type) {
-      return type.replaceAll("\\b(Boolean|Integer|Number|String|Date)\\b", "'$1'");
+      return type.replaceAll("\\b(Boolean|Integer|Number|String|Date|Blob)\\b", "'$1'");
     }
 
     @Override

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

@@ -441,6 +441,10 @@
       request.accept(accept);
     }
 
+    if (returnType === 'Blob') {
+      request.responseType('blob');
+    }
+
     // Attach previously saved cookies, if enabled
     if (this.enableCookies){
       if (typeof window === 'undefined') {
@@ -521,6 +525,8 @@
         return String(data);
       case 'Date':
         return this.parseDate(String(data));
+      case 'Blob':
+      	return data;
       default:
         if (type === Object) {
           // generic object, return directly

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

@@ -8,7 +8,7 @@
     "test": "./node_modules/mocha/bin/mocha --recursive"
   },
   "dependencies": {
-    "superagent": "1.7.1"
+    "superagent": "3.5.2"
   },
   "devDependencies": {
     "mocha": "~2.3.4",

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

@@ -438,12 +438,12 @@
               {{/licenseUrl}}
             </div>
           </div>
-          <div id="generator">
+{{^hideGenerationTimestamp}}          <div id="generator">
             <div class="content">
               Generated {{generatedDate}}
             </div>
           </div>
-      </div>
+{{/hideGenerationTimestamp}}      </div>
     </div>
   </div>
   {{>js_jsonformatter}}

modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptModelTest.java

@@ -420,10 +420,10 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.baseName, "inputBinaryData");
         Assert.assertEquals(property.getter, "getInputBinaryData");
         Assert.assertEquals(property.setter, "setInputBinaryData");
-        Assert.assertEquals(property.datatype, "String");
+        Assert.assertEquals(property.datatype, "Blob");
         Assert.assertEquals(property.name, "inputBinaryData");
         Assert.assertEquals(property.defaultValue, null);
-        Assert.assertEquals(property.baseType, "String");
+        Assert.assertEquals(property.baseType, "Blob");
         Assert.assertFalse(property.hasMore);
         Assert.assertFalse(property.required);
         Assert.assertTrue(property.isNotContainer);

samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md

@@ -6,7 +6,6 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build date: 2017-03-15T16:43:14.410+01:00
 - Build package: io.swagger.codegen.languages.CsharpDotNet2ClientCodegen
 
 <a name="frameworks-supported"></a>

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

@@ -78,7 +78,7 @@ var _double = 1.2; // Number | None
 
 var patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 
-var _byte = "B"; // String | None
+var _byte = B; // Blob | None
 
 var opts = { 
   'integer': 56, // Number | None
@@ -86,7 +86,7 @@ var opts = {
   'int64': 789, // Number | None
   '_float': 3.4, // Number | None
   '_string': "_string_example", // String | None
-  'binary': "B", // String | None
+  'binary': B, // Blob | None
   '_date': new Date("2013-10-20"), // Date | None
   'dateTime': new Date("2013-10-20T19:20:30+01:00"), // Date | None
   'password': "password_example", // String | None
@@ -107,13 +107,13 @@ Name | Type | Description  | Notes
  **_number** | **Number**| None | 
  **_double** | **Number**| None | 
  **patternWithoutDelimiter** | **String**| None | 
- **_byte** | **String**| None | 
+ **_byte** | **Blob**| None | 
  **integer** | **Number**| None | [optional] 
  **int32** | **Number**| None | [optional] 
  **int64** | **Number**| None | [optional] 
  **_float** | **Number**| None | [optional] 
  **_string** | **String**| None | [optional] 
- **binary** | **String**| None | [optional] 
+ **binary** | **Blob**| None | [optional] 
  **_date** | **Date**| None | [optional] 
  **dateTime** | **Date**| None | [optional] 
  **password** | **String**| None | [optional] 

samples/client/petstore/javascript-promise/docs/FormatTest.md

@@ -10,8 +10,8 @@ Name | Type | Description | Notes
 **_float** | **Number** |  | [optional] 
 **_double** | **Number** |  | [optional] 
 **_string** | **String** |  | [optional] 
-**_byte** | **String** |  | 
+**_byte** | **Blob** |  | 
-**binary** | **String** |  | [optional] 
+**binary** | **Blob** |  | [optional] 
 **_date** | **Date** |  | 
 **dateTime** | **Date** |  | [optional] 
 **uuid** | **String** |  | [optional] 

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

@@ -8,7 +8,7 @@
     "test": "./node_modules/mocha/bin/mocha --recursive"
   },
   "dependencies": {
-    "superagent": "1.7.1"
+    "superagent": "3.5.2"
   },
   "devDependencies": {
     "mocha": "~2.3.4",

samples/client/petstore/javascript-promise/src/ApiClient.js

@@ -434,6 +434,10 @@
     if (accept) {
       request.accept(accept);
     }
+    
+    if (returnType === 'Blob') {
+      request.responseType('blob');
+    }
 
     // Attach previously saved cookies, if enabled
     if (this.enableCookies){
@@ -497,6 +501,8 @@
         return String(data);
       case 'Date':
         return this.parseDate(String(data));
+      case 'Blob':
+      	return data;
       default:
         if (type === Object) {
           // generic object, return directly

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

@@ -104,14 +104,14 @@
      * @param {Number} _number None
      * @param {Number} _double None
      * @param {String} patternWithoutDelimiter None
-     * @param {String} _byte None
+     * @param {Blob} _byte None
      * @param {Object} opts Optional parameters
      * @param {Number} opts.integer None
      * @param {Number} opts.int32 None
      * @param {Number} opts.int64 None
      * @param {Number} opts._float None
      * @param {String} opts._string None
-     * @param {String} opts.binary None
+     * @param {Blob} opts.binary None
      * @param {Date} opts._date None
      * @param {Date} opts.dateTime None
      * @param {String} opts.password None
@@ -186,14 +186,14 @@
      * @param {Number} _number None
      * @param {Number} _double None
      * @param {String} patternWithoutDelimiter None
-     * @param {String} _byte None
+     * @param {Blob} _byte None
      * @param {Object} opts Optional parameters
      * @param {Number} opts.integer None
      * @param {Number} opts.int32 None
      * @param {Number} opts.int64 None
      * @param {Number} opts._float None
      * @param {String} opts._string None
-     * @param {String} opts.binary None
+     * @param {Blob} opts.binary None
      * @param {Date} opts._date None
      * @param {Date} opts.dateTime None
      * @param {String} opts.password None

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

@@ -42,7 +42,7 @@
    * @alias module:model/FormatTest
    * @class
    * @param _number {Number} 
-   * @param _byte {String} 
+   * @param _byte {Blob} 
    * @param _date {Date} 
    * @param password {String} 
    */
@@ -97,10 +97,10 @@
         obj['string'] = ApiClient.convertToType(data['string'], 'String');
       }
       if (data.hasOwnProperty('byte')) {
-        obj['byte'] = ApiClient.convertToType(data['byte'], 'String');
+        obj['byte'] = ApiClient.convertToType(data['byte'], Blob);
       }
       if (data.hasOwnProperty('binary')) {
-        obj['binary'] = ApiClient.convertToType(data['binary'], 'String');
+        obj['binary'] = ApiClient.convertToType(data['binary'], Blob);
       }
       if (data.hasOwnProperty('date')) {
         obj['date'] = ApiClient.convertToType(data['date'], 'Date');
@@ -147,11 +147,11 @@
    */
   exports.prototype['string'] = undefined;
   /**
-   * @member {String} byte
+   * @member {Blob} byte
    */
   exports.prototype['byte'] = undefined;
   /**
-   * @member {String} binary
+   * @member {Blob} binary
    */
   exports.prototype['binary'] = undefined;
   /**

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

@@ -81,7 +81,7 @@ var _double = 1.2; // Number | None
 
 var patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 
-var _byte = "B"; // String | None
+var _byte = B; // Blob | None
 
 var opts = { 
   'integer': 56, // Number | None
@@ -89,7 +89,7 @@ var opts = {
   'int64': 789, // Number | None
   '_float': 3.4, // Number | None
   '_string': "_string_example", // String | None
-  'binary': "B", // String | None
+  'binary': B, // Blob | None
   '_date': new Date("2013-10-20"), // Date | None
   'dateTime': new Date("2013-10-20T19:20:30+01:00"), // Date | None
   'password': "password_example", // String | None
@@ -113,13 +113,13 @@ Name | Type | Description  | Notes
  **_number** | **Number**| None | 
  **_double** | **Number**| None | 
  **patternWithoutDelimiter** | **String**| None | 
- **_byte** | **String**| None | 
+ **_byte** | **Blob**| None | 
  **integer** | **Number**| None | [optional] 
  **int32** | **Number**| None | [optional] 
  **int64** | **Number**| None | [optional] 
  **_float** | **Number**| None | [optional] 
  **_string** | **String**| None | [optional] 
- **binary** | **String**| None | [optional] 
+ **binary** | **Blob**| None | [optional] 
  **_date** | **Date**| None | [optional] 
  **dateTime** | **Date**| None | [optional] 
  **password** | **String**| None | [optional] 

samples/client/petstore/javascript/docs/FormatTest.md

@@ -10,8 +10,8 @@ Name | Type | Description | Notes
 **_float** | **Number** |  | [optional] 
 **_double** | **Number** |  | [optional] 
 **_string** | **String** |  | [optional] 
-**_byte** | **String** |  | 
+**_byte** | **Blob** |  | 
-**binary** | **String** |  | [optional] 
+**binary** | **Blob** |  | [optional] 
 **_date** | **Date** |  | 
 **dateTime** | **Date** |  | [optional] 
 **uuid** | **String** |  | [optional] 

samples/client/petstore/javascript/package.json

@@ -8,7 +8,7 @@
     "test": "./node_modules/mocha/bin/mocha --recursive"
   },
   "dependencies": {
-    "superagent": "1.7.1"
+    "superagent": "3.5.2"
   },
   "devDependencies": {
     "mocha": "~2.3.4",

samples/client/petstore/javascript/src/ApiClient.js

@@ -443,6 +443,10 @@
     if (accept) {
       request.accept(accept);
     }
+    
+    if (returnType === 'Blob') {
+      request.responseType('blob');
+    }
 
     // Attach previously saved cookies, if enabled
     if (this.enableCookies){
@@ -508,6 +512,8 @@
         return String(data);
       case 'Date':
         return this.parseDate(String(data));
+      case 'Blob':
+      	return data;
       default:
         if (type === Object) {
           // generic object, return directly

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

@@ -106,14 +106,14 @@
      * @param {Number} _number None
      * @param {Number} _double None
      * @param {String} patternWithoutDelimiter None
-     * @param {String} _byte None
+     * @param {Blob} _byte None
      * @param {Object} opts Optional parameters
      * @param {Number} opts.integer None
      * @param {Number} opts.int32 None
      * @param {Number} opts.int64 None
      * @param {Number} opts._float None
      * @param {String} opts._string None
-     * @param {String} opts.binary None
+     * @param {Blob} opts.binary None
      * @param {Date} opts._date None
      * @param {Date} opts.dateTime None
      * @param {String} opts.password None

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

@@ -42,7 +42,7 @@
    * @alias module:model/FormatTest
    * @class
    * @param _number {Number} 
-   * @param _byte {String} 
+   * @param _byte {Blob} 
    * @param _date {Date} 
    * @param password {String} 
    */
@@ -97,10 +97,10 @@
         obj['string'] = ApiClient.convertToType(data['string'], 'String');
       }
       if (data.hasOwnProperty('byte')) {
-        obj['byte'] = ApiClient.convertToType(data['byte'], 'String');
+        obj['byte'] = ApiClient.convertToType(data['byte'], Blob);
       }
       if (data.hasOwnProperty('binary')) {
-        obj['binary'] = ApiClient.convertToType(data['binary'], 'String');
+        obj['binary'] = ApiClient.convertToType(data['binary'], Blob);
       }
       if (data.hasOwnProperty('date')) {
         obj['date'] = ApiClient.convertToType(data['date'], 'Date');
@@ -147,11 +147,11 @@
    */
   exports.prototype['string'] = undefined;
   /**
-   * @member {String} byte
+   * @member {Blob} byte
    */
   exports.prototype['byte'] = undefined;
   /**
-   * @member {String} binary
+   * @member {Blob} binary
    */
   exports.prototype['binary'] = undefined;
   /**

samples/html2/index.html

@@ -1870,8 +1870,8 @@ except ApiException as e:
   "type" : "array",
   "items" : {
     "type" : "string",
-    "default" : "available",
+    "enum" : [ "available", "pending", "sold" ],
-    "enum" : [ "available", "pending", "sold" ]
+    "default" : "available"
   },
   "collectionFormat" : "csv"
 };
@@ -7291,11 +7291,6 @@ except ApiException as e:
                 <div class="license-url">http://www.apache.org/licenses/LICENSE-2.0.html</div>
             </div>
           </div>
-          <div id="generator">
-            <div class="content">
-              Generated 2017-03-23T14:23:30.922+08:00
-            </div>
-          </div>
       </div>
     </div>
   </div>