Skip to content

Commit 14c7b9b

Browse files
simonbaslesbrannen
authored andcommitted
Change plain 'WebMVC' links to 'See equivalent in the Servlet stack'
Closes gh-29694
1 parent 11f3edc commit 14c7b9b

File tree

4 files changed

+101
-101
lines changed

4 files changed

+101
-101
lines changed

framework-docs/src/docs/asciidoc/web/webflux-cors.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[[webflux-cors]]
22
= CORS
3-
[.small]#<<web.adoc#mvc-cors, Web MVC>>#
3+
[.small]#<<web.adoc#mvc-cors, See equivalent in the Servlet stack>>#
44

55
Spring WebFlux lets you handle CORS (Cross-Origin Resource Sharing). This section
66
describes how to do so.
@@ -10,7 +10,7 @@ describes how to do so.
1010

1111
[[webflux-cors-intro]]
1212
== Introduction
13-
[.small]#<<web.adoc#mvc-cors-intro, Web MVC>>#
13+
[.small]#<<web.adoc#mvc-cors-intro, See equivalent in the Servlet stack>>#
1414

1515
For security reasons, browsers prohibit AJAX calls to resources outside the current origin.
1616
For example, you could have your bank account in one tab and evil.com in another. Scripts
@@ -27,7 +27,7 @@ powerful workarounds based on IFRAME or JSONP.
2727

2828
[[webflux-cors-processing]]
2929
== Processing
30-
[.small]#<<web.adoc#mvc-cors-processing, Web MVC>>#
30+
[.small]#<<web.adoc#mvc-cors-processing, See equivalent in the Servlet stack>>#
3131

3232
The CORS specification distinguishes between preflight, simple, and actual requests.
3333
To learn how CORS works, you can read
@@ -77,7 +77,7 @@ To learn more from the source or to make advanced customizations, see:
7777

7878
[[webflux-cors-controller]]
7979
== `@CrossOrigin`
80-
[.small]#<<web.adoc#mvc-cors-controller, Web MVC>>#
80+
[.small]#<<web.adoc#mvc-cors-controller, See equivalent in the Servlet stack>>#
8181

8282
The {api-spring-framework}/web/bind/annotation/CrossOrigin.html[`@CrossOrigin`]
8383
annotation enables cross-origin requests on annotated controller methods, as the
@@ -237,7 +237,7 @@ as the following example shows:
237237

238238
[[webflux-cors-global]]
239239
== Global Configuration
240-
[.small]#<<web.adoc#mvc-cors-global, Web MVC>>#
240+
[.small]#<<web.adoc#mvc-cors-global, See equivalent in the Servlet stack>>#
241241

242242
In addition to fine-grained, controller method-level configuration, you probably want to
243243
define some global CORS configuration, too. You can set URL-based `CorsConfiguration`
@@ -308,7 +308,7 @@ as the following example shows:
308308

309309
[[webflux-cors-webfilter]]
310310
== CORS `WebFilter`
311-
[.small]#<<web.adoc#mvc-cors-filter, Web MVC>>#
311+
[.small]#<<web.adoc#mvc-cors-filter, See equivalent in the Servlet stack>>#
312312

313313
You can apply CORS support through the built-in
314314
{api-spring-framework}/web/cors/reactive/CorsWebFilter.html[`CorsWebFilter`], which is a

framework-docs/src/docs/asciidoc/web/webflux-functional.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[[webflux-fn]]
22
= Functional Endpoints
3-
[.small]#<<web.adoc#webmvc-fn, Web MVC>>#
3+
[.small]#<<web.adoc#webmvc-fn, See equivalent in the Servlet stack>>#
44

55
Spring WebFlux includes WebFlux.fn, a lightweight functional programming model in which functions
66
are used to route and handle requests and contracts are designed for immutability.
@@ -12,7 +12,7 @@ the same <<web-reactive.adoc#webflux-reactive-spring-web>> foundation.
1212

1313
[[webflux-fn-overview]]
1414
== Overview
15-
[.small]#<<web.adoc#webmvc-fn-overview, Web MVC>>#
15+
[.small]#<<web.adoc#webmvc-fn-overview, See equivalent in the Servlet stack>>#
1616

