From 4f3726ecfd92213a6a986605a20a1f06a35e81a2 Mon Sep 17 00:00:00 2001 From: Tomschi Date: Tue, 1 Apr 2025 08:48:14 +0200 Subject: [PATCH] #11737 Add package to bean name in converter.mustache for EnumConverterConfiguration.java (#17738) * Add package to bean name in converter.mustache for EnumConverterConfiguration.java. * Fix samples for EnumConverterConfiguration.java. --- .../src/main/resources/JavaSpring/converter.mustache | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- .../openapitools/configuration/EnumConverterConfiguration.java | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache index 3b32e7680fc..ec747152877 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/converter.mustache @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@Configuration(value = "{{configPackage}}.enumConverterConfiguration") public class EnumConverterConfiguration { {{#models}} 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 dc5bf376b0f..638061b124c 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,7 +6,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter") 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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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-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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b257cf0a16c..941171792aa 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 e1295b2ef2d..d3923226f81 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,7 +7,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@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 b31b8d24ae2..56850481c2d 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.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -@Configuration +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") public class EnumConverterConfiguration { @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter")