diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java index 00c825d2b9..3e2ae1dad9 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java @@ -282,15 +282,6 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest { /** * Add the given header values. * @param headers the header values - * @deprecated in favor of {@link #headers(HttpHeaders)} - */ - @Deprecated(since = "7.0", forRemoval = true) - B headers(MultiValueMap headers); - - /** - * Add the given header values. - * @param headers the header values - * @since 7.0 */ B headers(HttpHeaders headers); @@ -332,12 +323,6 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest { */ B ifUnmodifiedSince(long ifUnmodifiedSince); - /** - * Set the values of the {@code If-Match} header. - * @param ifMatches the new value of the header - */ - B ifMatch(String... ifMatches); - /** * Set the values of the {@code If-None-Match} header. * @param ifNoneMatches the new value of the header @@ -483,13 +468,6 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest { return this; } - @Override - @Deprecated(since = "7.0", forRemoval = true) - public BodyBuilder headers(MultiValueMap headers) { - this.headers.putAll(headers); - return this; - } - @Override public BodyBuilder headers(HttpHeaders headers) { this.headers.putAll(headers); @@ -538,12 +516,6 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest { return this; } - @Override - public BodyBuilder ifMatch(String... ifMatches) { - this.headers.setIfMatch(Arrays.asList(ifMatches)); - return this; - } - @Override public BodyBuilder ifNoneMatch(String... ifNoneMatches) { this.headers.setIfNoneMatch(Arrays.asList(ifNoneMatches)); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java index c4d1c3195a..768e9fc2c0 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java @@ -480,7 +480,7 @@ class DefaultServerRequestTests { @Test void ifMatchValueShouldMatchWhenETagMatches() { MockServerHttpRequest mockRequest = MockServerHttpRequest.put("/") - .ifMatch("\"first\"", "\"second\"").build(); + .header(HttpHeaders.IF_MATCH, "\"first\"", "\"second\"").build(); DefaultServerRequest request = createRequest(mockRequest); Mono result = request.checkNotModified("\"second\"");