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