Merge remote-tracking branch 'origin' into 7.0.x

samples/client/petstore/javascript-es6/.openapi-generator/FILES

@@ -58,6 +58,7 @@ docs/ReadOnlyFirst.md
 docs/Return.md
 docs/SpecialModelName.md
 docs/StoreApi.md
+docs/StringOrBoolean.md
 docs/Tag.md
 docs/User.md
 docs/UserApi.md
@@ -123,5 +124,6 @@ src/model/Pig.js
 src/model/ReadOnlyFirst.js
 src/model/Return.js
 src/model/SpecialModelName.js
+src/model/StringOrBoolean.js
 src/model/Tag.js
 src/model/User.js

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

@@ -215,6 +215,7 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [OpenApiPetstore.Return](docs/Return.md)
  - [OpenApiPetstore.SpecialModelName](docs/SpecialModelName.md)
+ - [OpenApiPetstore.StringOrBoolean](docs/StringOrBoolean.md)
  - [OpenApiPetstore.Tag](docs/Tag.md)
  - [OpenApiPetstore.User](docs/User.md)
 
@@ -223,6 +224,18 @@ Class | Method | HTTP request | Description
 
 
 
+### petstore_auth
+
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
+
+
+
 ### api_key
 
 
@@ -241,30 +254,18 @@ Class | Method | HTTP request | Description
 
 
 
-### bearer_test
-
-- **Type**: Bearer authentication (JWT)
-
-
-
 ### http_basic_test
 
 - **Type**: HTTP basic authentication
 
 
 
+### bearer_test
+
+- **Type**: Bearer authentication (JWT)
+
+
+
 ### http_signature_test
 
 
-
-
-### petstore_auth
-
-
-- **Type**: OAuth
-- **Flow**: implicit
-- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
-- **Scopes**: 
-  - write:pets: modify pets in your account
-  - read:pets: read your pets
-

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

@@ -109,7 +109,7 @@ This endpoint does not need any parameter.
 
 Find purchase order by ID
 
-For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 
 ### Example
 

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

@@ -0,0 +1,8 @@
+# OpenApiPetstore.StringOrBoolean
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+

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

