root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Update code for Spring Framework 5.3.4 

See gh-24998
This commit is contained in:
Phillip Webb 2021-01-26 11:51:09 -08:00
parent b7ae5558f6
commit d95d7a0245
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java
View File

@ -163,6 +163,7 @@ public abstract class AbstractWebFluxEndpointHandlerMapping extends RequestMappi
return reactiveWebOperation; return reactiveWebOperation;
} }
@SuppressWarnings("deprecation")
private RequestMappingInfo createRequestMappingInfo(WebOperation operation) { private RequestMappingInfo createRequestMappingInfo(WebOperation operation) {
WebOperationRequestPredicate predicate = operation.getRequestPredicate(); WebOperationRequestPredicate predicate = operation.getRequestPredicate();
PatternsRequestCondition patterns = new PatternsRequestCondition( PatternsRequestCondition patterns = new PatternsRequestCondition(
@ -176,6 +177,7 @@ public abstract class AbstractWebFluxEndpointHandlerMapping extends RequestMappi
return new RequestMappingInfo(null, patterns, methods, null, null, consumes, produces, null); return new RequestMappingInfo(null, patterns, methods, null, null, consumes, produces, null);
} }
@SuppressWarnings("deprecation")
private void registerLinksMapping() { private void registerLinksMapping() {
PatternsRequestCondition patterns = new PatternsRequestCondition( PatternsRequestCondition patterns = new PatternsRequestCondition(
pathPatternParser.parse(this.endpointMapping.getPath())); pathPatternParser.parse(this.endpointMapping.getPath()));

1
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMapping.java
View File

@ -101,6 +101,7 @@ public class ControllerEndpointHandlerMapping extends RequestMappingHandlerMappi
return getPathPatternParser().parse(this.endpointMapping.createSubPath(endpoint.getRootPath() + pattern)); return getPathPatternParser().parse(this.endpointMapping.createSubPath(endpoint.getRootPath() + pattern));
} }
@SuppressWarnings("deprecation")
private RequestMappingInfo withNewPatterns(RequestMappingInfo mapping, PathPattern[] patterns) { private RequestMappingInfo withNewPatterns(RequestMappingInfo mapping, PathPattern[] patterns) {
PatternsRequestCondition patternsCondition = new PatternsRequestCondition(patterns); PatternsRequestCondition patternsCondition = new PatternsRequestCondition(patterns);
return new RequestMappingInfo(patternsCondition, mapping.getMethodsCondition(), mapping.getParamsCondition(), return new RequestMappingInfo(patternsCondition, mapping.getMethodsCondition(), mapping.getParamsCondition(),

6
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java
View File

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.web.client;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.time.Duration;
import java.util.Map; import java.util.Map;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@ -97,6 +98,11 @@ public class MockRestServiceServerAutoConfiguration {
getDelegate().verify(); getDelegate().verify();
} }
@Override
public void verify(Duration timeout) {
getDelegate().verify(timeout);
}
@Override @Override
public void reset() { public void reset() {
Map<RestTemplate, RequestExpectationManager> expectationManagers = this.customizer.getExpectationManagers(); Map<RestTemplate, RequestExpectationManager> expectationManagers = this.customizer.getExpectationManagers();

6
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java
View File

@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.time.Duration;
import org.springframework.boot.web.client.RootUriTemplateHandler; import org.springframework.boot.web.client.RootUriTemplateHandler;
import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpRequest;
@ -111,6 +112,11 @@ public class RootUriRequestExpectationManager implements RequestExpectationManag
this.expectationManager.verify(); this.expectationManager.verify();
} }
@Override
public void verify(Duration timeout) {
this.expectationManager.verify(timeout);
}
@Override @Override
public void reset() { public void reset() {
this.expectationManager.reset(); this.expectationManager.reset();