1717
In WebFlux.fn, an HTTP request is handled with a `HandlerFunction`: a function that takes
1818
`ServerRequest` and returns a delayed `ServerResponse` (i.e. `Mono<ServerResponse>`).
@@ -113,7 +113,7 @@ Most applications can run through the WebFlux Java configuration, see <<webflux-
113113

114114
[[webflux-fn-handler-functions]]
115115
== HandlerFunction
116-
[.small]#<<web.adoc#webmvc-fn-handler-functions, Web MVC>>#
116+
[.small]#<<web.adoc#webmvc-fn-handler-functions, See equivalent in the Servlet stack>>#
117117

118118
`ServerRequest` and `ServerResponse` are immutable interfaces that offer JDK 8-friendly
119119
access to the HTTP request and response.
@@ -486,7 +486,7 @@ See <<core.adoc#validation-beanvalidation, Spring Validation>>.
486486

487487
[[webflux-fn-router-functions]]
488488
== `RouterFunction`
489-
[.small]#<<web.adoc#webmvc-fn-router-functions, Web MVC>>#
489+
[.small]#<<web.adoc#webmvc-fn-router-functions, See equivalent in the Servlet stack>>#
490490

491491
Router functions are used to route the requests to the corresponding `HandlerFunction`.
492492
Typically, you do not write router functions yourself, but rather use a method on the
@@ -687,7 +687,7 @@ We can further improve by using the `nest` method together with `accept`:
687687

688688
[[webflux-fn-running]]
689689
== Running a Server
690-
[.small]#<<web.adoc#webmvc-fn-running, Web MVC>>#
690+
[.small]#<<web.adoc#webmvc-fn-running, See equivalent in the Servlet stack>>#
691691

