From 2b4250ec4427933b00286ebf8e0dbf4af7ca4747 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 16 Feb 2018 12:58:01 -0500 Subject: [PATCH] [doc] WebFlux has coverage of URI links Issue: SPR-16423 --- src/docs/asciidoc/web/web-uris.adoc | 3 +++ src/docs/asciidoc/web/webflux.adoc | 11 +++++++++++ src/docs/asciidoc/web/webmvc.adoc | 1 + 3 files changed, 15 insertions(+) diff --git a/src/docs/asciidoc/web/web-uris.adoc b/src/docs/asciidoc/web/web-uris.adoc index a02e405aa8a..c90c5e00358 100644 --- a/src/docs/asciidoc/web/web-uris.adoc +++ b/src/docs/asciidoc/web/web-uris.adoc @@ -1,6 +1,7 @@ [[web-uricomponents]] = UriComponents +[.small]#Spring MVC and Spring WebFlux# `UriComponents` is comparable to `java.net.URI`. However it comes with a dedicated `UriComponentsBuilder` and supports URI template variables: @@ -38,6 +39,7 @@ The above can be done as a single chain and with a shortcut: [[web-uribuilder]] = UriBuilder +[.small]#Spring MVC and Spring WebFlux# <> is an implementation of `UriBuilder`. Together `UriBuilderFactory` and `UriBuilder` provide a pluggable mechanism for building a URI @@ -100,6 +102,7 @@ An example of using the `DefaultUriBuilderFactory`: [[web-uri-encoding]] = URI Encoding +[.small]#Spring MVC and Spring WebFlux# The default way of encoding URIs in `UriComponents` works as follows: diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc index 414f575243e..23a0cb63a45 100644 --- a/src/docs/asciidoc/web/webflux.adoc +++ b/src/docs/asciidoc/web/webflux.adoc @@ -2197,6 +2197,17 @@ Javadoc for more details. +[[mvc-uri-building]] +== URI Links +[.small]#<># + +This section describes various options available in the Spring Framework to prepare URIs. + + +include::web-uris.adoc[leveloffset=+2] + + + include::webflux-functional.adoc[leveloffset=+1] diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc index 5dcb3f50d8d..455411f0e80 100644 --- a/src/docs/asciidoc/web/webmvc.adoc +++ b/src/docs/asciidoc/web/webmvc.adoc @@ -2880,6 +2880,7 @@ Javadoc for more details. [[mvc-uri-building]] == URI Links +[.small]#<># This section describes various options available in the Spring Framework to prepare URIs.