diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java b/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java index ecdc97f333..aca9719d1d 100644 --- a/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java @@ -77,12 +77,6 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie return this.httpMethod; } - @Override - @Deprecated - public String getMethodValue() { - return this.httpMethod.name(); - } - public void setURI(URI uri) { this.uri = uri; } diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpResponse.java b/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpResponse.java index 85de0e70a7..362f8c9c91 100644 --- a/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpResponse.java +++ b/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpResponse.java @@ -71,12 +71,6 @@ public class MockClientHttpResponse implements ClientHttpResponse { return this.statusCode; } - @Override - @Deprecated - public int getRawStatusCode() { - return this.statusCode.value(); - } - @Override public HttpHeaders getHeaders() { if (!getCookies().isEmpty() && this.headers.get(HttpHeaders.SET_COOKIE) == null) { diff --git a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java index 65de69096d..7bf5a693ca 100644 --- a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java @@ -90,12 +90,6 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest { return this.httpMethod; } - @Override - @Deprecated - public String getMethodValue() { - return this.httpMethod.name(); - } - @Override @Nullable public InetSocketAddress getLocalAddress() { diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java index d56315d09e..65cd21e9a0 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java @@ -181,9 +181,9 @@ public class ExchangeResult { * @since 5.1.10 * @deprecated as of 6.0, in favor of {@link #getStatus()} */ - @Deprecated(since = "6.0") + @Deprecated(since = "6.0", forRemoval = true) public int getRawStatusCode() { - return this.response.getRawStatusCode(); + return getStatus().value(); } /** diff --git a/spring-web/src/main/java/org/springframework/http/HttpRequest.java b/spring-web/src/main/java/org/springframework/http/HttpRequest.java index ae15189012..f1219a01ca 100644 --- a/spring-web/src/main/java/org/springframework/http/HttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/HttpRequest.java @@ -42,8 +42,10 @@ public interface HttpRequest extends HttpMessage { * @deprecated as of Spring Framework 6.0 in favor of {@link #getMethod()} and * {@link HttpMethod#name()} */ - @Deprecated(since = "6.0") - String getMethodValue(); + @Deprecated(since = "6.0", forRemoval = true) + default String getMethodValue() { + return getMethod().name(); + } /** * Return the URI of the request (including a query string if any, diff --git a/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java index 2af781be97..ee52dc4293 100644 --- a/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java +++ b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java @@ -44,12 +44,6 @@ final class BufferingClientHttpRequestWrapper extends AbstractBufferingClientHtt return this.request.getMethod(); } - @Override - @Deprecated - public String getMethodValue() { - return this.request.getMethodValue(); - } - @Override public URI getURI() { return this.request.getURI(); diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java index 8ad4af7210..17dc755a0b 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java @@ -67,12 +67,6 @@ final class HttpComponentsClientHttpRequest extends AbstractBufferingClientHttpR return HttpMethod.valueOf(this.httpRequest.getMethod()); } - @Override - @Deprecated - public String getMethodValue() { - return this.httpRequest.getMethod(); - } - @Override public URI getURI() { try { diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java index 02fb26af44..708303eb66 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java @@ -73,12 +73,6 @@ final class HttpComponentsStreamingClientHttpRequest extends AbstractClientHttpR return HttpMethod.valueOf(this.httpRequest.getMethod()); } - @Override - @Deprecated - public String getMethodValue() { - return this.httpRequest.getMethod(); - } - @Override public URI getURI() { try { diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java index aa617cccf1..37d0dce1bd 100644 --- a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java @@ -60,12 +60,6 @@ class InterceptingClientHttpRequest extends AbstractBufferingClientHttpRequest { return this.method; } - @Override - @Deprecated - public String getMethodValue() { - return this.method.name(); - } - @Override public URI getURI() { return this.uri; diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java index 07c074fd2e..2d7e19a73a 100644 --- a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java @@ -56,12 +56,6 @@ class OkHttp3ClientHttpRequest extends AbstractBufferingClientHttpRequest { return this.method; } - @Override - @Deprecated - public String getMethodValue() { - return this.method.name(); - } - @Override public URI getURI() { return this.uri; diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java index d47be65d4a..01c3d36874 100644 --- a/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java @@ -52,12 +52,6 @@ final class SimpleBufferingClientHttpRequest extends AbstractBufferingClientHttp return HttpMethod.valueOf(this.connection.getRequestMethod()); } - @Override - @Deprecated - public String getMethodValue() { - return this.connection.getRequestMethod(); - } - @Override public URI getURI() { try { diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java index 1a6a9fc42a..7411639e53 100644 --- a/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java @@ -60,12 +60,6 @@ final class SimpleStreamingClientHttpRequest extends AbstractClientHttpRequest { return HttpMethod.valueOf(this.connection.getRequestMethod()); } - @Override - @Deprecated - public String getMethodValue() { - return this.connection.getRequestMethod(); - } - @Override public URI getURI() { try { diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponse.java index 41b109a324..3db5d31eda 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponse.java @@ -53,8 +53,10 @@ public interface ClientHttpResponse extends ReactiveHttpInputMessage { * @see #getStatusCode() * @deprecated as of 6.0, in favor of {@link #getStatusCode()} */ - @Deprecated(since = "6.0") - int getRawStatusCode(); + @Deprecated(since = "6.0", forRemoval = true) + default int getRawStatusCode() { + return getStatusCode().value(); + } /** * Return a read-only map of response cookies received from the server. diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponseDecorator.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponseDecorator.java index 210d506f5b..1c9e6214c3 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponseDecorator.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponseDecorator.java @@ -60,12 +60,6 @@ public class ClientHttpResponseDecorator implements ClientHttpResponse { return this.delegate.getStatusCode(); } - @Override - @Deprecated - public int getRawStatusCode() { - return this.delegate.getRawStatusCode(); - } - @Override public HttpHeaders getHeaders() { return this.delegate.getHeaders(); diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java index 07597a54a7..c4bce7b21e 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java @@ -72,12 +72,6 @@ class HttpComponentsClientHttpResponse implements ClientHttpResponse { return HttpStatusCode.valueOf(this.message.getHead().getCode()); } - @Override - @Deprecated - public int getRawStatusCode() { - return this.message.getHead().getCode(); - } - @Override public MultiValueMap getCookies() { LinkedMultiValueMap result = new LinkedMultiValueMap<>(); diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java index 5e0820577c..38c7245942 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java @@ -84,12 +84,6 @@ class JdkClientHttpResponse implements ClientHttpResponse { return HttpStatusCode.valueOf(this.response.statusCode()); } - @Override - @Deprecated - public int getRawStatusCode() { - return this.response.statusCode(); - } - @Override public HttpHeaders getHeaders() { return this.headers; diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpResponse.java index 7cd6dc41d1..11dfcb30fc 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpResponse.java @@ -68,12 +68,6 @@ class JettyClientHttpResponse implements ClientHttpResponse { return HttpStatusCode.valueOf(this.reactiveResponse.getStatus()); } - @Override - @Deprecated - public int getRawStatusCode() { - return this.reactiveResponse.getStatus(); - } - @Override public MultiValueMap getCookies() { MultiValueMap result = new LinkedMultiValueMap<>(); diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java index 1dc275d666..35b15f7345 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java @@ -134,12 +134,6 @@ class ReactorClientHttpResponse implements ClientHttpResponse { return HttpStatusCode.valueOf(this.response.status().code()); } - @Override - @Deprecated - public int getRawStatusCode() { - return this.response.status().code(); - } - @Override public MultiValueMap getCookies() { MultiValueMap result = new LinkedMultiValueMap<>(); @@ -184,7 +178,7 @@ class ReactorClientHttpResponse implements ClientHttpResponse { } private boolean mayHaveBody(HttpMethod method) { - int code = this.getRawStatusCode(); + int code = getStatusCode().value(); return !((code >= 100 && code < 200) || code == 204 || code == 205 || method.equals(HttpMethod.HEAD) || getHeaders().getContentLength() == 0); } @@ -193,7 +187,7 @@ class ReactorClientHttpResponse implements ClientHttpResponse { public String toString() { return "ReactorClientHttpResponse{" + "request=[" + this.response.method().name() + " " + this.response.uri() + "]," + - "status=" + getRawStatusCode() + '}'; + "status=" + getStatusCode() + '}'; } } diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ClientHttpResponse.java index 3000ed05a4..ba6cdba491 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ClientHttpResponse.java @@ -118,12 +118,6 @@ class ReactorNetty2ClientHttpResponse implements ClientHttpResponse { return HttpStatusCode.valueOf(this.response.status().code()); } - @Override - @Deprecated - public int getRawStatusCode() { - return this.response.status().code(); - } - @Override public MultiValueMap getCookies() { MultiValueMap result = new LinkedMultiValueMap<>(); @@ -168,7 +162,7 @@ class ReactorNetty2ClientHttpResponse implements ClientHttpResponse { } private boolean mayHaveBody(HttpMethod method) { - int code = this.getRawStatusCode(); + int code = this.getStatusCode().value(); return !((code >= 100 && code < 200) || code == 204 || code == 205 || method.equals(HttpMethod.HEAD) || getHeaders().getContentLength() == 0); } @@ -177,7 +171,7 @@ class ReactorNetty2ClientHttpResponse implements ClientHttpResponse { public String toString() { return "ReactorNetty2ClientHttpResponse{" + "request=[" + this.response.method().name() + " " + this.response.uri() + "]," + - "status=" + getRawStatusCode() + '}'; + "status=" + getStatusCode() + '}'; } } diff --git a/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java b/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java index 28233e8585..a38f7a65e1 100644 --- a/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java +++ b/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java @@ -62,15 +62,6 @@ public class HttpRequestWrapper implements HttpRequest { return this.request.getMethod(); } - /** - * Return the method value of the wrapped request. - */ - @Override - @Deprecated - public String getMethodValue() { - return this.request.getMethodValue(); - } - /** * Return the URI of the wrapped request. */ diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java index 2712de7eb4..4e2fee8607 100644 --- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java @@ -94,12 +94,6 @@ public class ServletServerHttpRequest implements ServerHttpRequest { return HttpMethod.valueOf(this.servletRequest.getMethod()); } - @Override - @Deprecated - public String getMethodValue() { - return this.servletRequest.getMethod(); - } - @Override public URI getURI() { if (this.uri == null) { diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java b/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java index c93b4ac286..f3e4ba62b7 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java @@ -207,12 +207,6 @@ class DefaultServerHttpRequestBuilder implements ServerHttpRequest.Builder { return this.method; } - @Override - @Deprecated - public String getMethodValue() { - return this.method.name(); - } - @Override protected MultiValueMap initCookies() { return this.originalRequest.getCookies(); diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorNetty2ServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorNetty2ServerHttpRequest.java index 67b8fa02e4..7df363091e 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorNetty2ServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorNetty2ServerHttpRequest.java @@ -142,12 +142,6 @@ class ReactorNetty2ServerHttpRequest extends AbstractServerHttpRequest { return HttpMethod.valueOf(this.request.method().name()); } - @Override - @Deprecated - public String getMethodValue() { - return this.request.method().name(); - } - @Override protected MultiValueMap initCookies() { MultiValueMap cookies = new LinkedMultiValueMap<>(); diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java index 0dcbd3ed56..08553cd78d 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java @@ -140,12 +140,6 @@ class ReactorServerHttpRequest extends AbstractServerHttpRequest { return HttpMethod.valueOf(this.request.method().name()); } - @Override - @Deprecated - public String getMethodValue() { - return this.request.method().name(); - } - @Override protected MultiValueMap initCookies() { MultiValueMap cookies = new LinkedMultiValueMap<>(); diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpRequestDecorator.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpRequestDecorator.java index 6f6396bfb1..84f157b3cc 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpRequestDecorator.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpRequestDecorator.java @@ -65,12 +65,6 @@ public class ServerHttpRequestDecorator implements ServerHttpRequest { return getDelegate().getMethod(); } - @Override - @Deprecated - public String getMethodValue() { - return getDelegate().getMethodValue(); - } - @Override public URI getURI() { return getDelegate().getURI(); diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java index 536fca1648..f47d58f264 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java @@ -164,12 +164,6 @@ class ServletServerHttpRequest extends AbstractServerHttpRequest { return HttpMethod.valueOf(this.request.getMethod()); } - @Override - @Deprecated - public String getMethodValue() { - return this.request.getMethod(); - } - @Override protected MultiValueMap initCookies() { MultiValueMap httpCookies = new LinkedMultiValueMap<>(); diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java index f21abb16bf..41e9693e04 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java @@ -82,12 +82,6 @@ class UndertowServerHttpRequest extends AbstractServerHttpRequest { return HttpMethod.valueOf(this.exchange.getRequestMethod().toString()); } - @Override - @Deprecated - public String getMethodValue() { - return this.exchange.getRequestMethod().toString(); - } - @SuppressWarnings("deprecation") @Override protected MultiValueMap initCookies() { diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/reactive/MockClientHttpResponse.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/reactive/MockClientHttpResponse.java index a2606ceed1..c139fd7477 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/reactive/MockClientHttpResponse.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/reactive/MockClientHttpResponse.java @@ -71,12 +71,6 @@ public class MockClientHttpResponse implements ClientHttpResponse { return this.statusCode; } - @Override - @Deprecated - public int getRawStatusCode() { - return this.statusCode.value(); - } - @Override public HttpHeaders getHeaders() { if (!getCookies().isEmpty() && this.headers.get(HttpHeaders.SET_COOKIE) == null) { 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 9b9946ebec..8078a7db83 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 @@ -90,12 +90,6 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest { return this.httpMethod; } - @Override - @Deprecated - public String getMethodValue() { - return this.httpMethod.name(); - } - @Override @Nullable public InetSocketAddress getLocalAddress() { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java index 85c3e2f04a..9701942cae 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java @@ -63,8 +63,10 @@ public interface ClientResponse { * @since 5.1 * @deprecated as of 6.0, in favor of {@link #statusCode()} */ - @Deprecated(since = "6.0") - int rawStatusCode(); + @Deprecated(since = "6.0", forRemoval = true) + default int rawStatusCode() { + return statusCode().value(); + } /** * Return the headers of this response. diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java index 6252a4e2f6..a9012deb14 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java @@ -118,12 +118,6 @@ class DefaultClientResponse implements ClientResponse { return this.response.getStatusCode(); } - @Override - @Deprecated - public int rawStatusCode() { - return this.response.getRawStatusCode(); - } - @Override public Headers headers() { return this.headers; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java index 24e9e555b4..ef68d4f8cd 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java @@ -56,12 +56,6 @@ final class DefaultClientResponseBuilder implements ClientResponse.Builder { return HttpMethod.valueOf("UNKNOWN"); } - @Override - @Deprecated - public String getMethodValue() { - return "UNKNOWN"; - } - @Override public URI getURI() { return this.empty; @@ -261,12 +255,6 @@ final class DefaultClientResponseBuilder implements ClientResponse.Builder { return this.statusCode; } - @Override - @Deprecated - public int getRawStatusCode() { - return this.statusCode.value(); - } - @Override @SuppressWarnings("ConstantConditions") public HttpHeaders getHeaders() { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java index 3eea475007..9ce4e0b87a 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java @@ -405,12 +405,6 @@ class DefaultWebClient implements WebClient { return httpMethod; } - @Override - @Deprecated - public String getMethodValue() { - return httpMethod.name(); - } - @Override public URI getURI() { return this.uri; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java index f7a14f4ed3..cde4daea9e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java @@ -144,12 +144,6 @@ public abstract class ExchangeFunctions { return request.method(); } - @Override - @Deprecated - public String getMethodValue() { - return request.method().name(); - } - @Override public URI getURI() { return request.url(); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapper.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapper.java index 4152c7474a..cd811c396f 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapper.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapper.java @@ -78,12 +78,6 @@ public class ClientResponseWrapper implements ClientResponse { return this.delegate.statusCode(); } - @Override - @Deprecated - public int rawStatusCode() { - return this.delegate.rawStatusCode(); - } - @Override public Headers headers() { return this.delegate.headers(); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java index 75fd6ad6a5..572bf0daa2 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java @@ -262,12 +262,6 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder { return this.method; } - @Override - @Deprecated - public String getMethodValue() { - return this.method.name(); - } - @Override public URI getURI() { return this.uri; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java index 74747cd5e4..27eb214a6e 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java @@ -106,7 +106,7 @@ class DefaultClientResponseBuilderTests { ClientResponse other = ClientResponse.create(499, ExchangeStrategies.withDefaults()).build(); ClientResponse result = other.mutate().build(); - assertThat(result.rawStatusCode()).isEqualTo(499); + assertThat(result.statusCode().value()).isEqualTo(499); assertThat(result.statusCode()).isEqualTo(HttpStatusCode.valueOf(499)); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java index 23c3dc8da2..6de7a3be12 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java @@ -87,15 +87,6 @@ class DefaultClientResponseTests { assertThat(defaultClientResponse.statusCode()).isEqualTo(status); } - @Test - @SuppressWarnings("deprecation") - void rawStatusCode() { - int status = 999; - given(mockResponse.getRawStatusCode()).willReturn(status); - - assertThat(defaultClientResponse.rawStatusCode()).isEqualTo(status); - } - @Test void header() { long contentLength = 42L; @@ -342,7 +333,6 @@ class DefaultClientResponseTests { Flux body = Flux.just(dataBuffer); httpHeaders.setContentType(MediaType.TEXT_PLAIN); given(mockResponse.getStatusCode()).willReturn(HttpStatus.NOT_FOUND); - given(mockResponse.getRawStatusCode()).willReturn(HttpStatus.NOT_FOUND.value()); given(mockResponse.getBody()).willReturn(body); List> messageReaders = Collections.singletonList( @@ -366,7 +356,6 @@ class DefaultClientResponseTests { Flux body = Flux.just(dataBuffer); httpHeaders.setContentType(MediaType.TEXT_PLAIN); given(mockResponse.getStatusCode()).willReturn(HttpStatus.NOT_FOUND); - given(mockResponse.getRawStatusCode()).willReturn(HttpStatus.NOT_FOUND.value()); given(mockResponse.getBody()).willReturn(body); List> messageReaders = Collections.singletonList( @@ -393,7 +382,6 @@ class DefaultClientResponseTests { private void mockTextPlainResponse(Flux body) { httpHeaders.setContentType(MediaType.TEXT_PLAIN); given(mockResponse.getStatusCode()).willReturn(HttpStatus.OK); - given(mockResponse.getRawStatusCode()).willReturn(HttpStatus.OK.value()); given(mockResponse.getBody()).willReturn(body); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java index 8fd0685e86..2eadf273e1 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java @@ -60,15 +60,6 @@ class ClientResponseWrapperTests { assertThat(wrapper.statusCode()).isSameAs(status); } - @Test - @SuppressWarnings("deprecation") - void rawStatusCode() { - int status = 999; - given(mockResponse.rawStatusCode()).willReturn(status); - - assertThat(wrapper.rawStatusCode()).isEqualTo(status); - } - @Test void headers() { ClientResponse.Headers headers = mock(ClientResponse.Headers.class);