From d13685a3ad8f56e81c7f7ae6e1fb87f442eda84b Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 19 Jun 2021 10:44:00 +0800 Subject: [PATCH] More updates for isBoolean (#9802) * more updates for isBoolean * update samples --- .../java/org/openapitools/codegen/CodegenModel.java | 12 +++++++++++- .../org/openapitools/codegen/CodegenParameter.java | 8 ++++++++ .../org/openapitools/codegen/CodegenProperty.java | 8 ++++++++ .../org/openapitools/codegen/CodegenResponse.java | 8 ++++++++ .../codegen/IJsonSchemaValidationProperties.java | 6 +++++- .../builds/default/.openapi-generator/VERSION | 2 +- .../api.ts | 5 +++++ 7 files changed, 46 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java index 1ce5b200199..a441659434a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java @@ -614,6 +614,14 @@ public class CodegenModel implements IJsonSchemaValidationProperties { this.isShort = isShort; } + @Override + public boolean getIsBoolean() { return isBoolean; } + + @Override + public void setIsBoolean(boolean isBoolean) { + this.isBoolean= isBoolean; + } + @Override public boolean getIsUnboundedInteger() { return isUnboundedInteger; } @@ -771,6 +779,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { isShort == that.isShort && isLong == that.isLong && isUnboundedInteger == that.isUnboundedInteger && + isBoolean == that.isBoolean && isNumber == that.isNumber && isNumeric == that.isNumeric && isFloat == that.isFloat && @@ -857,7 +866,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { getDescription(), getClassVarName(), getModelJson(), getDataType(), getXmlPrefix(), getXmlNamespace(), getXmlName(), getClassFilename(), getUnescapedDescription(), getDiscriminator(), getDefaultValue(), getArrayModelType(), isAlias, isString, isInteger, isLong, isNumber, isNumeric, isFloat, isDouble, - isDate, isDateTime, isNull, hasValidation, isShort, isUnboundedInteger, + isDate, isDateTime, isNull, hasValidation, isShort, isUnboundedInteger, isBoolean, getVars(), getAllVars(), getRequiredVars(), getOptionalVars(), getReadOnlyVars(), getReadWriteVars(), getParentVars(), getAllowableValues(), getMandatory(), getAllMandatory(), getImports(), hasVars, isEmptyVars(), hasMoreModels, hasEnums, isEnum, isNullable, hasRequired, hasOptional, isArray, @@ -902,6 +911,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { sb.append(", isShort=").append(isShort); sb.append(", isLong=").append(isLong); sb.append(", isUnboundedInteger=").append(isUnboundedInteger); + sb.append(", isBoolean=").append(isBoolean); sb.append(", isNumber=").append(isNumber); sb.append(", isNumeric=").append(isNumeric); sb.append(", isFloat=").append(isFloat); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java index d2dc9fa9808..874ac93d152 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java @@ -574,6 +574,14 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { this.isShort = isShort; } + @Override + public boolean getIsBoolean() { return isBoolean; } + + @Override + public void setIsBoolean(boolean isBoolean) { + this.isBoolean = isBoolean; + } + @Override public boolean getIsUnboundedInteger() { return isUnboundedInteger; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java index 47e69fe89d4..c77abfbec98 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java @@ -517,6 +517,14 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti this.isShort = isShort; } + @Override + public boolean getIsBoolean() { return isBoolean; } + + @Override + public void setIsBoolean(boolean isBoolean) { + this.isBoolean = isBoolean; + } + @Override public boolean getIsUnboundedInteger() { return isUnboundedInteger; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java index d8c1756f446..22c85170bbb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java @@ -328,6 +328,14 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { this.isShort = isShort; } + @Override + public boolean getIsBoolean() { return isBoolean; } + + @Override + public void setIsBoolean(boolean isBoolean) { + this.isBoolean = isBoolean; + } + @Override public boolean getIsUnboundedInteger() { return isUnboundedInteger; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java index ea677853335..bf078ab792d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java @@ -83,6 +83,10 @@ public interface IJsonSchemaValidationProperties { void setIsShort(boolean isShort); + boolean getIsBoolean(); + + void setIsBoolean(boolean isBoolean); + boolean getIsUnboundedInteger(); void setIsUnboundedInteger(boolean isUnboundedInteger); @@ -118,4 +122,4 @@ public interface IJsonSchemaValidationProperties { boolean getHasRequired(); void setHasRequired(boolean hasRequired); -} \ No newline at end of file +} diff --git a/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION index d509cc92aa8..6555596f931 100644 --- a/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.1.1-SNAPSHOT \ No newline at end of file +5.2.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts index c9fba6a5167..afcfb41b258 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts @@ -383,6 +383,7 @@ export enum EnumArraysArrayEnumEnum { * @export * @enum {string} */ + export enum EnumClass { Abc = '_abc', Efg = '-efg', @@ -1017,6 +1018,7 @@ export interface OuterComposite { * @export * @enum {string} */ + export enum OuterEnum { Placed = 'placed', Approved = 'approved', @@ -1028,6 +1030,7 @@ export enum OuterEnum { * @export * @enum {string} */ + export enum OuterEnumDefaultValue { Placed = 'placed', Approved = 'approved', @@ -1039,6 +1042,7 @@ export enum OuterEnumDefaultValue { * @export * @enum {string} */ + export enum OuterEnumInteger { NUMBER_0 = 0, NUMBER_1 = 1, @@ -1050,6 +1054,7 @@ export enum OuterEnumInteger { * @export * @enum {string} */ + export enum OuterEnumIntegerDefaultValue { NUMBER_0 = 0, NUMBER_1 = 1,