Mark HttpMethod::resolve for removal

poutsma · poutsma · commit 2c58eea78102 · 2022-10-12T15:32:51.000+02:00
diff --git a/spring-web/src/main/java/org/springframework/http/HttpMethod.java b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
@@ -138,7 +138,7 @@ public static HttpMethod valueOf(String method) {
 	 * @deprecated in favor of {@link #valueOf(String)}
 	 */
 	@Nullable
-	@Deprecated
+	@Deprecated(since = "6.0", forRemoval = true)
 	public static HttpMethod resolve(@Nullable String method) {
 		return (method != null ? valueOf(method) : null);
 	}

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public static HttpMethod valueOf(String method) {`
`138`	`138`	`* @deprecated in favor of {@link #valueOf(String)}`
`139`	`139`	`*/`
`140`	`140`	`@Nullable`
`141`		`- @Deprecated`
	`141`	`+ @Deprecated(since = "6.0", forRemoval = true)`
`142`	`142`	`public static HttpMethod resolve(@Nullable String method) {`
`143`	`143`	`return (method != null ? valueOf(method) : null);`
`144`	`144`	`}`