loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Spring] Fix bean name collisions (#14092) (fix #14094)

Browse Source 
* Use correct Pascal case for java enum

* Uniquely name @Bean annotations

* Use existing mustache var instead, run generate files

* rebase, re-run generators

* try to undo botched rebase/merge

* Attempt to manually undo whatever is going on w/ build, oops

* Attempt to manually undo whatever is going on w/ build, oops
This commit is contained in:
Johnny Marnell
2023-01-17 04:24:15 -05:00
committed by GitHub
parent 9f502930ea
commit c912bae3bc
55 changed files with 305 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/OpenApiGeneratorApplication.java
View File

@@ -6,16 +6,23 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator;
@SpringBootApplication
@ComponentScan(basePackages = {"org.openapitools", "org.openapitools.api" , "org.openapitools.configuration"})
@SpringBootApplication(
nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class
)
@ComponentScan(
basePackages = {"org.openapitools", "org.openapitools.api" , "org.openapitools.configuration"},
nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class
)
public class OpenApiGeneratorApplication {
public static void main(String[] args) {
SpringApplication.run(OpenApiGeneratorApplication.class, args);
}
@Bean
@Bean(name = "org.openapitools.OpenApiGeneratorApplication.jsonNullableModule")
public Module jsonNullableModule() {
return new JsonNullableModule();
}

4
samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
View File

@@ -10,7 +10,7 @@ import org.springframework.core.convert.converter.Converter;
@Configuration
public class EnumConverterConfiguration {
@Bean
@Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter")
Converter<String, EnumClass> enumClassConverter() {
return new Converter<String, EnumClass>() {
@Override
@@ -19,7 +19,7 @@ public class EnumConverterConfiguration {
}
};
}
@Bean
@Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.outerEnumConverter")
Converter<String, OuterEnum> outerEnumConverter() {
return new Converter<String, OuterEnum>() {
@Override