Skip to content

Commit 62a4e7b

Browse files
bnasslahsenbnasslahsen
committed
code review
1 parent 1a3c5ce commit 62a4e7b

18 files changed

+51
-54
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.springframework.http.server.reactive.ServerHttpRequest;
4343
import org.springframework.web.bind.annotation.GetMapping;
4444
import org.springframework.web.bind.annotation.PathVariable;
45-
import org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping;
45+
import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
4646

4747
import static org.springdoc.core.Constants.API_DOCS_URL;
4848
import static org.springdoc.core.Constants.APPLICATION_OPENAPI_YAML;
@@ -68,7 +68,7 @@ public class MultipleOpenApiActuatorResource extends MultipleOpenApiResource {
6868
* @param springDocConfigProperties the spring doc config properties
6969
* @param actuatorProvider the actuator provider
7070
*/
71-
public MultipleOpenApiActuatorResource(List<GroupedOpenApi> groupedOpenApis, ObjectFactory<OpenAPIService> defaultOpenAPIBuilder, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingInfoHandlerMapping requestMappingHandlerMapping, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
71+
public MultipleOpenApiActuatorResource(List<GroupedOpenApi> groupedOpenApis, ObjectFactory<OpenAPIService> defaultOpenAPIBuilder, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingHandlerMapping requestMappingHandlerMapping, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
7272
super(groupedOpenApis, defaultOpenAPIBuilder, requestBuilder, responseBuilder, operationParser, requestMappingHandlerMapping, springDocConfigProperties, actuatorProvider);
7373
}
7474

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
import org.springframework.beans.factory.InitializingBean;
3939
import org.springframework.beans.factory.ObjectFactory;
40-
import org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping;
40+
import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
4141

4242
import static org.springdoc.core.Constants.ACTUATOR_DEFAULT_GROUP;
4343

@@ -75,7 +75,7 @@ public abstract class MultipleOpenApiResource implements InitializingBean {
7575
/**
7676
* The Request mapping handler mapping.
7777
*/
78-
private final RequestMappingInfoHandlerMapping requestMappingHandlerMapping;
78+
private final RequestMappingHandlerMapping requestMappingHandlerMapping;
7979

8080
/**
8181
* The Spring doc config properties.
@@ -107,7 +107,7 @@ public abstract class MultipleOpenApiResource implements InitializingBean {
107107
public MultipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
108108
ObjectFactory<OpenAPIService> defaultOpenAPIBuilder, AbstractRequestService requestBuilder,
109109
GenericResponseService responseBuilder, OperationService operationParser,
110-
RequestMappingInfoHandlerMapping requestMappingHandlerMapping,
110+
RequestMappingHandlerMapping requestMappingHandlerMapping,
111111
SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
112112

113113
this.groupedOpenApis = groupedOpenApis;
@@ -121,7 +121,7 @@ public MultipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
121121
}
122122

123123
@Override
124-
public void afterPropertiesSet() throws Exception {
124+
public void afterPropertiesSet() {
125125
this.groupedOpenApiResources = groupedOpenApis.stream()
126126
.collect(Collectors.toMap(GroupedOpenApi::getGroup, item ->
127127
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.springframework.web.bind.annotation.GetMapping;
4343
import org.springframework.web.bind.annotation.PathVariable;
4444
import org.springframework.web.bind.annotation.RestController;
45-
import org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping;
45+
import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
4646

4747
import static org.springdoc.core.Constants.API_DOCS_URL;
4848
import static org.springdoc.core.Constants.APPLICATION_OPENAPI_YAML;
@@ -67,7 +67,7 @@ public class MultipleOpenApiWebFluxResource extends MultipleOpenApiResource {
6767
* @param springDocConfigProperties the spring doc config properties
6868
* @param actuatorProvider the actuator provider
6969
*/
70-
public MultipleOpenApiWebFluxResource(List<GroupedOpenApi> groupedOpenApis, ObjectFactory<OpenAPIService> defaultOpenAPIBuilder, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingInfoHandlerMapping requestMappingHandlerMapping, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
70+
public MultipleOpenApiWebFluxResource(List<GroupedOpenApi> groupedOpenApis, ObjectFactory<OpenAPIService> defaultOpenAPIBuilder, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingHandlerMapping requestMappingHandlerMapping, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
7171
super(groupedOpenApis, defaultOpenAPIBuilder, requestBuilder, responseBuilder, operationParser, requestMappingHandlerMapping, springDocConfigProperties, actuatorProvider);
7272
}
7373

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.springframework.http.MediaType;
4343
import org.springframework.http.server.reactive.ServerHttpRequest;
4444
import org.springframework.web.bind.annotation.GetMapping;
45-
import org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping;
45+
import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
4646

4747
import static org.apache.commons.lang3.StringUtils.EMPTY;
4848
import static org.springdoc.core.Constants.APPLICATION_OPENAPI_YAML;
@@ -72,7 +72,7 @@ public class OpenApiActuatorResource extends OpenApiResource {
7272
* @param springDocConfigProperties the spring doc config properties
7373
* @param actuatorProvider the actuator provider
7474
*/
75-
public OpenApiActuatorResource(String groupName, ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingInfoHandlerMapping requestMappingHandlerMapping, Optional<List<OperationCustomizer>> operationCustomizers, Optional<List<OpenApiCustomiser>> openApiCustomisers, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
75+
public OpenApiActuatorResource(String groupName, ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingHandlerMapping requestMappingHandlerMapping, Optional<List<OperationCustomizer>> operationCustomizers, Optional<List<OpenApiCustomiser>> openApiCustomisers, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
7676
super(groupName, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, requestMappingHandlerMapping, operationCustomizers, openApiCustomisers, springDocConfigProperties, actuatorProvider);
7777
}
7878

@@ -89,7 +89,7 @@ public OpenApiActuatorResource(String groupName, ObjectFactory<OpenAPIService> o
8989
* @param springDocConfigProperties the spring doc config properties
9090
* @param actuatorProvider the actuator provider
9191
*/
92-
public OpenApiActuatorResource(ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingInfoHandlerMapping requestMappingHandlerMapping, Optional<List<OperationCustomizer>> operationCustomizers, Optional<List<OpenApiCustomiser>> openApiCustomisers, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
92+
public OpenApiActuatorResource(ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingHandlerMapping requestMappingHandlerMapping, Optional<List<OperationCustomizer>> operationCustomizers, Optional<List<OpenApiCustomiser>> openApiCustomisers, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
9393
super(openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, requestMappingHandlerMapping, operationCustomizers, openApiCustomisers, springDocConfigProperties, actuatorProvider);
9494
}
9595

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import org.springframework.web.reactive.function.server.RouterFunction;
5656
import org.springframework.web.reactive.result.condition.PatternsRequestCondition;
5757
import org.springframework.web.reactive.result.method.RequestMappingInfo;
58-
import org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping;
58+
import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
5959
import org.springframework.web.util.pattern.PathPattern;
6060

6161
import static org.springdoc.core.ActuatorProvider.getTag;
@@ -70,7 +70,7 @@ public abstract class OpenApiResource extends AbstractOpenApiResource {
7070
/**
7171
* The Request mapping handler mapping.
7272
*/
73-
protected final RequestMappingInfoHandlerMapping requestMappingHandlerMapping;
73+
protected final RequestMappingHandlerMapping requestMappingHandlerMapping;
7474

7575
/**
7676
* Instantiates a new Open api resource.
@@ -88,7 +88,7 @@ public abstract class OpenApiResource extends AbstractOpenApiResource {
8888
*/
8989
public OpenApiResource(String groupName, ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder,
9090
GenericResponseService responseBuilder, OperationService operationParser,
91-
RequestMappingInfoHandlerMapping requestMappingHandlerMapping,
91+
RequestMappingHandlerMapping requestMappingHandlerMapping,
9292
Optional<List<OperationCustomizer>> operationCustomizers,
9393
Optional<List<OpenApiCustomiser>> openApiCustomisers,
9494
SpringDocConfigProperties springDocConfigProperties,
@@ -112,7 +112,7 @@ public OpenApiResource(String groupName, ObjectFactory<OpenAPIService> openAPIBu
112112
*/
113113
public OpenApiResource(ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder,
114114
GenericResponseService responseBuilder, OperationService operationParser,
115-
RequestMappingInfoHandlerMapping requestMappingHandlerMapping,
115+
RequestMappingHandlerMapping requestMappingHandlerMapping,
116116
Optional<List<OperationCustomizer>> operationCustomizers,
117117
Optional<List<OpenApiCustomiser>> openApiCustomisers,
118118
SpringDocConfigProperties springDocConfigProperties,

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.springframework.http.server.reactive.ServerHttpRequest;
4747
import org.springframework.web.bind.annotation.GetMapping;
4848
import org.springframework.web.bind.annotation.RestController;
49-
import org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping;
5049
import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
5150

5251
import static org.springdoc.core.Constants.API_DOCS_URL;
@@ -75,7 +74,7 @@ public class OpenApiWebfluxResource extends OpenApiResource {
7574
* @param springDocConfigProperties the spring doc config properties
7675
* @param actuatorProvider the actuator provider
7776
*/
78-
public OpenApiWebfluxResource(String groupName, ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingInfoHandlerMapping requestMappingHandlerMapping, Optional<List<OperationCustomizer>> operationCustomizers, Optional<List<OpenApiCustomiser>> openApiCustomisers, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
77+
public OpenApiWebfluxResource(String groupName, ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingHandlerMapping requestMappingHandlerMapping, Optional<List<OperationCustomizer>> operationCustomizers, Optional<List<OpenApiCustomiser>> openApiCustomisers, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
7978
super(groupName, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, requestMappingHandlerMapping, operationCustomizers, openApiCustomisers, springDocConfigProperties, actuatorProvider);
8079
}
8180

@@ -93,7 +92,7 @@ public OpenApiWebfluxResource(String groupName, ObjectFactory<OpenAPIService> op
9392
* @param actuatorProvider the actuator provider
9493
*/
9594
@Autowired
96-
public OpenApiWebfluxResource(ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingInfoHandlerMapping requestMappingHandlerMapping, Optional<List<OperationCustomizer>> operationCustomizers, Optional<List<OpenApiCustomiser>> openApiCustomisers, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
95+
public OpenApiWebfluxResource(ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingHandlerMapping requestMappingHandlerMapping, Optional<List<OperationCustomizer>> operationCustomizers, Optional<List<OpenApiCustomiser>> openApiCustomisers, SpringDocConfigProperties springDocConfigProperties, Optional<ActuatorProvider> actuatorProvider) {
9796
super(openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, requestMappingHandlerMapping, operationCustomizers, openApiCustomisers, springDocConfigProperties, actuatorProvider);
9897
}
9998

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import org.springframework.context.annotation.Conditional;
4747
import org.springframework.context.annotation.Configuration;
4848
import org.springframework.context.annotation.Lazy;
49-
import org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping;
49+
import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
5050

5151
import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
5252
import static org.springdoc.core.Constants.SPRINGDOC_USE_MANAGEMENT_PORT;
@@ -83,7 +83,7 @@ public class MultipleOpenApiSupportConfiguration {
8383
MultipleOpenApiWebFluxResource multipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
8484
ObjectFactory<OpenAPIService> defaultOpenAPIBuilder, AbstractRequestService requestBuilder,
8585
GenericResponseService responseBuilder, OperationService operationParser,
86-
RequestMappingInfoHandlerMapping requestMappingHandlerMapping,
86+
RequestMappingHandlerMapping requestMappingHandlerMapping,
8787
SpringDocConfigProperties springDocConfigProperties,
8888
Optional<ActuatorProvider> actuatorProvider) {
8989
return new MultipleOpenApiWebFluxResource(groupedOpenApis,
@@ -122,7 +122,7 @@ static class SpringDocWebMvcActuatorDifferentConfiguration {
122122
MultipleOpenApiActuatorResource multipleOpenApiActuatorResource(List<GroupedOpenApi> groupedOpenApis,
123123
ObjectFactory<OpenAPIService> defaultOpenAPIBuilder, AbstractRequestService requestBuilder,
124124
GenericResponseService responseBuilder, OperationService operationParser,
125-
RequestMappingInfoHandlerMapping requestMappingHandlerMapping,
125+
RequestMappingHandlerMapping requestMappingHandlerMapping,
126126
SpringDocConfigProperties springDocConfigProperties,
127127
Optional<ActuatorProvider> actuatorProvider) {
128128
return new MultipleOpenApiActuatorResource(groupedOpenApis, defaultOpenAPIBuilder, requestBuilder,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import org.springframework.context.annotation.Configuration;
5858
import org.springframework.context.annotation.Lazy;
5959
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
60-
import org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping;
60+
import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
6161

6262
import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
6363
import static org.springdoc.core.Constants.SPRINGDOC_USE_MANAGEMENT_PORT;
@@ -92,7 +92,7 @@ public class SpringDocWebFluxConfiguration {
9292
@Lazy(false)
9393
OpenApiWebfluxResource openApiResource(ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder,
9494
GenericResponseService responseBuilder, OperationService operationParser,
95-
RequestMappingInfoHandlerMapping requestMappingHandlerMapping,
95+
RequestMappingHandlerMapping requestMappingHandlerMapping,
9696
Optional<List<OperationCustomizer>> operationCustomizers,
9797
Optional<List<OpenApiCustomiser>> openApiCustomisers,
9898
SpringDocConfigProperties springDocConfigProperties,
@@ -206,7 +206,7 @@ ActuatorProvider actuatorProvider(ServerProperties serverProperties,
206206
@Lazy(false)
207207
OpenApiActuatorResource actuatorOpenApiResource(ObjectFactory<OpenAPIService> openAPIBuilderObjectFactory, AbstractRequestService requestBuilder,
208208
GenericResponseService responseBuilder, OperationService operationParser,
209-
RequestMappingInfoHandlerMapping requestMappingHandlerMapping,
209+
RequestMappingHandlerMapping requestMappingHandlerMapping,
210210
Optional<List<OperationCustomizer>> operationCustomizers,
211211
Optional<List<OpenApiCustomiser>> openApiCustomisers,
212212
SpringDocConfigProperties springDocConfigProperties,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.springframework.http.MediaType;
4545
import org.springframework.web.bind.annotation.GetMapping;
4646
import org.springframework.web.bind.annotation.PathVariable;
47-
import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
47+
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
4848

4949
import static org.springdoc.core.Constants.APPLICATION_OPENAPI_YAML;
5050
import static org.springdoc.core.Constants.DEFAULT_API_DOCS_ACTUATOR_URL;
@@ -72,7 +72,7 @@ public class MultipleOpenApiActuatorResource extends MultipleOpenApiResource {
7272
* @param routerFunctionProvider the router function provider
7373
* @param repositoryRestResourceProvider the repository rest resource provider
7474
*/
75-
public MultipleOpenApiActuatorResource(List<GroupedOpenApi> groupedOpenApis, ObjectFactory<OpenAPIService> defaultOpenAPIBuilder, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingInfoHandlerMapping requestMappingHandlerMapping, Optional<ActuatorProvider> actuatorProvider, SpringDocConfigProperties springDocConfigProperties, Optional<SecurityOAuth2Provider> springSecurityOAuth2Provider, Optional<RouterFunctionProvider> routerFunctionProvider, Optional<RepositoryRestResourceProvider> repositoryRestResourceProvider) {
75+
public MultipleOpenApiActuatorResource(List<GroupedOpenApi> groupedOpenApis, ObjectFactory<OpenAPIService> defaultOpenAPIBuilder, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, RequestMappingHandlerMapping requestMappingHandlerMapping, Optional<ActuatorProvider> actuatorProvider, SpringDocConfigProperties springDocConfigProperties, Optional<SecurityOAuth2Provider> springSecurityOAuth2Provider, Optional<RouterFunctionProvider> routerFunctionProvider, Optional<RepositoryRestResourceProvider> repositoryRestResourceProvider) {
7676
super(groupedOpenApis, defaultOpenAPIBuilder, requestBuilder, responseBuilder, operationParser, requestMappingHandlerMapping, actuatorProvider, springDocConfigProperties, springSecurityOAuth2Provider, routerFunctionProvider, repositoryRestResourceProvider);
7777
}
7878

0 commit comments

Comments
 (0)