692692
How do you run a router function in an HTTP server? A simple option is to convert a router
693693
function to an `HttpHandler` by using one of the following:
@@ -793,7 +793,7 @@ The following example shows a WebFlux Java configuration (see
793793

794794
[[webflux-fn-handler-filter-function]]
795795
== Filtering Handler Functions
796-
[.small]#<<web.adoc#webmvc-fn-handler-filter-function, Web MVC>>#
796+
[.small]#<<web.adoc#webmvc-fn-handler-filter-function, See equivalent in the Servlet stack>>#
797797

798798
You can filter handler functions by using the `before`, `after`, or `filter` methods on the routing
799799
function builder.

framework-docs/src/docs/asciidoc/web/webflux-view.adoc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[[webflux-view]]
22
= View Technologies
3-
[.small]#<<web.adoc#mvc-view, Web MVC>>#
3+
[.small]#<<web.adoc#mvc-view, See equivalent in the Servlet stack>>#
44

55
The use of view technologies in Spring WebFlux is pluggable. Whether you decide to
66
use Thymeleaf, FreeMarker, or some other view technology is primarily a matter of a
@@ -12,7 +12,7 @@ WebFlux. We assume you are already familiar with <<webflux-viewresolution>>.
1212

1313
[[webflux-view-thymeleaf]]
1414
== Thymeleaf
15-
[.small]#<<web.adoc#mvc-view-thymeleaf, Web MVC>>#
15+
[.small]#<<web.adoc#mvc-view-thymeleaf, See equivalent in the Servlet stack>>#
1616

1717
Thymeleaf is a modern server-side Java template engine that emphasizes natural HTML
1818
templates that can be previewed in a browser by double-clicking, which is very
@@ -33,7 +33,7 @@ https://web.archive.org/web/20210623051330/http%3A//forum.thymeleaf.org/Thymelea
3333

3434
[[webflux-view-freemarker]]
3535
== FreeMarker
36-
[.small]#<<web.adoc#mvc-view-freemarker, Web MVC>>#
36+
[.small]#<<web.adoc#mvc-view-freemarker, See equivalent in the Servlet stack>>#
3737

3838
https://freemarker.apache.org/[Apache FreeMarker] is a template engine for generating any
3939
kind of text output from HTML to email and others. The Spring Framework has built-in
@@ -43,7 +43,7 @@ integration for using Spring WebFlux with FreeMarker templates.
4343

4444
[[webflux-view-freemarker-contextconfig]]
4545
=== View Configuration
46-
[.small]#<<web.adoc#mvc-view-freemarker-contextconfig, Web MVC>>#
46+
[.small]#<<web.adoc#mvc-view-freemarker-contextconfig, See equivalent in the Servlet stack>>#
4747

4848
The following example shows how to configure FreeMarker as a view technology:
4949

@@ -98,7 +98,7 @@ returns the view name, `welcome`, the resolver looks for the
9898

9999
[[webflux-views-freemarker]]
100100
=== FreeMarker Configuration
101-
[.small]#<<web.adoc#mvc-views-freemarker, Web MVC>>#
101+
[.small]#<<web.adoc#mvc-views-freemarker, See equivalent in the Servlet stack>>#
102102

103103
You can pass FreeMarker 'Settings' and 'SharedVariables' directly to the FreeMarker
104104
`Configuration` object (which is managed by Spring) by setting the appropriate bean
@@ -151,7 +151,7 @@ the `Configuration` object.
151151

152152
[[webflux-view-freemarker-forms]]
153153
=== Form Handling
154-
[.small]#<<web.adoc#mvc-view-freemarker-forms, Web MVC>>#
154+
[.small]#<<web.adoc#mvc-view-freemarker-forms, See equivalent in the Servlet stack>>#
155155

156156
Spring provides a tag library for use in JSPs that contains, among others, a
157157
`<spring:bind/>` element. This element primarily lets forms display values from
@@ -162,7 +162,7 @@ with additional convenience macros for generating form input elements themselves
162162

163163
[[webflux-view-bind-macros]]
164164
==== The Bind Macros
165-
[.small]#<<web.adoc#mvc-view-bind-macros, Web MVC>>#
165+
[.small]#<<web.adoc#mvc-view-bind-macros, See equivalent in the Servlet stack>>#
166166

167167
A standard set of macros are maintained within the `spring-webflux.jar` file for
168168
FreeMarker, so they are always available to a suitably configured application.
@@ -193,7 +193,7 @@ sections of the Spring MVC documentation.
193193

194194
[[webflux-view-script]]
195195
== Script Views
196-
[.small]#<<web.adoc#mvc-view-script, Web MVC>>#
196+
[.small]#<<web.adoc#mvc-view-script, See equivalent in the Servlet stack>>#
197197

198198
The Spring Framework has a built-in integration for using Spring WebFlux with any
199199
templating library that can run on top of the
@@ -219,7 +219,7 @@ TIP: The basic rule for integrating any other script engine is that it must impl
219219

220220
[[webflux-view-script-dependencies]]
221221
=== Requirements
222-
[.small]#<<web.adoc#mvc-view-script-dependencies, Web MVC>>#
222+
[.small]#<<web.adoc#mvc-view-script-dependencies, See equivalent in the Servlet stack>>#
223223

224224
You need to have the script engine on your classpath, the details of which vary by script engine:
225225

@@ -239,7 +239,7 @@ through https://www.webjars.org/[WebJars].
239239

240240
[[webflux-view-script-integrate]]
241241
=== Script Templates
242-
[.small]#<<web.adoc#mvc-view-script-integrate, Web MVC>>#
242+
[.small]#<<web.adoc#mvc-view-script-integrate, See equivalent in the Servlet stack>>#
243243

244244
You can declare a `ScriptTemplateConfigurer` bean to specify the script engine to use,
245245
the script files to load, what function to call to render templates, and so on.
@@ -389,7 +389,7 @@ for more configuration examples.
389389

390390
[[webflux-view-httpmessagewriter]]
391391
== JSON and XML
392-
[.small]#<<web.adoc#mvc-view-jackson, Web MVC>>#
392+
[.small]#<<web.adoc#mvc-view-jackson, See equivalent in the Servlet stack>>#
393393

394394
For <<webflux-multiple-representations>> purposes, it is useful to be able to alternate
395395
between rendering a model with an HTML template or as other formats (such as JSON or XML),

0 commit comments

Comments
 (0)