From 6597551858fb64fe3f086a35b7ab8c72cd105056 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 3 Oct 2017 15:29:36 -0400 Subject: [PATCH] WebClient content included in WebFlux section only Before this commit WebClient documentation was also included from the Integration section where the RestTemplate is documented. That is convenient but results in duplicate content under different URLs. This commit removes the include from the Integration section and leaves --- src/docs/asciidoc/integration.adoc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc index b03430dc7e..2e2ed88212 100644 --- a/src/docs/asciidoc/integration.adoc +++ b/src/docs/asciidoc/integration.adoc @@ -953,9 +953,9 @@ The Spring Framework offers two choices for client-side access to REST endpoints * <> -- the original Spring REST client with an API similar to other template classes in Spring, such as `JdbcTemplate`, `JmsTemplate` and others. The `RestTemplate` is built for synchronous use with the blocking I/O. -* <> -- reactive client with a functional, -fluent API. It is built on a non-blocking foundation for async and sync scenarios and -supports Reactive Streams back pressure. +* <> -- reactive client with a functional, +fluent API from the `spring-webflux` module. It is built on a non-blocking foundation +for async and sync scenarios and supports Reactive Streams back pressure. [[rest-resttemplate]] @@ -1348,10 +1348,6 @@ Please use the <> instead. -include::web/webflux-webclient.adoc[leveloffset=+3] - - - [[ejb]] == Enterprise JavaBeans (EJB) integration