Skip to content

Commit 9de56d4

Browse files
committed
Add missing @ConditionalOnMissingBean annotations to allow users to override the bean
1 parent c69671c commit 9de56d4

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import org.springframework.beans.factory.ObjectFactory;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
27+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2728
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2829
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2930
import org.springframework.context.annotation.Bean;
@@ -39,7 +40,8 @@
3940
@ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
4041
public class MultipleOpenApiWebFluxConfiguration {
4142

42-
@Bean
43+
@Bean(name = "multipleWebfluxOpenApiResource")
44+
@ConditionalOnMissingBean(name = "multipleWebfluxOpenApiResource")
4345
public MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
4446
ObjectFactory<OpenAPIBuilder> defaultOpenAPIBuilder, AbstractRequestBuilder requestBuilder,
4547
GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -49,4 +51,4 @@ public MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> grou
4951
responseBuilder, operationParser,
5052
requestMappingHandlerMapping,springDocConfigProperties);
5153
}
52-
}
54+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
@ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
4343
public class SpringDocWebFluxConfiguration {
4444

45-
@Bean
45+
@Bean(name = "webfluxOpenApiResource")
46+
@ConditionalOnMissingBean(name = "webfluxOpenApiResource")
4647
public OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
4748
GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
4849
RequestMappingInfoHandlerMapping requestMappingHandlerMapping,

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import org.springframework.beans.factory.ObjectFactory;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
29+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2930
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3031
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
3132
import org.springframework.context.annotation.Bean;
@@ -41,7 +42,8 @@
4142
@ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
4243
public class MultipleOpenApiSupportConfiguration {
4344

44-
@Bean
45+
@Bean(name = "multipleMvcOpenApiResource")
46+
@ConditionalOnMissingBean(name = "multipleMvcOpenApiResource")
4547
public MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
4648
ObjectFactory<OpenAPIBuilder> defaultOpenAPIBuilder, AbstractRequestBuilder requestBuilder,
4749
GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -52,4 +54,4 @@ public MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> grou
5254
responseBuilder, operationParser,
5355
requestMappingHandlerMapping, servletContextProvider,springDocConfigProperties);
5456
}
55-
}
57+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
@ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
4848
public class SpringDocWebMvcConfiguration {
4949

50-
@Bean
50+
@Bean(name = "mvcOpenApiResource")
51+
@ConditionalOnMissingBean(name = "mvcOpenApiResource")
5152
public OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
5253
GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
5354
RequestMappingInfoHandlerMapping requestMappingHandlerMapping, Optional<ActuatorProvider> servletContextProvider,

0 commit comments

Comments
 (0)