Skip to content

Commit cab0bdd

Browse files
author
bnasslahsen
committed
code review
1 parent bc7acb8 commit cab0bdd

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,21 @@ PropertyCustomizingConverter propertyCustomizingConverter(Optional<List<Property
9292
}
9393

9494
@Bean
95-
@ConditionalOnMissingBean
95+
@ConditionalOnMissingBean(name="fileSupportConverter")
9696
@Lazy(false)
9797
FileSupportConverter fileSupportConverter() {
9898
return new FileSupportConverter();
9999
}
100100

101101
@Bean
102-
@ConditionalOnMissingBean
102+
@ConditionalOnMissingBean(name="responseSupportConverter")
103103
@Lazy(false)
104104
ResponseSupportConverter responseSupportConverter() {
105105
return new ResponseSupportConverter();
106106
}
107107

108108
@Bean
109-
@ConditionalOnMissingBean
109+
@ConditionalOnMissingBean(name="openAPIBuilder")
110110
OpenAPIBuilder openAPIBuilder(Optional<OpenAPI> openAPI, ApplicationContext context,
111111
SecurityParser securityParser,
112112
SpringDocConfigProperties springDocConfigProperties,
@@ -122,7 +122,7 @@ ModelConverterRegistrar modelConverterRegistrar(Optional<List<ModelConverter>> m
122122

123123
@Bean
124124
@ConditionalOnWebApplication
125-
@ConditionalOnMissingBean
125+
@ConditionalOnMissingBean(name="operationBuilder")
126126
OperationBuilder operationBuilder(GenericParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
127127
SecurityParser securityParser, PropertyResolverUtils propertyResolverUtils) {
128128
return new OperationBuilder(parameterBuilder, requestBodyBuilder,
@@ -136,13 +136,13 @@ PropertyResolverUtils propertyResolverUtils(ConfigurableBeanFactory factory) {
136136

137137
@Bean
138138
@ConditionalOnWebApplication
139-
@ConditionalOnMissingBean
139+
@ConditionalOnMissingBean(name="requestBodyBuilder")
140140
RequestBodyBuilder requestBodyBuilder(GenericParameterBuilder parameterBuilder) {
141141
return new RequestBodyBuilder(parameterBuilder);
142142
}
143143

144144
@Bean
145-
@ConditionalOnMissingBean
145+
@ConditionalOnMissingBean(name="securityParser")
146146
SecurityParser securityParser(PropertyResolverUtils propertyResolverUtils) {
147147
return new SecurityParser(propertyResolverUtils);
148148
}
@@ -153,7 +153,7 @@ ReturnTypeParser genericReturnTypeParser() {
153153
}
154154

155155
@Bean
156-
@ConditionalOnMissingBean
156+
@ConditionalOnMissingBean(name="parameterBuilder")
157157
GenericParameterBuilder parameterBuilder(PropertyResolverUtils propertyResolverUtils) {
158158
return new GenericParameterBuilder(propertyResolverUtils);
159159
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class SpringDocDataRestConfiguration {
6565
class QuerydslProvider {
6666

6767
@Bean
68-
@ConditionalOnMissingBean
68+
@ConditionalOnMissingBean(name="queryDslQuerydslPredicateOperationCustomizer")
6969
@Lazy(false)
7070
QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory) {
7171
if (querydslBindingsFactory.isPresent()) {
@@ -78,14 +78,14 @@ QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomize
7878

7979

8080
@Bean
81-
@ConditionalOnMissingBean
81+
@ConditionalOnMissingBean(name="halProvider")
8282
@Lazy(false)
8383
HalProvider halProvider(Optional<RepositoryRestConfiguration> repositoryRestConfiguration) {
8484
return new HalProvider(repositoryRestConfiguration);
8585
}
8686

8787
@Bean
88-
@ConditionalOnMissingBean
88+
@ConditionalOnMissingBean(name = "collectionModelContentConverter")
8989
@Lazy(false)
9090
CollectionModelContentConverter collectionModelContentConverter(HalProvider halProvider, LinkRelationProvider linkRelationProvider) {
9191
return halProvider.isHalEnabled() ? new CollectionModelContentConverter(linkRelationProvider) : null;
@@ -98,6 +98,7 @@ CollectionModelContentConverter collectionModelContentConverter(HalProvider halP
9898
* @see org.springframework.hateoas.mediatype.hal.Jackson2HalModule.HalLinkListSerializer#serialize(Links, JsonGenerator, SerializerProvider)
9999
*/
100100
@Bean
101+
@ConditionalOnMissingBean(name = "linksSchemaCustomiser")
101102
@Lazy(false)
102103
OpenApiCustomiser linksSchemaCustomiser(HalProvider halProvider) {
103104
if (!halProvider.isHalEnabled()) {

springdoc-openapi-kotlin/src/main/java/org/springdoc/kotlin/SpringDocKotlinConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import kotlin.Deprecated;
2424
import kotlin.coroutines.Continuation;
2525

26+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2627
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2728
import org.springframework.context.annotation.Bean;
2829
import org.springframework.context.annotation.Configuration;
@@ -43,6 +44,7 @@ public class SpringDocKotlinConfiguration {
4344

4445
@Bean
4546
@Lazy(false)
47+
@ConditionalOnMissingBean(name = "kotlinCoroutinesReturnTypeParser")
4648
KotlinCoroutinesReturnTypeParser kotlinCoroutinesReturnTypeParser() {
4749
return new KotlinCoroutinesReturnTypeParser();
4850
}

0 commit comments

Comments
 (0)