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

poutsma · poutsma · commit ce03980fb466 · 2022-10-12T16:29:14.000+02:00
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
@@ -77,12 +77,6 @@ public HttpMethod getMethod() {
 		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
@@ -71,12 +71,6 @@ public HttpStatusCode getStatusCode() {
 		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
@@ -90,12 +90,6 @@ public HttpMethod getMethod() {
 		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
@@ -181,9 +181,9 @@ public HttpStatusCode getStatus() {
 	 * @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
@@ -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
@@ -44,12 +44,6 @@ public HttpMethod getMethod() {
 		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
@@ -67,12 +67,6 @@ public HttpMethod getMethod() {
 		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
@@ -73,12 +73,6 @@ public HttpMethod getMethod() {
 		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
@@ -60,12 +60,6 @@ public HttpMethod getMethod() {
 		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
@@ -56,12 +56,6 @@ public HttpMethod getMethod() {
 		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
@@ -52,12 +52,6 @@ public HttpMethod getMethod() {
 		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
@@ -60,12 +60,6 @@ public HttpMethod getMethod() {
 		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
@@ -53,8 +53,10 @@ default String getId() {
 	 * @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
@@ -60,12 +60,6 @@ public HttpStatusCode getStatusCode() {
 		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
@@ -72,12 +72,6 @@ public HttpStatusCode getStatusCode() {
 		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<>();
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
@@ -84,12 +84,6 @@ public HttpStatusCode getStatusCode() {
 		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
@@ -68,12 +68,6 @@ public HttpStatusCode getStatusCode() {
 		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<>();
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
@@ -134,12 +134,6 @@ public HttpStatusCode getStatusCode() {
 		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 @@ void releaseAfterCancel(HttpMethod method) {
 	}
 
 	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 @@ private boolean mayHaveBody(HttpMethod method) {
 	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
@@ -118,12 +118,6 @@ public HttpStatusCode getStatusCode() {
 		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 @@ void releaseAfterCancel(HttpMethod method) {
 	}
 
 	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 @@ private boolean mayHaveBody(HttpMethod method) {
 	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
@@ -62,15 +62,6 @@ public HttpMethod getMethod() {
 		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
@@ -94,12 +94,6 @@ public HttpMethod getMethod() {
 		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
@@ -207,12 +207,6 @@ public HttpMethod getMethod() {
 			return this.method;
 		}
 
-		@Override
-		@Deprecated
-		public String getMethodValue() {
-			return this.method.name();
-		}
-
 		@Override
 		protected MultiValueMap<String, HttpCookie> 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
@@ -142,12 +142,6 @@ public HttpMethod getMethod() {
 		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<>();
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
@@ -140,12 +140,6 @@ public HttpMethod getMethod() {
 		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<>();
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
@@ -65,12 +65,6 @@ public HttpMethod getMethod() {
 		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
@@ -164,12 +164,6 @@ public HttpMethod getMethod() {
 		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<>();
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
@@ -82,12 +82,6 @@ public HttpMethod getMethod() {
 		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() {
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
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
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
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
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
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
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
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
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
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
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
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

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,6 @@ public HttpMethod getMethod() {`
`77`	`77`	`return this.httpMethod;`
`78`	`78`	`}`
`79`	`79`
`80`		`- @Override`
`81`		`- @Deprecated`
`82`		`- public String getMethodValue() {`
`83`		`- return this.httpMethod.name();`
`84`		`- }`
`85`		`-`
`86`	`80`	`public void setURI(URI uri) {`
`87`	`81`	`this.uri = uri;`
`88`	`82`	`}`