root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Additional changes because HttpMethod changed from enum to class 

See gh-27697
This commit is contained in:
Sam Brannen 2022-01-03 16:01:01 +01:00
parent 1dee80e750
commit 97625e3658
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 * @param vars variables to expand into the template
* @return the created builder * @return the created builder
* @since 5.2.7 * @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 @Deprecated
public static BodyBuilder method(String httpMethod, String uri, Object... vars) { public static BodyBuilder method(String httpMethod, String uri, Object... vars) {

4
spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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."); assertThat(ex.getMessage()).contains("HTTP method is required.");
} }
@SuppressWarnings("deprecation")
static Stream<Executable> httpMethodNotNullOrEmpty() { static Stream<Executable> httpMethodNotNullOrEmpty() {
String uriTemplate = "/foo bar?a=b"; String uriTemplate = "/foo bar?a=b";
return Stream.of( return Stream.of(
@ -80,4 +81,5 @@ class MockServerHttpRequestTests {
() -> MockServerHttpRequest.method(" ", uriTemplate).build() () -> MockServerHttpRequest.method(" ", uriTemplate).build()
); );
} }
} }

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; import java.net.URI;
/** /**
* Represents an HTTP request message, consisting of * Represents an HTTP request message, consisting of a
* {@linkplain #getMethod() method} and {@linkplain #getURI() uri}. * {@linkplain #getMethod() method} and a {@linkplain #getURI() URI}.
* *
* @author Arjen Poutsma * @author Arjen Poutsma
* @since 3.1 * @since 3.1
@ -39,7 +39,7 @@ public interface HttpRequest extends HttpMessage {
* @return the HTTP method as a plain String * @return the HTTP method as a plain String
* @since 5.0 * @since 5.0
* @see #getMethod() * @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()} * {@link HttpMethod#name()}
*/ */
@Deprecated @Deprecated