Skip to content

Commit 3729c49

Browse files
committed
Polish package name for web sample code
See gh-27132
1 parent ea65c28 commit 3729c49

39 files changed

+59
-59
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/reactive.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ The annotation-based one is quite close to the Spring MVC model, as shown in the
1212

1313
[source,java,indent=0,subs="verbatim"]
1414
----
15-
include::{docs-java}/features/developingwebapplications/springwebflux/MyRestController.java[]
15+
include::{docs-java}/web/reactive/webflux/MyRestController.java[]
1616
----
1717

1818
"`WebFlux.fn`", the functional variant, separates the routing configuration from the actual handling of the requests, as shown in the following example:
1919

2020
[source,java,indent=0,subs="verbatim"]
2121
----
22-
include::{docs-java}/features/developingwebapplications/springwebflux/MyRoutingConfiguration.java[]
22+
include::{docs-java}/web/reactive/webflux/MyRoutingConfiguration.java[]
2323
----
2424

2525
[source,java,indent=0,subs="verbatim"]
2626
----
27-
include::{docs-java}/features/developingwebapplications/springwebflux/MyUserHandler.java[]
27+
include::{docs-java}/web/reactive/webflux/MyUserHandler.java[]
2828
----
2929

3030
WebFlux is part of the Spring Framework and detailed information is available in its {spring-framework-docs}/web-reactive.html#webflux-fn[reference documentation].
@@ -43,12 +43,12 @@ You can still enforce your choice by setting the chosen application type to `Spr
4343

4444
[source,java,indent=0,subs="verbatim"]
4545
----
46-
include::{docs-java}/features/developingwebapplications/springwebflux/MyRoutingConfiguration.java[]
46+
include::{docs-java}/web/reactive/webflux/MyRoutingConfiguration.java[]
4747
----
4848

4949
[source,java,indent=0,subs="verbatim"]
5050
----
51-
include::{docs-java}/features/developingwebapplications/springwebflux/MyUserHandler.java[]
51+
include::{docs-java}/web/reactive/webflux/MyUserHandler.java[]
5252
----
5353

5454
WebFlux is part of the Spring Framework and detailed information is available in its {spring-framework-docs}/web-reactive.html#webflux-fn[reference documentation].
@@ -90,7 +90,7 @@ If you need to add or customize codecs, you can create a custom `CodecCustomizer
9090

9191
[source,java,indent=0,subs="verbatim"]
9292
----
93-
include::{docs-java}/features/developingwebapplications/springwebflux/httpcodecs/MyCodecsConfiguration.java[]
93+
include::{docs-java}/web/reactive/webflux/httpcodecs/MyCodecsConfiguration.java[]
9494
----
9595

9696
You can also leverage <<web#web.servlet.spring-mvc.json,Boot's custom JSON serializers and deserializers>>.
@@ -164,7 +164,7 @@ Because a `ErrorWebExceptionHandler` is quite low-level, Spring Boot also provid
164164

165165
[source,java,indent=0,subs="verbatim"]
166166
----
167-
include::{docs-java}/features/developingwebapplications/springwebflux/errorhandling/MyErrorWebExceptionHandler.java[]
167+
include::{docs-java}/web/reactive/webflux/errorhandling/MyErrorWebExceptionHandler.java[]
168168
----
169169

170170
For a more complete picture, you can also subclass `DefaultErrorWebExceptionHandler` directly and override specific methods.
@@ -174,7 +174,7 @@ Applications can ensure that such exceptions are recorded with the request metri
174174

175175
[source,java,indent=0,subs="verbatim"]
176176
----
177-
include::{docs-java}/features/developingwebapplications/springwebflux/errorhandling/MyExceptionHandlingController.java[]
177+
include::{docs-java}/web/reactive/webflux/errorhandling/MyExceptionHandlingController.java[]
178178
----
179179

180180

spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The following code shows a typical `@RestController` that serves JSON data:
1212

1313
[source,java,indent=0,subs="verbatim"]
1414
----
15-
include::{docs-java}/features/developingwebapplications/springmvc/MyRestController.java[]
15+
include::{docs-java}/web/servlet/springmvc/MyRestController.java[]
1616
----
1717

