diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java index 8eb631a8576..2873a18e839 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 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,12 +70,10 @@ import org.springframework.web.util.UriTemplateHandler; * addition to the generalized {@code exchange} and {@code execute} methods that * support of less frequent cases. * - *

NOTE: As of 5.0, the non-blocking, reactive - * {@code org.springframework.web.reactive.client.WebClient} offers a - * modern alternative to the {@code RestTemplate} with efficient support for - * both sync and async, as well as streaming scenarios. The {@code RestTemplate} - * will be deprecated in a future version and will not have major new features - * added going forward. + *

NOTE: As of 5.0 this class is in maintenance mode, with + * only minor requests for changes and bugs to be accepted going forward. Please, + * consider using the {@code org.springframework.web.reactive.client.WebClient} + * which has a more modern API and supports sync, async, and streaming scenarios. * * @author Arjen Poutsma * @author Brian Clozel @@ -89,7 +87,7 @@ import org.springframework.web.util.UriTemplateHandler; */ public class RestTemplate extends InterceptingHttpAccessor implements RestOperations { - private static boolean romePresent = + private static final boolean romePresent = ClassUtils.isPresent("com.rometools.rome.feed.WireFeed", RestTemplate.class.getClassLoader()); diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc index eb5a6e473a8..e4e768726c2 100644 --- a/src/docs/asciidoc/integration.adoc +++ b/src/docs/asciidoc/integration.adoc @@ -956,10 +956,10 @@ that supports both sync and async, as well as streaming scenarios. [NOTE] ==== -As of 5.0, the non-blocking, reactive `WebClient` offers a modern alternative to the -`RestTemplate` with efficient support for both sync and async, as well as streaming -scenarios. The `RestTemplate` will be deprecated in a future version and will not have -major new features gong forward. +As of 5.0 the `RestTemplate` is in maintenance mode, with only minor requests for +changes and bugs to be accepted going forward. Please, consider using the +<> which offers a more modern API and +supports sync, async, and streaming scenarios. ==== diff --git a/src/docs/asciidoc/web/webmvc-client.adoc b/src/docs/asciidoc/web/webmvc-client.adoc index 8aac7410215..2391ffe71c1 100644 --- a/src/docs/asciidoc/web/webmvc-client.adoc +++ b/src/docs/asciidoc/web/webmvc-client.adoc @@ -15,10 +15,10 @@ libraries. [NOTE] ==== -As of 5.0, the non-blocking, reactive `WebClient` offers a modern alternative to the -`RestTemplate` with efficient support for both sync and async, as well as streaming -scenarios. The `RestTemplate` will be deprecated in a future version and will not have -major new features gong forward. +As of 5.0 the `RestTemplate` is in maintenance mode, with only minor requests for +changes and bugs to be accepted going forward. Please, consider using the +<> which offers a more modern API and +supports sync, async, and streaming scenarios. ==== See <> for details.