Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mark HttpRequest::getMethodValue and ClientHttpResponse::getRawStatusCode for removal

Browse Source
This commit is contained in:
Arjen Poutsma
2022-10-12 16:29:14 +02:00
parent 2c58eea781
commit ce03980fb4
39 changed files with 19 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
View File

@@ -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;
}

6
spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpResponse.java
View File

@@ -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) {

6
spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
View File

@@ -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() {

4
spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
View File

@@ -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();
}
/**

6
spring-web/src/main/java/org/springframework/http/HttpRequest.java
View File

@@ -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,

6
spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
View File

@@ -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();

6
spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
View File

@@ -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 {

6
spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java
View File

@@ -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 {

6
spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
View File

@@ -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;

6
spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java
View File

@@ -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;

6
spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
View File

@@ -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 {

6
spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java
View File

@@ -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 {

6
spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponse.java
View File

@@ -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.

6
spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponseDecorator.java
View File

@@ -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();

6
spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java
View File

@@ -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<String, ResponseCookie> getCookies() {
LinkedMultiValueMap<String, ResponseCookie> result = new LinkedMultiValueMap<>();

6
spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
View File

@@ -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;

6
spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpResponse.java
View File

@@ -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<String, ResponseCookie> getCookies() {
MultiValueMap<String, ResponseCookie> result = new LinkedMultiValueMap<>();

10
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java
View File

@@ -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<String, ResponseCookie> getCookies() {
MultiValueMap<String, ResponseCookie> 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() + '}';
}
}

10
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ClientHttpResponse.java
View File

@@ -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<String, ResponseCookie> getCookies() {
MultiValueMap<String, ResponseCookie> 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() + '}';
}
}

9
spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
View File

@@ -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.
*/

6
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
View File

@@ -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) {

6
spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java
View File

@@ -207,12 +207,6 @@ class DefaultServerHttpRequestBuilder implements ServerHttpRequest.Builder {
return this.method;
}
@Override
@Deprecated
public String getMethodValue() {
return this.method.name();
}
@Override
protected MultiValueMap<String, HttpCookie> initCookies() {
return this.originalRequest.getCookies();

6
spring-web/src/main/java/org/springframework/http/server/reactive/ReactorNetty2ServerHttpRequest.java
View File

@@ -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<String, HttpCookie> initCookies() {
MultiValueMap<String, HttpCookie> cookies = new LinkedMultiValueMap<>();

6
spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
View File

@@ -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<String, HttpCookie> initCookies() {
MultiValueMap<String, HttpCookie> cookies = new LinkedMultiValueMap<>();

6
spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpRequestDecorator.java
View File

@@ -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();

6
spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
View File

@@ -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<String, HttpCookie> initCookies() {
MultiValueMap<String, HttpCookie> httpCookies = new LinkedMultiValueMap<>();

6
spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java
View File

@@ -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<String, HttpCookie> initCookies() {

6
spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/reactive/MockClientHttpResponse.java
View File

@@ -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) {

6
spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java
View File

@@ -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() {

6
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
View File

@@ -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.

6
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
View File

@@ -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;

12
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java
View File

@@ -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() {

6
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
View File

@@ -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;

6
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java
View File

@@ -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();

6
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapper.java
View File

@@ -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();

6
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java
View File

@@ -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;

2
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java
View File

@@ -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));
}

12
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java
View File

@@ -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<DataBuffer> 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<HttpMessageReader<?>> messageReaders = Collections.singletonList(
@@ -366,7 +356,6 @@ class DefaultClientResponseTests {
Flux<DataBuffer> 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<HttpMessageReader<?>> messageReaders = Collections.singletonList(
@@ -393,7 +382,6 @@ class DefaultClientResponseTests {
private void mockTextPlainResponse(Flux<DataBuffer> body) {
httpHeaders.setContentType(MediaType.TEXT_PLAIN);
given(mockResponse.getStatusCode()).willReturn(HttpStatus.OK);
given(mockResponse.getRawStatusCode()).willReturn(HttpStatus.OK.value());
given(mockResponse.getBody()).willReturn(body);
}

9
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java
View File

@@ -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);