@@ -46,11 +46,11 @@ class ApiClient {
          * @type {Array.<String>}
          */
         this.authentications = {
+            'petstore_auth': {type: 'oauth2'},
             'api_key': {type: 'apiKey', 'in': 'header', name: 'api_key'},
             'api_key_query': {type: 'apiKey', 'in': 'query', name: 'api_key_query'},
-            'bearer_test': {type: 'bearer'}, // JWT
             'http_basic_test': {type: 'basic'},
-            'petstore_auth': {type: 'oauth2'}
+            'bearer_test': {type: 'bearer'}, // JWT
         }
 
         /**

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

@@ -123,7 +123,7 @@ export default class StoreApi {
 
     /**
      * Find purchase order by ID
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
      * @param {Number} orderId ID of pet that needs to be fetched
      * @param {module:api/StoreApi~getOrderByIdCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/Order}

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

@@ -63,6 +63,7 @@ import Pig from './model/Pig';
 import ReadOnlyFirst from './model/ReadOnlyFirst';
 import Return from './model/Return';
 import SpecialModelName from './model/SpecialModelName';
+import StringOrBoolean from './model/StringOrBoolean';
 import Tag from './model/Tag';
 import User from './model/User';
 import AnotherFakeApi from './api/AnotherFakeApi';
@@ -412,6 +413,12 @@ export {
      */
     SpecialModelName,
 
+    /**
+     * The StringOrBoolean model constructor.
+     * @property {module:model/StringOrBoolean}
+     */
+    StringOrBoolean,
+
     /**
      * The Tag model constructor.
      * @property {module:model/Tag}

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

@@ -84,15 +84,15 @@ class Color {
 
         // Hex color string, such as #00FF00.
         try {
-            // validate array of string
+            // validate string
             if (!(typeof instance === 'string')) {
-                throw new Error("Invalid input. Must be string. Input: " + JSON.stringify(instance));
+                throw new Error("Invalid value. Must be string. Input: " + JSON.stringify(instance));
             }
             if (!/^#(?:[0-9a-fA-F]{3}){1,2}$/.test(instance)) {
-                throw new Error("Invalid string value in an array items. Must conform to /^#(?:[0-9a-fA-F]{3}){1,2}$/. Input: " + JSON.stringify(instance));
+                throw new Error("Invalid string value. Must conform to /^#(?:[0-9a-fA-F]{3}){1,2}$/. Input: " + JSON.stringify(instance));
             }
             if (instance.length > 7 && instance.length < 7) {
-                throw new Error("Invalid string value in an array items. Max. length: 7. Min. length: 7. Input: " + JSON.stringify(instance));
+                throw new Error("Invalid string value. Max. length: 7. Min. length: 7. Input: " + JSON.stringify(instance));
             }
             this.actualInstance = instance;
             match++;
@@ -124,7 +124,7 @@ class Color {
     }
 
     /**
-     * Gets the actaul instance, which can be <code>String</code>, <code>[Number]</code>.
+     * Gets the actual instance, which can be <code>String</code>, <code>[Number]</code>.
      * @return {(module:model/String|module:model/[Number])} The actual instance.
      */
     getActualInstance() {
@@ -132,7 +132,7 @@ class Color {
     }
 
     /**
-     * Sets the actaul instance, which can be <code>String</code>, <code>[Number]</code>.
+     * Sets the actual instance, which can be <code>String</code>, <code>[Number]</code>.
      * @param {(module:model/String|module:model/[Number])} obj The actual instance.
      */
     setActualInstance(obj) {
@@ -140,7 +140,7 @@ class Color {
     }
 
     /**
-     * Returns the JSON representation of the actual intance.
+     * Returns the JSON representation of the actual instance.
      * @return {string}
      */
     toJSON = function(){

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

@@ -74,7 +74,7 @@ class FileSchemaTestClass {
             }
             // validate the optional field `files` (array)
             for (const item of data['files']) {
-                File.validateJsonObject(item);
+                File.validateJSON(item);
             };
         }
 

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

@@ -106,7 +106,7 @@ class Pet {
             }
             // validate the optional field `tags` (array)
             for (const item of data['tags']) {
-                Tag.validateJsonObject(item);
+                Tag.validateJSON(item);
             };
         }
         // ensure the json data is a string

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

@@ -88,7 +88,7 @@ class Pig {
     }
 
     /**
-     * Gets the actaul instance, which can be <code>BasquePig</code>, <code>DanishPig</code>.
+     * Gets the actual instance, which can be <code>BasquePig</code>, <code>DanishPig</code>.
      * @return {(module:model/BasquePig|module:model/DanishPig)} The actual instance.
      */
     getActualInstance() {
@@ -96,7 +96,7 @@ class Pig {
     }
 
     /**
-     * Sets the actaul instance, which can be <code>BasquePig</code>, <code>DanishPig</code>.
+     * Sets the actual instance, which can be <code>BasquePig</code>, <code>DanishPig</code>.
      * @param {(module:model/BasquePig|module:model/DanishPig)} obj The actual instance.
      */
     setActualInstance(obj) {
@@ -104,7 +104,7 @@ class Pig {
     }
 
     /**
-     * Returns the JSON representation of the actual intance.
+     * Returns the JSON representation of the actual instance.
      * @return {string}
      */
     toJSON = function(){

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

@@ -0,0 +1,119 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+
+/**
+ * The StringOrBoolean model module.
+ * @module model/StringOrBoolean
+ * @version 1.0.0
+ */
+class StringOrBoolean {
+    /**
+     * Constructs a new <code>StringOrBoolean</code>.
+     * String or boolean
+     * @alias module:model/StringOrBoolean
+     * @param {(module:model/Boolean|module:model/String)} instance The actual instance to initialize StringOrBoolean.
+     */
+    constructor(instance = null) {
+        if (instance === null) {
+            this.actualInstance = null;
+            return;
+        }
+        var match = 0;
+        var errorMessages = [];
+        try {
+            // validate string
+            if (!(typeof instance === 'string')) {
+                throw new Error("Invalid value. Must be string. Input: " + JSON.stringify(instance));
+            }
+            this.actualInstance = instance;
+            match++;
+        } catch(err) {
+            // json data failed to deserialize into String
+            errorMessages.push("Failed to construct String: " + err)
+        }
+
+        try {
+            // validate boolean
+            if (!(typeof instance === 'boolean')) {
+                throw new Error("Invalid value. Must be boolean. Input: " + JSON.stringify(instance));
+            }
+            this.actualInstance = instance;
+            match++;
+        } catch(err) {
+            // json data failed to deserialize into Boolean
+            errorMessages.push("Failed to construct Boolean: " + err)
+        }
+
+        if (match > 1) {
+            throw new Error("Multiple matches found constructing `StringOrBoolean` with oneOf schemas Boolean, String. Input: " + JSON.stringify(instance));
+        } else if (match === 0) {
+            this.actualInstance = null; // clear the actual instance in case there are multiple matches
+            throw new Error("No match found constructing `StringOrBoolean` with oneOf schemas Boolean, String. Details: " +
+                            errorMessages.join(", "));
+        } else { // only 1 match
+            // the input is valid
+        }
+    }
+
+    /**
+     * Constructs a <code>StringOrBoolean</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/StringOrBoolean} obj Optional instance to populate.
+     * @return {module:model/StringOrBoolean} The populated <code>StringOrBoolean</code> instance.
+     */
+    static constructFromObject(data, obj) {
+        return new StringOrBoolean(data);
+    }
+
+    /**
+     * Gets the actual instance, which can be <code>Boolean</code>, <code>String</code>.
+     * @return {(module:model/Boolean|module:model/String)} The actual instance.
+     */
+    getActualInstance() {
+        return this.actualInstance;
+    }
+
+    /**
+     * Sets the actual instance, which can be <code>Boolean</code>, <code>String</code>.
+     * @param {(module:model/Boolean|module:model/String)} obj The actual instance.
+     */
+    setActualInstance(obj) {
+       this.actualInstance = StringOrBoolean.constructFromObject(obj).getActualInstance();
+    }
+
+    /**
+     * Returns the JSON representation of the actual instance.
+     * @return {string}
+     */
+    toJSON = function(){
+        return this.getActualInstance();
+    }
+
+    /**
+     * Create an instance of StringOrBoolean from a JSON string.
+     * @param {string} json_string JSON string.
+     * @return {module:model/StringOrBoolean} An instance of StringOrBoolean.
+     */
+    static fromJSON = function(json_string){
+        return StringOrBoolean.constructFromObject(JSON.parse(json_string));
+    }
+}
+
+
+StringOrBoolean.OneOf = ["Boolean", "String"];
+
+export default StringOrBoolean;
+

samples/client/petstore/javascript-es6/test/PetstoreTest.js

@@ -280,6 +280,20 @@ describe('Petstore', function() {
       expect(JSON.stringify(result)).to.be(nested_one_of_json);
     });
 
+    it('should serialize and deserialize StringOrBoolean correctly', function() {
+      // string
+      var json = '"Hello World"'
+      var result = OpenAPIPetstore.ApiClient.convertToType(JSON.parse(json), OpenAPIPetstore.StringOrBoolean);
+      expect(result).to.be.a(OpenAPIPetstore.StringOrBoolean);
+      expect(JSON.stringify(result)).to.be(json);
+
+      // boolean
+      json = 'true'
+      result = OpenAPIPetstore.ApiClient.convertToType(JSON.parse(json), OpenAPIPetstore.StringOrBoolean);
+      expect(result).to.be.a(OpenAPIPetstore.StringOrBoolean);
+      expect(JSON.stringify(result)).to.be(json);
+    });
+
   });
 });
 

samples/client/petstore/javascript-es6/test/model/StringOrBoolean.spec.js

@@ -0,0 +1,59 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.StringOrBoolean();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('StringOrBoolean', function() {
+    it('should create an instance of StringOrBoolean', function() {
+      // uncomment below and update the code to test StringOrBoolean
+      //var instance = new OpenApiPetstore.StringOrBoolean();
+      //expect(instance).to.be.a(OpenApiPetstore.StringOrBoolean);
+    });
+
+  });
+
+}));