From 2ec34c1e114872f0f883938ead8d2f87e57db2f2 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 17 Jan 2020 16:19:05 +0800 Subject: [PATCH] add multipleOf to various codegen classes --- .../openapitools/codegen/CodegenModel.java | 18 +++++++++++++-- .../codegen/CodegenParameter.java | 10 +++++++++ .../openapitools/codegen/CodegenProperty.java | 2 +- .../openapitools/codegen/CodegenResponse.java | 16 +++++++++++++- .../IJsonSchemaValidationProperties.java | 22 +++++++++++++++---- 5 files changed, 60 insertions(+), 8 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 f8eb675d4770..9e59c755cbd0 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 @@ -81,6 +81,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { private String minimum; private String maximum; private String pattern; + private Number multipleOf; public String getAdditionalPropertiesType() { return additionalPropertiesType; @@ -414,6 +415,16 @@ public void setMaxProperties(Integer maxProperties) { this.maxProperties = maxProperties; } + @Override + public Number getMultipleOf() { + return multipleOf; + } + + @Override + public void setMultipleOf(Number multipleOf) { + this.multipleOf = multipleOf; + } + public List getReadOnlyVars() { return readOnlyVars; } @@ -569,7 +580,9 @@ public boolean equals(Object o) { Objects.equals(getMinLength(), that.getMinLength()) && Objects.equals(getMinimum(), that.getMinimum()) && Objects.equals(getMaximum(), that.getMaximum()) && - Objects.equals(getPattern(), that.getPattern()); + Objects.equals(getPattern(), that.getPattern()) && + Objects.equals(getMultipleOf(), that.getMultipleOf()); + } @Override @@ -585,7 +598,7 @@ public int hashCode() { hasChildren, isMapModel, hasOnlyReadOnly, getExternalDocumentation(), getVendorExtensions(), getAdditionalPropertiesType(), getMaxProperties(), getMinProperties(), getUniqueItems(), getMaxItems(), getMinItems(), getMaxLength(), getMinLength(), getExclusiveMinimum(), getExclusiveMaximum(), getMinimum(), - getMaximum(), getPattern()); + getMaximum(), getPattern(), getMultipleOf()); } @Override @@ -662,6 +675,7 @@ public String toString() { sb.append(", minimum='").append(minimum).append('\''); sb.append(", maximum='").append(maximum).append('\''); sb.append(", pattern='").append(pattern).append('\''); + sb.append(", multipleOf='").append(multipleOf).append('\''); sb.append('}'); return sb.toString(); } 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 14fb30a86175..beb42d599581 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 @@ -456,5 +456,15 @@ public void setMaxProperties(Integer maxProperties) { this.maxProperties = maxProperties; } + @Override + public Number getMultipleOf() { + return multipleOf; + } + + @Override + public void setMultipleOf(Number multipleOf) { + this.multipleOf = multipleOf; + } + } 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 c72d24bc0891..eb545a09f068 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 @@ -708,6 +708,6 @@ public int hashCode() { isWriteOnly, isNullable, isSelfReference, isCircularReference, _enum, allowableValues, items, mostInnerItems, vendorExtensions, hasValidation, isInherited, discriminatorValue, nameInCamelCase, nameInSnakeCase, enumName, maxItems, minItems, isXmlAttribute, xmlPrefix, xmlName, xmlNamespace, - isXmlWrapped); + isXmlWrapped, multipleOf); } } 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 b814f2207f35..79074fb28fcb 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 @@ -66,6 +66,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { private String minimum; private String maximum; public String pattern; + public Number multipleOf; @Override public int hashCode() { @@ -127,7 +128,9 @@ public boolean equals(Object o) { Objects.equals(exclusiveMaximum, that.exclusiveMaximum) && Objects.equals(getMinimum(), that.getMinimum()) && Objects.equals(getMaximum(), that.getMaximum()) && - Objects.equals(getPattern(), that.getPattern()); + Objects.equals(getPattern(), that.getPattern()) && + Objects.equals(getMultipleOf(), that.getMultipleOf()); + } @Override @@ -250,6 +253,16 @@ public void setMaxProperties(Integer maxProperties) { this.maxProperties = maxProperties; } + @Override + public Number getMultipleOf() { + return multipleOf; + } + + @Override + public void setMultipleOf(Number multipleOf) { + this.multipleOf = multipleOf; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("CodegenResponse{"); @@ -299,6 +312,7 @@ public String toString() { sb.append(", minimum='").append(minimum).append('\''); sb.append(", maximum='").append(maximum).append('\''); sb.append(", pattern='").append(pattern).append('\''); + sb.append(", multipleOf='").append(multipleOf).append('\''); sb.append('}'); return sb.toString(); } 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 8a4f9cea99a4..c86fbf7c7a74 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 @@ -1,41 +1,55 @@ package org.openapitools.codegen; -import java.math.BigDecimal; - public interface IJsonSchemaValidationProperties { String getPattern(); + void setPattern(String pattern); String getMaximum(); + void setMaximum(String maximum); String getMinimum(); + void setMinimum(String minimum); boolean getExclusiveMaximum(); + void setExclusiveMaximum(boolean exclusiveMaximum); - + boolean getExclusiveMinimum(); + void setExclusiveMinimum(boolean exclusiveMinimum); Integer getMinLength(); + void setMinLength(Integer minLength); - + Integer getMaxLength(); + void setMaxLength(Integer maxLength); Integer getMinItems(); + void setMinItems(Integer minItems); Integer getMaxItems(); + void setMaxItems(Integer maxItems); boolean getUniqueItems(); + void setUniqueItems(boolean uniqueItems); Integer getMinProperties(); + void setMinProperties(Integer minProperties); Integer getMaxProperties(); + void setMaxProperties(Integer maxProperties); + + Number getMultipleOf(); + + void setMultipleOf(Number multipleOf); }