1818
Spring MVC is part of the core Spring Framework, and detailed information is available in the {spring-framework-docs}/web.html#mvc[reference documentation].
@@ -62,7 +62,7 @@ If you need to add or customize converters, you can use Spring Boot's `HttpMessa
6262

6363
[source,java,indent=0,subs="verbatim"]
6464
----
65-
include::{docs-java}/features/developingwebapplications/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java[]
65+
include::{docs-java}/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java[]
6666
----
6767

6868
Any `HttpMessageConverter` bean that is present in the context is added to the list of converters.
@@ -80,7 +80,7 @@ You can also use it on classes that contain serializers/deserializers as inner c
8080

8181
[source,java,indent=0,subs="verbatim"]
8282
----
83-
include::{docs-java}/features/developingwebapplications/springmvc/json/MyJsonComponent.java[]
83+
include::{docs-java}/web/servlet/springmvc/json/MyJsonComponent.java[]
8484
----
8585

8686
All `@JsonComponent` beans in the `ApplicationContext` are automatically registered with Jackson.
@@ -93,7 +93,7 @@ The example above can be rewritten to use `JsonObjectSerializer`/`JsonObjectDese
9393

9494
[source,java,indent=0,subs="verbatim"]
9595
----
96-
include::{docs-java}/features/developingwebapplications/springmvc/json/object/MyJsonComponent.java[]
96+
include::{docs-java}/web/servlet/springmvc/json/object/MyJsonComponent.java[]
9797
----
9898

9999

@@ -342,7 +342,7 @@ You can also define a class annotated with `@ControllerAdvice` to customize the
342342

343343
[source,java,indent=0,subs="verbatim"]
344344
----
345-
include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/MyControllerAdvice.java[]
345+
include::{docs-java}/web/servlet/springmvc/errorhandling/MyControllerAdvice.java[]
346346
----
347347

348348
In the preceding example, if `YourException` is thrown by a controller defined in the same package as `SomeController`, a JSON representation of the `CustomErrorType` POJO is used instead of the `ErrorAttributes` representation.
@@ -352,7 +352,7 @@ Applications can ensure that such exceptions are recorded with the request metri
352352

353353
[source,java,indent=0,subs="verbatim"]
354354
----
355-
include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/MyController.java[]
355+
include::{docs-java}/web/servlet/springmvc/errorhandling/MyController.java[]
356356
----
357357

358358

@@ -397,7 +397,7 @@ For more complex mappings, you can also add beans that implement the `ErrorViewR
397397

398398
[source,java,indent=0,subs="verbatim"]
399399
----
400-
include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/errorpages/MyErrorViewResolver.java[]
400+
include::{docs-java}/web/servlet/springmvc/errorhandling/errorpages/MyErrorViewResolver.java[]
401401
----
402402

403403
You can also use regular Spring MVC features such as {spring-framework-docs}/web.html#mvc-exceptionhandlers[`@ExceptionHandler` methods] and {spring-framework-docs}/web.html#mvc-ann-controller-advice[`@ControllerAdvice`].
@@ -412,14 +412,14 @@ This abstraction works directly with the underlying embedded servlet container a
412412

413413
[source,java,indent=0,subs="verbatim"]
414414
----
415-
include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyErrorPagesConfiguration.java[]
415+
include::{docs-java}/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyErrorPagesConfiguration.java[]
416416
----
417417

418418
NOTE: If you register an `ErrorPage` with a path that ends up being handled by a `Filter` (as is common with some non-Spring web frameworks, like Jersey and Wicket), then the `Filter` has to be explicitly registered as an `ERROR` dispatcher, as shown in the following example:
419419

420420
[source,java,indent=0,subs="verbatim"]
421421
----
422-
include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilterConfiguration.java[]
422+
include::{docs-java}/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilterConfiguration.java[]
423423
----
424424

425425
Note that the default `FilterRegistrationBean` does not include the `ERROR` dispatcher type.
@@ -451,7 +451,7 @@ Using {spring-framework-docs}/web.html#mvc-cors-controller[controller method COR
451451

