code cleanup

bnasslahsen · bnasslahsen · commit f16e5fffacc5 · 2020-04-25T22:21:30.000+02:00
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocConfiguration.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocConfiguration.java
@@ -92,21 +92,21 @@ PropertyCustomizingConverter propertyCustomizingConverter(Optional<List<Property
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "fileSupportConverter")
+	@ConditionalOnMissingBean
 	@Lazy(false)
 	FileSupportConverter fileSupportConverter() {
 		return new FileSupportConverter();
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "responseSupportConverter")
+	@ConditionalOnMissingBean
 	@Lazy(false)
 	ResponseSupportConverter responseSupportConverter() {
 		return new ResponseSupportConverter();
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "openAPIBuilder")
+	@ConditionalOnMissingBean
 	OpenAPIBuilder openAPIBuilder(Optional<OpenAPI> openAPI, ApplicationContext context,
 			SecurityParser securityParser,
 			SpringDocConfigProperties springDocConfigProperties,
@@ -122,7 +122,7 @@ ModelConverterRegistrar modelConverterRegistrar(Optional<List<ModelConverter>> m
 
 	@Bean
 	@ConditionalOnWebApplication
-	@ConditionalOnMissingBean(name = "operationBuilder")
+	@ConditionalOnMissingBean
 	OperationBuilder operationBuilder(GenericParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
 			SecurityParser securityParser, PropertyResolverUtils propertyResolverUtils) {
 		return new OperationBuilder(parameterBuilder, requestBodyBuilder,
@@ -136,24 +136,25 @@ PropertyResolverUtils propertyResolverUtils(ConfigurableBeanFactory factory) {
 
 	@Bean
 	@ConditionalOnWebApplication
-	@ConditionalOnMissingBean(name = "requestBodyBuilder")
+	@ConditionalOnMissingBean
 	RequestBodyBuilder requestBodyBuilder(GenericParameterBuilder parameterBuilder) {
 		return new RequestBodyBuilder(parameterBuilder);
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "securityParser")
+	@ConditionalOnMissingBean
 	SecurityParser securityParser(PropertyResolverUtils propertyResolverUtils) {
 		return new SecurityParser(propertyResolverUtils);
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	ReturnTypeParser genericReturnTypeParser() {
 		return new ReturnTypeParser() {};
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "parameterBuilder")
+	@ConditionalOnMissingBean
 	GenericParameterBuilder parameterBuilder(PropertyResolverUtils propertyResolverUtils) {
 		return new GenericParameterBuilder(propertyResolverUtils);
 	}
diff --git a/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringDocDataRestConfiguration.java b/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringDocDataRestConfiguration.java
@@ -62,14 +62,14 @@ public class SpringDocDataRestConfiguration {
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "halProvider")
+	@ConditionalOnMissingBean
 	@Lazy(false)
 	HalProvider halProvider(Optional<RepositoryRestConfiguration> repositoryRestConfiguration) {
 		return new HalProvider(repositoryRestConfiguration);
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "collectionModelContentConverter")
+	@ConditionalOnMissingBean
 	@Lazy(false)
 	CollectionModelContentConverter collectionModelContentConverter(HalProvider halProvider, LinkRelationProvider linkRelationProvider) {
 		return halProvider.isHalEnabled() ? new CollectionModelContentConverter(linkRelationProvider) : null;
@@ -82,7 +82,7 @@ CollectionModelContentConverter collectionModelContentConverter(HalProvider halP
 	 * @see org.springframework.hateoas.mediatype.hal.Jackson2HalModule.HalLinkListSerializer#serialize(Links, JsonGenerator, SerializerProvider)
 	 */
 	@Bean
-	@ConditionalOnMissingBean(name = "linksSchemaCustomiser")
+	@ConditionalOnMissingBean
 	@Lazy(false)
 	OpenApiCustomiser linksSchemaCustomiser(HalProvider halProvider) {
 		if (!halProvider.isHalEnabled()) {
@@ -105,7 +105,7 @@ OpenApiCustomiser linksSchemaCustomiser(HalProvider halProvider) {
 	class QuerydslProvider {
 
 		@Bean
-		@ConditionalOnMissingBean(name = "queryDslQuerydslPredicateOperationCustomizer")
+		@ConditionalOnMissingBean
 		@Lazy(false)
 		QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory) {
 			if (querydslBindingsFactory.isPresent()) {
diff --git a/springdoc-openapi-kotlin/src/main/java/org/springdoc/kotlin/SpringDocKotlinConfiguration.java b/springdoc-openapi-kotlin/src/main/java/org/springdoc/kotlin/SpringDocKotlinConfiguration.java
@@ -44,7 +44,7 @@ public class SpringDocKotlinConfiguration {
 
 	@Bean
 	@Lazy(false)
-	@ConditionalOnMissingBean(name = "kotlinCoroutinesReturnTypeParser")
+	@ConditionalOnMissingBean
 	KotlinCoroutinesReturnTypeParser kotlinCoroutinesReturnTypeParser() {
 		return new KotlinCoroutinesReturnTypeParser();
 	}
diff --git a/springdoc-openapi-security/src/main/java/org/springdoc/security/SpringDocSecurityConfiguration.java b/springdoc-openapi-security/src/main/java/org/springdoc/security/SpringDocSecurityConfiguration.java
@@ -44,7 +44,7 @@ public class SpringDocSecurityConfiguration {
 	@ConditionalOnBean(FrameworkEndpointHandlerMapping.class)
 	class SpringSecurityOAuth2ProviderConfiguration {
 		@Bean
-		@ConditionalOnMissingBean(name = "springSecurityOAuth2Provider")
+		@ConditionalOnMissingBean
 		SpringSecurityOAuth2Provider springSecurityOAuth2Provider(FrameworkEndpointHandlerMapping oauth2EndpointHandlerMapping) {
 			return new SpringSecurityOAuth2Provider(oauth2EndpointHandlerMapping);
 		}
diff --git a/springdoc-openapi-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfig.java b/springdoc-openapi-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfig.java
@@ -25,6 +25,7 @@
 import org.springdoc.core.SwaggerUiOAuthProperties;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,16 +39,19 @@
 public class SwaggerConfig {
 
 	@Bean
+	@ConditionalOnMissingBean
 	SwaggerWelcome swaggerWelcome(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties) {
 		return new SwaggerWelcome(swaggerUiConfig, springDocConfigProperties);
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	SwaggerIndexTransformer indexPageTransformer(SwaggerUiOAuthProperties swaggerUiOAuthProperties, ObjectMapper objectMapper) {
 		return new SwaggerIndexTransformer(swaggerUiOAuthProperties, objectMapper);
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	SwaggerWebMvcConfigurer swaggerWebMvcConfigurer(SwaggerUiConfigProperties swaggerUiConfig, SwaggerIndexTransformer swaggerIndexTransformer) {
 		return new SwaggerWebMvcConfigurer(swaggerUiConfig, swaggerIndexTransformer);
 	}
diff --git a/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/api/OpenApiResource.java b/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/api/OpenApiResource.java
@@ -40,7 +40,6 @@
 import reactor.core.publisher.Mono;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -58,7 +57,6 @@
 import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
 
 @RestController
-@ConditionalOnMissingBean(name = "openApiResource")
 public class OpenApiResource extends AbstractOpenApiResource {
 
 	private final RequestMappingInfoHandlerMapping requestMappingHandlerMapping;
diff --git a/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/MultipleOpenApiWebFluxConfiguration.java b/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/MultipleOpenApiWebFluxConfiguration.java
@@ -49,7 +49,7 @@
 public class MultipleOpenApiWebFluxConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(name = "multipleOpenApiResource")
+	@ConditionalOnMissingBean
 	@Lazy(false)
 	MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
 			ObjectFactory<OpenAPIBuilder> defaultOpenAPIBuilder, AbstractRequestBuilder requestBuilder,
diff --git a/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/SpringDocWebFluxConfiguration.java b/springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/SpringDocWebFluxConfiguration.java
@@ -54,7 +54,7 @@
 public class SpringDocWebFluxConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(name = "openApiResource")
+	@ConditionalOnMissingBean
 	@Lazy(false)
 	OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
 			GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -67,7 +67,7 @@ OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBu
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "requestBuilder")
+	@ConditionalOnMissingBean
 	RequestBuilder requestBuilder(GenericParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
 			OperationBuilder operationBuilder, Optional<List<OperationCustomizer>> operationCustomizers,
 			Optional<List<ParameterCustomizer>> parameterCustomizers,
@@ -77,13 +77,13 @@ RequestBuilder requestBuilder(GenericParameterBuilder parameterBuilder, RequestB
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "responseBuilder")
+	@ConditionalOnMissingBean
 	GenericResponseBuilder responseBuilder(OperationBuilder operationBuilder, List<ReturnTypeParser> returnTypeParsers, SpringDocConfigProperties springDocConfigProperties, PropertyResolverUtils propertyResolverUtils) {
 		return new GenericResponseBuilder(operationBuilder, returnTypeParsers, springDocConfigProperties, propertyResolverUtils);
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "webFluxSupportConverter")
+	@ConditionalOnMissingBean
 	@Lazy(false)
 	WebFluxSupportConverter webFluxSupportConverter() {
 		return new WebFluxSupportConverter();
diff --git a/springdoc-openapi-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfig.java b/springdoc-openapi-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfig.java
@@ -25,6 +25,7 @@
 import org.springdoc.core.SwaggerUiOAuthProperties;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -39,11 +40,13 @@
 public class SwaggerConfig implements WebFluxConfigurer {
 
 	@Bean
+	@ConditionalOnMissingBean
 	SwaggerWebFluxConfigurer swaggerWebFluxConfigurer(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties, SwaggerIndexTransformer swaggerIndexTransformer) {
 		return new SwaggerWebFluxConfigurer(swaggerUiConfig, springDocConfigProperties, swaggerIndexTransformer);
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	SwaggerIndexTransformer indexPageTransformer(SwaggerUiOAuthProperties swaggerUiOAuthProperties, ObjectMapper objectMapper) {
 		return new SwaggerIndexTransformer(swaggerUiOAuthProperties, objectMapper);
 	}
diff --git a/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/OpenApiResource.java b/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/OpenApiResource.java
@@ -43,7 +43,6 @@
 import org.springdoc.core.customizers.OpenApiCustomiser;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -62,7 +61,6 @@
 import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
 
 @RestController
-@ConditionalOnMissingBean(name = "openApiResource")
 public class OpenApiResource extends AbstractOpenApiResource {
 
 	private final RequestMappingInfoHandlerMapping requestMappingHandlerMapping;
diff --git a/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/MultipleOpenApiSupportConfiguration.java b/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/MultipleOpenApiSupportConfiguration.java
@@ -52,7 +52,7 @@
 public class MultipleOpenApiSupportConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(name = "multipleOpenApiResource")
+	@ConditionalOnMissingBean
 	@Lazy(false)
 	MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
 			ObjectFactory<OpenAPIBuilder> defaultOpenAPIBuilder, AbstractRequestBuilder requestBuilder,
diff --git a/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/SpringDocWebMvcConfiguration.java b/springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/SpringDocWebMvcConfiguration.java
@@ -60,7 +60,7 @@
 public class SpringDocWebMvcConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(name = "openApiResource")
+	@ConditionalOnMissingBean
 	@Lazy(false)
 	OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
 			GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -76,7 +76,7 @@ OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBu
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "requestBuilder")
+	@ConditionalOnMissingBean
 	RequestBuilder requestBuilder(GenericParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
 			OperationBuilder operationBuilder, Optional<List<OperationCustomizer>> operationCustomizers,
 			Optional<List<ParameterCustomizer>> parameterCustomizers,
@@ -86,7 +86,7 @@ RequestBuilder requestBuilder(GenericParameterBuilder parameterBuilder, RequestB
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(name = "responseBuilder")
+	@ConditionalOnMissingBean
 	GenericResponseBuilder responseBuilder(OperationBuilder operationBuilder, List<ReturnTypeParser> returnTypeParsers, SpringDocConfigProperties springDocConfigProperties, PropertyResolverUtils propertyResolverUtils) {
 		return new GenericResponseBuilder(operationBuilder, returnTypeParsers, springDocConfigProperties, propertyResolverUtils);
 	}
@@ -96,7 +96,7 @@ GenericResponseBuilder responseBuilder(OperationBuilder operationBuilder, List<R
 	class SpringDocWebMvcActuatorConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean(name = "actuatorProvider")
+		@ConditionalOnMissingBean
 		ActuatorProvider actuatorProvider(WebMvcEndpointHandlerMapping webMvcEndpointHandlerMapping) {
 			return new ActuatorProvider(webMvcEndpointHandlerMapping);
 		}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public class SpringDocKotlinConfiguration {`
`44`	`44`
`45`	`45`	`@Bean`
`46`	`46`	`@Lazy(false)`
`47`		`- @ConditionalOnMissingBean(name = "kotlinCoroutinesReturnTypeParser")`
	`47`	`+ @ConditionalOnMissingBean`
`48`	`48`	`KotlinCoroutinesReturnTypeParser kotlinCoroutinesReturnTypeParser() {`
`49`	`49`	`return new KotlinCoroutinesReturnTypeParser();`
`50`	`50`	`}`