Skip to content

Commit aa21b7f

Browse files
author
bnasslahsen
committed
project review
1 parent e1c4f22 commit aa21b7f

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

Diff for: springdoc-openapi-common/src/main/java/org/springdoc/core/OpenAPIBuilder.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import org.apache.commons.lang3.StringUtils;
4949
import org.slf4j.Logger;
5050
import org.slf4j.LoggerFactory;
51-
5251
import org.springdoc.core.customizers.OpenApiBuilderCustomiser;
5352
import org.springframework.beans.factory.config.BeanDefinition;
5453
import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
@@ -88,7 +87,7 @@ public class OpenAPIBuilder {
8887

8988
private final Optional<SecurityOAuth2Provider> springSecurityOAuth2Provider;
9089

91-
private final List<OpenApiBuilderCustomiser> openApiBuilderCustomisers;
90+
private final Optional<List<OpenApiBuilderCustomiser>> openApiBuilderCustomisers;
9291

9392
private boolean isServersPresent;
9493

@@ -98,8 +97,8 @@ public class OpenAPIBuilder {
9897

9998
@SuppressWarnings("WeakerAccess")
10099
OpenAPIBuilder(Optional<OpenAPI> openAPI, ApplicationContext context, SecurityParser securityParser,
101-
Optional<SecurityOAuth2Provider> springSecurityOAuth2Provider, SpringDocConfigProperties springDocConfigProperties,
102-
List<OpenApiBuilderCustomiser> openApiBuilderCustomisers) {
100+
Optional<SecurityOAuth2Provider> springSecurityOAuth2Provider, SpringDocConfigProperties springDocConfigProperties,
101+
Optional<List<OpenApiBuilderCustomiser>> openApiBuilderCustomisers) {
103102
if (openAPI.isPresent()) {
104103
this.openAPI = openAPI.get();
105104
if (this.openAPI.getComponents() == null)
@@ -165,7 +164,7 @@ else if (calculatedOpenAPI.getInfo() == null) {
165164
}
166165
// add security schemes
167166
this.calculateSecuritySchemes(calculatedOpenAPI.getComponents());
168-
Optional.ofNullable(this.openApiBuilderCustomisers).ifPresent(customisers -> customisers.forEach(customiser -> customiser.customise(this)));
167+
openApiBuilderCustomisers.ifPresent(customisers -> customisers.forEach(customiser -> customiser.customise(this)));
169168
}
170169

171170
public void updateServers(OpenAPI openAPI) {

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ PropertyCustomizingConverter propertyCustomizingConverter(Optional<List<Property
7373
}
7474

7575
@Bean
76-
ResponseSupportConverter responseSupportConverter(){
76+
ResponseSupportConverter responseSupportConverter() {
7777
return new ResponseSupportConverter();
7878
}
7979

@@ -84,9 +84,9 @@ IgnoredParameterAnnotationsDefault ignoredParameterAnnotationsDefault() {
8484

8585
@Bean
8686
public OpenAPIBuilder openAPIBuilder(Optional<OpenAPI> openAPI, ApplicationContext context, SecurityParser securityParser,
87-
Optional<SecurityOAuth2Provider> springSecurityOAuth2Provider, SpringDocConfigProperties springDocConfigProperties,
88-
List<OpenApiBuilderCustomiser> openApiBuilderCustomisers) {
89-
return new OpenAPIBuilder(openAPI, context, securityParser, springSecurityOAuth2Provider,springDocConfigProperties, openApiBuilderCustomisers);
87+
Optional<SecurityOAuth2Provider> springSecurityOAuth2Provider, SpringDocConfigProperties springDocConfigProperties,
88+
Optional<List<OpenApiBuilderCustomiser>> openApiBuilderCustomisers) {
89+
return new OpenAPIBuilder(openAPI, context, securityParser, springSecurityOAuth2Provider, springDocConfigProperties, openApiBuilderCustomisers);
9090
}
9191

9292
@Bean

0 commit comments

Comments
 (0)