452452
[source,java,indent=0,subs="verbatim"]
453453
----
454-
include::{docs-java}/features/developingwebapplications/springmvc/cors/MyCorsConfiguration.java[]
454+
include::{docs-java}/web/servlet/springmvc/cors/MyCorsConfiguration.java[]
455455
----
456456

457457

@@ -467,7 +467,7 @@ To get started with Jersey, include the `spring-boot-starter-jersey` as a depend
467467

468468
[source,java,indent=0,subs="verbatim"]
469469
----
470-
include::{docs-java}/features/developingwebapplications/jersey/MyJerseyConfig.java[]
470+
include::{docs-java}/web/servlet/jersey/MyJerseyConfig.java[]
471471
----
472472

473473
WARNING: Jersey's support for scanning executable archives is rather limited.
@@ -480,7 +480,7 @@ All the registered endpoints should be `@Components` with HTTP resource annotati
480480

481481
[source,java,indent=0,subs="verbatim"]
482482
----
483-
include::{docs-java}/features/developingwebapplications/jersey/MyEndpoint.java[]
483+
include::{docs-java}/web/servlet/jersey/MyEndpoint.java[]
484484
----
485485

486486
Since the `Endpoint` is a Spring `@Component`, its lifecycle is managed by Spring and you can use the `@Autowired` annotation to inject dependencies and use the `@Value` annotation to inject external configuration.
@@ -596,15 +596,15 @@ The following example shows programmatically setting the port:
596596

597597
[source,java,indent=0,subs="verbatim"]
598598
----
599-
include::{docs-java}/features/developingwebapplications/embeddedcontainer/customizing/programmatic/MyWebServerFactoryCustomizer.java[]
599+
include::{docs-java}/web/servlet/embeddedcontainer/customizing/programmatic/MyWebServerFactoryCustomizer.java[]
600600
----
601601

602602
`TomcatServletWebServerFactory`, `JettyServletWebServerFactory` and `UndertowServletWebServerFactory` are dedicated variants of `ConfigurableServletWebServerFactory` that have additional customization setter methods for Tomcat, Jetty and Undertow respectively.
603603
The following example shows how to customize `TomcatServletWebServerFactory` that provides access to Tomcat-specific configuration options:
604604

605605
[source,java,indent=0,subs="verbatim"]
606606
----
607-
include::{docs-java}/features/developingwebapplications/embeddedcontainer/customizing/programmatic/MyTomcatWebServerFactoryCustomizer.java[]
607+
include::{docs-java}/web/servlet/embeddedcontainer/customizing/programmatic/MyTomcatWebServerFactoryCustomizer.java[]
608608
----
609609

610610

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.developingwebapplications.springmvc;
17+
package org.springframework.boot.docs.web.reactive.webflux;
1818

1919
class Customer {
2020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.developingwebapplications.springwebflux;
17+
package org.springframework.boot.docs.web.reactive.webflux;
1818

1919
import reactor.core.publisher.Flux;
2020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.developingwebapplications.springwebflux;
17+
package org.springframework.boot.docs.web.reactive.webflux;
1818

1919
import reactor.core.publisher.Flux;
2020
import reactor.core.publisher.Mono;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.developingwebapplications.springwebflux;
17+
package org.springframework.boot.docs.web.reactive.webflux;
1818

1919
import org.springframework.context.annotation.Bean;
2020
import org.springframework.context.annotation.Configuration;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.developingwebapplications.springwebflux;
17+
package org.springframework.boot.docs.web.reactive.webflux;
1818

1919
import reactor.core.publisher.Mono;
2020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.developingwebapplications.springmvc;
17+
package org.springframework.boot.docs.web.reactive.webflux;
1818

1919
import java.util.List;
2020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.developingwebapplications.springwebflux;
17+
package org.springframework.boot.docs.web.reactive.webflux;
1818

1919
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
2020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.developingwebapplications.springwebflux.errorhandling;
17+
package org.springframework.boot.docs.web.reactive.webflux.errorhandling;
1818

1919
import reactor.core.publisher.Mono;
2020

0 commit comments

Comments
 (0)