Merge branch '6.1.x'

sbrannen · sbrannen · commit f6fcf1574593 · 2024-09-24T12:33:58.000+02:00
diff --git a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java
@@ -191,6 +191,7 @@ static Stream<HttpMethod> safeHttpMethods() {
 		return Stream.of(HttpMethod.GET, HttpMethod.OPTIONS, HttpMethod.TRACE);
 	}
 
+	@SuppressWarnings("deprecation")
 	private RequestConfig retrieveRequestConfig(HttpComponentsClientHttpRequestFactory factory) throws Exception {
 		URI uri = URI.create(baseUrl + "/status/ok");
 		HttpComponentsClientHttpRequest request = (HttpComponentsClientHttpRequest)

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,7 @@ static Stream<HttpMethod> safeHttpMethods() {`
`191`	`191`	`return Stream.of(HttpMethod.GET, HttpMethod.OPTIONS, HttpMethod.TRACE);`
`192`	`192`	`}`
`193`	`193`
	`194`	`+ @SuppressWarnings("deprecation")`
`194`	`195`	`private RequestConfig retrieveRequestConfig(HttpComponentsClientHttpRequestFactory factory) throws Exception {`
`195`	`196`	`URI uri = URI.create(baseUrl + "/status/ok");`
`196`	`197`	`HttpComponentsClientHttpRequest request = (HttpComponentsClientHttpRequest)`