GH-11268: Suppress RestTemplate removal warnings

Fixes: #11268

Add @SuppressWarnings("removal") on remaining RestTemplate-based HTTP
outbound APIs and tests until that client is removed. Migrate the
uri-expression unit test onto RestClient + requestFactory.

Signed-off-by: Burak KALAYCI <kalayciburak1996@gmail.com>

Author: kalayciburak

spring-integration-http/src/main/java/org/springframework/integration/http/dsl/Http.java

@@ -37,6 +37,7 @@
  * @author Artem Bilan
  * @author Shiliang Li
  * @author Arun Sethumadhavan
+ * @author Burak Kalayci
  *
  * @since 5.0
  */
@@ -90,6 +91,7 @@ public static HttpMessageHandlerSpec outboundChannelAdapter(Expression uriExpres
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	public static HttpMessageHandlerSpec outboundChannelAdapter(URI uri, @Nullable RestTemplate restTemplate) {
 		return outboundChannelAdapter(uri, toRestClient(restTemplate));
 	}
@@ -115,6 +117,7 @@ public static HttpMessageHandlerSpec outboundChannelAdapter(URI uri, @Nullable R
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	public static HttpMessageHandlerSpec outboundChannelAdapter(String uri, @Nullable RestTemplate restTemplate) {
 		return outboundChannelAdapter(uri, toRestClient(restTemplate));
 	}
@@ -142,6 +145,7 @@ public static HttpMessageHandlerSpec outboundChannelAdapter(String uri, @Nullabl
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	public static <P> HttpMessageHandlerSpec outboundChannelAdapter(Function<Message<P>, ?> uriFunction,
 			RestTemplate restTemplate) {
 
@@ -174,6 +178,7 @@ public static <P> HttpMessageHandlerSpec outboundChannelAdapter(Function<Message
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	public static HttpMessageHandlerSpec outboundChannelAdapter(Expression uriExpression,
 			@Nullable RestTemplate restTemplate) {
 
@@ -243,6 +248,7 @@ public static HttpMessageHandlerSpec outboundGateway(Expression uriExpression) {
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	public static HttpMessageHandlerSpec outboundGateway(URI uri, @Nullable RestTemplate restTemplate) {
 		return outboundGateway(uri, toRestClient(restTemplate));
 	}
@@ -268,6 +274,7 @@ public static HttpMessageHandlerSpec outboundGateway(URI uri, @Nullable RestClie
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	public static HttpMessageHandlerSpec outboundGateway(String uri, @Nullable RestTemplate restTemplate) {
 		return outboundGateway(uri, toRestClient(restTemplate));
 	}
@@ -295,6 +302,7 @@ public static HttpMessageHandlerSpec outboundGateway(String uri, @Nullable RestC
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	public static <P> HttpMessageHandlerSpec outboundGateway(Function<Message<P>, ?> uriFunction,
 			RestTemplate restTemplate) {
 
@@ -327,6 +335,7 @@ public static <P> HttpMessageHandlerSpec outboundGateway(Function<Message<P>, ?>
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	public static HttpMessageHandlerSpec outboundGateway(Expression uriExpression,
 			@Nullable RestTemplate restTemplate) {
 
@@ -360,6 +369,7 @@ private static HttpMessageHandlerSpec outboundGatewaySpec(Expression uriExpressi
 		return new HttpMessageHandlerSpec(uriExpression, restClient);
 	}
 
+	@SuppressWarnings("removal")
 	private static @Nullable RestClient toRestClient(@Nullable RestTemplate restTemplate) {
 		return restTemplate != null ? RestClient.create(restTemplate) : null;
 	}

spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpMessageHandlerSpec.java

@@ -42,6 +42,7 @@
  * @author Oleksii Komlyk
  * @author Arun Sethumadhavan
  * @author Glenn Renfro
+ * @author Burak Kalayci
  *
  * @since 5.0
  *
@@ -56,6 +57,7 @@ public class HttpMessageHandlerSpec
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	protected HttpMessageHandlerSpec(URI uri, @Nullable RestTemplate restTemplate) {
 		this(new ValueExpression<>(uri), restTemplate != null ? RestClient.create(restTemplate) : null);
 	}
@@ -64,6 +66,7 @@ protected HttpMessageHandlerSpec(URI uri, @Nullable RestTemplate restTemplate) {
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	protected HttpMessageHandlerSpec(String uri, @Nullable RestTemplate restTemplate) {
 		this(new LiteralExpression(uri), restTemplate != null ? RestClient.create(restTemplate) : null);
 	}
@@ -72,6 +75,7 @@ protected HttpMessageHandlerSpec(String uri, @Nullable RestTemplate restTemplate
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	protected HttpMessageHandlerSpec(Expression uriExpression, @Nullable RestTemplate restTemplate) {
 		this(uriExpression, restTemplate != null ? RestClient.create(restTemplate) : null);
 	}
@@ -109,6 +113,7 @@ public HttpMessageHandlerSpec requestFactory(ClientHttpRequestFactory requestFac
 	 * @deprecated Since 7.2 in favor of {@link RestClient.ResponseSpec.ErrorHandler}.
 	 */
 	@Deprecated(since = "7.2", forRemoval = true)
+	@SuppressWarnings("removal")
 	public HttpMessageHandlerSpec errorHandler(ResponseErrorHandler errorHandler) {
 		Assert.isTrue(!isClientSet(), "the 'errorHandler' must be specified on the provided client");
 		this.target.setErrorHandler(errorHandler);

spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java

@@ -67,11 +67,13 @@
  * @author Shiliang Li
  * @author Arun Sethumadhavan
  * @author Glenn Renfro
+ * @author Burak Kalayci
  *
  * @since 2.0
  */
 public class HttpRequestExecutingMessageHandler extends AbstractHttpRequestExecutingMessageHandler {
 
+	@SuppressWarnings("removal")
 	private final @Nullable RestTemplate restTemplate;
 
 	private volatile @Nullable RestClient restClient;
@@ -113,6 +115,7 @@ public HttpRequestExecutingMessageHandler(Expression uriExpression) {
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	public HttpRequestExecutingMessageHandler(String uri, @Nullable RestTemplate restTemplate) {
 		this(new LiteralExpression(uri), restTemplate);
 		/*
@@ -131,6 +134,7 @@ public HttpRequestExecutingMessageHandler(String uri, @Nullable RestTemplate res
 	 * @deprecated Since 7.1 in favor of {@link RestClient}-based configuration.
 	 */
 	@Deprecated(since = "7.1", forRemoval = true)
+	@SuppressWarnings("removal")
 	public HttpRequestExecutingMessageHandler(Expression uriExpression, @Nullable RestTemplate restTemplate) {
 		this(uriExpression, restTemplate, null);
 	}
@@ -162,6 +166,7 @@ public HttpRequestExecutingMessageHandler(Expression uriExpression, @Nullable Re
 		this(uriExpression, null, restClient);
 	}
 
+	@SuppressWarnings("removal")
 	private HttpRequestExecutingMessageHandler(Expression uriExpression,
 			@Nullable RestTemplate restTemplate, @Nullable RestClient restClient) {
 
@@ -226,6 +231,7 @@ protected void doInit() {
 	 * @see RestTemplate#setErrorHandler(ResponseErrorHandler)
 	 */
 	@Deprecated(since = "7.2", forRemoval = true)
+	@SuppressWarnings("removal")
 	public void setErrorHandler(ResponseErrorHandler errorHandler) {
 		assertLocalClient("errorHandler");
 		RestClient.Builder localRestClientBuilder = this.localRestClientBuilder;
@@ -325,6 +331,7 @@ public void setEncodingMode(DefaultUriBuilderFactory.EncodingMode encodingMode)
 		}
 	}
 
+	@SuppressWarnings("removal")
 	private ResponseEntity<?> exchangeWithRestTemplate(Object uri, HttpMethod httpMethod, HttpEntity<?> httpRequest,
 			Object expectedResponseType, Map<String, ?> uriVariables) {
 

spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java

@@ -59,11 +59,13 @@
  * @author Artem Bilan
  * @author Gary Russell
  * @author Arun Sethumadhavan
+ * @author Burak Kalayci
  *
  * @since 3.0
  */
 @SpringJUnitConfig
 @DirtiesContext
+@SuppressWarnings("removal")
 public class HttpProxyScenarioTests {
 
 	private final HandlerAdapter handlerAdapter = new HttpRequestHandlerAdapter();

spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java

@@ -63,9 +63,11 @@
  * @author Shiliang Li
  * @author Glenn Renfro
  * @author Arun Sethumadhavan
+ * @author Burak Kalayci
  */
 @SpringJUnitConfig
 @DirtiesContext
+@SuppressWarnings("removal")
 public class HttpOutboundChannelAdapterParserTests {
 
 	@Autowired

spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java

@@ -60,9 +60,11 @@
  * @author Biju Kunjummen
  * @author Glenn Renfro
  * @author Arun Sethumadhavan
+ * @author Burak Kalayci
  */
 @SpringJUnitConfig
 @DirtiesContext
+@SuppressWarnings("removal")
 public class HttpOutboundGatewayParserTests {
 
 	public static final ResponseErrorHandler mockResponseErrorHandler = mock();

spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java

@@ -93,6 +93,7 @@
  * @author Florian Schöffl
  * @author Glenn Renfro
  * @author Arun Sethumadhavan
+ * @author Burak Kalayci
  */
 public class HttpRequestExecutingMessageHandlerTests implements TestApplicationContextAware {
 
@@ -793,11 +794,14 @@ public void testHttpOutboundGatewayWithinChain() {
 	}
 
 	@Test
-	@SuppressWarnings("removal")
 	public void testUriExpression() {
-		MockRestTemplate restTemplate = new MockRestTemplate();
+		AtomicReference<URI> actualUri = new AtomicReference<>();
 		HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler(
-				new SpelExpressionParser().parseExpression("headers['foo']"), restTemplate);
+				new SpelExpressionParser().parseExpression("headers['foo']"));
+		handler.setRequestFactory((uri, httpMethod) -> {
+			actualUri.set(uri);
+			throw new RuntimeException("intentional");
+		});
 		setBeanFactory(handler);
 		handler.afterPropertiesSet();
 		String theURL = "https://bar/baz?foo#bar";
@@ -806,7 +810,7 @@ public void testUriExpression() {
 		assertThatException()
 				.isThrownBy(() -> handler.handleMessage(message));
 
-		assertThat(restTemplate.actualUrl.get()).isEqualTo(theURL);
+		assertThat(actualUri.get()).hasToString(theURL);
 	}
 
 	@Test
@@ -966,6 +970,7 @@ private static void setBeanFactory(HttpRequestExecutingMessageHandler handler) {
 		handler.setBeanFactory(TEST_INTEGRATION_CONTEXT);
 	}
 
+	@SuppressWarnings("removal")
 	private static void setRestTemplateForTesting(HttpRequestExecutingMessageHandler handler,
 			RestTemplate restTemplate) {
 
@@ -1010,6 +1015,7 @@ public String toString() {
 
 	}
 
+	@SuppressWarnings("removal")
 	private static class MockRestTemplate extends RestTemplate {
 
 		private final AtomicReference<HttpEntity<?>> lastRequestEntity = new AtomicReference<>();
@@ -1027,7 +1033,7 @@ protected <T> T doExecute(URI url, String uriTemplate, HttpMethod method,
 
 	}
 
-	@SuppressWarnings("unused")
+	@SuppressWarnings({"unused", "removal"})
 	private static class MockRestTemplate2 extends RestTemplate {
 
 		private final AtomicReference<String> actualUrl = new AtomicReference<>();