From d95d7a02450140de601ad0ca7e7f967501280303 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 26 Jan 2021 11:51:09 -0800 Subject: [PATCH] Update code for Spring Framework 5.3.4 See gh-24998 --- .../web/reactive/AbstractWebFluxEndpointHandlerMapping.java | 2 ++ .../web/reactive/ControllerEndpointHandlerMapping.java | 1 + .../web/client/MockRestServiceServerAutoConfiguration.java | 6 ++++++ .../test/web/client/RootUriRequestExpectationManager.java | 6 ++++++ 4 files changed, 15 insertions(+) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java index 76dd55d8453d..7d37e8319c31 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java @@ -163,6 +163,7 @@ protected ReactiveWebOperation wrapReactiveWebOperation(ExposableWebEndpoint end return reactiveWebOperation; } + @SuppressWarnings("deprecation") private RequestMappingInfo createRequestMappingInfo(WebOperation operation) { WebOperationRequestPredicate predicate = operation.getRequestPredicate(); PatternsRequestCondition patterns = new PatternsRequestCondition( @@ -176,6 +177,7 @@ private RequestMappingInfo createRequestMappingInfo(WebOperation operation) { return new RequestMappingInfo(null, patterns, methods, null, null, consumes, produces, null); } + @SuppressWarnings("deprecation") private void registerLinksMapping() { PatternsRequestCondition patterns = new PatternsRequestCondition( pathPatternParser.parse(this.endpointMapping.getPath())); diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMapping.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMapping.java index 93d84098c6f2..a38c610ec084 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMapping.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMapping.java @@ -101,6 +101,7 @@ private PathPattern getEndpointMappedPattern(ExposableControllerEndpoint endpoin return getPathPatternParser().parse(this.endpointMapping.createSubPath(endpoint.getRootPath() + pattern)); } + @SuppressWarnings("deprecation") private RequestMappingInfo withNewPatterns(RequestMappingInfo mapping, PathPattern[] patterns) { PatternsRequestCondition patternsCondition = new PatternsRequestCondition(patterns); return new RequestMappingInfo(patternsCondition, mapping.getMethodsCondition(), mapping.getParamsCondition(), diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java index 2c47ef8f0960..8441d5ae3b56 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.lang.reflect.Constructor; +import java.time.Duration; import java.util.Map; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -97,6 +98,11 @@ public void verify() { getDelegate().verify(); } + @Override + public void verify(Duration timeout) { + getDelegate().verify(timeout); + } + @Override public void reset() { Map expectationManagers = this.customizer.getExpectationManagers(); diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java index 8a0bc77985ae..674e0c2df12f 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java @@ -20,6 +20,7 @@ import java.io.OutputStream; import java.net.URI; import java.net.URISyntaxException; +import java.time.Duration; import org.springframework.boot.web.client.RootUriTemplateHandler; import org.springframework.http.client.ClientHttpRequest; @@ -111,6 +112,11 @@ public void verify() { this.expectationManager.verify(); } + @Override + public void verify(Duration timeout) { + this.expectationManager.verify(timeout); + } + @Override public void reset() { this.expectationManager.reset();