loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[js] fix boolean in oneOf, add tests (#14380)

Browse Source
This commit is contained in:
William Cheng
2023-01-06 11:26:32 +08:00
committed by GitHub
parent c514dc3c1b
commit b22bf0a071
24 changed files with 646 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/client/petstore/javascript-es6/src/index.js
View File

@@ -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}

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

@@ -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++;

119
samples/client/petstore/javascript-es6/src/model/StringOrBoolean.js Normal file
View File

@@ -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;