From b346498f981e824f784df2de7a9981c87acd0bbb Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 8 Mar 2021 08:32:47 -0800 Subject: [PATCH 01/11] Adds getHasVars and setHasVars to IJsonSchemaValidationProperties --- .../IJsonSchemaValidationProperties.java | 4 ++++ .../petstore/python-experimental/.coverage | Bin 94208 -> 0 bytes 2 files changed, 4 insertions(+) delete mode 100644 samples/openapi3/client/petstore/python-experimental/.coverage 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 0dc63f0c1ebb..fa9c8f535976 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 @@ -102,4 +102,8 @@ public interface IJsonSchemaValidationProperties { boolean getAdditionalPropertiesIsAnyType(); void setAdditionalPropertiesIsAnyType(boolean additionalPropertiesIsAnyType); + + boolean getHasVars(); + + void setHasVars(boolean hasVars); } \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-experimental/.coverage b/samples/openapi3/client/petstore/python-experimental/.coverage deleted file mode 100644 index 5955fbda978e38e521f3d0dca42218088d7229ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94208 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 Date: Mon, 8 Mar 2021 08:42:29 -0800 Subject: [PATCH 02/11] Updates CodegenModel --- .../java/org/openapitools/codegen/CodegenModel.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 5bb6cbda4b7f..a567f80e2ac0 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 @@ -723,6 +723,17 @@ public void setAdditionalPropertiesIsAnyType(boolean additionalPropertiesIsAnyTy this.additionalPropertiesIsAnyType = additionalPropertiesIsAnyType; } + @Override + public boolean getHasVars() { + return this.hasVars; + } + + @Override + public void setHasVars(boolean hasVars) { + this.hasVars = hasVars; + } + + @Override public boolean equals(Object o) { if (this == o) return true; From ea4949dabc7247bf015195f1a709865c0b3b15ea Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 8 Mar 2021 08:47:11 -0800 Subject: [PATCH 03/11] Updates CodegenProperty --- .../org/openapitools/codegen/CodegenModel.java | 1 - .../org/openapitools/codegen/CodegenProperty.java | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 2 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 a567f80e2ac0..76bdf64501b3 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 @@ -733,7 +733,6 @@ public void setHasVars(boolean hasVars) { this.hasVars = hasVars; } - @Override public boolean equals(Object o) { if (this == o) return true; 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 d4dadd49fc20..f00ef51ffba7 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 @@ -186,6 +186,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti public String xmlNamespace; public boolean isXmlWrapped = false; private boolean additionalPropertiesIsAnyType; + private boolean hasVars; public String getBaseName() { return baseName; @@ -704,6 +705,16 @@ public void setAdditionalPropertiesIsAnyType(boolean additionalPropertiesIsAnyTy this.additionalPropertiesIsAnyType = additionalPropertiesIsAnyType; } + @Override + public boolean getHasVars() { + return this.hasVars; + } + + @Override + public void setHasVars(boolean hasVars) { + this.hasVars = hasVars; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("CodegenProperty{"); @@ -794,6 +805,7 @@ public String toString() { sb.append(", isXmlWrapped=").append(isXmlWrapped); sb.append(", isNull=").append(isNull); sb.append(", getAdditionalPropertiesIsAnyType=").append(getAdditionalPropertiesIsAnyType()); + sb.append(", getHasVars=").append(getHasVars()); sb.append('}'); return sb.toString(); } @@ -844,6 +856,7 @@ public boolean equals(Object o) { isXmlWrapped == that.isXmlWrapped && isNull == that.isNull && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && + getHasVars() == that.getHasVars() && Objects.equals(openApiType, that.openApiType) && Objects.equals(baseName, that.baseName) && Objects.equals(complexType, that.complexType) && @@ -905,6 +918,6 @@ public int hashCode() { items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, isInherited, discriminatorValue, nameInCamelCase, nameInSnakeCase, enumName, maxItems, minItems, isXmlAttribute, xmlPrefix, xmlName, - xmlNamespace, isXmlWrapped, isNull, getAdditionalPropertiesIsAnyType()); + xmlNamespace, isXmlWrapped, isNull, additionalPropertiesIsAnyType, hasVars); } } From df5280a5d4da28f05c908ef9b48b9a85b14fc326 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 8 Mar 2021 09:54:12 -0800 Subject: [PATCH 04/11] Updates codegenparameter --- .../openapitools/codegen/CodegenParameter.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) 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 3ecbc32462f5..6a93e266730e 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 @@ -40,6 +40,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { public boolean isFile; public boolean isEnum; private boolean additionalPropertiesIsAnyType; + private boolean hasVars; public List _enum; public Map allowableValues; public CodegenProperty items; @@ -151,6 +152,7 @@ public CodegenParameter copy() { output.additionalProperties = this.additionalProperties; output.isNull = this.isNull; output.setAdditionalPropertiesIsAnyType(this.getAdditionalPropertiesIsAnyType()); + output.setHasVars(this.hasVars); if (this._enum != null) { output._enum = new ArrayList(this._enum); @@ -205,7 +207,7 @@ public CodegenParameter copy() { @Override public int hashCode() { - return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, isDeepObject, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull, getAdditionalPropertiesIsAnyType()); + return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, isDeepObject, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull, additionalPropertiesIsAnyType, hasVars); } @Override @@ -251,6 +253,7 @@ public boolean equals(Object o) { required == that.required && isNull == that.isNull && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && + getHasVars() == that.getHasVars() && getExclusiveMaximum() == that.getExclusiveMaximum() && getExclusiveMinimum() == that.getExclusiveMinimum() && getUniqueItems() == that.getUniqueItems() && @@ -367,7 +370,8 @@ public String toString() { sb.append(", contentType=").append(contentType); sb.append(", multipleOf=").append(multipleOf); sb.append(", isNull=").append(isNull); - sb.append(", getAdditionalPropertiesIsAnyType=").append(getAdditionalPropertiesIsAnyType()); + sb.append(", getAdditionalPropertiesIsAnyType=").append(additionalPropertiesIsAnyType); + sb.append(", getHasVars=").append(hasVars); sb.append('}'); return sb.toString(); } @@ -605,5 +609,15 @@ public boolean getAdditionalPropertiesIsAnyType() { public void setAdditionalPropertiesIsAnyType(boolean additionalPropertiesIsAnyType) { this.additionalPropertiesIsAnyType = additionalPropertiesIsAnyType; } + + @Override + public boolean getHasVars() { + return this.hasVars; + } + + @Override + public void setHasVars(boolean hasVars) { + this.hasVars = hasVars; + } } From e9fbb61a975adbb7abab4f089f6e78be32f75b57 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 8 Mar 2021 10:00:32 -0800 Subject: [PATCH 05/11] Updates codegenresponse --- .../openapitools/codegen/CodegenResponse.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 856bb8fc292a..37a21190fc5a 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 @@ -80,6 +80,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { public List requiredVars = new ArrayList(); private boolean hasValidation; private boolean additionalPropertiesIsAnyType; + private boolean hasVars; @Override public int hashCode() { @@ -90,7 +91,7 @@ public int hashCode() { vars, requiredVars, isNull, hasValidation, getMaxProperties(), getMinProperties(), uniqueItems, getMaxItems(), getMinItems(), getMaxLength(), getMinLength(), exclusiveMinimum, exclusiveMaximum, getMinimum(), getMaximum(), getPattern(), - is1xx, is2xx, is3xx, is4xx, is5xx, getAdditionalPropertiesIsAnyType()); + is1xx, is2xx, is3xx, is4xx, is5xx, additionalPropertiesIsAnyType, hasVars); } @Override @@ -133,6 +134,7 @@ public boolean equals(Object o) { is4xx == that.is4xx && is5xx == that.is5xx && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && + getHasVars() == that.getHasVars() && Objects.equals(vars, that.vars) && Objects.equals(requiredVars, that.requiredVars) && Objects.equals(headers, that.headers) && @@ -431,7 +433,8 @@ public String toString() { sb.append(", requiredVars='").append(requiredVars).append('\''); sb.append(", isNull='").append(isNull); sb.append(", hasValidation='").append(hasValidation); - sb.append(", getAdditionalPropertiesIsAnyType=").append(getAdditionalPropertiesIsAnyType()); + sb.append(", getAdditionalPropertiesIsAnyType=").append(additionalPropertiesIsAnyType); + sb.append(", getHasVars=").append(hasVars); sb.append('}'); return sb.toString(); } @@ -478,4 +481,14 @@ public boolean getAdditionalPropertiesIsAnyType() { public void setAdditionalPropertiesIsAnyType(boolean additionalPropertiesIsAnyType) { this.additionalPropertiesIsAnyType = additionalPropertiesIsAnyType; } + + @Override + public boolean getHasVars() { + return this.hasVars; + } + + @Override + public void setHasVars(boolean hasVars) { + this.hasVars = hasVars; + } } From f34f7b317c63ad4b23ec33ffa554271378c40116 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 8 Mar 2021 11:43:24 -0800 Subject: [PATCH 06/11] Adds testHasVarsInModel --- .../codegen/DefaultCodegenTest.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index c673d995f468..ce41740ae490 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -2955,4 +2955,43 @@ public void testVarsAndRequiredVarsPresent() { assertEquals(cp.isModel, true); assertEquals(cp.complexType, "objectData"); } + + @Test + public void testHasVarsInModel() { + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + codegen.setDisallowAdditionalPropertiesIfNotPresent(false); + + Schema sc; + CodegenModel cm; + List modelNames; + + modelNames = Arrays.asList( + "ArrayWithValidationsInItems", + "ObjectWithValidationsInAdditionalProperties", + "AdditionalPropertiesUnset", + "AdditionalPropertiesTrue", + "AdditionalPropertiesFalse", + "AdditionalPropertiesSchema" + ); + for (String modelName : modelNames) { + sc = openAPI.getComponents().getSchemas().get(modelName); + cm = codegen.fromModel(modelName, sc); + assertEquals(cm.getHasVars(), false); + } + + modelNames = Arrays.asList( + "ObjectModelWithRefAddPropsInProps", + "ObjectModelWithAddPropsInProps", + "ObjectWithOptionalAndRequiredProps", + "ObjectPropContainsProps" + ); + for (String modelName : modelNames) { + sc = openAPI.getComponents().getSchemas().get(modelName); + cm = codegen.fromModel(modelName, sc); + assertEquals(cm.getHasVars(), true); + } + + } } From 502f866e22702aa098d4cc7447b1b323f71ab098 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 8 Mar 2021 19:44:18 -0800 Subject: [PATCH 07/11] Adds testHasVarsInProperty --- .../codegen/DefaultCodegenTest.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index ce41740ae490..8414ce8d80bb 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -2992,6 +2992,38 @@ public void testHasVarsInModel() { cm = codegen.fromModel(modelName, sc); assertEquals(cm.getHasVars(), true); } + } + + @Test + public void testHasVarsInProperty() { + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + codegen.setDisallowAdditionalPropertiesIfNotPresent(false); + + Schema sc; + CodegenModel cm; + List modelNames; + + modelNames = Arrays.asList( + "ObjectWithValidationsInArrayPropItems", + "ObjectModelWithRefAddPropsInProps", + "ObjectModelWithAddPropsInProps", + "ObjectWithOptionalAndRequiredProps" + ); + for (String modelName : modelNames) { + sc = openAPI.getComponents().getSchemas().get(modelName); + cm = codegen.fromModel(modelName, sc); + assertEquals(cm.vars.get(0).getHasVars(), false); + } + modelNames = Arrays.asList( + "ObjectPropContainsProps" + ); + for (String modelName : modelNames) { + sc = openAPI.getComponents().getSchemas().get(modelName); + cm = codegen.fromModel(modelName, sc); + assertEquals(cm.getHasVars(), true); + } } } From b9eeb86eb6b7abceba1258312a9e8d83a5450d6b Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 8 Mar 2021 23:33:25 -0800 Subject: [PATCH 08/11] Updates testHasVarsInProperty --- .../openapitools/codegen/DefaultCodegen.java | 3 +++ .../codegen/DefaultCodegenTest.java | 18 ++++++++------- .../src/test/resources/3_0/issue_7613.yaml | 22 +++++++++++++++++++ 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index e2c86e22bebf..a5fce66d29c0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -6141,6 +6141,9 @@ private void addVarsRequiredVarsAdditionalProps(Schema schema, IJsonSchemaValida if (objSchema.getRequired() != null) { requiredVars.addAll(objSchema.getRequired()); } + if (objSchema.getProperties() != null && objSchema.getProperties().size() > 0) { + property.setHasVars(true); + } addVars(property, property.getVars(), objSchema.getProperties(), requiredVars); List requireCpVars = property.getVars() .stream() diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index 8414ce8d80bb..87b276725dbc 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -3017,13 +3017,15 @@ public void testHasVarsInProperty() { assertEquals(cm.vars.get(0).getHasVars(), false); } - modelNames = Arrays.asList( - "ObjectPropContainsProps" - ); - for (String modelName : modelNames) { - sc = openAPI.getComponents().getSchemas().get(modelName); - cm = codegen.fromModel(modelName, sc); - assertEquals(cm.getHasVars(), true); - } + String modelName; + modelName = "ArrayWithObjectWithPropsInItems"; + sc = openAPI.getComponents().getSchemas().get(modelName); + cm = codegen.fromModel(modelName, sc); + assertEquals(cm.getItems().getHasVars(), true); + + modelName = "ObjectWithObjectWithPropsInAdditionalProperties"; + sc = openAPI.getComponents().getSchemas().get(modelName); + cm = codegen.fromModel(modelName, sc); + assertEquals(cm.getAdditionalProperties().getHasVars(), true); } } diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_7613.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_7613.yaml index 4060da8ea647..5973adb14d7e 100644 --- a/modules/openapi-generator/src/test/resources/3_0/issue_7613.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/issue_7613.yaml @@ -354,4 +354,26 @@ components: required: - a - b + ArrayWithObjectWithPropsInItems: + type: array + items: + type: object + properties: + a: + type: string + minLength: 1 + b: + type: string + minLength: 1 + ObjectWithObjectWithPropsInAdditionalProperties: + type: object + additionalProperties: + type: object + properties: + a: + type: string + minLength: 1 + b: + type: string + minLength: 1 securitySchemes: {} \ No newline at end of file From 8628e72a4a2c44d9e8eecb73a8649b7116cbb198 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 8 Mar 2021 23:47:43 -0800 Subject: [PATCH 09/11] Adds testHasVarsInParameter --- .../codegen/DefaultCodegenTest.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index 87b276725dbc..a5bf1b4f4a9a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -3028,4 +3028,28 @@ public void testHasVarsInProperty() { cm = codegen.fromModel(modelName, sc); assertEquals(cm.getAdditionalProperties().getHasVars(), true); } + + @Test + public void testHasVarsInParameter() { + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + codegen.setDisallowAdditionalPropertiesIfNotPresent(false); + + String path; + Operation operation; + CodegenOperation co; + + path = "/array_with_validations_in_items/{items}"; + operation = openAPI.getPaths().get(path).getPost(); + co = codegen.fromOperation(path, "POST", operation, null); + assertEquals(co.pathParams.get(0).getHasVars(), false); + assertEquals(co.bodyParam.getHasVars(), false); + + path = "/object_with_optional_and_required_props/{objectData}"; + operation = openAPI.getPaths().get(path).getPost(); + co = codegen.fromOperation(path, "POST", operation, null); + assertEquals(co.pathParams.get(0).getHasVars(), true); + assertEquals(co.bodyParam.getHasVars(), true); + } } From d15f1de3aaacf59ebd6574952d99e4d8bdad3b1b Mon Sep 17 00:00:00 2001 From: Justin Black Date: Tue, 9 Mar 2021 08:22:54 -0800 Subject: [PATCH 10/11] Adds testHasVarsInResponse --- .../codegen/DefaultCodegenTest.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index a5bf1b4f4a9a..f103f744f0a2 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -3052,4 +3052,27 @@ public void testHasVarsInParameter() { assertEquals(co.pathParams.get(0).getHasVars(), true); assertEquals(co.bodyParam.getHasVars(), true); } + + @Test + public void testHasVarsInResponse() { + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + codegen.setDisallowAdditionalPropertiesIfNotPresent(false); + + String path; + Operation operation; + CodegenOperation co; + + path = "/additional_properties/"; + operation = openAPI.getPaths().get(path).getPost(); + co = codegen.fromOperation(path, "POST", operation, null); + assertEquals(co.responses.get(0).getHasVars(), false); + + path = "/object_with_optional_and_required_props/{objectData}"; + operation = openAPI.getPaths().get(path).getPost(); + co = codegen.fromOperation(path, "POST", operation, null); + // does not have vars because the inline schema was extracted into a component ref + assertEquals(co.responses.get(0).getHasVars(), false); + } } From 12ddfda9869ac48ed1d133905c2165b70c77630d Mon Sep 17 00:00:00 2001 From: Justin Black Date: Tue, 9 Mar 2021 08:55:15 -0800 Subject: [PATCH 11/11] Samples update --- .../java/org/openapitools/handler/PathHandlerInterface.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java index ae55bb6cd94d..c8a8a1bf671f 100644 --- a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java +++ b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java @@ -541,10 +541,10 @@ public interface PathHandlerInterface { *

Response headers: [CodegenProperty{openApiType='integer', baseName='X-Rate-Limit', complexType='null', getter='getxRateLimit', setter='setxRateLimit', description='calls per hour allowed by the user', dataType='Integer', datatypeWithEnum='Integer', dataFormat='int32', name='xRateLimit', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Rate-Limit;', baseType='Integer', containerType='null', title='null', unescapedDescription='calls per hour allowed by the user', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ "type" : "integer", "format" : "int32" -}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isLong=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when toekn expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when toekn expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isLong=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when toekn expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when toekn expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ "type" : "string", "format" : "date-time" -}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isLong=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false}]

+}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isLong=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false}]

* *

Produces: [{mediaType=application/xml}, {mediaType=application/json}]

*

Returns: {@link String}