From 5baf40336f32c106316e1a718e7038754926c28b Mon Sep 17 00:00:00 2001 From: Jorge Date: Tue, 2 Jun 2026 16:18:29 +0200 Subject: [PATCH 1/6] fix: add generated annotation for enum converter --- .../src/main/resources/JavaSpring/converter.mustache | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache index b573b65fb0d4..8d032b6f3c2f 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache @@ -12,6 +12,8 @@ import {{modelPackage}}.{{classname}}; {{/model}} {{/models}} +import {{javaxPackage}}.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -23,6 +25,7 @@ import org.springframework.core.convert.converter.Converter; * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ +{{>generatedAnnotation}} @Configuration(value = "{{configPackage}}.enumConverterConfiguration") public class EnumConverterConfiguration { From c9d463561625b170f8ca77aeff6df199799ab770 Mon Sep 17 00:00:00 2001 From: Jorge Date: Wed, 3 Jun 2026 10:49:40 +0200 Subject: [PATCH 2/6] fix: add generated annotation to enum converter configuration --- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- .../configuration/EnumConverterConfiguration.java | 4 +++- 25 files changed, 75 insertions(+), 25 deletions(-) diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 2bbba8e787e7..bb78f3e7dcac 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -6,6 +6,8 @@ import org.openapitools.model.FruitType; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -17,7 +19,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.fruitTypeConverter") diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 2bbba8e787e7..bb78f3e7dcac 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -6,6 +6,8 @@ import org.openapitools.model.FruitType; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -17,7 +19,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.fruitTypeConverter") diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 2bbba8e787e7..bb78f3e7dcac 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -6,6 +6,8 @@ import org.openapitools.model.FruitType; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -17,7 +19,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.fruitTypeConverter") diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..35410be61695 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import javax.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index ecf23401fee5..42f4c39815f3 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClassDto; import org.openapitools.model.OuterEnumDto; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 0feb90d61375..f2087afcbdf7 100644 --- a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -6,6 +6,8 @@ import org.openapitools.model.PetSort; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -17,7 +19,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.petSortConverter") diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 83a50a671d5a..2ee0b068901c 100644 --- a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.PetSort; import org.openapitools.model.PetSortEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.petSortConverter") diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 9d3d98fad6d3..53fb6fdebf87 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClass; import org.openapitools.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 03049c52f0f7..22273ec027a3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.virtualan.model.EnumClass; import org.openapitools.virtualan.model.OuterEnum; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 8c5315a26208..ff2a308c7c1c 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -11,6 +11,8 @@ import org.openapitools.model.OuterEnumIntegerDto; import org.openapitools.model.SingleRefTypeDto; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -22,7 +24,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index ecf23401fee5..42f4c39815f3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,6 +7,8 @@ import org.openapitools.model.EnumClassDto; import org.openapitools.model.OuterEnumDto; +import jakarta.annotation.Generated; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -18,7 +20,7 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") From e869de83d6477eccff522ebdf7d8b4d73aeb95bc Mon Sep 17 00:00:00 2001 From: Jorge Date: Wed, 3 Jun 2026 12:30:36 +0200 Subject: [PATCH 3/6] fix: add generated annotation to enum converter configuration --- .../src/main/resources/JavaSpring/converter.mustache | 1 + .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- .../openapitools/configuration/EnumConverterConfiguration.java | 3 ++- 26 files changed, 51 insertions(+), 25 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache index 8d032b6f3c2f..90999bcd3e60 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache @@ -26,6 +26,7 @@ import org.springframework.core.convert.converter.Converter; * `original` or the specification has an integer enum. */ {{>generatedAnnotation}} + @Configuration(value = "{{configPackage}}.enumConverterConfiguration") public class EnumConverterConfiguration { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index bb78f3e7dcac..3f58e69d872f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -19,7 +19,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.fruitTypeConverter") diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index bb78f3e7dcac..3f58e69d872f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -19,7 +19,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.fruitTypeConverter") diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index bb78f3e7dcac..3f58e69d872f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -19,7 +19,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.fruitTypeConverter") diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 35410be61695..730f6b0cc899 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 42f4c39815f3..0e0fd15378d2 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index f2087afcbdf7..d9301ad1f924 100644 --- a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -19,7 +19,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.petSortConverter") diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 2ee0b068901c..ddf4ab86231b 100644 --- a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.petSortConverter") diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 53fb6fdebf87..49273ba02b4e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 22273ec027a3..a29f865ff966 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index ff2a308c7c1c..bf99ad55aeb3 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -24,7 +24,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 42f4c39815f3..0e0fd15378d2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -20,7 +20,8 @@ * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than * `original` or the specification has an integer enum. */ -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT")@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") From 60d3a7d54aed13f0a67710030a4a868a800b65ad Mon Sep 17 00:00:00 2001 From: Jorge Date: Thu, 4 Jun 2026 12:44:09 +0200 Subject: [PATCH 4/6] fix: add pageable support to pet API endpoints --- .../org/openapitools/api/PetController.java | 8 +++++-- .../java/org/openapitools/api/PetApi.java | 21 +++++++------------ .../.openapi-generator/FILES | 1 - .../java/org/openapitools/model/Order.java | 3 +-- .../main/java/org/openapitools/model/Pet.java | 3 +-- .../springboot-4/.openapi-generator/FILES | 1 - .../java/org/openapitools/model/Order.java | 3 +-- .../main/java/org/openapitools/model/Pet.java | 3 +-- .../.openapi-generator/FILES | 1 - .../kotlin/org/openapitools/model/ApiError.kt | 3 +-- .../org/openapitools/model/ReasonCode.kt | 3 +-- .../kotlin/org/openapitools/api/PetApi.kt | 4 ++-- .../.openapi-generator/FILES | 1 - .../kotlin/org/openapitools/model/Order.kt | 3 +-- .../main/kotlin/org/openapitools/model/Pet.kt | 3 +-- .../.openapi-generator/FILES | 1 - .../java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/model/PetSort.java | 3 +-- .../org/openapitools/model/PetSortEnum.java | 3 +-- .../springboot/.openapi-generator/FILES | 1 - .../EnumConverterConfiguration.java | 2 +- .../org/openapitools/model/BigCatDto.java | 3 +-- .../org/openapitools/model/EnumArraysDto.java | 3 +-- .../org/openapitools/model/EnumClassDto.java | 3 +-- .../org/openapitools/model/EnumTestDto.java | 9 ++++---- .../java/org/openapitools/model/OrderDto.java | 3 +-- .../org/openapitools/model/OuterEnumDto.java | 3 +-- .../model/ParentWithNullableDto.java | 3 +-- .../java/org/openapitools/model/PetDto.java | 3 +-- 29 files changed, 39 insertions(+), 66 deletions(-) diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java index 78cd3c0d5fec..01a1ef7cd935 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java @@ -7,6 +7,8 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.lang.Nullable; +import org.springframework.data.domain.Pageable; +import org.springdoc.core.annotations.ParameterObject; import org.openapitools.model.Pet; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -125,7 +127,8 @@ ResponseEntity deletePet( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByStatus( - @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status, + @ParameterObject final Pageable pageable ); @@ -163,7 +166,8 @@ ResponseEntity> findPetsByStatus( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByTags( - @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags, + @ParameterObject final Pageable pageable ); diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 6d015c8e2890..320effcb2eae 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -7,6 +7,8 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.lang.Nullable; +import org.springframework.data.domain.Pageable; +import org.springdoc.core.annotations.ParameterObject; import org.openapitools.model.Pet; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -127,7 +129,8 @@ ResponseEntity deletePet( @org.springframework.validation.annotation.Validated @org.springframework.security.access.prepost.PreAuthorize("hasRole('ADMIN')") ResponseEntity> findPetsByStatus( - @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status, + @ParameterObject final Pageable pageable ); @@ -137,9 +140,6 @@ ResponseEntity> findPetsByStatus( * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * * @param tags Tags to filter by (required) - * @param size2 The number of items to return per page. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (required) - * @param page The page to return, starting with page 0. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (required) - * @param sort The sorting to apply to the Pageable object. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (required) * @param size A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used. (optional) * @return successful operation (status code 200) * or Invalid tag value (status code 400) @@ -170,10 +170,8 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags, - @NotNull @Min(value = 1) @Parameter(name = "size", description = "The number of items to return per page. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "size", required = true, defaultValue = "20") Integer size2, - @NotNull @Min(value = 0) @Parameter(name = "page", description = "The page to return, starting with page 0. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "page", required = true, defaultValue = "0") Integer page, - @NotNull @Parameter(name = "sort", description = "The sorting to apply to the Pageable object. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "sort", required = true, defaultValue = "id,asc") String sort, - @Parameter(name = "size", description = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.", in = ParameterIn.HEADER) @RequestHeader(value = "size", required = false) @Nullable String size + @Parameter(name = "size", description = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.", in = ParameterIn.HEADER) @RequestHeader(value = "size", required = false) @Nullable String size, + @ParameterObject final Pageable pageable ); @@ -219,9 +217,6 @@ ResponseEntity getPetById( * GET /pet/all : List all pets * Returns all pets with pagination support * - * @param page The page number to return. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (optional, default to 0) - * @param size The number of items to return per page. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (optional, default to 20) - * @param sort The sort order. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (optional) * @return successful operation (status code 200) * or Invalid status value (status code 400) */ @@ -248,9 +243,7 @@ ResponseEntity getPetById( ) @org.springframework.validation.annotation.Validated ResponseEntity> listAllPets( - @Parameter(name = "page", description = "The page number to return. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", in = ParameterIn.QUERY) @Valid @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, - @Parameter(name = "size", description = "The number of items to return per page. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", in = ParameterIn.QUERY) @Valid @RequestParam(value = "size", required = false, defaultValue = "20") Integer size, - @Parameter(name = "sort", description = "The sort order. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", in = ParameterIn.QUERY) @Valid @RequestParam(value = "sort", required = false) @Nullable String sort + @ParameterObject final Pageable pageable ); diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/.openapi-generator/FILES index 340304fd3cd6..7bcd6d2efc85 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/.openapi-generator/FILES @@ -11,7 +11,6 @@ src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiDelegate.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java -src/main/java/org/openapitools/configuration/ValuedEnum.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ModelApiResponse.java src/main/java/org/openapitools/model/Order.java diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java index a79b99b3d599..a05cd077488c 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java @@ -8,7 +8,6 @@ import java.time.OffsetDateTime; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.lang.Nullable; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -46,7 +45,7 @@ public class Order { /** * Order Status */ - public enum StatusEnum implements ValuedEnum { + public enum StatusEnum { PLACED("placed"), APPROVED("approved"), diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java index 14e73607e3e6..bccd8f9bcc22 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java @@ -11,7 +11,6 @@ import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.springframework.lang.Nullable; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -50,7 +49,7 @@ public class Pet { /** * pet status in the store */ - public enum StatusEnum implements ValuedEnum { + public enum StatusEnum { AVAILABLE("available"), PENDING("pending"), diff --git a/samples/openapi3/server/petstore/springboot-4/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-4/.openapi-generator/FILES index 24038465612c..b15e2c45d45d 100644 --- a/samples/openapi3/server/petstore/springboot-4/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-4/.openapi-generator/FILES @@ -8,7 +8,6 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java -src/main/java/org/openapitools/configuration/ValuedEnum.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ModelApiResponse.java src/main/java/org/openapitools/model/Order.java diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java index 34ef3ffa36ed..cd97ab532474 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java @@ -8,7 +8,6 @@ import java.time.OffsetDateTime; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.lang.Nullable; -import org.openapitools.configuration.ValuedEnum; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; @@ -45,7 +44,7 @@ public class Order { /** * Order Status */ - public enum StatusEnum implements ValuedEnum { + public enum StatusEnum { PLACED("placed"), APPROVED("approved"), diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java index 98bf496ca1f5..16f85dfab0f1 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java @@ -11,7 +11,6 @@ import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.springframework.lang.Nullable; -import org.openapitools.configuration.ValuedEnum; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; @@ -49,7 +48,7 @@ public class Pet { /** * pet status in the store */ - public enum StatusEnum implements ValuedEnum { + public enum StatusEnum { AVAILABLE("available"), PENDING("pending"), diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-integer-enum/.openapi-generator/FILES index 8ce899fc9e08..d35b88d1309a 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-springboot-integer-enum/.openapi-generator/FILES @@ -10,6 +10,5 @@ src/main/kotlin/org/openapitools/api/ApiUtil.kt src/main/kotlin/org/openapitools/api/DefaultApi.kt src/main/kotlin/org/openapitools/api/Exceptions.kt src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt -src/main/kotlin/org/openapitools/configuration/ValuedEnum.kt src/main/kotlin/org/openapitools/model/ApiError.kt src/main/kotlin/org/openapitools/model/ReasonCode.kt diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt index a48b4b5e4b8e..2c192ad855e3 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt +++ b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.ReasonCode -import org.openapitools.configuration.ValuedEnum import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -36,7 +35,7 @@ data class ApiError( * * Values: OK,ERROR */ - enum class ErrorCode(@get:JsonValue override val value: kotlin.Int) : ValuedEnum { + enum class ErrorCode(@get:JsonValue override val value: kotlin.Int) { OK(0), ERROR(100); diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ReasonCode.kt b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ReasonCode.kt index 96efb7984c28..bb95c82a59d0 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ReasonCode.kt +++ b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ReasonCode.kt @@ -4,7 +4,6 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import org.openapitools.configuration.ValuedEnum import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -19,7 +18,7 @@ import jakarta.validation.Valid * * Values: _10,_20 */ -enum class ReasonCode(@get:JsonValue override val value: kotlin.Int) : ValuedEnum { +enum class ReasonCode(@get:JsonValue override val value: kotlin.Int) { _10(10), _20(20); diff --git a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/api/PetApi.kt index a3471ad6f48a..2987390510c8 100644 --- a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -132,7 +132,7 @@ interface PetApi { value = [PATH_FIND_PETS_WITH_MIN_SIZE_CONSTRAINT_FROM_ALL_OF_REF], produces = ["application/json"] ) - fun findPetsWithMinSizeConstraintFromAllOfRef(@ValidPageable(minSize = 5) pageable: Pageable): ResponseEntity> { + fun findPetsWithMinSizeConstraintFromAllOfRef(pageable: Pageable): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -209,7 +209,7 @@ interface PetApi { value = [PATH_FIND_PETS_WITH_SIZE_CONSTRAINT_FROM_ALL_OF_REF], produces = ["application/json"] ) - fun findPetsWithSizeConstraintFromAllOfRef(@ValidPageable(maxSize = 75) pageable: Pageable): ResponseEntity> { + fun findPetsWithSizeConstraintFromAllOfRef(pageable: Pageable): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } diff --git a/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES index 9d7cb0668469..c7afb2eda91e 100644 --- a/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES @@ -18,7 +18,6 @@ src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt src/main/kotlin/org/openapitools/api/UserApiController.kt src/main/kotlin/org/openapitools/api/UserApiService.kt src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt -src/main/kotlin/org/openapitools/configuration/ValuedEnum.kt src/main/kotlin/org/openapitools/model/Category.kt src/main/kotlin/org/openapitools/model/ModelApiResponse.kt src/main/kotlin/org/openapitools/model/Order.kt diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt index 0aefed01433e..8eb4e0cddeab 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt @@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.annotation.Nulls -import org.openapitools.configuration.ValuedEnum import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -51,7 +50,7 @@ data class Order( * Order Status * Values: placed,approved,delivered */ - enum class Status(@get:JsonValue override val value: kotlin.String) : ValuedEnum { + enum class Status(@get:JsonValue override val value: kotlin.String) { placed("placed"), approved("approved"), diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt index 076207ab8f19..8d39acfd0054 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag -import org.openapitools.configuration.ValuedEnum import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -53,7 +52,7 @@ data class Pet( * pet status in the store * Values: available,pending,sold */ - enum class Status(@get:JsonValue override val value: kotlin.String) : ValuedEnum { + enum class Status(@get:JsonValue override val value: kotlin.String) { available("available"), pending("pending"), diff --git a/samples/server/petstore/springboot-sort-validation/.openapi-generator/FILES b/samples/server/petstore/springboot-sort-validation/.openapi-generator/FILES index b28d849d88bf..da2d4c6d3b44 100644 --- a/samples/server/petstore/springboot-sort-validation/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-sort-validation/.openapi-generator/FILES @@ -9,7 +9,6 @@ src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/ValidPageable.java src/main/java/org/openapitools/configuration/ValidSort.java -src/main/java/org/openapitools/configuration/ValuedEnum.java src/main/java/org/openapitools/model/NullableModel.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/PetSort.java diff --git a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/api/PetApi.java index 6de78b9bbd70..e6a983446386 100644 --- a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/api/PetApi.java @@ -164,7 +164,7 @@ ResponseEntity> findPetsWithExternalParamRefArraySort( produces = { "application/json" } ) ResponseEntity> findPetsWithMinSizeConstraintFromAllOfRef( - @ValidPageable(minSize = 5) final Pageable pageable + final Pageable pageable ); @@ -276,7 +276,7 @@ ResponseEntity> findPetsWithSizeConstraint( produces = { "application/json" } ) ResponseEntity> findPetsWithSizeConstraintFromAllOfRef( - @ValidPageable(maxSize = 75) final Pageable pageable + final Pageable pageable ); diff --git a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSort.java b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSort.java index e463c41cb3a6..129f441e10b6 100644 --- a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSort.java +++ b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSort.java @@ -3,7 +3,6 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import java.time.OffsetDateTime; @@ -22,7 +21,7 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") -public enum PetSort implements Serializable, ValuedEnum { +public enum PetSort implements Serializable { ID_ASC("id,asc"), diff --git a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSortEnum.java b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSortEnum.java index d86730f78a6d..42d89ad85847 100644 --- a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSortEnum.java +++ b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSortEnum.java @@ -3,7 +3,6 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import java.time.OffsetDateTime; @@ -22,7 +21,7 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") -public enum PetSortEnum implements Serializable, ValuedEnum { +public enum PetSortEnum implements Serializable { NAME_ASC("name,asc"), diff --git a/samples/server/petstore/springboot/.openapi-generator/FILES b/samples/server/petstore/springboot/.openapi-generator/FILES index 3f4797342e97..cda3767c5400 100644 --- a/samples/server/petstore/springboot/.openapi-generator/FILES +++ b/samples/server/petstore/springboot/.openapi-generator/FILES @@ -12,7 +12,6 @@ src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java -src/main/java/org/openapitools/configuration/ValuedEnum.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 0e0fd15378d2..d8366cfcfed6 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,7 +7,7 @@ import org.openapitools.model.EnumClassDto; import org.openapitools.model.OuterEnumDto; -import jakarta.annotation.Generated; +import javax.annotation.Generated; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java index 9d5b7638767e..30f28da15843 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java @@ -11,7 +11,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.model.CatDto; import org.springframework.lang.Nullable; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -34,7 +33,7 @@ public class BigCatDto extends CatDto { /** * Gets or Sets kind */ - public enum KindEnum implements ValuedEnum { + public enum KindEnum { LIONS("lions"), TIGERS("tigers"), diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java index f392ac1d61d1..160ff8c0754e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -10,7 +10,6 @@ import java.util.Arrays; import java.util.List; import org.springframework.lang.Nullable; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -32,7 +31,7 @@ public class EnumArraysDto { /** * Gets or Sets justSymbol */ - public enum JustSymbolEnum implements ValuedEnum { + public enum JustSymbolEnum { GREATER_THAN_OR_EQUAL_TO(">="), DOLLAR("$"); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumClassDto.java index 55842b9a0d5c..145172d05a6d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumClassDto.java @@ -3,7 +3,6 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -22,7 +21,7 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") -public enum EnumClassDto implements ValuedEnum { +public enum EnumClassDto { _ABC("_abc"), diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java index 991858866b66..a566fee46d72 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.model.OuterEnumDto; import org.springframework.lang.Nullable; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -30,7 +29,7 @@ public class EnumTestDto { /** * Gets or Sets enumString */ - public enum EnumStringEnum implements ValuedEnum { + public enum EnumStringEnum { UPPER("UPPER"), LOWER("lower"), @@ -69,7 +68,7 @@ public static EnumStringEnum fromValue(String value) { /** * Gets or Sets enumStringRequired */ - public enum EnumStringRequiredEnum implements ValuedEnum { + public enum EnumStringRequiredEnum { UPPER("UPPER"), LOWER("lower"), @@ -108,7 +107,7 @@ public static EnumStringRequiredEnum fromValue(String value) { /** * Gets or Sets enumInteger */ - public enum EnumIntegerEnum implements ValuedEnum { + public enum EnumIntegerEnum { NUMBER_1(1), NUMBER_MINUS_1(-1); @@ -145,7 +144,7 @@ public static EnumIntegerEnum fromValue(Integer value) { /** * Gets or Sets enumNumber */ - public enum EnumNumberEnum implements ValuedEnum { + public enum EnumNumberEnum { NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java index 73ff67d349c5..fa5545ced20e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java @@ -9,7 +9,6 @@ import java.time.OffsetDateTime; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.lang.Nullable; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -40,7 +39,7 @@ public class OrderDto { /** * Order Status */ - public enum StatusEnum implements ValuedEnum { + public enum StatusEnum { PLACED("placed"), APPROVED("approved"), diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterEnumDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterEnumDto.java index 46a19523ad51..da47d0693ef6 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterEnumDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterEnumDto.java @@ -3,7 +3,6 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonValue; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -22,7 +21,7 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") -public enum OuterEnumDto implements ValuedEnum { +public enum OuterEnumDto { PLACED("placed"), diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java index 061409a5bdf1..ad46d4d639b0 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -13,7 +13,6 @@ import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; import java.util.NoSuchElementException; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -43,7 +42,7 @@ public class ParentWithNullableDto { /** * Gets or Sets type */ - public enum TypeEnum implements ValuedEnum { + public enum TypeEnum { CHILD_WITH_NULLABLE("ChildWithNullable"); private final String value; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java index 5a423c6b0d25..f135ad471129 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java @@ -15,7 +15,6 @@ import org.openapitools.model.CategoryDto; import org.openapitools.model.TagDto; import org.springframework.lang.Nullable; -import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -47,7 +46,7 @@ public class PetDto { /** * pet status in the store */ - public enum StatusEnum implements ValuedEnum { + public enum StatusEnum { AVAILABLE("available"), PENDING("pending"), From 72c404baef407088e60ddf6cee58a84fd29aa74f Mon Sep 17 00:00:00 2001 From: Jorge Date: Thu, 4 Jun 2026 12:49:14 +0200 Subject: [PATCH 5/6] Revert "fix: add pageable support to pet API endpoints" This reverts commit 60d3a7d54aed13f0a67710030a4a868a800b65ad. --- .../org/openapitools/api/PetController.java | 8 ++----- .../java/org/openapitools/api/PetApi.java | 21 ++++++++++++------- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/model/Order.java | 3 ++- .../main/java/org/openapitools/model/Pet.java | 3 ++- .../springboot-4/.openapi-generator/FILES | 1 + .../java/org/openapitools/model/Order.java | 3 ++- .../main/java/org/openapitools/model/Pet.java | 3 ++- .../.openapi-generator/FILES | 1 + .../kotlin/org/openapitools/model/ApiError.kt | 3 ++- .../org/openapitools/model/ReasonCode.kt | 3 ++- .../kotlin/org/openapitools/api/PetApi.kt | 4 ++-- .../.openapi-generator/FILES | 1 + .../kotlin/org/openapitools/model/Order.kt | 3 ++- .../main/kotlin/org/openapitools/model/Pet.kt | 3 ++- .../.openapi-generator/FILES | 1 + .../java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/model/PetSort.java | 3 ++- .../org/openapitools/model/PetSortEnum.java | 3 ++- .../springboot/.openapi-generator/FILES | 1 + .../EnumConverterConfiguration.java | 2 +- .../org/openapitools/model/BigCatDto.java | 3 ++- .../org/openapitools/model/EnumArraysDto.java | 3 ++- .../org/openapitools/model/EnumClassDto.java | 3 ++- .../org/openapitools/model/EnumTestDto.java | 9 ++++---- .../java/org/openapitools/model/OrderDto.java | 3 ++- .../org/openapitools/model/OuterEnumDto.java | 3 ++- .../model/ParentWithNullableDto.java | 3 ++- .../java/org/openapitools/model/PetDto.java | 3 ++- 29 files changed, 66 insertions(+), 39 deletions(-) diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java index 01a1ef7cd935..78cd3c0d5fec 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java @@ -7,8 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.lang.Nullable; -import org.springframework.data.domain.Pageable; -import org.springdoc.core.annotations.ParameterObject; import org.openapitools.model.Pet; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -127,8 +125,7 @@ ResponseEntity deletePet( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByStatus( - @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status, - @ParameterObject final Pageable pageable + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status ); @@ -166,8 +163,7 @@ ResponseEntity> findPetsByStatus( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByTags( - @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags, - @ParameterObject final Pageable pageable + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ); diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 320effcb2eae..6d015c8e2890 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -7,8 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.lang.Nullable; -import org.springframework.data.domain.Pageable; -import org.springdoc.core.annotations.ParameterObject; import org.openapitools.model.Pet; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -129,8 +127,7 @@ ResponseEntity deletePet( @org.springframework.validation.annotation.Validated @org.springframework.security.access.prepost.PreAuthorize("hasRole('ADMIN')") ResponseEntity> findPetsByStatus( - @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status, - @ParameterObject final Pageable pageable + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status ); @@ -140,6 +137,9 @@ ResponseEntity> findPetsByStatus( * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * * @param tags Tags to filter by (required) + * @param size2 The number of items to return per page. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (required) + * @param page The page to return, starting with page 0. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (required) + * @param sort The sorting to apply to the Pageable object. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (required) * @param size A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used. (optional) * @return successful operation (status code 200) * or Invalid tag value (status code 400) @@ -170,8 +170,10 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags, - @Parameter(name = "size", description = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.", in = ParameterIn.HEADER) @RequestHeader(value = "size", required = false) @Nullable String size, - @ParameterObject final Pageable pageable + @NotNull @Min(value = 1) @Parameter(name = "size", description = "The number of items to return per page. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "size", required = true, defaultValue = "20") Integer size2, + @NotNull @Min(value = 0) @Parameter(name = "page", description = "The page to return, starting with page 0. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "page", required = true, defaultValue = "0") Integer page, + @NotNull @Parameter(name = "sort", description = "The sorting to apply to the Pageable object. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "sort", required = true, defaultValue = "id,asc") String sort, + @Parameter(name = "size", description = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.", in = ParameterIn.HEADER) @RequestHeader(value = "size", required = false) @Nullable String size ); @@ -217,6 +219,9 @@ ResponseEntity getPetById( * GET /pet/all : List all pets * Returns all pets with pagination support * + * @param page The page number to return. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (optional, default to 0) + * @param size The number of items to return per page. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (optional, default to 20) + * @param sort The sort order. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used. (optional) * @return successful operation (status code 200) * or Invalid status value (status code 400) */ @@ -243,7 +248,9 @@ ResponseEntity getPetById( ) @org.springframework.validation.annotation.Validated ResponseEntity> listAllPets( - @ParameterObject final Pageable pageable + @Parameter(name = "page", description = "The page number to return. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", in = ParameterIn.QUERY) @Valid @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, + @Parameter(name = "size", description = "The number of items to return per page. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", in = ParameterIn.QUERY) @Valid @RequestParam(value = "size", required = false, defaultValue = "20") Integer size, + @Parameter(name = "sort", description = "The sort order. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", in = ParameterIn.QUERY) @Valid @RequestParam(value = "sort", required = false) @Nullable String sort ); diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/.openapi-generator/FILES index 7bcd6d2efc85..340304fd3cd6 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/.openapi-generator/FILES @@ -11,6 +11,7 @@ src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/api/UserApiDelegate.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java +src/main/java/org/openapitools/configuration/ValuedEnum.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ModelApiResponse.java src/main/java/org/openapitools/model/Order.java diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java index a05cd077488c..a79b99b3d599 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Order.java @@ -8,6 +8,7 @@ import java.time.OffsetDateTime; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.lang.Nullable; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -45,7 +46,7 @@ public class Order { /** * Order Status */ - public enum StatusEnum { + public enum StatusEnum implements ValuedEnum { PLACED("placed"), APPROVED("approved"), diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java index bccd8f9bcc22..14e73607e3e6 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java @@ -11,6 +11,7 @@ import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.springframework.lang.Nullable; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import jakarta.validation.Valid; @@ -49,7 +50,7 @@ public class Pet { /** * pet status in the store */ - public enum StatusEnum { + public enum StatusEnum implements ValuedEnum { AVAILABLE("available"), PENDING("pending"), diff --git a/samples/openapi3/server/petstore/springboot-4/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-4/.openapi-generator/FILES index b15e2c45d45d..24038465612c 100644 --- a/samples/openapi3/server/petstore/springboot-4/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-4/.openapi-generator/FILES @@ -8,6 +8,7 @@ src/main/java/org/openapitools/api/StoreApi.java src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java +src/main/java/org/openapitools/configuration/ValuedEnum.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ModelApiResponse.java src/main/java/org/openapitools/model/Order.java diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java index cd97ab532474..34ef3ffa36ed 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Order.java @@ -8,6 +8,7 @@ import java.time.OffsetDateTime; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.lang.Nullable; +import org.openapitools.configuration.ValuedEnum; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; @@ -44,7 +45,7 @@ public class Order { /** * Order Status */ - public enum StatusEnum { + public enum StatusEnum implements ValuedEnum { PLACED("placed"), APPROVED("approved"), diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java index 16f85dfab0f1..98bf496ca1f5 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java @@ -11,6 +11,7 @@ import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.springframework.lang.Nullable; +import org.openapitools.configuration.ValuedEnum; import java.time.OffsetDateTime; import jakarta.validation.Valid; import jakarta.validation.constraints.*; @@ -48,7 +49,7 @@ public class Pet { /** * pet status in the store */ - public enum StatusEnum { + public enum StatusEnum implements ValuedEnum { AVAILABLE("available"), PENDING("pending"), diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-integer-enum/.openapi-generator/FILES index d35b88d1309a..8ce899fc9e08 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-springboot-integer-enum/.openapi-generator/FILES @@ -10,5 +10,6 @@ src/main/kotlin/org/openapitools/api/ApiUtil.kt src/main/kotlin/org/openapitools/api/DefaultApi.kt src/main/kotlin/org/openapitools/api/Exceptions.kt src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt +src/main/kotlin/org/openapitools/configuration/ValuedEnum.kt src/main/kotlin/org/openapitools/model/ApiError.kt src/main/kotlin/org/openapitools/model/ReasonCode.kt diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt index 2c192ad855e3..a48b4b5e4b8e 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt +++ b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.ReasonCode +import org.openapitools.configuration.ValuedEnum import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -35,7 +36,7 @@ data class ApiError( * * Values: OK,ERROR */ - enum class ErrorCode(@get:JsonValue override val value: kotlin.Int) { + enum class ErrorCode(@get:JsonValue override val value: kotlin.Int) : ValuedEnum { OK(0), ERROR(100); diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ReasonCode.kt b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ReasonCode.kt index bb95c82a59d0..96efb7984c28 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ReasonCode.kt +++ b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ReasonCode.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty +import org.openapitools.configuration.ValuedEnum import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin import jakarta.validation.constraints.Email @@ -18,7 +19,7 @@ import jakarta.validation.Valid * * Values: _10,_20 */ -enum class ReasonCode(@get:JsonValue override val value: kotlin.Int) { +enum class ReasonCode(@get:JsonValue override val value: kotlin.Int) : ValuedEnum { _10(10), _20(20); diff --git a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/api/PetApi.kt index 2987390510c8..a3471ad6f48a 100644 --- a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -132,7 +132,7 @@ interface PetApi { value = [PATH_FIND_PETS_WITH_MIN_SIZE_CONSTRAINT_FROM_ALL_OF_REF], produces = ["application/json"] ) - fun findPetsWithMinSizeConstraintFromAllOfRef(pageable: Pageable): ResponseEntity> { + fun findPetsWithMinSizeConstraintFromAllOfRef(@ValidPageable(minSize = 5) pageable: Pageable): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -209,7 +209,7 @@ interface PetApi { value = [PATH_FIND_PETS_WITH_SIZE_CONSTRAINT_FROM_ALL_OF_REF], produces = ["application/json"] ) - fun findPetsWithSizeConstraintFromAllOfRef(pageable: Pageable): ResponseEntity> { + fun findPetsWithSizeConstraintFromAllOfRef(@ValidPageable(maxSize = 75) pageable: Pageable): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } diff --git a/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES index c7afb2eda91e..9d7cb0668469 100644 --- a/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/FILES @@ -18,6 +18,7 @@ src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt src/main/kotlin/org/openapitools/api/UserApiController.kt src/main/kotlin/org/openapitools/api/UserApiService.kt src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt +src/main/kotlin/org/openapitools/configuration/ValuedEnum.kt src/main/kotlin/org/openapitools/model/Category.kt src/main/kotlin/org/openapitools/model/ModelApiResponse.kt src/main/kotlin/org/openapitools/model/Order.kt diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt index 8eb4e0cddeab..0aefed01433e 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.annotation.Nulls +import org.openapitools.configuration.ValuedEnum import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -50,7 +51,7 @@ data class Order( * Order Status * Values: placed,approved,delivered */ - enum class Status(@get:JsonValue override val value: kotlin.String) { + enum class Status(@get:JsonValue override val value: kotlin.String) : ValuedEnum { placed("placed"), approved("approved"), diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt index 8d39acfd0054..076207ab8f19 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue import com.fasterxml.jackson.annotation.Nulls import org.openapitools.model.Category import org.openapitools.model.Tag +import org.openapitools.configuration.ValuedEnum import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin import javax.validation.constraints.Email @@ -52,7 +53,7 @@ data class Pet( * pet status in the store * Values: available,pending,sold */ - enum class Status(@get:JsonValue override val value: kotlin.String) { + enum class Status(@get:JsonValue override val value: kotlin.String) : ValuedEnum { available("available"), pending("pending"), diff --git a/samples/server/petstore/springboot-sort-validation/.openapi-generator/FILES b/samples/server/petstore/springboot-sort-validation/.openapi-generator/FILES index da2d4c6d3b44..b28d849d88bf 100644 --- a/samples/server/petstore/springboot-sort-validation/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-sort-validation/.openapi-generator/FILES @@ -9,6 +9,7 @@ src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/ValidPageable.java src/main/java/org/openapitools/configuration/ValidSort.java +src/main/java/org/openapitools/configuration/ValuedEnum.java src/main/java/org/openapitools/model/NullableModel.java src/main/java/org/openapitools/model/Pet.java src/main/java/org/openapitools/model/PetSort.java diff --git a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/api/PetApi.java index e6a983446386..6de78b9bbd70 100644 --- a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/api/PetApi.java @@ -164,7 +164,7 @@ ResponseEntity> findPetsWithExternalParamRefArraySort( produces = { "application/json" } ) ResponseEntity> findPetsWithMinSizeConstraintFromAllOfRef( - final Pageable pageable + @ValidPageable(minSize = 5) final Pageable pageable ); @@ -276,7 +276,7 @@ ResponseEntity> findPetsWithSizeConstraint( produces = { "application/json" } ) ResponseEntity> findPetsWithSizeConstraintFromAllOfRef( - final Pageable pageable + @ValidPageable(maxSize = 75) final Pageable pageable ); diff --git a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSort.java b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSort.java index 129f441e10b6..e463c41cb3a6 100644 --- a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSort.java +++ b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSort.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import java.time.OffsetDateTime; @@ -21,7 +22,7 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") -public enum PetSort implements Serializable { +public enum PetSort implements Serializable, ValuedEnum { ID_ASC("id,asc"), diff --git a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSortEnum.java b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSortEnum.java index 42d89ad85847..d86730f78a6d 100644 --- a/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSortEnum.java +++ b/samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/model/PetSortEnum.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import java.time.OffsetDateTime; @@ -21,7 +22,7 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") -public enum PetSortEnum implements Serializable { +public enum PetSortEnum implements Serializable, ValuedEnum { NAME_ASC("name,asc"), diff --git a/samples/server/petstore/springboot/.openapi-generator/FILES b/samples/server/petstore/springboot/.openapi-generator/FILES index cda3767c5400..3f4797342e97 100644 --- a/samples/server/petstore/springboot/.openapi-generator/FILES +++ b/samples/server/petstore/springboot/.openapi-generator/FILES @@ -12,6 +12,7 @@ src/main/java/org/openapitools/api/UserApi.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java +src/main/java/org/openapitools/configuration/ValuedEnum.java src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index d8366cfcfed6..0e0fd15378d2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,7 +7,7 @@ import org.openapitools.model.EnumClassDto; import org.openapitools.model.OuterEnumDto; -import javax.annotation.Generated; +import jakarta.annotation.Generated; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java index 30f28da15843..9d5b7638767e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java @@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.model.CatDto; import org.springframework.lang.Nullable; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -33,7 +34,7 @@ public class BigCatDto extends CatDto { /** * Gets or Sets kind */ - public enum KindEnum { + public enum KindEnum implements ValuedEnum { LIONS("lions"), TIGERS("tigers"), diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java index 160ff8c0754e..f392ac1d61d1 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java @@ -10,6 +10,7 @@ import java.util.Arrays; import java.util.List; import org.springframework.lang.Nullable; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -31,7 +32,7 @@ public class EnumArraysDto { /** * Gets or Sets justSymbol */ - public enum JustSymbolEnum { + public enum JustSymbolEnum implements ValuedEnum { GREATER_THAN_OR_EQUAL_TO(">="), DOLLAR("$"); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumClassDto.java index 145172d05a6d..55842b9a0d5c 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumClassDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -21,7 +22,7 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") -public enum EnumClassDto { +public enum EnumClassDto implements ValuedEnum { _ABC("_abc"), diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java index a566fee46d72..991858866b66 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.model.OuterEnumDto; import org.springframework.lang.Nullable; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -29,7 +30,7 @@ public class EnumTestDto { /** * Gets or Sets enumString */ - public enum EnumStringEnum { + public enum EnumStringEnum implements ValuedEnum { UPPER("UPPER"), LOWER("lower"), @@ -68,7 +69,7 @@ public static EnumStringEnum fromValue(String value) { /** * Gets or Sets enumStringRequired */ - public enum EnumStringRequiredEnum { + public enum EnumStringRequiredEnum implements ValuedEnum { UPPER("UPPER"), LOWER("lower"), @@ -107,7 +108,7 @@ public static EnumStringRequiredEnum fromValue(String value) { /** * Gets or Sets enumInteger */ - public enum EnumIntegerEnum { + public enum EnumIntegerEnum implements ValuedEnum { NUMBER_1(1), NUMBER_MINUS_1(-1); @@ -144,7 +145,7 @@ public static EnumIntegerEnum fromValue(Integer value) { /** * Gets or Sets enumNumber */ - public enum EnumNumberEnum { + public enum EnumNumberEnum implements ValuedEnum { NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java index fa5545ced20e..73ff67d349c5 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java @@ -9,6 +9,7 @@ import java.time.OffsetDateTime; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.lang.Nullable; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -39,7 +40,7 @@ public class OrderDto { /** * Order Status */ - public enum StatusEnum { + public enum StatusEnum implements ValuedEnum { PLACED("placed"), APPROVED("approved"), diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterEnumDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterEnumDto.java index da47d0693ef6..46a19523ad51 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterEnumDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterEnumDto.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -21,7 +22,7 @@ */ @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") -public enum OuterEnumDto { +public enum OuterEnumDto implements ValuedEnum { PLACED("placed"), diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java index ad46d4d639b0..061409a5bdf1 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -13,6 +13,7 @@ import org.openapitools.jackson.nullable.JsonNullable; import org.springframework.lang.Nullable; import java.util.NoSuchElementException; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -42,7 +43,7 @@ public class ParentWithNullableDto { /** * Gets or Sets type */ - public enum TypeEnum { + public enum TypeEnum implements ValuedEnum { CHILD_WITH_NULLABLE("ChildWithNullable"); private final String value; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java index f135ad471129..5a423c6b0d25 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java @@ -15,6 +15,7 @@ import org.openapitools.model.CategoryDto; import org.openapitools.model.TagDto; import org.springframework.lang.Nullable; +import org.openapitools.configuration.ValuedEnum; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -46,7 +47,7 @@ public class PetDto { /** * pet status in the store */ - public enum StatusEnum { + public enum StatusEnum implements ValuedEnum { AVAILABLE("available"), PENDING("pending"), From 41eaf91eadd1702aff566e38e0b1a25c96bdf287 Mon Sep 17 00:00:00 2001 From: Jorge Date: Thu, 4 Jun 2026 13:06:32 +0200 Subject: [PATCH 6/6] fix: update import for Generated annotation in EnumConverterConfiguration --- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java index 0e0fd15378d2..d8366cfcfed6 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java @@ -7,7 +7,7 @@ import org.openapitools.model.EnumClassDto; import org.openapitools.model.OuterEnumDto; -import jakarta.annotation.Generated; +import javax.annotation.Generated; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration;