parent
b7ae5558f6
commit
d95d7a0245
|
@ -163,6 +163,7 @@ public abstract class AbstractWebFluxEndpointHandlerMapping extends RequestMappi
|
|||
return reactiveWebOperation;
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
private RequestMappingInfo createRequestMappingInfo(WebOperation operation) {
|
||||
WebOperationRequestPredicate predicate = operation.getRequestPredicate();
|
||||
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);
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
private void registerLinksMapping() {
|
||||
PatternsRequestCondition patterns = new PatternsRequestCondition(
|
||||
pathPatternParser.parse(this.endpointMapping.getPath()));
|
||||
|
|
|
@ -101,6 +101,7 @@ public class ControllerEndpointHandlerMapping extends RequestMappingHandlerMappi
|
|||
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(),
|
||||
|
|
|
@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.web.client;
|
|||
|
||||
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 class MockRestServiceServerAutoConfiguration {
|
|||
getDelegate().verify();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void verify(Duration timeout) {
|
||||
getDelegate().verify(timeout);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reset() {
|
||||
Map<RestTemplate, RequestExpectationManager> expectationManagers = this.customizer.getExpectationManagers();
|
||||
|
|
|
@ -20,6 +20,7 @@ import java.io.IOException;
|
|||
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 class RootUriRequestExpectationManager implements RequestExpectationManag
|
|||
this.expectationManager.verify();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void verify(Duration timeout) {
|
||||
this.expectationManager.verify(timeout);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reset() {
|
||||
this.expectationManager.reset();
|
||||
|
|
Loading…
Reference in New Issue