diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/reactive.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/reactive.adoc index f8d5dbb075..cb66b692a2 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/reactive.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/reactive.adoc @@ -12,19 +12,19 @@ The annotation-based one is quite close to the Spring MVC model, as shown in the [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springwebflux/MyRestController.java[] +include::{docs-java}/web/reactive/webflux/MyRestController.java[] ---- "`WebFlux.fn`", the functional variant, separates the routing configuration from the actual handling of the requests, as shown in the following example: [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springwebflux/MyRoutingConfiguration.java[] +include::{docs-java}/web/reactive/webflux/MyRoutingConfiguration.java[] ---- [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springwebflux/MyUserHandler.java[] +include::{docs-java}/web/reactive/webflux/MyUserHandler.java[] ---- 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 [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springwebflux/MyRoutingConfiguration.java[] +include::{docs-java}/web/reactive/webflux/MyRoutingConfiguration.java[] ---- [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springwebflux/MyUserHandler.java[] +include::{docs-java}/web/reactive/webflux/MyUserHandler.java[] ---- 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 [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springwebflux/httpcodecs/MyCodecsConfiguration.java[] +include::{docs-java}/web/reactive/webflux/httpcodecs/MyCodecsConfiguration.java[] ---- You can also leverage <>. @@ -164,7 +164,7 @@ Because a `ErrorWebExceptionHandler` is quite low-level, Spring Boot also provid [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springwebflux/errorhandling/MyErrorWebExceptionHandler.java[] +include::{docs-java}/web/reactive/webflux/errorhandling/MyErrorWebExceptionHandler.java[] ---- 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 [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springwebflux/errorhandling/MyExceptionHandlingController.java[] +include::{docs-java}/web/reactive/webflux/errorhandling/MyExceptionHandlingController.java[] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc index dcc93d8dc2..3f15ebcf4b 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc @@ -12,7 +12,7 @@ The following code shows a typical `@RestController` that serves JSON data: [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springmvc/MyRestController.java[] +include::{docs-java}/web/servlet/springmvc/MyRestController.java[] ---- 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 [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java[] +include::{docs-java}/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java[] ---- 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 [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springmvc/json/MyJsonComponent.java[] +include::{docs-java}/web/servlet/springmvc/json/MyJsonComponent.java[] ---- 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 [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springmvc/json/object/MyJsonComponent.java[] +include::{docs-java}/web/servlet/springmvc/json/object/MyJsonComponent.java[] ---- @@ -342,7 +342,7 @@ You can also define a class annotated with `@ControllerAdvice` to customize the [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/MyControllerAdvice.java[] +include::{docs-java}/web/servlet/springmvc/errorhandling/MyControllerAdvice.java[] ---- 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 [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/MyController.java[] +include::{docs-java}/web/servlet/springmvc/errorhandling/MyController.java[] ---- @@ -397,7 +397,7 @@ For more complex mappings, you can also add beans that implement the `ErrorViewR [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/errorpages/MyErrorViewResolver.java[] +include::{docs-java}/web/servlet/springmvc/errorhandling/errorpages/MyErrorViewResolver.java[] ---- 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 [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyErrorPagesConfiguration.java[] +include::{docs-java}/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyErrorPagesConfiguration.java[] ---- 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: [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilterConfiguration.java[] +include::{docs-java}/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilterConfiguration.java[] ---- 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 [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/springmvc/cors/MyCorsConfiguration.java[] +include::{docs-java}/web/servlet/springmvc/cors/MyCorsConfiguration.java[] ---- @@ -467,7 +467,7 @@ To get started with Jersey, include the `spring-boot-starter-jersey` as a depend [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/jersey/MyJerseyConfig.java[] +include::{docs-java}/web/servlet/jersey/MyJerseyConfig.java[] ---- 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 [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/jersey/MyEndpoint.java[] +include::{docs-java}/web/servlet/jersey/MyEndpoint.java[] ---- 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,7 +596,7 @@ The following example shows programmatically setting the port: [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/embeddedcontainer/customizing/programmatic/MyWebServerFactoryCustomizer.java[] +include::{docs-java}/web/servlet/embeddedcontainer/customizing/programmatic/MyWebServerFactoryCustomizer.java[] ---- `TomcatServletWebServerFactory`, `JettyServletWebServerFactory` and `UndertowServletWebServerFactory` are dedicated variants of `ConfigurableServletWebServerFactory` that have additional customization setter methods for Tomcat, Jetty and Undertow respectively. @@ -604,7 +604,7 @@ The following example shows how to customize `TomcatServletWebServerFactory` tha [source,java,indent=0,subs="verbatim"] ---- -include::{docs-java}/features/developingwebapplications/embeddedcontainer/customizing/programmatic/MyTomcatWebServerFactoryCustomizer.java[] +include::{docs-java}/web/servlet/embeddedcontainer/customizing/programmatic/MyTomcatWebServerFactoryCustomizer.java[] ---- diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/Customer.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/Customer.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/Customer.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/Customer.java index cf088634b8..ec167450c5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/Customer.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/Customer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc; +package org.springframework.boot.docs.web.reactive.webflux; class Customer { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/CustomerRepository.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/CustomerRepository.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/CustomerRepository.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/CustomerRepository.java index 595d2b21a5..8d27fb9446 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/CustomerRepository.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/CustomerRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springwebflux; +package org.springframework.boot.docs.web.reactive.webflux; import reactor.core.publisher.Flux; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyRestController.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/MyRestController.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyRestController.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/MyRestController.java index d9c5c9a0f9..bde6ad0451 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyRestController.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/MyRestController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springwebflux; +package org.springframework.boot.docs.web.reactive.webflux; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyRoutingConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/MyRoutingConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyRoutingConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/MyRoutingConfiguration.java index e1d1e064d5..d0dbee00c5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyRoutingConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/MyRoutingConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springwebflux; +package org.springframework.boot.docs.web.reactive.webflux; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyUserHandler.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/MyUserHandler.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyUserHandler.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/MyUserHandler.java index 49a31e2731..36f64dab86 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyUserHandler.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/MyUserHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springwebflux; +package org.springframework.boot.docs.web.reactive.webflux; import reactor.core.publisher.Mono; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/User.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/User.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/User.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/User.java index f0e90bdf68..ad977faf76 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/User.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/User.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc; +package org.springframework.boot.docs.web.reactive.webflux; import java.util.List; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/UserRepository.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/UserRepository.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/UserRepository.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/UserRepository.java index 7c4616a066..b3c507d9ad 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/UserRepository.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/UserRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springwebflux; +package org.springframework.boot.docs.web.reactive.webflux; import org.springframework.data.repository.reactive.ReactiveCrudRepository; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/MyErrorWebExceptionHandler.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/errorhandling/MyErrorWebExceptionHandler.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/MyErrorWebExceptionHandler.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/errorhandling/MyErrorWebExceptionHandler.java index 93273dda74..586ca2cff5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/MyErrorWebExceptionHandler.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/errorhandling/MyErrorWebExceptionHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springwebflux.errorhandling; +package org.springframework.boot.docs.web.reactive.webflux.errorhandling; import reactor.core.publisher.Mono; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/MyExceptionHandlingController.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/errorhandling/MyExceptionHandlingController.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/MyExceptionHandlingController.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/errorhandling/MyExceptionHandlingController.java index b3e45caa1c..b1913940a8 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/MyExceptionHandlingController.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/errorhandling/MyExceptionHandlingController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springwebflux.errorhandling; +package org.springframework.boot.docs.web.reactive.webflux.errorhandling; import org.springframework.boot.web.reactive.error.ErrorAttributes; import org.springframework.stereotype.Controller; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/httpcodecs/MyCodecsConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/httpcodecs/MyCodecsConfiguration.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/httpcodecs/MyCodecsConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/httpcodecs/MyCodecsConfiguration.java index 04a5e12715..66e7568f00 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/httpcodecs/MyCodecsConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/httpcodecs/MyCodecsConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springwebflux.httpcodecs; +package org.springframework.boot.docs.web.reactive.webflux.httpcodecs; import org.springframework.boot.web.codec.CodecCustomizer; import org.springframework.context.annotation.Bean; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/MyTomcatWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/customizing/programmatic/MyTomcatWebServerFactoryCustomizer.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/MyTomcatWebServerFactoryCustomizer.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/customizing/programmatic/MyTomcatWebServerFactoryCustomizer.java index 7a83567d3f..7583a91227 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/MyTomcatWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/customizing/programmatic/MyTomcatWebServerFactoryCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.embeddedcontainer.customizing.programmatic; +package org.springframework.boot.docs.web.servlet.embeddedcontainer.customizing.programmatic; import java.time.Duration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/MyWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/customizing/programmatic/MyWebServerFactoryCustomizer.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/MyWebServerFactoryCustomizer.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/customizing/programmatic/MyWebServerFactoryCustomizer.java index bad3502428..cd4a2acf9f 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/MyWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/embeddedcontainer/customizing/programmatic/MyWebServerFactoryCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.embeddedcontainer.customizing.programmatic; +package org.springframework.boot.docs.web.servlet.embeddedcontainer.customizing.programmatic; import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/MyEndpoint.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/jersey/MyEndpoint.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/MyEndpoint.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/jersey/MyEndpoint.java index 1678226e7b..19ef84982e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/MyEndpoint.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/jersey/MyEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.jersey; +package org.springframework.boot.docs.web.servlet.jersey; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/MyJerseyConfig.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/jersey/MyJerseyConfig.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/MyJerseyConfig.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/jersey/MyJerseyConfig.java index ccccd0391b..4a9c8c6b40 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/MyJerseyConfig.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/jersey/MyJerseyConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.jersey; +package org.springframework.boot.docs.web.servlet.jersey; import org.glassfish.jersey.server.ResourceConfig; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/Customer.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/Customer.java similarity index 87% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/Customer.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/Customer.java index 411b1f8232..e9011fc9a0 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/Customer.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/Customer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springwebflux; +package org.springframework.boot.docs.web.servlet.springmvc; class Customer { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/CustomerRepository.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/CustomerRepository.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/CustomerRepository.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/CustomerRepository.java index 8c41b96904..cbcb0c07a0 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/CustomerRepository.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/CustomerRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc; +package org.springframework.boot.docs.web.servlet.springmvc; import java.util.List; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/MyRestController.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/MyRestController.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/MyRestController.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/MyRestController.java index d139042e7f..461c67fbe2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/MyRestController.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/MyRestController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc; +package org.springframework.boot.docs.web.servlet.springmvc; import java.util.List; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/User.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/User.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/User.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/User.java index 4337c215b6..258d005a37 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/User.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/User.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springwebflux; +package org.springframework.boot.docs.web.servlet.springmvc; import java.util.List; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/UserRepository.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/UserRepository.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/UserRepository.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/UserRepository.java index c21fde3694..c95963d299 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/UserRepository.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/UserRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc; +package org.springframework.boot.docs.web.servlet.springmvc; import org.springframework.data.repository.CrudRepository; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/cors/MyCorsConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/cors/MyCorsConfiguration.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/cors/MyCorsConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/cors/MyCorsConfiguration.java index 53be9963ff..2bf8d26dc7 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/cors/MyCorsConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/cors/MyCorsConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.cors; +package org.springframework.boot.docs.web.servlet.springmvc.cors; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/CustomException.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/CustomException.java similarity index 87% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/CustomException.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/CustomException.java index 3f80217fa2..5cc177a7c9 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/CustomException.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/CustomException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling; +package org.springframework.boot.docs.web.servlet.springmvc.errorhandling; class CustomException extends RuntimeException { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyController.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyController.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyController.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyController.java index 90a1d9dcac..e677f2d29e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyController.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling; +package org.springframework.boot.docs.web.servlet.springmvc.errorhandling; import javax.servlet.http.HttpServletRequest; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyControllerAdvice.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyControllerAdvice.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyControllerAdvice.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyControllerAdvice.java index c72fa6034f..48b9748ebf 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyControllerAdvice.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyControllerAdvice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling; +package org.springframework.boot.docs.web.servlet.springmvc.errorhandling; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyErrorBody.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyErrorBody.java similarity index 87% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyErrorBody.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyErrorBody.java index 8e275fc602..01ecf69dbb 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyErrorBody.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyErrorBody.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling; +package org.springframework.boot.docs.web.servlet.springmvc.errorhandling; class MyErrorBody { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyException.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyException.java similarity index 87% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyException.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyException.java index e70c35bbf2..a329960708 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyException.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling; +package org.springframework.boot.docs.web.servlet.springmvc.errorhandling; class MyException extends RuntimeException { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/SomeController.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/SomeController.java similarity index 86% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/SomeController.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/SomeController.java index 6bb3e593e1..c4d8a00a7f 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/SomeController.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/SomeController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling; +package org.springframework.boot.docs.web.servlet.springmvc.errorhandling; class SomeController { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpages/MyErrorViewResolver.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpages/MyErrorViewResolver.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpages/MyErrorViewResolver.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpages/MyErrorViewResolver.java index 663e5c4463..12e814efa1 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpages/MyErrorViewResolver.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpages/MyErrorViewResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling.errorpages; +package org.springframework.boot.docs.web.servlet.springmvc.errorhandling.errorpages; import java.util.Map; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyErrorPagesConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyErrorPagesConfiguration.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyErrorPagesConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyErrorPagesConfiguration.java index f609f23e55..531b1c2fe2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyErrorPagesConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyErrorPagesConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling.errorpageswithoutspringmvc; +package org.springframework.boot.docs.web.servlet.springmvc.errorhandling.errorpageswithoutspringmvc; import org.springframework.boot.web.server.ErrorPage; import org.springframework.boot.web.server.ErrorPageRegistrar; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilter.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilter.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilter.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilter.java index 88932ee3cf..e92921d848 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilter.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling.errorpageswithoutspringmvc; +package org.springframework.boot.docs.web.servlet.springmvc.errorhandling.errorpageswithoutspringmvc; import java.io.IOException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilterConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilterConfiguration.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilterConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilterConfiguration.java index 55e5818585..e9402fe5b7 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilterConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/MyFilterConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling.errorpageswithoutspringmvc; +package org.springframework.boot.docs.web.servlet.springmvc.errorhandling.errorpageswithoutspringmvc; import java.util.EnumSet; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/MyJsonComponent.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/MyJsonComponent.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/MyJsonComponent.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/MyJsonComponent.java index 44fea4b648..659edbfa17 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/MyJsonComponent.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/MyJsonComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.json; +package org.springframework.boot.docs.web.servlet.springmvc.json; import java.io.IOException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/MyObject.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/MyObject.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/MyObject.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/MyObject.java index 25cf41f1a4..5629243c26 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/MyObject.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/MyObject.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.json; +package org.springframework.boot.docs.web.servlet.springmvc.json; class MyObject { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/object/MyJsonComponent.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/object/MyJsonComponent.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/object/MyJsonComponent.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/object/MyJsonComponent.java index de7c4dc692..0334517d05 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/object/MyJsonComponent.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/object/MyJsonComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.json.object; +package org.springframework.boot.docs.web.servlet.springmvc.json.object; import java.io.IOException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/object/MyObject.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/object/MyObject.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/object/MyObject.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/object/MyObject.java index 906f2f2250..02ce461779 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/object/MyObject.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/object/MyObject.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.json.object; +package org.springframework.boot.docs.web.servlet.springmvc.json.object; class MyObject { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/AdditionalHttpMessageConverter.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/AdditionalHttpMessageConverter.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/AdditionalHttpMessageConverter.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/AdditionalHttpMessageConverter.java index 3bf816eaaa..79cedd792f 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/AdditionalHttpMessageConverter.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/AdditionalHttpMessageConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.messageconverters; +package org.springframework.boot.docs.web.servlet.springmvc.messageconverters; import java.io.IOException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/AnotherHttpMessageConverter.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/AnotherHttpMessageConverter.java similarity index 87% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/AnotherHttpMessageConverter.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/AnotherHttpMessageConverter.java index 57c8abbbef..a7a0b68fa3 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/AnotherHttpMessageConverter.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/AnotherHttpMessageConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.messageconverters; +package org.springframework.boot.docs.web.servlet.springmvc.messageconverters; class AnotherHttpMessageConverter extends AdditionalHttpMessageConverter { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java index 50cc98cc3c..bcd66bf3d5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/MyHttpMessageConvertersConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.features.developingwebapplications.springmvc.messageconverters; +package org.springframework.boot.docs.web.servlet.springmvc.messageconverters; import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.context.annotation.Bean;