Deprecated AsyncRestTemplate and related types

This commit deprecates `AsyncRestTemplate` and related types (`AsyncClientHttpRequestFactory` etc.) in favor of the Spring 5.0 `WebClient`. Issue: SPR-15294

Author: poutsma

spring-test/src/main/java/org/springframework/mock/http/client/MockAsyncClientHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -20,21 +20,22 @@
 import java.net.URI;
 
 import org.springframework.http.HttpMethod;
-import org.springframework.http.client.AsyncClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.SettableListenableFuture;
 
 /**
  * An extension of {@link MockClientHttpRequest} that also implements
- * {@link AsyncClientHttpRequest} by wrapping the response in a
+ * {@link org.springframework.http.client.AsyncClientHttpRequest} by wrapping the response in a
  * {@link SettableListenableFuture}.
  *
  * @author Rossen Stoyanchev
  * @author Sam Brannen
  * @since 4.1
+ * @deprecated as of Spring 5.0, with no direct replacement
  */
-public class MockAsyncClientHttpRequest extends MockClientHttpRequest implements AsyncClientHttpRequest {
+@Deprecated
+public class MockAsyncClientHttpRequest extends MockClientHttpRequest implements org.springframework.http.client.AsyncClientHttpRequest {
 
 public MockAsyncClientHttpRequest() {
 }

spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -20,14 +20,10 @@
 import java.net.URI;
 
 import org.springframework.http.HttpMethod;
-import org.springframework.http.client.AsyncClientHttpRequest;
-import org.springframework.http.client.AsyncClientHttpRequestFactory;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.mock.http.client.MockAsyncClientHttpRequest;
 import org.springframework.util.Assert;
-import org.springframework.web.client.AsyncRestTemplate;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.support.RestGatewaySupport;
 
@@ -65,6 +61,7 @@
  * @author Rossen Stoyanchev
  * @since 3.2
  */
+@SuppressWarnings("deprecation")
 public class MockRestServiceServer {
 
 private final RequestExpectationManager expectationManager;
@@ -139,7 +136,7 @@ public static MockRestServiceServerBuilder bindTo(RestTemplate restTemplate) {
  * to reply to the given {@code AsyncRestTemplate}.
  * @since 4.3
  */
-public static MockRestServiceServerBuilder bindTo(AsyncRestTemplate asyncRestTemplate) {
+public static MockRestServiceServerBuilder bindTo(org.springframework.web.client.AsyncRestTemplate asyncRestTemplate) {
 return new DefaultBuilder(asyncRestTemplate);
 }
 
@@ -168,7 +165,7 @@ public static MockRestServiceServer createServer(RestTemplate restTemplate) {
  * @param asyncRestTemplate the AsyncRestTemplate to set up for mock testing
  * @return the created mock server
  */
-public static MockRestServiceServer createServer(AsyncRestTemplate asyncRestTemplate) {
+public static MockRestServiceServer createServer(org.springframework.web.client.AsyncRestTemplate asyncRestTemplate) {
 return bindTo(asyncRestTemplate).build();
 }
 
@@ -215,7 +212,7 @@ private static class DefaultBuilder implements MockRestServiceServerBuilder {
 
 private final RestTemplate restTemplate;
 
-private final AsyncRestTemplate asyncRestTemplate;
+private final org.springframework.web.client.AsyncRestTemplate asyncRestTemplate;
 
 private boolean ignoreExpectOrder;
 
@@ -225,7 +222,7 @@ public DefaultBuilder(RestTemplate restTemplate) {
 this.asyncRestTemplate = null;
 }
 
-public DefaultBuilder(AsyncRestTemplate asyncRestTemplate) {
+public DefaultBuilder(org.springframework.web.client.AsyncRestTemplate asyncRestTemplate) {
 Assert.notNull(asyncRestTemplate, "AsyncRestTemplate must not be null");
 this.restTemplate = null;
 this.asyncRestTemplate = asyncRestTemplate;
@@ -266,23 +263,24 @@ public MockRestServiceServer build(RequestExpectationManager manager) {
  * Mock ClientHttpRequestFactory that creates requests by iterating
  * over the list of expected {@link DefaultRequestExpectation}'s.
  */
-private class MockClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory {
+@SuppressWarnings("deprecation")
+private class MockClientHttpRequestFactory implements ClientHttpRequestFactory, org.springframework.http.client.AsyncClientHttpRequestFactory {
 
 @Override
 public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) {
 return createRequestInternal(uri, httpMethod);
 }
 
 @Override
-public AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod) {
+public org.springframework.http.client.AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod) {
 return createRequestInternal(uri, httpMethod);
 }
 
-private MockAsyncClientHttpRequest createRequestInternal(URI uri, HttpMethod method) {
+private org.springframework.mock.http.client.MockAsyncClientHttpRequest createRequestInternal(URI uri, HttpMethod method) {
 Assert.notNull(uri, "'uri' must not be null");
 Assert.notNull(method, "'httpMethod' must not be null");
 
-return new MockAsyncClientHttpRequest(method, uri) {
+return new org.springframework.mock.http.client.MockAsyncClientHttpRequest(method, uri) {
 
 @Override
 protected ClientHttpResponse executeInternal() throws IOException {

spring-web/src/main/java/org/springframework/http/client/AbstractAsyncClientHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -29,7 +29,9 @@
  *
  * @author Arjen Poutsma
  * @since 4.0
+ * @deprecated as of Spring 5.0, in favor of {@link org.springframework.http.client.reactive.AbstractClientHttpRequest}
  */
+@Deprecated
 abstract class AbstractAsyncClientHttpRequest implements AsyncClientHttpRequest {
 
 private final HttpHeaders headers = new HttpHeaders();

spring-web/src/main/java/org/springframework/http/client/AbstractBufferingAsyncClientHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -29,7 +29,9 @@
  *
  * @author Arjen Poutsma
  * @since 4.0
+ * @deprecated as of Spring 5.0, with no direct replacement
  */
+@Deprecated
 abstract class AbstractBufferingAsyncClientHttpRequest extends AbstractAsyncClientHttpRequest {
 
 private ByteArrayOutputStream bufferedOutput = new ByteArrayOutputStream(1024);

spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -32,7 +32,9 @@
  * @author Arjen Poutsma
  * @since 4.0
  * @see AsyncClientHttpRequestFactory#createAsyncRequest
+ * @deprecated as of Spring 5.0, in favor of {@link org.springframework.web.reactive.function.client.ClientRequest}
  */
+@Deprecated
 public interface AsyncClientHttpRequest extends HttpRequest, HttpOutputMessage {
 
 /**

spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestExecution.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -31,17 +31,19 @@
  * @author Rossen Stoyanchev
  * @since 4.3
  * @see AsyncClientHttpRequestInterceptor
+ * @deprecated as of Spring 5.0, in favor of {@link org.springframework.web.reactive.function.client.ExchangeFilterFunction}
  */
+@Deprecated
 public interface AsyncClientHttpRequestExecution {
 
- /**
-  * Resume the request execution by invoking the next interceptor in the chain
-  * or executing the request to the remote service.
-  * @param request the HTTP request, containing the HTTP method and headers
-  * @param body the body of the request
-  * @return a corresponding future handle
-  * @throws IOException in case of I/O errors
-  */
- ListenableFuture<ClientHttpResponse> executeAsync(HttpRequest request, byte[] body) throws IOException;
+/**
+ * Resume the request execution by invoking the next interceptor in the chain
+ * or executing the request to the remote service.
+ * @param request the HTTP request, containing the HTTP method and headers
+ * @param body the body of the request
+ * @return a corresponding future handle
+ * @throws IOException in case of I/O errors
+ */
+ListenableFuture<ClientHttpResponse> executeAsync(HttpRequest request, byte[] body) throws IOException;
 
 }

spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -27,7 +27,9 @@
  *
  * @author Arjen Poutsma
  * @since 4.0
+ * @deprecated as of Spring 5.0, in favor of {@link org.springframework.http.client.reactive.ClientHttpConnector}
  */
+@Deprecated
 public interface AsyncClientHttpRequestFactory {
 
 /**

spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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,7 +19,6 @@
 import java.io.IOException;
 
 import org.springframework.http.HttpRequest;
-import org.springframework.http.client.support.InterceptingAsyncHttpAccessor;
 import org.springframework.util.concurrent.ListenableFuture;
 
 /**
@@ -36,8 +35,10 @@
  * @author Rossen Stoyanchev
  * @since 4.3
  * @see org.springframework.web.client.AsyncRestTemplate
- * @see InterceptingAsyncHttpAccessor
+ * @see org.springframework.http.client.support.InterceptingAsyncHttpAccessor
+ * @deprecated as of Spring 5.0, in favor of {@link org.springframework.web.reactive.function.client.ExchangeFilterFunction}
  */
+@Deprecated
 public interface AsyncClientHttpRequestInterceptor {
 
 /**

spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -49,7 +49,9 @@
  * @author Arjen Poutsma
  * @since 4.0
  * @see HttpComponentsClientHttpRequestFactory#createRequest
+ * @deprecated as of Spring 5.0, with no direct replacement
  */
+@Deprecated
 final class HttpComponentsAsyncClientHttpRequest extends AbstractBufferingAsyncClientHttpRequest {
 
 private final HttpAsyncClient httpClient;

spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -43,7 +43,9 @@
  * @author Stephane Nicoll
  * @since 4.0
  * @see HttpAsyncClient
+ * @deprecated as of Spring 5.0, with no direct replacement
  */
+@Deprecated
 public class HttpComponentsAsyncClientHttpRequestFactory extends HttpComponentsClientHttpRequestFactory
 implements AsyncClientHttpRequestFactory, InitializingBean {