Skip to content

Commit 1b14e51

Browse files
authored
Merge pull request #1959 from krupt/feature/1958
Replaced deprecated org.springframework.core.LocalVariableTableParameterNameDiscoverer with org.springframework.core.DefaultParameterNameDiscoverer
2 parents 75d3423 + ccc9a31 commit 1b14e51

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
import org.springframework.context.annotation.Conditional;
103103
import org.springframework.context.annotation.Configuration;
104104
import org.springframework.context.annotation.Lazy;
105-
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
105+
import org.springframework.core.DefaultParameterNameDiscoverer;
106106
import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
107107
import org.springframework.http.HttpStatus;
108108
import org.springframework.http.ResponseEntity;
@@ -174,8 +174,8 @@ static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor2() {
174174
*/
175175
@Bean
176176
@Lazy(false)
177-
LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer() {
178-
return new LocalVariableTableParameterNameDiscoverer();
177+
DefaultParameterNameDiscoverer localSpringDocParameterNameDiscoverer() {
178+
return new DefaultParameterNameDiscoverer();
179179
}
180180

181181
/**

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocDataRestConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import org.springframework.context.annotation.ImportRuntimeHints;
6161
import org.springframework.context.annotation.Lazy;
6262
import org.springframework.context.annotation.Primary;
63-
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
63+
import org.springframework.core.DefaultParameterNameDiscoverer;
6464
import org.springframework.data.domain.Sort;
6565
import org.springframework.data.mapping.context.PersistentEntities;
6666
import org.springframework.data.querydsl.binding.QuerydslBindingsFactory;
@@ -192,7 +192,7 @@ DataRestOperationService dataRestOperationBuilder(DataRestRequestService dataRes
192192
@Bean
193193
@ConditionalOnMissingBean
194194
@Lazy(false)
195-
DataRestRequestService dataRestRequestBuilder(LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer, GenericParameterService parameterBuilder,
195+
DataRestRequestService dataRestRequestBuilder(DefaultParameterNameDiscoverer localSpringDocParameterNameDiscoverer, GenericParameterService parameterBuilder,
196196
RequestBodyService requestBodyService, AbstractRequestService requestBuilder, SpringDocDataRestUtils springDocDataRestUtils) {
197197
return new DataRestRequestService(localSpringDocParameterNameDiscoverer, parameterBuilder,
198198
requestBodyService, requestBuilder, springDocDataRestUtils);

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRequestService.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import org.springdoc.core.utils.SpringDocAnnotationsUtils;
5252
import org.springdoc.core.utils.SpringDocDataRestUtils;
5353

54-
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
54+
import org.springframework.core.DefaultParameterNameDiscoverer;
5555
import org.springframework.core.MethodParameter;
5656
import org.springframework.core.annotation.AnnotatedElementUtils;
5757
import org.springframework.data.rest.core.mapping.ResourceMetadata;
@@ -72,7 +72,7 @@ public class DataRestRequestService {
7272
/**
7373
* The Local spring doc parameter name discoverer.
7474
*/
75-
private final LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer;
75+
private final DefaultParameterNameDiscoverer localSpringDocParameterNameDiscoverer;
7676

7777
/**
7878
* The Parameter builder.
@@ -103,7 +103,7 @@ public class DataRestRequestService {
103103
* @param requestBuilder the request builder
104104
* @param springDocDataRestUtils the spring doc data rest utils
105105
*/
106-
public DataRestRequestService(LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer, GenericParameterService parameterBuilder,
106+
public DataRestRequestService(DefaultParameterNameDiscoverer localSpringDocParameterNameDiscoverer, GenericParameterService parameterBuilder,
107107
RequestBodyService requestBodyService, AbstractRequestService requestBuilder, SpringDocDataRestUtils springDocDataRestUtils) {
108108
this.localSpringDocParameterNameDiscoverer = localSpringDocParameterNameDiscoverer;
109109
this.parameterBuilder = parameterBuilder;

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/AbstractRequestService.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
import org.springdoc.core.providers.JavadocProvider;
7474
import org.springdoc.core.utils.SpringDocAnnotationsUtils;
7575

76-
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
76+
import org.springframework.core.DefaultParameterNameDiscoverer;
7777
import org.springframework.core.MethodParameter;
7878
import org.springframework.core.annotation.AnnotatedElementUtils;
7979
import org.springframework.http.HttpMethod;
@@ -163,7 +163,7 @@ public abstract class AbstractRequestService {
163163
/**
164164
* The Local spring doc parameter name discoverer.
165165
*/
166-
private final LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer;
166+
private final DefaultParameterNameDiscoverer localSpringDocParameterNameDiscoverer;
167167

168168
/**
169169
* The Parameter customizers.
@@ -191,7 +191,7 @@ public abstract class AbstractRequestService {
191191
*/
192192
protected AbstractRequestService(GenericParameterService parameterBuilder, RequestBodyService requestBodyService,
193193
OperationService operationService, Optional<List<ParameterCustomizer>> parameterCustomizers,
194-
LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
194+
DefaultParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
195195
super();
196196
this.parameterBuilder = parameterBuilder;
197197
this.requestBodyService = requestBodyService;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
import org.springframework.context.annotation.Bean;
6969
import org.springframework.context.annotation.Configuration;
7070
import org.springframework.context.annotation.Lazy;
71-
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
71+
import org.springframework.core.DefaultParameterNameDiscoverer;
7272

7373
import static org.springdoc.core.utils.Constants.SPRINGDOC_ENABLED;
7474
import static org.springdoc.core.utils.Constants.SPRINGDOC_USE_MANAGEMENT_PORT;
@@ -132,7 +132,7 @@ OpenApiWebfluxResource openApiResource(ObjectFactory<OpenAPIService> openAPIBuil
132132
RequestService requestBuilder(GenericParameterService parameterBuilder, RequestBodyService requestBodyService,
133133
OperationService operationService,
134134
Optional<List<ParameterCustomizer>> parameterCustomizers,
135-
LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
135+
DefaultParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
136136
return new RequestService(parameterBuilder, requestBodyService,
137137
operationService, parameterCustomizers, localSpringDocParameterNameDiscoverer);
138138
}

springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/service/RequestService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.springdoc.core.service.OperationService;
3434
import org.springdoc.core.service.RequestBodyService;
3535

36-
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
36+
import org.springframework.core.DefaultParameterNameDiscoverer;
3737
import org.springframework.http.codec.multipart.FilePart;
3838
import org.springframework.http.server.reactive.ServerHttpRequest;
3939
import org.springframework.http.server.reactive.ServerHttpResponse;
@@ -66,7 +66,7 @@ public class RequestService extends AbstractRequestService {
6666
*/
6767
public RequestService(GenericParameterService parameterBuilder, RequestBodyService requestBodyService,
6868
OperationService operationService, Optional<List<ParameterCustomizer>> parameterCustomizers,
69-
LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
69+
DefaultParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
7070
super(parameterBuilder, requestBodyService, operationService, parameterCustomizers, localSpringDocParameterNameDiscoverer);
7171
}
7272
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
import org.springframework.context.annotation.Bean;
7070
import org.springframework.context.annotation.Configuration;
7171
import org.springframework.context.annotation.Lazy;
72-
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
72+
import org.springframework.core.DefaultParameterNameDiscoverer;
7373
import org.springframework.web.servlet.ModelAndView;
7474
import org.springframework.web.servlet.function.RouterFunction;
7575
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
@@ -141,7 +141,7 @@ OpenApiWebMvcResource openApiResource(ObjectFactory<OpenAPIService> openAPIBuild
141141
@Lazy(false)
142142
RequestService requestBuilder(GenericParameterService parameterBuilder, RequestBodyService requestBodyService,
143143
OperationService operationService, Optional<List<ParameterCustomizer>> parameterCustomizers,
144-
LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
144+
DefaultParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
145145
return new RequestService(parameterBuilder, requestBodyService,
146146
operationService, parameterCustomizers, localSpringDocParameterNameDiscoverer);
147147
}

springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/service/RequestService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.springdoc.core.service.OperationService;
3434
import org.springdoc.core.service.RequestBodyService;
3535

36-
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
36+
import org.springframework.core.DefaultParameterNameDiscoverer;
3737

3838
import static org.springdoc.core.utils.SpringDocUtils.getConfig;
3939

@@ -63,7 +63,7 @@ public class RequestService extends AbstractRequestService {
6363
*/
6464
public RequestService(GenericParameterService parameterBuilder, RequestBodyService requestBodyService,
6565
OperationService operationService, Optional<List<ParameterCustomizer>> parameterCustomizers,
66-
LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
66+
DefaultParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
6767
super(parameterBuilder, requestBodyService, operationService, parameterCustomizers, localSpringDocParameterNameDiscoverer);
6868
}
6969
}

0 commit comments

Comments
 (0)