From 59d5a74719f359092e78609077a70b3199dc8e9d Mon Sep 17 00:00:00 2001 From: c19yamahar Date: Thu, 19 Nov 2026 17:07:00 +0900 Subject: [PATCH 1/6] fix(kotlin-spring): omit @Size for URI model properties --- .../resources/kotlin-spring/beanValidationModel.mustache | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache index 1522232e2f9e..8e8a419ecd04 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache @@ -5,6 +5,8 @@ format: email pattern set }}{{#pattern}} @get:Pattern(regexp="{{{pattern}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}){{/pattern}}{{! +URI properties are java.net.URI, which is not supported by Bean Validation @Size +}}{{^isUri}}{{! minLength && maxLength set }}{{#minLength}}{{#maxLength}} @get:Size(min={{minLength}},max={{maxLength}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}){{/maxLength}}{{/minLength}}{{! @@ -13,7 +15,7 @@ minLength set, maxLength not @get:Size(min={{minLength}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}){{/maxLength}}{{/minLength}}{{! minLength not set, maxLength set }}{{^minLength}}{{#maxLength}} - @get:Size(max={{.}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}){{/maxLength}}{{/minLength}}{{! + @get:Size(max={{.}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}){{/maxLength}}{{/minLength}}{{/isUri}}{{! @Size: minItems && maxItems set }}{{#minItems}}{{#maxItems}} @get:Size(min={{minItems}},max={{maxItems}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}) {{/maxItems}}{{/minItems}}{{! @@ -35,4 +37,4 @@ isLong set Not Integer, not Long => we have a decimal value! }}{{^isInteger}}{{^isLong}}{{#minimum}} @get:DecimalMin(value="{{.}}"{{#exclusiveMinimum}}, inclusive=false{{/exclusiveMinimum}}{{#vendorExtensions.x-minimum-message}}, message="{{vendorExtensions.x-minimum-message}}"{{/vendorExtensions.x-minimum-message}}){{/minimum}}{{#maximum}} - @get:DecimalMax(value="{{.}}"{{#exclusiveMaximum}}, inclusive=false{{/exclusiveMaximum}}{{#vendorExtensions.x-maximum-message}}, message="{{vendorExtensions.x-maximum-message}}"{{/vendorExtensions.x-maximum-message}}){{/maximum}}{{/isLong}}{{/isInteger}} \ No newline at end of file + @get:DecimalMax(value="{{.}}"{{#exclusiveMaximum}}, inclusive=false{{/exclusiveMaximum}}{{#vendorExtensions.x-maximum-message}}, message="{{vendorExtensions.x-maximum-message}}"{{/vendorExtensions.x-maximum-message}}){{/maximum}}{{/isLong}}{{/isInteger}} From 23598f0401cf89b12fef48f0681235e1fd7ec170 Mon Sep 17 00:00:00 2001 From: c19yamahar Date: Thu, 19 Nov 2026 17:35:58 +0900 Subject: [PATCH 2/6] fix(kotlin-spring): preserve formatting when omitting URI @Size --- .../kotlin-spring/beanValidationModel.mustache | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache index 8e8a419ecd04..f73b8bb7021e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache @@ -5,17 +5,15 @@ format: email pattern set }}{{#pattern}} @get:Pattern(regexp="{{{pattern}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}){{/pattern}}{{! -URI properties are java.net.URI, which is not supported by Bean Validation @Size -}}{{^isUri}}{{! -minLength && maxLength set -}}{{#minLength}}{{#maxLength}} - @get:Size(min={{minLength}},max={{maxLength}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}){{/maxLength}}{{/minLength}}{{! +minLength && maxLength set; URI is not supported by Bean Validation @Size +}}{{#minLength}}{{#maxLength}}{{^isUri}} + @get:Size(min={{minLength}},max={{maxLength}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}){{/isUri}}{{/maxLength}}{{/minLength}}{{! minLength set, maxLength not -}}{{#minLength}}{{^maxLength}} - @get:Size(min={{minLength}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}){{/maxLength}}{{/minLength}}{{! +}}{{#minLength}}{{^maxLength}}{{^isUri}} + @get:Size(min={{minLength}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}){{/isUri}}{{/maxLength}}{{/minLength}}{{! minLength not set, maxLength set -}}{{^minLength}}{{#maxLength}} - @get:Size(max={{.}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}){{/maxLength}}{{/minLength}}{{/isUri}}{{! +}}{{^minLength}}{{#maxLength}}{{^isUri}} + @get:Size(max={{.}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}){{/isUri}}{{/maxLength}}{{/minLength}}{{! @Size: minItems && maxItems set }}{{#minItems}}{{#maxItems}} @get:Size(min={{minItems}},max={{maxItems}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}) {{/maxItems}}{{/minItems}}{{! From dfea6ab5c1cb9c134a9e6ecad0d56c3ad3dc3664 Mon Sep 17 00:00:00 2001 From: c19yamahar Date: Thu, 19 Nov 2026 17:41:12 +0900 Subject: [PATCH 3/6] fix: avoid no needs changes --- .../main/resources/kotlin-spring/beanValidationModel.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache index f73b8bb7021e..6046ffa55eab 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache @@ -35,4 +35,4 @@ isLong set Not Integer, not Long => we have a decimal value! }}{{^isInteger}}{{^isLong}}{{#minimum}} @get:DecimalMin(value="{{.}}"{{#exclusiveMinimum}}, inclusive=false{{/exclusiveMinimum}}{{#vendorExtensions.x-minimum-message}}, message="{{vendorExtensions.x-minimum-message}}"{{/vendorExtensions.x-minimum-message}}){{/minimum}}{{#maximum}} - @get:DecimalMax(value="{{.}}"{{#exclusiveMaximum}}, inclusive=false{{/exclusiveMaximum}}{{#vendorExtensions.x-maximum-message}}, message="{{vendorExtensions.x-maximum-message}}"{{/vendorExtensions.x-maximum-message}}){{/maximum}}{{/isLong}}{{/isInteger}} + @get:DecimalMax(value="{{.}}"{{#exclusiveMaximum}}, inclusive=false{{/exclusiveMaximum}}{{#vendorExtensions.x-maximum-message}}, message="{{vendorExtensions.x-maximum-message}}"{{/vendorExtensions.x-maximum-message}}){{/maximum}}{{/isLong}}{{/isInteger}} \ No newline at end of file From 7e22fd6773adc7f5626b53a21623decde9a1867c Mon Sep 17 00:00:00 2001 From: c19yamahar Date: Thu, 19 Nov 2026 18:20:16 +0900 Subject: [PATCH 4/6] feat: omit pattern and add test --- .../beanValidationModel.mustache | 6 ++-- .../spring/KotlinSpringServerCodegenTest.java | 19 ++++++++++++ .../3_0/kotlin/uri-validation-pattern.yaml | 29 +++++++++++++++++++ 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache index 6046ffa55eab..ff31aa5fb061 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache @@ -2,9 +2,9 @@ format: email }}{{#isEmail}} @get:Email{{/isEmail}}{{! -pattern set -}}{{#pattern}} - @get:Pattern(regexp="{{{pattern}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}){{/pattern}}{{! +pattern set; URI is not supported by Bean Validation @Pattern +}}{{#pattern}}{{^isUri}} + @get:Pattern(regexp="{{{pattern}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}){{/isUri}}{{/pattern}}{{! minLength && maxLength set; URI is not supported by Bean Validation @Size }}{{#minLength}}{{#maxLength}}{{^isUri}} @get:Size(min={{minLength}},max={{maxLength}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}){{/isUri}}{{/maxLength}}{{/minLength}}{{! diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index 720075e4cc2a..5ca37e86ddd0 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -8032,6 +8032,25 @@ public void kdocParamNameIsNotHtmlEscaped() throws IOException { assertFileContains(itemFile.toPath(), "@param `2ndField` "); } + @Test(description = "URI properties do not get unsupported Bean Validation annotations") + public void uriPropertiesDoNotGetPatternOrSizeConstraints() throws IOException { + Map files = generateFromContract( + "src/test/resources/3_0/kotlin/uri-validation-pattern.yaml", + new HashMap<>(Map.of(USE_BEANVALIDATION, true)) + ); + + File modelFile = files.get("UriPayload.kt"); + assertThat(modelFile).isNotNull(); + String model = Files.readString(modelFile.toPath()); + + assertThat(model).contains("uri: java.net.URI?"); + assertThat(model).doesNotContain("@get:Pattern(regexp=\"^https?://\")"); + assertThat(model).contains("@get:Pattern(regexp=\"^[a-z]+$\")"); + String sizeConstraint = "@get:Size(min=1)"; + assertThat(model).contains(sizeConstraint); + assertThat(model.indexOf(sizeConstraint)).isEqualTo(model.lastIndexOf(sizeConstraint)); + } + /** * Regression test for https://github.com/OpenAPITools/openapi-generator/issues/24139 diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml new file mode 100644 index 000000000000..ef7a282da9a2 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml @@ -0,0 +1,29 @@ +openapi: 3.0.3 +info: + title: URI validation annotations + version: 1.0.0 +paths: + /uri-payload: + get: + operationId: getUriPayload + responses: + '200': + description: URI payload + content: + application/json: + schema: + $ref: '#/components/schemas/UriPayload' +components: + schemas: + UriPayload: + type: object + properties: + uri: + type: string + format: uri + pattern: '^https?://' + minLength: 1 + plainString: + type: string + pattern: '^[a-z]+$' + minLength: 1 From 728929208d76a5dee4678b587cbdad0bb19b2214 Mon Sep 17 00:00:00 2001 From: c19yamahar Date: Thu, 19 Nov 2026 18:45:28 +0900 Subject: [PATCH 5/6] fix(kotlin-spring): omit validation constraints for URI parameters --- .../languages/KotlinSpringServerCodegen.java | 8 ++++++++ .../kotlin-spring/beanValidationCore.mustache | 12 ++++++------ .../spring/KotlinSpringServerCodegenTest.java | 14 ++++++++++++-- .../3_0/kotlin/uri-validation-pattern.yaml | 14 ++++++++++++++ 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index 8d9283033f85..8105ce3ff44d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -1513,6 +1513,14 @@ protected String getExtraListAnnotation(Schema items) { return String.join(" ", annotations); } + @Override + protected void updateParameterForString(CodegenParameter codegenParameter, Schema parameterSchema) { + super.updateParameterForString(codegenParameter, parameterSchema); + if (ModelUtils.isURISchema(parameterSchema)) { + codegenParameter.isUri = true; + } + } + /** * Bean validation for the element type of a list/set, following the rules of * {@code AbstractJavaCodegen#getBeanValidation} and rendered in the format of {@code beanValidationCore.mustache}. diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationCore.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationCore.mustache index b14fb649c69a..0a1a3515284f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationCore.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationCore.mustache @@ -1,12 +1,12 @@ {{#isEmail}}@Email {{/isEmail}}{{! -pattern set -}}{{#pattern}}@Pattern(regexp="{{{.}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}) {{/pattern}}{{! -minLength && maxLength set -}}{{#minLength}}{{#maxLength}}@Size(min={{minLength}},max={{maxLength}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}) {{/maxLength}}{{/minLength}}{{! +pattern set; URI is not supported by Bean Validation @Pattern +}}{{#pattern}}{{^isUri}}@Pattern(regexp="{{{.}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}) {{/isUri}}{{/pattern}}{{! +minLength && maxLength set; URI is not supported by Bean Validation @Size +}}{{#minLength}}{{#maxLength}}{{^isUri}}@Size(min={{minLength}},max={{maxLength}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}) {{/isUri}}{{/maxLength}}{{/minLength}}{{! minLength set, maxLength not -}}{{#minLength}}{{^maxLength}}@Size(min={{minLength}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}) {{/maxLength}}{{/minLength}}{{! +}}{{#minLength}}{{^maxLength}}{{^isUri}}@Size(min={{minLength}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}) {{/isUri}}{{/maxLength}}{{/minLength}}{{! minLength not set, maxLength set -}}{{^minLength}}{{#maxLength}}@Size(max={{.}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}) {{/maxLength}}{{/minLength}}{{! +}}{{^minLength}}{{#maxLength}}{{^isUri}}@Size(max={{.}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}) {{/isUri}}{{/maxLength}}{{/minLength}}{{! @Size: minItems && maxItems set }}{{#minItems}}{{#maxItems}}@Size(min={{minItems}},max={{maxItems}}{{#vendorExtensions.x-size-message}}, message="{{vendorExtensions.x-size-message}}"{{/vendorExtensions.x-size-message}}) {{/maxItems}}{{/minItems}}{{! @Size: minItems set, maxItems not diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index 5ca37e86ddd0..f995b04d5a6b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -8032,8 +8032,8 @@ public void kdocParamNameIsNotHtmlEscaped() throws IOException { assertFileContains(itemFile.toPath(), "@param `2ndField` "); } - @Test(description = "URI properties do not get unsupported Bean Validation annotations") - public void uriPropertiesDoNotGetPatternOrSizeConstraints() throws IOException { + @Test(description = "URI properties and parameters do not get unsupported Bean Validation annotations") + public void uriPropertiesAndParametersDoNotGetPatternOrSizeConstraints() throws IOException { Map files = generateFromContract( "src/test/resources/3_0/kotlin/uri-validation-pattern.yaml", new HashMap<>(Map.of(USE_BEANVALIDATION, true)) @@ -8049,6 +8049,16 @@ public void uriPropertiesDoNotGetPatternOrSizeConstraints() throws IOException { String sizeConstraint = "@get:Size(min=1)"; assertThat(model).contains(sizeConstraint); assertThat(model.indexOf(sizeConstraint)).isEqualTo(model.lastIndexOf(sizeConstraint)); + + File apiFile = files.get("UriPayloadApiController.kt"); + assertThat(apiFile).isNotNull(); + String api = Files.readString(apiFile.toPath()); + assertThat(api).contains("uriParam: java.net.URI?"); + assertThat(api).doesNotContain("@Pattern(regexp=\"^https?://\")"); + assertThat(api).contains("@Pattern(regexp=\"^[a-z]+$\")"); + String parameterSizeConstraint = "@Size(min=1)"; + assertThat(api).contains(parameterSizeConstraint); + assertThat(api.indexOf(parameterSizeConstraint)).isEqualTo(api.lastIndexOf(parameterSizeConstraint)); } diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml index ef7a282da9a2..509097947d83 100644 --- a/modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml @@ -6,6 +6,20 @@ paths: /uri-payload: get: operationId: getUriPayload + parameters: + - in: query + name: uriParam + schema: + type: string + format: uri + pattern: '^https?://' + minLength: 1 + - in: query + name: plainStringParam + schema: + type: string + pattern: '^[a-z]+$' + minLength: 1 responses: '200': description: URI payload From 805cef7515f3d38f2a3f6ebaa3178562fed2b480 Mon Sep 17 00:00:00 2001 From: c19yamahar Date: Thu, 19 Nov 2026 19:42:15 +0900 Subject: [PATCH 6/6] test(kotlin-spring): cover URI validation constraint branches --- .../spring/KotlinSpringServerCodegenTest.java | 57 +++++++++++++++---- .../3_0/kotlin/uri-validation-pattern.yaml | 40 +++++++++++++ 2 files changed, 87 insertions(+), 10 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index f995b04d5a6b..a699c5878736 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -8044,21 +8044,58 @@ public void uriPropertiesAndParametersDoNotGetPatternOrSizeConstraints() throws String model = Files.readString(modelFile.toPath()); assertThat(model).contains("uri: java.net.URI?"); - assertThat(model).doesNotContain("@get:Pattern(regexp=\"^https?://\")"); - assertThat(model).contains("@get:Pattern(regexp=\"^[a-z]+$\")"); - String sizeConstraint = "@get:Size(min=1)"; - assertThat(model).contains(sizeConstraint); - assertThat(model.indexOf(sizeConstraint)).isEqualTo(model.lastIndexOf(sizeConstraint)); + assertThat(getKotlinPropertyAnnotations(model, "uri")) + .doesNotContain("@get:Pattern(regexp=\"^https?://\")") + .doesNotContain("@get:Size"); + assertThat(getKotlinPropertyAnnotations(model, "uriMaxLength")).doesNotContain("@get:Size"); + assertThat(getKotlinPropertyAnnotations(model, "uriMinMaxLength")).doesNotContain("@get:Size"); + assertThat(getKotlinPropertyAnnotations(model, "plainString")) + .contains("@get:Pattern(regexp=\"^[a-z]+$\")") + .contains("@get:Size(min=1)"); + assertThat(getKotlinPropertyAnnotations(model, "plainStringMaxLength")).contains("@get:Size(max=10)"); + assertThat(getKotlinPropertyAnnotations(model, "plainStringMinMaxLength")) + .contains("@get:Size(min=2,max=12)"); File apiFile = files.get("UriPayloadApiController.kt"); assertThat(apiFile).isNotNull(); String api = Files.readString(apiFile.toPath()); assertThat(api).contains("uriParam: java.net.URI?"); - assertThat(api).doesNotContain("@Pattern(regexp=\"^https?://\")"); - assertThat(api).contains("@Pattern(regexp=\"^[a-z]+$\")"); - String parameterSizeConstraint = "@Size(min=1)"; - assertThat(api).contains(parameterSizeConstraint); - assertThat(api.indexOf(parameterSizeConstraint)).isEqualTo(api.lastIndexOf(parameterSizeConstraint)); + assertThat(getKotlinParameterAnnotations(api, "uriParam")) + .doesNotContain("@Pattern(regexp=\"^https?://\")") + .doesNotContain("@Size"); + assertThat(getKotlinParameterAnnotations(api, "uriParamMaxLength")).doesNotContain("@Size"); + assertThat(getKotlinParameterAnnotations(api, "uriParamMinMaxLength")).doesNotContain("@Size"); + assertThat(getKotlinParameterAnnotations(api, "plainStringParam")) + .contains("@Pattern(regexp=\"^[a-z]+$\")") + .contains("@Size(min=1)"); + assertThat(getKotlinParameterAnnotations(api, "plainStringParamMaxLength")).contains("@Size(max=10)"); + assertThat(getKotlinParameterAnnotations(api, "plainStringParamMinMaxLength")) + .contains("@Size(min=2,max=12)"); + } + + private String getKotlinPropertyAnnotations(String model, String propertyName) { + String declaration = "val " + propertyName + ":"; + int declarationIndex = model.indexOf(declaration); + assertThat(declarationIndex).as("property declaration for %s", propertyName).isGreaterThanOrEqualTo(0); + + int previousPropertyIndex = model.lastIndexOf("val ", declarationIndex - 1); + int annotationsStart; + if (previousPropertyIndex >= 0) { + annotationsStart = model.indexOf('\n', previousPropertyIndex) + 1; + } else { + int classDeclarationIndex = model.lastIndexOf("data class ", declarationIndex); + annotationsStart = model.indexOf('\n', classDeclarationIndex) + 1; + } + return model.substring(annotationsStart, declarationIndex); + } + + private String getKotlinParameterAnnotations(String api, String parameterName) { + String declaration = parameterName + ":"; + int declarationIndex = api.indexOf(declaration); + assertThat(declarationIndex).as("parameter declaration for %s", parameterName).isGreaterThanOrEqualTo(0); + + int lineStart = api.lastIndexOf('\n', declarationIndex) + 1; + return api.substring(lineStart, declarationIndex); } diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml index 509097947d83..7952eb5d4282 100644 --- a/modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/uri-validation-pattern.yaml @@ -14,12 +14,36 @@ paths: format: uri pattern: '^https?://' minLength: 1 + - in: query + name: uriParamMaxLength + schema: + type: string + format: uri + maxLength: 10 + - in: query + name: uriParamMinMaxLength + schema: + type: string + format: uri + minLength: 2 + maxLength: 12 - in: query name: plainStringParam schema: type: string pattern: '^[a-z]+$' minLength: 1 + - in: query + name: plainStringParamMaxLength + schema: + type: string + maxLength: 10 + - in: query + name: plainStringParamMinMaxLength + schema: + type: string + minLength: 2 + maxLength: 12 responses: '200': description: URI payload @@ -41,3 +65,19 @@ components: type: string pattern: '^[a-z]+$' minLength: 1 + uriMaxLength: + type: string + format: uri + maxLength: 10 + uriMinMaxLength: + type: string + format: uri + minLength: 2 + maxLength: 12 + plainStringMaxLength: + type: string + maxLength: 10 + plainStringMinMaxLength: + type: string + minLength: 2 + maxLength: 12