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 6d8bda48ab8..a105e69713b 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -238,7 +238,7 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest { * @param vars variables to expand into the template * @return the created builder * @since 5.2.7 - * @deprecated in favor of {@link #method(HttpMethod, String, Object...)} + * @deprecated as of Spring Framework 6.0 in favor of {@link #method(HttpMethod, String, Object...)} */ @Deprecated public static BodyBuilder method(String httpMethod, String uri, Object... vars) { diff --git a/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java b/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java index 1fecf99f478..59288db82c0 100644 --- a/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java +++ b/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,6 +70,7 @@ class MockServerHttpRequestTests { assertThat(ex.getMessage()).contains("HTTP method is required."); } + @SuppressWarnings("deprecation") static Stream httpMethodNotNullOrEmpty() { String uriTemplate = "/foo bar?a=b"; return Stream.of( @@ -80,4 +81,5 @@ class MockServerHttpRequestTests { () -> MockServerHttpRequest.method(" ", uriTemplate).build() ); } + } 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 2c0c71ca185..643f3ca365c 100644 --- a/spring-web/src/main/java/org/springframework/http/HttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/HttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ package org.springframework.http; import java.net.URI; /** - * Represents an HTTP request message, consisting of - * {@linkplain #getMethod() method} and {@linkplain #getURI() uri}. + * Represents an HTTP request message, consisting of a + * {@linkplain #getMethod() method} and a {@linkplain #getURI() URI}. * * @author Arjen Poutsma * @since 3.1 @@ -39,7 +39,7 @@ public interface HttpRequest extends HttpMessage { * @return the HTTP method as a plain String * @since 5.0 * @see #getMethod() - * @deprecated in favor of {@link #getMethod()} and + * @deprecated as of Spring Framework 6.0 in favor of {@link #getMethod()} and * {@link HttpMethod#name()} */ @Deprecated