Cannot override OpenApiResource autoconfiguration. Fixes #608.

bnasslahsen · bnasslahsen · commit ad8a599c04fa · 2020-04-24T20:02:40.000+02:00
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
+		@ConditionalOnMissingBean(name = "springSecurityOAuth2Provider")
 		SpringSecurityOAuth2Provider springSecurityOAuth2Provider(FrameworkEndpointHandlerMapping oauth2EndpointHandlerMapping) {
 			return new SpringSecurityOAuth2Provider(oauth2EndpointHandlerMapping);
 		}
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
+	@ConditionalOnMissingBean(name = "multipleOpenApiResource")
 	@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
+	@ConditionalOnMissingBean(name = "openApiResource")
 	@Lazy(false)
 	OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
 			GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -67,7 +67,7 @@ OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBu
 	}
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(name = "requestBuilder")
 	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
+	@ConditionalOnMissingBean(name = "responseBuilder")
 	GenericResponseBuilder responseBuilder(OperationBuilder operationBuilder, List<ReturnTypeParser> returnTypeParsers, SpringDocConfigProperties springDocConfigProperties, PropertyResolverUtils propertyResolverUtils) {
 		return new GenericResponseBuilder(operationBuilder, returnTypeParsers, springDocConfigProperties, propertyResolverUtils);
 	}
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(name = "webFluxSupportConverter")
 	@Lazy(false)
 	WebFluxSupportConverter webFluxSupportConverter() {
 		return new WebFluxSupportConverter();
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
+	@ConditionalOnMissingBean(name ="multipleOpenApiResource")
 	@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
+	@ConditionalOnMissingBean(name = "openApiResource")
 	@Lazy(false)
 	OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
 			GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -76,7 +76,7 @@ OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBu
 	}
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(name = "requestBuilder")
 	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
+	@ConditionalOnMissingBean(name = "responseBuilder")
 	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
+		@ConditionalOnMissingBean(name = "actuatorProvider")
 		ActuatorProvider actuatorProvider(WebMvcEndpointHandlerMapping webMvcEndpointHandlerMapping) {
 			return new ActuatorProvider(webMvcEndpointHandlerMapping);
 		}
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app94/SpringDocApp94Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app94/SpringDocApp94Test.java
@@ -88,7 +88,7 @@ public RequestMappingHandlerMapping defaultTestHandlerMapping(GreetingController
 			return result;
 		}
 
-		@Bean(name = "mvcOpenApiResource")
+		@Bean(name = "openApiResource")
 		public OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder, GenericResponseBuilder responseBuilder,
 				OperationBuilder operationParser,
 				@Qualifier("defaultTestHandlerMapping") RequestMappingHandlerMapping requestMappingHandlerMapping,

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public class SpringDocSecurityConfiguration {`
`44`	`44`	`@ConditionalOnBean(FrameworkEndpointHandlerMapping.class)`
`45`	`45`	`class SpringSecurityOAuth2ProviderConfiguration {`
`46`	`46`	`@Bean`
`47`		`- @ConditionalOnMissingBean`
	`47`	`+ @ConditionalOnMissingBean(name = "springSecurityOAuth2Provider")`
`48`	`48`	`SpringSecurityOAuth2Provider springSecurityOAuth2Provider(FrameworkEndpointHandlerMapping oauth2EndpointHandlerMapping) {`
`49`	`49`	`return new SpringSecurityOAuth2Provider(oauth2EndpointHandlerMapping);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public RequestMappingHandlerMapping defaultTestHandlerMapping(GreetingController`
`88`	`88`	`return result;`
`89`	`89`	`}`
`90`	`90`
`91`		`- @Bean(name = "mvcOpenApiResource")`
	`91`	`+ @Bean(name = "openApiResource")`
`92`	`92`	`public OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder, GenericResponseBuilder responseBuilder,`
`93`	`93`	`OperationBuilder operationParser,`
`94`	`94`	`@Qualifier("defaultTestHandlerMapping") RequestMappingHandlerMapping requestMappingHandlerMapping,`