From 40669cc7c682925bba691ca820a19c0fab95a6fc Mon Sep 17 00:00:00 2001 From: ioanadinuit <83220826+ioanadinuit@users.noreply.github.com> Date: Sun, 5 Dec 2021 10:01:04 +0200 Subject: [PATCH] Update annotation name (#11531) --- .../validation/{Camelcase.java => Capitalized.java} | 6 +++--- .../{CamelcaseValidator.java => CapitalizedValidator.java} | 6 +++--- .../src/main/resources/openapi/templates/api.mustache | 2 +- .../src/main/resources/openapi/templates/model.mustache | 2 +- .../src/main/resources/petstore.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/{Camelcase.java => Capitalized.java} (74%) rename spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/{CamelcaseValidator.java => CapitalizedValidator.java} (83%) diff --git a/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/Camelcase.java b/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/Capitalized.java similarity index 74% rename from spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/Camelcase.java rename to spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/Capitalized.java index b0b0b739e2..de83297c53 100644 --- a/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/Camelcase.java +++ b/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/Capitalized.java @@ -5,12 +5,12 @@ import javax.validation.Payload; import java.lang.annotation.*; @Documented -@Constraint(validatedBy = {CamelcaseValidator.class}) +@Constraint(validatedBy = {CapitalizedValidator.class}) @Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) -public @interface Camelcase { +public @interface Capitalized { - String message() default "Name should be uppercase."; + String message() default "Name should be capitalized."; boolean required() default true; diff --git a/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/CamelcaseValidator.java b/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/CapitalizedValidator.java similarity index 83% rename from spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/CamelcaseValidator.java rename to spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/CapitalizedValidator.java index 2b08e3dd2a..969dc0c56c 100644 --- a/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/CamelcaseValidator.java +++ b/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/java/com/baeldung/openapi/petstore/validation/CapitalizedValidator.java @@ -4,11 +4,11 @@ import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import java.util.Objects; -public class CamelcaseValidator implements ConstraintValidator { +public class CapitalizedValidator implements ConstraintValidator { - private Camelcase uppercaseAnnotation; + private Capitalized uppercaseAnnotation; - public void initialize(Camelcase constraintAnnotation) { + public void initialize(Capitalized constraintAnnotation) { this.uppercaseAnnotation = constraintAnnotation; } diff --git a/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/openapi/templates/api.mustache b/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/openapi/templates/api.mustache index a7a35d43b5..34f4afac3a 100644 --- a/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/openapi/templates/api.mustache +++ b/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/openapi/templates/api.mustache @@ -8,7 +8,7 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} import io.swagger.annotations.*; -import com.baeldung.openapi.petstore.validation.Camelcase; +import com.baeldung.openapi.petstore.validation.Capitalized; {{#jdk8-no-delegate}} {{#virtualService}} import io.virtualan.annotation.ApiVirtual; diff --git a/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/openapi/templates/model.mustache b/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/openapi/templates/model.mustache index d9329b40d3..4546a811ef 100644 --- a/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/openapi/templates/model.mustache +++ b/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/openapi/templates/model.mustache @@ -4,7 +4,7 @@ package {{package}}; {{/imports}} import com.fasterxml.jackson.databind.annotation.*; import com.fasterxml.jackson.annotation.*; -import com.baeldung.openapi.petstore.validation.Camelcase; +import com.baeldung.openapi.petstore.validation.Capitalized; {{^supportJava6}} import java.util.Objects; import java.util.Arrays; diff --git a/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/petstore.yml b/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/petstore.yml index c9884c01e8..c5fbd830bb 100644 --- a/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/petstore.yml +++ b/spring-swagger-codegen/custom-validations-opeanpi-codegen/src/main/resources/petstore.yml @@ -37,7 +37,7 @@ paths: schema: type: string description: Tags to filter by - x-constraints: "@Camelcase(required = true)" + x-constraints: "@Capitalized(required = true)" responses: '200': description: default response @@ -62,4 +62,4 @@ components: format: int64 name: type: string - x-constraints: "@Camelcase(required = true)" \ No newline at end of file + x-constraints: "@Capitalized(required = true)" \ No newline at end of file