Skip to content

Commit f16e5ff

Browse files
author
bnasslahsen
committed
code cleanup
1 parent 5cda6b6 commit f16e5ff

File tree

12 files changed

+31
-27
lines changed

12 files changed

+31
-27
lines changed

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

Lines changed: 8 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(name = "fileSupportConverter")
95+
@ConditionalOnMissingBean
9696
@Lazy(false)
9797
FileSupportConverter fileSupportConverter() {
9898
return new FileSupportConverter();
9999
}
100100

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

108108
@Bean
109-
@ConditionalOnMissingBean(name = "openAPIBuilder")
109+
@ConditionalOnMissingBean
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(name = "operationBuilder")
125+
@ConditionalOnMissingBean
126126
OperationBuilder operationBuilder(GenericParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
127127
SecurityParser securityParser, PropertyResolverUtils propertyResolverUtils) {
128128
return new OperationBuilder(parameterBuilder, requestBodyBuilder,
@@ -136,24 +136,25 @@ PropertyResolverUtils propertyResolverUtils(ConfigurableBeanFactory factory) {
136136

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

144144
@Bean
145-
@ConditionalOnMissingBean(name = "securityParser")
145+
@ConditionalOnMissingBean
146146
SecurityParser securityParser(PropertyResolverUtils propertyResolverUtils) {
147147
return new SecurityParser(propertyResolverUtils);
148148
}
149149

150150
@Bean
151+
@ConditionalOnMissingBean
151152
ReturnTypeParser genericReturnTypeParser() {
152153
return new ReturnTypeParser() {};
153154
}
154155

155156
@Bean
156-
@ConditionalOnMissingBean(name = "parameterBuilder")
157+
@ConditionalOnMissingBean
157158
GenericParameterBuilder parameterBuilder(PropertyResolverUtils propertyResolverUtils) {
158159
return new GenericParameterBuilder(propertyResolverUtils);
159160
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ public class SpringDocDataRestConfiguration {
6262
}
6363

6464
@Bean
65-
@ConditionalOnMissingBean(name = "halProvider")
65+
@ConditionalOnMissingBean
6666
@Lazy(false)
6767
HalProvider halProvider(Optional<RepositoryRestConfiguration> repositoryRestConfiguration) {
6868
return new HalProvider(repositoryRestConfiguration);
6969
}
7070

7171
@Bean
72-
@ConditionalOnMissingBean(name = "collectionModelContentConverter")
72+
@ConditionalOnMissingBean
7373
@Lazy(false)
7474
CollectionModelContentConverter collectionModelContentConverter(HalProvider halProvider, LinkRelationProvider linkRelationProvider) {
7575
return halProvider.isHalEnabled() ? new CollectionModelContentConverter(linkRelationProvider) : null;
@@ -82,7 +82,7 @@ CollectionModelContentConverter collectionModelContentConverter(HalProvider halP
8282
* @see org.springframework.hateoas.mediatype.hal.Jackson2HalModule.HalLinkListSerializer#serialize(Links, JsonGenerator, SerializerProvider)
8383
*/
8484
@Bean
85-
@ConditionalOnMissingBean(name = "linksSchemaCustomiser")
85+
@ConditionalOnMissingBean
8686
@Lazy(false)
8787
OpenApiCustomiser linksSchemaCustomiser(HalProvider halProvider) {
8888
if (!halProvider.isHalEnabled()) {
@@ -105,7 +105,7 @@ OpenApiCustomiser linksSchemaCustomiser(HalProvider halProvider) {
105105
class QuerydslProvider {
106106

107107
@Bean
108-
@ConditionalOnMissingBean(name = "queryDslQuerydslPredicateOperationCustomizer")
108+
@ConditionalOnMissingBean
109109
@Lazy(false)
110110
QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory) {
111111
if (querydslBindingsFactory.isPresent()) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class SpringDocKotlinConfiguration {
4444

4545
@Bean
4646
@Lazy(false)
47-
@ConditionalOnMissingBean(name = "kotlinCoroutinesReturnTypeParser")
47+
@ConditionalOnMissingBean
4848
KotlinCoroutinesReturnTypeParser kotlinCoroutinesReturnTypeParser() {
4949
return new KotlinCoroutinesReturnTypeParser();
5050
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class SpringDocSecurityConfiguration {
4444
@ConditionalOnBean(FrameworkEndpointHandlerMapping.class)
4545
class SpringSecurityOAuth2ProviderConfiguration {
4646
@Bean
47-
@ConditionalOnMissingBean(name = "springSecurityOAuth2Provider")
47+
@ConditionalOnMissingBean
4848
SpringSecurityOAuth2Provider springSecurityOAuth2Provider(FrameworkEndpointHandlerMapping oauth2EndpointHandlerMapping) {
4949
return new SpringSecurityOAuth2Provider(oauth2EndpointHandlerMapping);
5050
}

‎springdoc-openapi-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfig.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springdoc.core.SwaggerUiOAuthProperties;
2626

2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
28+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2829
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2930
import org.springframework.context.annotation.Bean;
3031
import org.springframework.context.annotation.Configuration;
@@ -38,16 +39,19 @@
3839
public class SwaggerConfig {
3940

4041
@Bean
42+
@ConditionalOnMissingBean
4143
SwaggerWelcome swaggerWelcome(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties) {
4244
return new SwaggerWelcome(swaggerUiConfig, springDocConfigProperties);
4345
}
4446

4547
@Bean
48+
@ConditionalOnMissingBean
4649
SwaggerIndexTransformer indexPageTransformer(SwaggerUiOAuthProperties swaggerUiOAuthProperties, ObjectMapper objectMapper) {
4750
return new SwaggerIndexTransformer(swaggerUiOAuthProperties, objectMapper);
4851
}
4952

5053
@Bean
54+
@ConditionalOnMissingBean
5155
SwaggerWebMvcConfigurer swaggerWebMvcConfigurer(SwaggerUiConfigProperties swaggerUiConfig, SwaggerIndexTransformer swaggerIndexTransformer) {
5256
return new SwaggerWebMvcConfigurer(swaggerUiConfig, swaggerIndexTransformer);
5357
}

‎springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/api/OpenApiResource.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import reactor.core.publisher.Mono;
4141

4242
import org.springframework.beans.factory.annotation.Value;
43-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
4443
import org.springframework.http.MediaType;
4544
import org.springframework.http.server.reactive.ServerHttpRequest;
4645
import org.springframework.web.bind.annotation.GetMapping;
@@ -58,7 +57,6 @@
5857
import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
5958

6059
@RestController
61-
@ConditionalOnMissingBean(name = "openApiResource")
6260
public class OpenApiResource extends AbstractOpenApiResource {
6361

6462
private final RequestMappingInfoHandlerMapping requestMappingHandlerMapping;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
public class MultipleOpenApiWebFluxConfiguration {
5050

5151
@Bean
52-
@ConditionalOnMissingBean(name = "multipleOpenApiResource")
52+
@ConditionalOnMissingBean
5353
@Lazy(false)
5454
MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
5555
ObjectFactory<OpenAPIBuilder> defaultOpenAPIBuilder, AbstractRequestBuilder requestBuilder,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
public class SpringDocWebFluxConfiguration {
5555

5656
@Bean
57-
@ConditionalOnMissingBean(name = "openApiResource")
57+
@ConditionalOnMissingBean
5858
@Lazy(false)
5959
OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
6060
GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -67,7 +67,7 @@ OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBu
6767
}
6868

6969
@Bean
70-
@ConditionalOnMissingBean(name = "requestBuilder")
70+
@ConditionalOnMissingBean
7171
RequestBuilder requestBuilder(GenericParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
7272
OperationBuilder operationBuilder, Optional<List<OperationCustomizer>> operationCustomizers,
7373
Optional<List<ParameterCustomizer>> parameterCustomizers,
@@ -77,13 +77,13 @@ RequestBuilder requestBuilder(GenericParameterBuilder parameterBuilder, RequestB
7777
}
7878

7979
@Bean
80-
@ConditionalOnMissingBean(name = "responseBuilder")
80+
@ConditionalOnMissingBean
8181
GenericResponseBuilder responseBuilder(OperationBuilder operationBuilder, List<ReturnTypeParser> returnTypeParsers, SpringDocConfigProperties springDocConfigProperties, PropertyResolverUtils propertyResolverUtils) {
8282
return new GenericResponseBuilder(operationBuilder, returnTypeParsers, springDocConfigProperties, propertyResolverUtils);
8383
}
8484

8585
@Bean
86-
@ConditionalOnMissingBean(name = "webFluxSupportConverter")
86+
@ConditionalOnMissingBean
8787
@Lazy(false)
8888
WebFluxSupportConverter webFluxSupportConverter() {
8989
return new WebFluxSupportConverter();

‎springdoc-openapi-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfig.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springdoc.core.SwaggerUiOAuthProperties;
2626

2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
28+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2829
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2930
import org.springframework.context.annotation.Bean;
3031
import org.springframework.context.annotation.Configuration;
@@ -39,11 +40,13 @@
3940
public class SwaggerConfig implements WebFluxConfigurer {
4041

4142
@Bean
43+
@ConditionalOnMissingBean
4244
SwaggerWebFluxConfigurer swaggerWebFluxConfigurer(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties, SwaggerIndexTransformer swaggerIndexTransformer) {
4345
return new SwaggerWebFluxConfigurer(swaggerUiConfig, springDocConfigProperties, swaggerIndexTransformer);
4446
}
4547

4648
@Bean
49+
@ConditionalOnMissingBean
4750
SwaggerIndexTransformer indexPageTransformer(SwaggerUiOAuthProperties swaggerUiOAuthProperties, ObjectMapper objectMapper) {
4851
return new SwaggerIndexTransformer(swaggerUiOAuthProperties, objectMapper);
4952
}

‎springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/OpenApiResource.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.springdoc.core.customizers.OpenApiCustomiser;
4444

4545
import org.springframework.beans.factory.annotation.Value;
46-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
4746
import org.springframework.core.annotation.AnnotationUtils;
4847
import org.springframework.http.MediaType;
4948
import org.springframework.web.bind.annotation.GetMapping;
@@ -62,7 +61,6 @@
6261
import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
6362

6463
@RestController
65-
@ConditionalOnMissingBean(name = "openApiResource")
6664
public class OpenApiResource extends AbstractOpenApiResource {
6765

6866
private final RequestMappingInfoHandlerMapping requestMappingHandlerMapping;

0 commit comments

Comments
 (0)