added @ConditionalOnMissingBean

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocConfiguration.java

@@ -43,6 +43,7 @@
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.bind.BindResult;
@@ -85,6 +86,7 @@ PropertyCustomizingConverter propertyCustomizingConverter(Optional<List<Property
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	ResponseSupportConverter responseSupportConverter() {
 		return new ResponseSupportConverter();
 	}
@@ -104,6 +106,7 @@ RequestTypeToIgnoreConverter requestTypeToIgnoreConverter() {
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	OpenAPIBuilder openAPIBuilder(Optional<OpenAPI> openAPI, ApplicationContext context,
 			SecurityParser securityParser,
 			SpringDocConfigProperties springDocConfigProperties,
@@ -118,6 +121,7 @@ ModelConverterRegistrar modelConverterRegistrar(Optional<List<ModelConverter>> m
 
 	@Bean
 	@ConditionalOnWebApplication
+	@ConditionalOnMissingBean
 	OperationBuilder operationBuilder(GenericParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
 			SecurityParser securityParser, PropertyResolverUtils propertyResolverUtils) {
 		return new OperationBuilder(parameterBuilder, requestBodyBuilder,
@@ -131,11 +135,13 @@ PropertyResolverUtils propertyResolverUtils(ConfigurableBeanFactory factory) {
 
 	@Bean
 	@ConditionalOnWebApplication
+	@ConditionalOnMissingBean
 	RequestBodyBuilder requestBodyBuilder(GenericParameterBuilder parameterBuilder) {
 		return new RequestBodyBuilder(parameterBuilder);
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	SecurityParser securityParser(PropertyResolverUtils propertyResolverUtils) {
 		return new SecurityParser(propertyResolverUtils);
 	}
@@ -146,6 +152,7 @@ ReturnTypeParser genericReturnTypeParser() {
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	GenericParameterBuilder parameterBuilder(PropertyResolverUtils propertyResolverUtils) {
 		return new GenericParameterBuilder(propertyResolverUtils);
 	}

springdoc-openapi-data-rest/src/main/java/org/springdoc/core/SpringDocDataRestConfiguration.java

@@ -36,6 +36,7 @@
 import org.springdoc.core.customizers.OpenApiCustomiser;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+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;
@@ -61,6 +62,7 @@ public class SpringDocDataRestConfiguration {
 	class QuerydslProvider {
 
 		@Bean
+		@ConditionalOnMissingBean
 		QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory) {
 			if (querydslBindingsFactory.isPresent()) {
 				getConfig().addRequestWrapperToIgnore(Predicate.class);
@@ -74,6 +76,7 @@ QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomize
 	class HalProviderConfiguration {
 
 		@Bean
+		@ConditionalOnMissingBean
 		HalProvider halProvider(Optional<RepositoryRestConfiguration> repositoryRestConfiguration) {
 			return repositoryRestConfiguration.isPresent() ? new HalProvider(repositoryRestConfiguration.get()) : null;
 		}

springdoc-openapi-security/src/main/java/org/springdoc/core/SpringDocSecurityConfiguration.java

@@ -19,6 +19,7 @@
 package org.springdoc.core;
 
 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;
@@ -43,6 +44,7 @@ public class SpringDocSecurityConfiguration {
 	@ConditionalOnBean(FrameworkEndpointHandlerMapping.class)
 	class SpringSecurityOAuth2ProviderConfiguration {
 		@Bean
+		@ConditionalOnMissingBean
 		SpringSecurityOAuth2Provider springSecurityOAuth2Provider(FrameworkEndpointHandlerMapping oauth2EndpointHandlerMapping) {
 			return new SpringSecurityOAuth2Provider(oauth2EndpointHandlerMapping);
 		}

springdoc-openapi-webflux-core/src/main/java/org/springdoc/core/SpringDocWebFluxConfiguration.java

@@ -72,6 +72,7 @@ GenericResponseBuilder responseBuilder(OperationBuilder operationBuilder, List<R
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	WebFluxSupportConverter webFluxSupportConverter() {
 		return new WebFluxSupportConverter();
 	}

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/core/SpringDocWebMvcConfiguration.java

@@ -84,6 +84,7 @@ GenericResponseBuilder responseBuilder(OperationBuilder operationBuilder, List<R
 	class SpringDocWebMvcActuatorConfiguration {
 
 		@Bean
+		@ConditionalOnMissingBean
 		ActuatorProvider actuatorProvider(WebMvcEndpointHandlerMapping webMvcEndpointHandlerMapping) {
 			return new ActuatorProvider(webMvcEndpointHandlerMapping);
 		}