diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/cloud-foundry.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/cloud-foundry.adoc index d4028b1ce9..9e168cdf52 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/cloud-foundry.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/cloud-foundry.adoc @@ -52,5 +52,5 @@ For Tomcat, the following configuration can be added: [source,java,indent=0] ---- -include::{include-productionreadyfeatures}/cloudfoundry/CloudFoundryCustomContextPathConfiguration.java[tag=*] +include::{docs-java}/actuator/cloudfoundry/customcontextpath/CloudFoundryCustomContextPathConfiguration.java[tag=*] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc index 9cd28a92c1..1080c7e539 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc @@ -437,7 +437,7 @@ The following example exposes a read operation that returns a custom object: [source,java,indent=0] ---- -include::{include-productionreadyfeatures}/endpoints/CustomEndpoint.java[tag=read] +include::{docs-java}/actuator/endpoints/implementingcustom/CustomEndpoint.java[tag=read] ---- You can also write technology-specific endpoints by using `@JmxEndpoint` or `@WebEndpoint`. @@ -474,7 +474,7 @@ This can be used to invoke a write operation that takes `String name` and `int c [source,java,indent=0] ---- -include::{include-productionreadyfeatures}/endpoints/CustomEndpoint.java[tag=write] +include::{docs-java}/actuator/endpoints/implementingcustom/CustomEndpoint.java[tag=write] ---- TIP: Because endpoints are technology agnostic, only simple types can be specified in the method signature. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc index 2a8128e9d8..7b27fdb14a 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc @@ -898,7 +898,7 @@ To replace the default metric tags, define a `MongoCommandTagsProvider` bean, as [source,java,indent=0] ---- -include::{include-productionreadyfeatures}/metrics/mongo/SampleCommandTagsProviderConfiguration.java[] +include::{docs-java}/actuator/metrics/supported/mongodb/command/SampleCommandTagsProviderConfiguration.java[] ---- To disable the auto-configured command metrics, set the following property: @@ -939,7 +939,7 @@ To replace the default metric tags, define a `MongoConnectionPoolTagsProvider` b [source,java,indent=0] ---- -include::{include-productionreadyfeatures}/metrics/mongo/SampleConnectionPoolTagsProviderConfiguration.java[tag=*] +include::{docs-java}/actuator/metrics/supported/mongodb/connectionpool/SampleConnectionPoolTagsProviderConfiguration.java[tag=*] ---- To disable the auto-configured connection pool metrics, set the following property: @@ -1024,14 +1024,14 @@ To register custom metrics, inject `MeterRegistry` into your component, as shown [source,java,indent=0] ---- -include::{include-productionreadyfeatures}/metrics/MetricsMeterRegistryInjection.java[tag=*] +include::{docs-java}/actuator/metrics/registeringcustom/MetricsMeterRegistryInjection.java[tag=*] ---- If your metrics depend on other beans, it is recommended that you use a `MeterBinder` to register them, as shown in the following example: [source,java,indent=0] ---- -include::{include-productionreadyfeatures}/metrics/SampleMeterBinderConfiguration.java[tag=*] +include::{docs-java}/actuator/metrics/registeringcustom/SampleMeterBinderConfiguration.java[tag=*] ---- Using a `MeterBinder` ensures that the correct dependency relationships are set up and that the bean is available when the metric's value is retrieved. @@ -1049,7 +1049,7 @@ For example, if you want to rename the `mytag.region` tag to `mytag.area` for al [source,java,indent=0] ---- -include::{include-productionreadyfeatures}/metrics/MetricsFilterConfiguration.java[tag=*] +include::{docs-java}/actuator/metrics/customizing/MetricsFilterConfiguration.java[tag=*] ---- NOTE: By default, all `MeterFilter` beans will be automatically bound to the Spring-managed `MeterRegistry`. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties index d5d39f2e53..ecede55509 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties @@ -525,7 +525,7 @@ features.external-config.typesafe-configuration-properties.using-annotated-types # 4 ==== Third-party Configuration boot-features-external-config-3rd-party-configuration=\ -features.external-config.typesafe-configuration-properties.3rd-party-configuration +features.external-config.typesafe-configuration-properties.third-party-configuration # 4 ==== Relaxed Binding boot-features-external-config-relaxed-binding=\ diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc index 36f5af9b32..ea24fb4f47 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc @@ -17,10 +17,7 @@ :github-raw: https://raw.githubusercontent.com/{github-repo}/{github-tag} :github-issues: https://github.com/{github-repo}/issues/ :github-wiki: https://github.com/{github-repo}/wiki -:include: ../../main/java/org/springframework/boot/docs -:include-springbootfeatures: {include}/springbootfeatures -:include-productionreadyfeatures: {include}/productionreadyfeatures -:include-howto: {include}/howto +:docs-java: ../../main/java/org/springframework/boot/docs :spring-boot-code: https://github.com/{github-repo}/tree/{github-tag} :spring-boot-api: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/api :spring-boot-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/caching.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/caching.adoc index 382dea25f3..5a8226f046 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/caching.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/caching.adoc @@ -11,7 +11,7 @@ In a nutshell, to add caching to an operation of your service add the relevant a [source,java,indent=0] ---- -include::{include-springbootfeatures}/caching/MathService.java[] +include::{docs-java}/features/caching/MathService.java[] ---- This example demonstrates the use of caching on a potentially costly operation. @@ -61,7 +61,7 @@ The following example sets a flag to say that `null` values should be passed dow [source,java,indent=0] ---- -include::{include-springbootfeatures}/caching/CacheManagerCustomizerConfiguration.java[] +include::{docs-java}/features/caching/provider/CacheManagerCustomizerConfiguration.java[] ---- NOTE: In the preceding example, an auto-configured `ConcurrentMapCacheManager` is expected. @@ -177,7 +177,7 @@ The following example shows a customizer that configures a specific entry expira [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/CouchbaseCacheManagerConfiguration.java[] +include::{docs-java}/features/caching/provider/couchbase/CouchbaseCacheManagerConfiguration.java[] ---- @@ -208,7 +208,7 @@ The following example shows a customizer that configures a specific time to live [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/RedisCacheManagerConfiguration.java[] +include::{docs-java}/features/caching/provider/redis/RedisCacheManagerConfiguration.java[] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/developing-auto-configuration.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/developing-auto-configuration.adoc index 2ff0f0e16f..36503d4a59 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/developing-auto-configuration.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/developing-auto-configuration.adoc @@ -78,7 +78,7 @@ To handle this scenario, a separate `@Configuration` class can be used to isolat [source,java,indent=0] ---- -include::{include-springbootfeatures}/creatingautoconfiguration/classconditions/MyAutoConfiguration.java[] +include::{docs-java}/features/developingautoconfiguration/conditionannotations/classconditions/MyAutoConfiguration.java[] ---- TIP: If you use `@ConditionalOnClass` or `@ConditionalOnMissingClass` as a part of a meta-annotation to compose your own composed annotations, you must use `name` as referring to the class in such a case is not handled. @@ -95,7 +95,7 @@ When placed on a `@Bean` method, the target type defaults to the return type of [source,java,indent=0] ---- -include::{include-springbootfeatures}/creatingautoconfiguration/beanconditions/MyAutoConfiguration.java[] +include::{docs-java}/features/developingautoconfiguration/conditionannotations/beanconditions/MyAutoConfiguration.java[] ---- In the preceding example, the `myService` bean is going to be created if no bean of type `MyService` is already contained in the `ApplicationContext`. @@ -156,7 +156,7 @@ The following example makes sure that `UserServiceAutoConfiguration` is always i [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/UserServiceAutoConfigurationTests.java[tag=runner] +include::{docs-java}/features/developingautoconfiguration/testing/UserServiceAutoConfigurationTests.java[tag=runner] ---- TIP: If multiple auto-configurations have to be defined, there is no need to order their declarations as they are invoked in the exact same order as when running the application. @@ -167,14 +167,14 @@ Invoking `run` provides a callback context that can be used with `AssertJ`. [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/UserServiceAutoConfigurationTests.java[tag=test-user-config] +include::{docs-java}/features/developingautoconfiguration/testing/UserServiceAutoConfigurationTests.java[tag=test-user-config] ---- It is also possible to easily customize the `Environment`, as shown in the following example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/UserServiceAutoConfigurationTests.java[tag=test-env] +include::{docs-java}/features/developingautoconfiguration/testing/UserServiceAutoConfigurationTests.java[tag=test-env] ---- The runner can also be used to display the `ConditionEvaluationReport`. @@ -183,7 +183,7 @@ The following example shows how to use the `ConditionEvaluationReportLoggingList [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/ConditionEvaluationReportTests.java[tag=*] +include::{docs-java}/features/developingautoconfiguration/testing/ConditionEvaluationReportTests.java[tag=*] ---- @@ -202,7 +202,7 @@ In the following example, we assert that if `UserService` is not present, the au [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/UserServiceAutoConfigurationTests.java[tag=test-classloader] +include::{docs-java}/features/developingautoconfiguration/testing/UserServiceAutoConfigurationTests.java[tag=test-classloader] ---- @@ -251,7 +251,7 @@ Make sure that configuration keys are documented by adding field javadoc for eac [source,java,indent=0] ---- -include::{include-springbootfeatures}/creatingautoconfiguration/configurationkeys/AcmeProperties.java[] +include::{docs-java}/features/developingautoconfiguration/customstarter/configurationkeys/AcmeProperties.java[] ---- NOTE: You should only use plain text with `@ConfigurationProperties` field Javadoc, since they are not processed before being added to the JSON. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/developing-web-applications.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/developing-web-applications.adoc index 37531be01f..a32cdad673 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/developing-web-applications.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/developing-web-applications.adoc @@ -19,7 +19,7 @@ The following code shows a typical `@RestController` that serves JSON data: [source,java,indent=0] ---- -include::{include-springbootfeatures}/webapplications/servlet/MyRestController.java[] +include::{docs-java}/features/developingwebapplications/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]. @@ -69,7 +69,7 @@ If you need to add or customize converters, you can use Spring Boot's `HttpMessa [source,java,indent=0] ---- -include::{include-springbootfeatures}/webapplications/HttpMessageConvertersConfiguration.java[] +include::{docs-java}/features/developingwebapplications/springmvc/messageconverters/HttpMessageConvertersConfiguration.java[] ---- Any `HttpMessageConverter` bean that is present in the context is added to the list of converters. @@ -87,7 +87,7 @@ You can also use it on classes that contain serializers/deserializers as inner c [source,java,indent=0] ---- -include::{include-springbootfeatures}/webapplications/json/MyJsonComponent.java[] +include::{docs-java}/features/developingwebapplications/springmvc/json/MyJsonComponent.java[] ---- All `@JsonComponent` beans in the `ApplicationContext` are automatically registered with Jackson. @@ -100,7 +100,7 @@ The example above can be rewritten to use `JsonObjectSerializer`/`JsonObjectDese [source,java,indent=0] ---- -include::{include-springbootfeatures}/webapplications/json/object/MyJsonComponent.java[] +include::{docs-java}/features/developingwebapplications/springmvc/json/object/MyJsonComponent.java[] ---- @@ -349,7 +349,7 @@ You can also define a class annotated with `@ControllerAdvice` to customize the [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-springbootfeatures}/webapplications/servlet/MyControllerAdvice.java[] +include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/MyControllerAdvice.java[] ---- In the preceding example, if `YourException` is thrown by a controller defined in the same package as `AcmeController`, a JSON representation of the `CustomErrorType` POJO is used instead of the `ErrorAttributes` representation. @@ -359,7 +359,7 @@ Applications can ensure that such exceptions are recorded with the request metri [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-springbootfeatures}/webapplications/servlet/MyController.java[] +include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/MyController.java[] ---- @@ -404,7 +404,7 @@ For more complex mappings, you can also add beans that implement the `ErrorViewR [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-springbootfeatures}/webapplications/servlet/MyErrorViewResolver.java[] +include::{docs-java}/features/developingwebapplications/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`]. @@ -419,14 +419,14 @@ This abstraction works directly with the underlying embedded servlet container a [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-springbootfeatures}/webapplications/servlet/ErrorPageConfiguration.java[] +include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/ErrorPageConfiguration.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,quotes,attributes"] ---- -include::{include-springbootfeatures}/webapplications/servlet/ServletFilterConfiguration.java[] +include::{docs-java}/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/ServletFilterConfiguration.java[] ---- Note that the default `FilterRegistrationBean` does not include the `ERROR` dispatcher type. @@ -469,7 +469,7 @@ Using {spring-framework-docs}/web.html#mvc-cors-controller[controller method COR [source,java,indent=0] ---- -include::{include-springbootfeatures}/webapplications/servlet/CorsConfiguration.java[] +include::{docs-java}/features/developingwebapplications/springmvc/cors/CorsConfiguration.java[] ---- @@ -484,19 +484,19 @@ The annotation-based one is quite close to the Spring MVC model, as shown in the [source,java,indent=0] ---- -include::{include-springbootfeatures}/webapplications/webflux/MyRestController.java[] +include::{docs-java}/features/developingwebapplications/springwebflux/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] ---- -include::{include-springbootfeatures}/webapplications/webflux/fn/RoutingConfiguration.java[] +include::{docs-java}/features/developingwebapplications/springwebflux/RoutingConfiguration.java[] ---- [source,java,indent=0] ---- -include::{include-springbootfeatures}/webapplications/webflux/fn/UserHandler.java[] +include::{docs-java}/features/developingwebapplications/springwebflux/UserHandler.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]. @@ -540,7 +540,7 @@ If you need to add or customize codecs, you can create a custom `CodecCustomizer [source,java,indent=0] ---- -include::{include-springbootfeatures}/webapplications/webflux/CodecConfiguration.java[] +include::{docs-java}/features/developingwebapplications/springwebflux/httpcodecs/CodecConfiguration.java[] ---- You can also leverage <>. @@ -614,7 +614,7 @@ Because a `WebExceptionHandler` is quite low-level, Spring Boot also provides a [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-springbootfeatures}/webapplications/webflux/CustomErrorWebExceptionHandler.java[] +include::{docs-java}/features/developingwebapplications/springwebflux/errorhandling/CustomErrorWebExceptionHandler.java[] ---- For a more complete picture, you can also subclass `DefaultErrorWebExceptionHandler` directly and override specific methods. @@ -624,7 +624,7 @@ Applications can ensure that such exceptions are recorded with the request metri [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-springbootfeatures}/webapplications/webflux/ExceptionHandlingController.java[] +include::{docs-java}/features/developingwebapplications/springwebflux/errorhandling/ExceptionHandlingController.java[] ---- @@ -702,7 +702,7 @@ To get started with Jersey, include the `spring-boot-starter-jersey` as a depend [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-springbootfeatures}/webapplications/jersey/JerseyConfig.java[] +include::{docs-java}/features/developingwebapplications/jersey/JerseyConfig.java[] ---- WARNING: Jersey's support for scanning executable archives is rather limited. @@ -715,7 +715,7 @@ All the registered endpoints should be `@Components` with HTTP resource annotati [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-springbootfeatures}/webapplications/jersey/Endpoint.java[] +include::{docs-java}/features/developingwebapplications/jersey/Endpoint.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. @@ -829,7 +829,7 @@ The following example shows programmatically setting the port: [source,java,indent=0] ---- -include::{include-springbootfeatures}/webapplications/embeddedservletcontainer/CustomizationBean.java[] +include::{docs-java}/features/developingwebapplications/embeddedcontainer/customizing/programmatic/CustomizationBean.java[] ---- `TomcatServletWebServerFactory`, `JettyServletWebServerFactory` and `UndertowServletWebServerFactory` are dedicated variants of `ConfigurableServletWebServerFactory` that have additional customization setter methods for Tomcat, Jetty and Undertow respectively. @@ -837,7 +837,7 @@ The following example shows how to customize `TomcatServletWebServerFactory` tha [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-springbootfeatures}/webapplications/embeddedservletcontainer/TomcatServerCustomizer.java[] +include::{docs-java}/features/developingwebapplications/embeddedcontainer/customizing/programmatic/TomcatServerCustomizer.java[] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/external-config.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/external-config.adoc index 39a15f0b83..ac52951bb2 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/external-config.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/external-config.adoc @@ -40,7 +40,7 @@ To provide a concrete example, suppose you develop a `@Component` that uses a `n [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/valueinjection/MyBean.java[] +include::{docs-java}/features/externalconfig/MyBean.java[] ---- On your application classpath (for example, inside your jar) you can have an `application.properties` file that provides a sensible default property value for `name`. @@ -616,7 +616,7 @@ It is possible to bind a bean declaring standard JavaBean properties as shown in [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/javabeanbinding/AcmeProperties.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/javabeanbinding/AcmeProperties.java[] ---- The preceding POJO defines the following properties: @@ -657,7 +657,7 @@ The example in the previous section can be rewritten in an immutable fashion as [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/constructorbinding/AcmeProperties.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/constructorbinding/AcmeProperties.java[] ---- In this setup, the `@ConstructorBinding` annotation is used to indicate that constructor binding should be used. @@ -671,7 +671,7 @@ If you wish you return a non-null instance of `Security` even when no properties [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/constructorbinding/nonnull/AcmeProperties.java[tag=*] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/constructorbinding/nonnull/AcmeProperties.java[] ---- @@ -697,7 +697,7 @@ This can be done on any `@Configuration` class, as shown in the following exampl [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/enable/MyConfiguration.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/enablingannotatedtypes/MyConfiguration.java[] ---- To use configuration property scanning, add the `@ConfigurationPropertiesScan` annotation to your application. @@ -707,7 +707,7 @@ If you want to define specific packages to scan, you can do so as shown in the f [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/enable/MyApplication.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/enablingannotatedtypes/MyApplication.java[] ---- [NOTE] @@ -743,7 +743,7 @@ To work with `@ConfigurationProperties` beans, you can inject them in the same w [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/use/MyService.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyService.java[] ---- TIP: Using `@ConfigurationProperties` also lets you generate metadata files that can be used by IDEs to offer auto-completion for your own keys. @@ -751,7 +751,7 @@ See the <> for details. -[[features.external-config.typesafe-configuration-properties.3rd-party-configuration]] +[[features.external-config.typesafe-configuration-properties.third-party-configuration]] ==== Third-party Configuration As well as using `@ConfigurationProperties` to annotate a class, you can also use it on public `@Bean` methods. Doing so can be particularly useful when you want to bind properties to third-party components that are outside of your control. @@ -760,7 +760,7 @@ To configure a bean from the `Environment` properties, add `@ConfigurationProper [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/ThirdPartyConfiguration.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.java[] ---- Any JavaBean property defined with the `another` prefix is mapped onto that `AnotherComponent` bean in manner similar to the preceding `AcmeProperties` example. @@ -776,7 +776,7 @@ As an example, consider the following `@ConfigurationProperties` class: [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/relaxed/OwnerProperties.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/OwnerProperties.java[] ---- With the preceding code, the following properties names can all be used: @@ -895,7 +895,7 @@ The following example exposes a list of `MyPojo` objects from `AcmeProperties`: [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/merge/list/AcmeProperties.java[tag=*] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/mergingcomplextypes/list/AcmeProperties.java[tag=*] ---- Consider the following configuration: @@ -950,7 +950,7 @@ The following example exposes a `Map` from `AcmeProperties`: [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/merge/map/AcmeProperties.java[tag=*] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/mergingcomplextypes/map/AcmeProperties.java[tag=*] ---- Consider the following configuration: @@ -1007,7 +1007,7 @@ Consider the following example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/duration/javabeanbinding/AppSystemProperties.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/conversion/durations/javabeanbinding/AppSystemProperties.java[] ---- To specify a session timeout of 30 seconds, `30`, `PT30S` and `30s` are all equivalent. @@ -1030,7 +1030,7 @@ If you prefer to use constructor binding, the same properties can be exposed, as [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/duration/constructorbinding/AppSystemProperties.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/conversion/durations/constructorbinding/AppSystemProperties.java[] ---- @@ -1071,7 +1071,7 @@ Consider the following example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/datasize/javabeanbinding/AppIoProperties.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/conversion/datasizes/javabeanbinding/AppIoProperties.java[] ---- To specify a buffer size of 10 megabytes, `10` and `10MB` are equivalent. @@ -1092,7 +1092,7 @@ If you prefer to use constructor binding, the same properties can be exposed, as [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/datasize/constructorbinding/AppIoProperties.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/conversion/datasizes/constructorbinding/AppIoProperties.java[] ---- TIP: If you are upgrading a `Long` property, make sure to define the unit (using `@DataSizeUnit`) if it isn't bytes. @@ -1108,7 +1108,7 @@ To do so, ensure that a compliant JSR-303 implementation is on your classpath an [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/validate/AcmeProperties.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/validate/AcmeProperties.java[] ---- TIP: You can also trigger validation by annotating the `@Bean` method that creates the configuration properties with `@Validated`. @@ -1118,7 +1118,7 @@ The following example builds on the preceding `AcmeProperties` example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/externalizedconfiguration/validate/nested/AcmeProperties.java[] +include::{docs-java}/features/externalconfig/typesafeconfigurationproperties/validate/nested/AcmeProperties.java[] ---- You can also add a custom Spring `Validator` by creating a bean definition called `configurationPropertiesValidator`. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/jta.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/jta.adoc index 9edd71b7c5..ba96642937 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/jta.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/jta.adoc @@ -43,7 +43,7 @@ You can inject into your bean without needing to use any `@Qualifier`: [source,java,indent=0] ---- -include::{include-springbootfeatures}/jta/primary/MyBean.java[tag=*] +include::{docs-java}/features/jta/mixingxaandnonxaconnections/primary/MyBean.java[tag=*] ---- In some situations, you might want to process certain JMS messages by using a non-XA `ConnectionFactory`. @@ -53,14 +53,14 @@ If you want to use a non-XA `ConnectionFactory`, you can the `nonXaJmsConnection [source,java,indent=0] ---- -include::{include-springbootfeatures}/jta/nonxa/MyBean.java[tag=*] +include::{docs-java}/features/jta/mixingxaandnonxaconnections/nonxa/MyBean.java[tag=*] ---- For consistency, the `jmsConnectionFactory` bean is also provided by using the bean alias `xaJmsConnectionFactory`: [source,java,indent=0] ---- -include::{include-springbootfeatures}/jta/xa/MyBean.java[tag=*] +include::{docs-java}/features/jta/mixingxaandnonxaconnections/xa/MyBean.java[tag=*] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/messaging.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/messaging.adoc index e092c8cfe1..6fbdc7bb63 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/messaging.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/messaging.adoc @@ -138,7 +138,7 @@ Spring's `JmsTemplate` is auto-configured, and you can autowire it directly into [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/jms/template/MyBean.java[] +include::{docs-java}/features/messaging/jms/sending/MyBean.java[] ---- NOTE: {spring-framework-api}/jms/core/JmsMessagingTemplate.html[`JmsMessagingTemplate`] can be injected in a similar manner. @@ -163,7 +163,7 @@ The following component creates a listener endpoint on the `someQueue` destinati [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/jms/receiving/MyBean.java[] +include::{docs-java}/features/messaging/jms/receiving/MyBean.java[] ---- TIP: See {spring-framework-api}/jms/annotation/EnableJms.html[the Javadoc of `@EnableJms`] for more details. @@ -174,14 +174,14 @@ For instance, the following example exposes another factory that uses a specific [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/jms/receiving/custom/JmsConfiguration.java[] +include::{docs-java}/features/messaging/jms/receiving/custom/JmsConfiguration.java[] ---- Then you can use the factory in any `@JmsListener`-annotated method as follows: [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/jms/receiving/custom/MyBean.java[] +include::{docs-java}/features/messaging/jms/receiving/custom/MyBean.java[] ---- @@ -239,7 +239,7 @@ Spring's `AmqpTemplate` and `AmqpAdmin` are auto-configured, and you can autowir [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/amqp/sending/MyBean.java[] +include::{docs-java}/features/messaging/amqp/sending/MyBean.java[] ---- NOTE: {spring-amqp-api}/rabbit/core/RabbitMessagingTemplate.html[`RabbitMessagingTemplate`] can be injected in a similar manner. @@ -276,7 +276,7 @@ The following sample component creates a listener endpoint on the `someQueue` qu [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/amqp/receiving/MyBean.java[] +include::{docs-java}/features/messaging/amqp/receiving/MyBean.java[] ---- TIP: See {spring-amqp-api}/rabbit/annotation/EnableRabbit.html[the Javadoc of `@EnableRabbit`] for more details. @@ -290,14 +290,14 @@ For instance, the following configuration class exposes another factory that use [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/amqp/receiving/custom/RabbitConfiguration.java[] +include::{docs-java}/features/messaging/amqp/receiving/custom/RabbitConfiguration.java[] ---- Then you can use the factory in any `@RabbitListener`-annotated method, as follows: [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/amqp/receiving/custom/MyBean.java[] +include::{docs-java}/features/messaging/amqp/receiving/custom/MyBean.java[] ---- You can enable retries to handle situations where your listener throws an exception. @@ -341,7 +341,7 @@ Spring's `KafkaTemplate` is auto-configured, and you can autowire it directly in [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/kafka/sending/MyBean.java[] +include::{docs-java}/features/messaging/kafka/sending/MyBean.java[] ---- NOTE: If the property configprop:spring.kafka.producer.transaction-id-prefix[] is defined, a `KafkaTransactionManager` is automatically configured. @@ -358,7 +358,7 @@ The following component creates a listener endpoint on the `someTopic` topic: [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/kafka/receiving/MyBean.java[] +include::{docs-java}/features/messaging/kafka/receiving/MyBean.java[] ---- If a `KafkaTransactionManager` bean is defined, it is automatically associated to the container factory. @@ -387,7 +387,7 @@ To use the factory bean, wire `StreamsBuilder` into your `@Bean` as shown in the [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/KafkaStreamsConfiguration.java[] +include::{docs-java}/features/messaging/kafka/streams/KafkaStreamsConfiguration.java[] ---- By default, the streams managed by the `StreamBuilder` object it creates are started automatically. @@ -472,14 +472,14 @@ There are several ways to do that: [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/kafka/test/property/MyTest.java[tag=*] +include::{docs-java}/features/messaging/kafka/embedded/property/MyTest.java[tag=*] ---- * Configure a property name on the `@EmbeddedKafka` annotation: [source,java,indent=0] ---- -include::{include-springbootfeatures}/messaging/kafka/test/annotation/MyTest.java[] +include::{docs-java}/features/messaging/kafka/embedded/annotation/MyTest.java[] ---- * Use a placeholder in configuration properties: diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/nosql.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/nosql.adoc index 899c68e17e..cdc9bd12a6 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/nosql.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/nosql.adoc @@ -38,7 +38,7 @@ The following listing shows an example of such a bean: [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/redis/MyBean.java[] +include::{docs-java}/features/nosql/redis/connecting/MyBean.java[] ---- TIP: You can also register an arbitrary number of beans that implement `LettuceClientConfigurationBuilderCustomizer` for more advanced customizations. @@ -64,7 +64,7 @@ The following example shows how to connect to a MongoDB database: [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/mongodb/databasefactory/MyBean.java[] +include::{docs-java}/features/nosql/mongodb/connecting/MyBean.java[] ---- If you have defined your own `MongoClient`, it will be used to auto-configure a suitable `MongoDatabaseFactory`. @@ -115,14 +115,13 @@ As with `JdbcTemplate`, Spring Boot auto-configures a bean for you to inject the [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/mongodb/template/MyBean.java[] +include::{docs-java}/features/nosql/mongodb/template/MyBean.java[] ---- See the {spring-data-mongodb-api}/core/MongoOperations.html[`MongoOperations` Javadoc] for complete details. -[[features.nosql.mongodb.repositories]] [[features.nosql.mongodb.repositories]] ==== Spring Data MongoDB Repositories Spring Data includes repository support for MongoDB. @@ -133,7 +132,7 @@ You could take the JPA example from earlier and, assuming that `City` is now a M [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/mongodb/data/CityRepository.java[] +include::{docs-java}/features/nosql/mongodb/repositories/CityRepository.java[] ---- TIP: You can customize document scanning locations by using the `@EntityScan` annotation. @@ -175,7 +174,7 @@ The following example shows how to inject a Neo4j `Driver` that gives you access [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/neo4j/driver/MyBean.java[] +include::{docs-java}/features/nosql/neo4j/connecting/MyBean.java[] ---- You can configure various aspects of the driver using `spring.neo4j.*` properties. @@ -207,7 +206,7 @@ You could take the JPA example from earlier and define `City` as Spring Data Neo [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/neo4j/data/CityRepository.java[] +include::{docs-java}/features/nosql/neo4j/repositories/CityRepository.java[] ---- The `spring-boot-starter-data-neo4j` "`Starter`" enables the repository support as well as transaction management. @@ -223,7 +222,7 @@ To enable transaction management, the following bean must be defined in your con [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/Neo4jReactiveTransactionManagerConfiguration.java[] +include::{docs-java}/features/nosql/neo4j/repositories/Neo4jReactiveTransactionManagerConfiguration.java[] ---- ==== @@ -244,7 +243,7 @@ The following example shows how to inject a Solr bean: [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/solr/client/MyBean.java[] +include::{docs-java}/features/nosql/solr/connecting/MyBean.java[] ---- If you add your own `@Bean` of type `SolrClient`, it replaces the default. @@ -342,7 +341,7 @@ as shown in the following example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/elasticsearch/template/MyBean.java[] +include::{docs-java}/features/nosql/elasticsearch/connectingusingspringdata/MyBean.java[] ---- In the presence of `spring-data-elasticsearch` and the required dependencies for using a `WebClient` (typically `spring-boot-starter-webflux`), Spring Boot can also auto-configure a <> and a `ReactiveElasticsearchTemplate` as beans. @@ -435,7 +434,7 @@ The following code listing shows how to inject a Cassandra bean: [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/cassandra/template/MyBean.java[] +include::{docs-java}/features/nosql/cassandra/connecting/MyBean.java[] ---- If you add your own `@Bean` of type `CassandraTemplate`, it replaces the default. @@ -514,7 +513,7 @@ The following examples shows how to inject a `CouchbaseTemplate` bean: [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/couchbase/template/MyBean.java[] +include::{docs-java}/features/nosql/couchbase/repositories/MyBean.java[] ---- There are a few beans that you can define in your own configuration to override those provided by the auto-configuration: @@ -528,7 +527,7 @@ For instance, you can customize the converters to use, as follows: [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/couchbase/CouchbaseConversionsConfiguration.java[] +include::{docs-java}/features/nosql/couchbase/repositories/CouchbaseConversionsConfiguration.java[] ---- @@ -575,7 +574,7 @@ You can also inject an auto-configured `LdapTemplate` instance as you would with [source,java,indent=0] ---- -include::{include-springbootfeatures}/nosql/ldap/template/MyBean.java[] +include::{docs-java}/features/nosql/ldap/repositories/MyBean.java[] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/profiles.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/profiles.adoc index 66dbe79234..e2b7de5b82 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/profiles.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/profiles.adoc @@ -5,7 +5,7 @@ Any `@Component`, `@Configuration` or `@ConfigurationProperties` can be marked w [source,java,indent=0] ---- -include::{include-springbootfeatures}/profiles/ProductionConfiguration.java[] +include::{docs-java}/features/profiles/ProductionConfiguration.java[] ---- NOTE: If `@ConfigurationProperties` beans are registered via `@EnableConfigurationProperties` instead of automatic scanning, the `@Profile` annotation needs to be specified on the `@Configuration` class that has the `@EnableConfigurationProperties` annotation. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/quartz.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/quartz.adoc index 91cbc08f33..97725b7a66 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/quartz.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/quartz.adoc @@ -52,5 +52,5 @@ Regular beans can also be injected in a similar manner, as shown in the followin [source,java,indent=0] ---- -include::{include-springbootfeatures}/quartz/SampleJob.java[] +include::{docs-java}/features/quartz/SampleJob.java[] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/resttemplate.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/resttemplate.adoc index 00b69a58a7..2f917f7bb8 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/resttemplate.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/resttemplate.adoc @@ -9,7 +9,7 @@ The following code shows a typical example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/resttemplate/MyService.java[] +include::{docs-java}/features/resttemplate/MyService.java[] ---- TIP: `RestTemplateBuilder` includes a number of useful methods that can be used to quickly configure a `RestTemplate`. @@ -31,7 +31,7 @@ The following example shows a customizer that configures the use of a proxy for [source,java,indent=0] ---- -include::{include-springbootfeatures}/resttemplate/RestTemplateProxyCustomizer.java[] +include::{docs-java}/features/resttemplate/customization/RestTemplateProxyCustomizer.java[] ---- Finally, you can also create your own `RestTemplateBuilder` bean. @@ -40,7 +40,7 @@ The following example exposes a `RestTemplateBuilder` with what Spring Boot woul [source,java,indent=0] ---- -include::{include-springbootfeatures}/resttemplate/RestTemplateBuilderConfiguration.java[] +include::{docs-java}/features/resttemplate/customization/RestTemplateBuilderConfiguration.java[] ---- The most extreme (and rarely used) option is to create your own `RestTemplateBuilder` bean without using a configurer. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/rsocket.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/rsocket.adoc index 238ac662c7..3689b037b4 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/rsocket.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/rsocket.adoc @@ -82,5 +82,5 @@ The following code shows a typical example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/rsocket/MyService.java[] +include::{docs-java}/features/rsocket//requester/MyService.java[] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/security.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/security.adoc index a5828846ec..59d6a05f0c 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/security.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/security.adoc @@ -62,7 +62,7 @@ For example, you can customize your security configuration by adding something l [source,java,indent=0] ---- -include::{include-springbootfeatures}/security/CustomWebFluxSecurityConfiguration.java[] +include::{docs-java}/features/security/springwebflux/CustomWebFluxSecurityConfiguration.java[] ---- @@ -141,7 +141,7 @@ For example, for servlet applications, you can add your own `SecurityFilterChain [source,java,indent=0] ---- -include::{include-springbootfeatures}/security/OAuthClientConfiguration.java[] +include::{docs-java}/features/security/oauth2/client/OAuthClientConfiguration.java[] ---- TIP: Spring Boot auto-configures an `InMemoryOAuth2AuthorizedClientService` which is used by Spring Security for the management of client registrations. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/spring-application.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/spring-application.adoc index b7aa2ab159..12aba9857a 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/spring-application.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/spring-application.adoc @@ -5,7 +5,7 @@ In many situations, you can delegate to the static `SpringApplication.run` metho [source,java,indent=0] ---- -include::{include-springbootfeatures}/springapplication/main/run/MyApplication.java[] +include::{docs-java}/features/springapplication/MyApplication.java[] ---- When your application starts, you should see something similar to the following output: @@ -167,7 +167,7 @@ For example, to turn off the banner, you could write: [source,java,indent=0] ---- -include::{include-springbootfeatures}/springapplication/main/custom/MyApplication.java[] +include::{docs-java}/features/springapplication/customizingspringapplication/MyApplication.java[] ---- NOTE: The constructor arguments passed to `SpringApplication` are configuration sources for Spring beans. @@ -188,7 +188,7 @@ The `SpringApplicationBuilder` lets you chain together multiple method calls and [source,java,indent=0] ---- -include::{include-springbootfeatures}/springapplication/SpringApplicationBuilderExample.java[tag=*] +include::{docs-java}/features/springapplication/fluentbuilderapi/SpringApplicationBuilderExample.java[tag=*] ---- NOTE: There are some restrictions when creating an `ApplicationContext` hierarchy. @@ -242,14 +242,14 @@ For example, we can export the "Readiness" state of the application to a file so [source,java,indent=0] ---- -include::{include-springbootfeatures}/springapplication/availability/ReadinessStateExporter.java[] +include::{docs-java}/features/springapplication/applicationavailability/managing/ReadinessStateExporter.java[] ---- We can also update the state of the application, when the application breaks and cannot recover: [source,java,indent=0] ---- -include::{include-springbootfeatures}/springapplication/availability/LocalCacheVerifier.java[] +include::{docs-java}/features/springapplication/applicationavailability/managing/LocalCacheVerifier.java[] ---- Spring Boot provides <>. @@ -334,7 +334,7 @@ The `ApplicationArguments` interface provides access to both the raw `String[]` [source,java,indent=0] ---- -include::{include-springbootfeatures}/springapplication/ApplicationArgumentsExample.java[] +include::{docs-java}/features/springapplication/applicationarguments/ApplicationArgumentsExample.java[] ---- TIP: Spring Boot also registers a `CommandLinePropertySource` with the Spring `Environment`. @@ -355,7 +355,7 @@ The following example shows a `CommandLineRunner` with a `run` method: [source,java,indent=0] ---- -include::{include-springbootfeatures}/springapplication/CommandLineRunnerExample.java[] +include::{docs-java}/features/springapplication/commandlinerunner/CommandLineRunnerExample.java[] ---- If several `CommandLineRunner` or `ApplicationRunner` beans are defined that must be called in a specific order, you can additionally implement the `org.springframework.core.Ordered` interface or use the `org.springframework.core.annotation.Order` annotation. @@ -372,7 +372,7 @@ This exit code can then be passed to `System.exit()` to return it as a status co [source,java,indent=0] ---- -include::{include-springbootfeatures}/springapplication/exitcode/MyApplication.java[] +include::{docs-java}/features/springapplication/applicationexit/MyApplication.java[] ---- Also, the `ExitCodeGenerator` interface may be implemented by exceptions. @@ -403,7 +403,7 @@ For example, to use the `BufferingApplicationStartup`, you could write: [source,java,indent=0] ---- -include::{include-springbootfeatures}/springapplication/startup/MyApplication.java[tag=*] +include::{docs-java}/features/springapplication/startuptracking/MyApplication.java[tag=*] ---- The first available implementation, `FlightRecorderApplicationStartup` is provided by Spring Framework. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/sql.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/sql.adoc index 6f7108f3e0..73b2fc57b5 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/sql.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/sql.adoc @@ -160,7 +160,7 @@ Spring's `JdbcTemplate` and `NamedParameterJdbcTemplate` classes are auto-config [source,java,indent=0] ---- -include::{include-springbootfeatures}/sql/jdbctemplate/MyBean.java[] +include::{docs-java}/features/sql/jdbctemplate/MyBean.java[] ---- You can customize some properties of the template by using the `spring.jdbc.template.*` properties, as shown in the following example: @@ -204,7 +204,7 @@ A typical entity class resembles the following example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/sql/jpa/City.java[] +include::{docs-java}/features/sql/jpaandspringdata/entityclasses/City.java[] ---- TIP: You can customize entity scanning locations by using the `@EntityScan` annotation. @@ -227,7 +227,7 @@ The following example shows a typical Spring Data repository interface definitio [source,java,indent=0] ---- -include::{include-springbootfeatures}/sql/jpa/CityRepository.java[] +include::{docs-java}/features/sql/jpaandspringdata/repositories/CityRepository.java[] ---- Spring Data JPA repositories support three different modes of bootstrapping: default, deferred, and lazy. @@ -368,7 +368,7 @@ To use the `DSLContext`, you can inject it, as shown in the following example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/sql/jooq/JooqExample.java[tag=!method] +include::{docs-java}/features/sql/jooq/dslcontext/JooqExample.java[tag=!method] ---- TIP: The jOOQ manual tends to use a variable named `create` to hold the `DSLContext`. @@ -377,7 +377,7 @@ You can then use the `DSLContext` to construct your queries, as shown in the fol [source,java,indent=0] ---- -include::{include-springbootfeatures}/sql/jooq/JooqExample.java[tag=method] +include::{docs-java}/features/sql/jooq/dslcontext/JooqExample.java[tag=method] ---- @@ -430,14 +430,14 @@ The following example shows how to manually override the database port while the [source,java,indent=0] ---- -include::{include-springbootfeatures}/sql/r2dbc/CustomizeR2dbcPortConfiguration.java[tag=*] +include::{docs-java}/features/sql/r2dbc/CustomizeR2dbcPortConfiguration.java[tag=*] ---- The following examples show how to set some PostgreSQL connection options: [source,java,indent=0] ---- -include::{include-springbootfeatures}/sql/r2dbc/CustomizeR2dbcPostgresOptionsConfiguration.java[tag=*] +include::{docs-java}/features/sql/r2dbc/CustomizeR2dbcPostgresOptionsConfiguration.java[tag=*] ---- When a `ConnectionFactory` bean is available, the regular JDBC `DataSource` auto-configuration backs off. @@ -474,7 +474,7 @@ A `DatabaseClient` bean is auto-configured, and you can `@Autowire` it directly [source,java,indent=0] ---- -include::{include-springbootfeatures}/sql/r2dbc/databaseclient/MyBean.java[tag=*] +include::{docs-java}/features/sql/r2dbc/usingdatabaseclient/MyBean.java[tag=*] ---- @@ -494,7 +494,7 @@ The following example shows a typical Spring Data repository interface definitio [source,java,indent=0] ---- -include::{include-springbootfeatures}/sql/r2dbc/CityRepository.java[tag=*] +include::{docs-java}/features/sql/r2dbc/repositories/CityRepository.java[tag=*] ---- TIP: We have barely scratched the surface of Spring Data R2DBC. For complete details, see the {spring-data-r2dbc-docs}[Spring Data R2DBC reference documentation]. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc index 5458a5f630..632d4b90bc 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc @@ -107,7 +107,7 @@ If you want to test a reactive web application in this scenario, you must set th [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/detection/MyWebFluxTests.java[] +include::{docs-java}/features/testing/springbootapplications/detectingwebapptype/MyWebFluxTests.java[] ---- @@ -150,7 +150,7 @@ You can then import that class explicitly where it is required, as shown in the [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/excluding/MyTests.java[] +include::{docs-java}/features/testing/springbootapplications/excludingconfiguration/MyTests.java[] ---- NOTE: If you directly use `@ComponentScan` (that is, not through `@SpringBootApplication`) you need to register the `TypeExcludeFilter` with it. @@ -165,7 +165,7 @@ have `@SpringBootTest` inject them using the `args` attribute. [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/ApplicationArgumentTests.java[] +include::{docs-java}/features/testing/springbootapplications/usingapplicationarguments/ApplicationArgumentTests.java[] ---- @@ -177,7 +177,7 @@ If you have web endpoints that you want to test against this mock environment, y [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/MockMvcTests.java[] +include::{docs-java}/features/testing/springbootapplications/withmockenvironment/MockMvcTests.java[] ---- TIP: If you want to focus only on the web layer and not start a complete `ApplicationContext`, consider <>. @@ -186,7 +186,7 @@ Alternatively, you can configure a {spring-framework-docs}/testing.html#webtestc [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/MockWebTestClientTests.java[] +include::{docs-java}/features/testing/springbootapplications/withmockenvironment/MockWebTestClientTests.java[] ---- [TIP] @@ -211,7 +211,7 @@ For convenience, tests that need to make REST calls to the started server can ad [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/RandomPortWebTestClientTests.java[] +include::{docs-java}/features/testing/springbootapplications/withrunningserver/RandomPortWebTestClientTests.java[] ---- This setup requires `spring-webflux` on the classpath. @@ -219,7 +219,7 @@ If you can't or won't add webflux, Spring Boot also provides a `TestRestTemplate [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/RandomPortTestRestTemplateTests.java[] +include::{docs-java}/features/testing/springbootapplications/withrunningserver/RandomPortTestRestTemplateTests.java[] ---- @@ -238,7 +238,7 @@ If such test needs access to an `MBeanServer`, consider marking it dirty as well [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/jmx/SampleJmxTests.java[] +include::{docs-java}/features/testing/springbootapplications/jmx/SampleJmxTests.java[] ---- @@ -270,7 +270,7 @@ To use this feature with a different arrangement, listeners must be explicitly a [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/mocking/listener/MyTests.java[] +include::{docs-java}/features/testing/springbootapplications/mockingbeans/listener/MyTests.java[] ---- ==== @@ -279,7 +279,7 @@ The following example replaces an existing `RemoteService` bean with a mock impl [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/mocking/MyTests.java[] +include::{docs-java}/features/testing/springbootapplications/mockingbeans/bean/MyTests.java[] ---- NOTE: `@MockBean` cannot be used to mock the behavior of a bean that's exercised during application context refresh. @@ -345,7 +345,7 @@ The following example shows a test class for Jackson: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/json/MyJsonTests.java[] +include::{docs-java}/features/testing/springbootapplications/jsontests/MyJsonTests.java[] ---- NOTE: JSON helper classes can also be used directly in standard unit tests. @@ -357,7 +357,7 @@ For instance, the following example asserts that the actual number is a float va [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/json/AssertJ.java[tag=*] +include::{docs-java}/features/testing/springbootapplications/jsontests/AssertJ.java[tag=*] ---- @@ -383,7 +383,7 @@ The following example uses `MockMvc`: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/mvc/MyControllerTests.java[] +include::{docs-java}/features/testing/springbootapplications/springmvctests/MyControllerTests.java[] ---- TIP: If you need to configure elements of the auto-configuration (for example, when servlet filters should be applied) you can use attributes in the `@AutoConfigureMockMvc` annotation. @@ -393,7 +393,7 @@ The following example uses HtmlUnit: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/mvc/MyHtmlUnitTests.java[] +include::{docs-java}/features/testing/springbootapplications/springmvctests/MyHtmlUnitTests.java[] ---- NOTE: By default, Spring Boot puts `WebDriver` beans in a special "`scope`" to ensure that the driver exits after each test and that a new instance is injected. @@ -430,7 +430,7 @@ The following example shows a class that uses both `@WebFluxTest` and a `WebTest [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/webflux/MyControllerTests.java[] +include::{docs-java}/features/testing/springbootapplications/springwebfluxtests/MyControllerTests.java[] ---- TIP: This setup is only supported by WebFlux applications as using `WebTestClient` in a mocked web application only works with WebFlux at the moment. @@ -459,7 +459,7 @@ The following example shows a typical setup for using Cassandra tests in Spring [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/cassandra/MyDataCassandraTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringdatacassandra/MyDataCassandraTests.java[] ---- @@ -483,7 +483,7 @@ If that is not what you want, you can disable transaction management for a test [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/jpa/MyNonTransactionalTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringdatajpa/MyNonTransactionalTests.java[] ---- Data JPA tests may also inject a {spring-boot-test-autoconfigure-module-code}/orm/jpa/TestEntityManager.java[`TestEntityManager`] bean, which provides an alternative to the standard JPA `EntityManager` that is specifically designed for tests. @@ -493,7 +493,7 @@ The following example shows the `@DataJpaTest` annotation in use: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/jpa/MyRepositoryTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringdatajpa/withoutdb/MyRepositoryTests.java[] ---- In-memory embedded databases generally work well for tests, since they are fast and do not require any installation. @@ -501,7 +501,7 @@ If, however, you prefer to run tests against a real database you can use the `@A [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/jpa/db/MyRepositoryTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringdatajpa/withdb/MyRepositoryTests.java[] ---- @@ -521,7 +521,7 @@ If that is not what you want, you can disable transaction management for a test [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/jdbc/MyTransactionalTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredjdbc/MyTransactionalTests.java[] ---- If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `DataJpaTest`. @@ -563,7 +563,7 @@ The following example shows the `@JooqTest` annotation in use: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/jooq/MyJooqTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredjooq/MyJooqTests.java[] ---- JOOQ tests are transactional and roll back at the end of each test by default. @@ -585,7 +585,7 @@ The following class shows the `@DataMongoTest` annotation in use: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/mongodb/MyDataMongoDbTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringdatamongodb/withoutdb/MyDataMongoDbTests.java[] ---- In-memory embedded MongoDB generally works well for tests, since it is fast and does not require any developer installation. @@ -593,7 +593,7 @@ If, however, you prefer to run tests against a real MongoDB server, you should e [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/mongodb/db/MyDataMongoDbTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringdatamongodb/withdb/MyDataMongoDbTests.java[] ---- @@ -612,7 +612,7 @@ The following example shows a typical setup for using Neo4J tests in Spring Boot [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/neo4j/MyDataNeo4jTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringdataneo4j/propagation/MyDataNeo4jTests.java[] ---- By default, Data Neo4j tests are transactional and roll back at the end of each test. @@ -621,7 +621,7 @@ If that is not what you want, you can disable transaction management for a test [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/neo4j/tx/MyDataNeo4jTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringdataneo4j/nopropagation/MyDataNeo4jTests.java[] ---- NOTE: Transactional tests are not supported with reactive access. @@ -643,7 +643,7 @@ The following example shows the `@DataRedisTest` annotation in use: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/redis/MyDataRedisTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringdataredis/MyDataRedisTests.java[] ---- @@ -662,7 +662,7 @@ The following example shows the `@DataLdapTest` annotation in use: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/ldap/MyDataLdapTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringdataldap/inmemory/MyDataLdapTests.java[] ---- In-memory embedded LDAP generally works well for tests, since it is fast and does not require any developer installation. @@ -670,7 +670,7 @@ If, however, you prefer to run tests against a real LDAP server, you should excl [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/data/ldap/server/MyDataLdapTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringdataldap/server/MyDataLdapTests.java[] ---- @@ -688,7 +688,7 @@ The specific beans that you want to test should be specified by using the `value [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/restclient/MyRestClientTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredrestclient/MyRestClientTests.java[] ---- @@ -710,14 +710,14 @@ You can inject it by using `@Autowired` and use it in your tests as you normally [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/restdocs/mvc/UserDocumentationTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/UserDocumentationTests.java[] ---- If you require more control over Spring REST Docs configuration than offered by the attributes of `@AutoConfigureRestDocs`, you can use a `RestDocsMockMvcConfigurationCustomizer` bean, as shown in the following example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/restdocs/mvc/CustomizationConfiguration.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/CustomizationConfiguration.java[] ---- If you want to make use of Spring REST Docs support for a parameterized output directory, you can create a `RestDocumentationResultHandler` bean. @@ -726,7 +726,7 @@ The following example shows a `RestDocumentationResultHandler` being defined: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/restdocs/mvc/ResultHandlerConfiguration.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/ResultHandlerConfiguration.java[] ---- @@ -738,14 +738,14 @@ You can inject it by using `@Autowired` and use it in your tests as you normally [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/restdocs/webclient/UsersDocumentationTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringrestdocs/withwebtestclient/UsersDocumentationTests.java[] ---- If you require more control over Spring REST Docs configuration than offered by the attributes of `@AutoConfigureRestDocs`, you can use a `RestDocsWebTestClientConfigurationCustomizer` bean, as shown in the following example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/restdocs/webclient/AdvancedRestDocsConfiguration.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringrestdocs/withwebtestclient/AdvancedRestDocsConfiguration.java[] ---- @@ -757,14 +757,14 @@ You can inject it by using `@Autowired` and use it in your tests as you normally [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/restdocs/restassured/UserDocumentationTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringrestdocs/withrestassured/UserDocumentationTests.java[] ---- If you require more control over Spring REST Docs configuration than offered by the attributes of `@AutoConfigureRestDocs`, a `RestDocsRestAssuredConfigurationCustomizer` bean can be used, as shown in the following example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/restdocs/restassured/AdvancedRestDocsConfiguration.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredspringrestdocs/withrestassured/AdvancedRestDocsConfiguration.java[] ---- @@ -782,7 +782,7 @@ The following example shows the `@WebServiceClientTest` annotation in use: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/webservices/MyWebServiceClientTests.java[] +include::{docs-java}/features/testing/springbootapplications/autoconfiguredwebservices/MyWebServiceClientTests.java[] ---- @@ -794,7 +794,7 @@ Additional auto-configurations can be added on a test-by-test basis by creating [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/slicing/ExampleJdbcTests.java[] +include::{docs-java}/features/testing/springbootapplications/additionalautoconfigurationandslicing/ExampleJdbcTests.java[] ---- NOTE: Make sure to not use the regular `@Import` annotation to import auto-configurations as they are handled in a specific way by Spring Boot. @@ -821,7 +821,7 @@ You could define your `@SpringBootApplication` as follows: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/slicing/SampleApplication.java[] +include::{docs-java}/features/testing/springbootapplications/userconfigurationandslicing/SampleApplication.java[] ---- Because this class is the source configuration for the test, any slice test actually tries to start Spring Batch, which is definitely not what you want to do. @@ -829,7 +829,7 @@ A recommended approach is to move that area-specific configuration to a separate [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/slicing/BatchConfiguration.java[] +include::{docs-java}/features/testing/springbootapplications/userconfigurationandslicing/BatchConfiguration.java[] ---- NOTE: Depending on the complexity of your application, you may either have a single `@Configuration` class for your customizations or one class per domain area. @@ -840,14 +840,14 @@ For example, for a `@WebMvcTest`, the following configuration will not include t [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/slicing/WebConfiguration.java[] +include::{docs-java}/features/testing/springbootapplications/userconfigurationandslicing/WebConfiguration.java[] ---- The configuration below will, however, cause the custom `WebMvcConfigurer` to be loaded by the test slice. [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/slicing/TestWebMvcConfigurer.java[] +include::{docs-java}/features/testing/springbootapplications/userconfigurationandslicing/TestWebMvcConfigurer.java[] ---- Another source of confusion is classpath scanning. @@ -856,7 +856,7 @@ Your application may resemble the following code: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/applications/slicing/scan/SampleApplication.java[] +include::{docs-java}/features/testing/springbootapplications/userconfigurationandslicing/scan/SampleApplication.java[] ---- Doing so effectively overrides the default component scan directive with the side effect of scanning those two packages regardless of the slice that you chose. @@ -892,7 +892,7 @@ You can use it when you do not need the full set of features provided by `@Sprin [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/utils/MyConfigFileTests.java[] +include::{docs-java}/features/testing/utilities/configdataapplicationcontextinitializer/MyConfigFileTests.java[] ---- NOTE: Using `ConfigDataApplicationContextInitializer` alone does not provide support for `@Value("${...}")` injection. @@ -908,7 +908,7 @@ You can call it with `key=value` strings, as follows: [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/utils/MyEnvironmentTests.java[tag=*] +include::{docs-java}/features/testing/utilities/testpropertyvalues/MyEnvironmentTests.java[tag=*] ---- @@ -920,7 +920,7 @@ To use add `@ExtendWith(OutputCaptureExtension.class)` and inject `CapturedOutpu [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/OutputCaptureTests.java[] +include::{docs-java}/features/testing/utilities/outputcapture/OutputCaptureTests.java[] ---- @@ -945,7 +945,7 @@ If you do use Apache's HTTP client, some additional test-friendly features are e [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/utils/testresttemplate/MyTest.java[] +include::{docs-java}/features/testing/utilities/testresttemplate/MyTests.java[] ---- Alternatively, if you use the `@SpringBootTest` annotation with `WebEnvironment.RANDOM_PORT` or `WebEnvironment.DEFINED_PORT`, you can inject a fully configured `TestRestTemplate` and start using it. @@ -954,5 +954,5 @@ Any URLs that do not specify a host and port automatically connect to the embedd [source,java,indent=0] ---- -include::{include-springbootfeatures}/testing/webclient/SampleWebClientTests.java[] +include::{docs-java}/features/testing/utilities/testresttemplate/MySpringBootTests.java[] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/validation.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/validation.adoc index 5281aaf696..74684fe488 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/validation.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/validation.adoc @@ -8,5 +8,5 @@ For instance, the following service triggers the validation of the first argumen [source,java,indent=0] ---- -include::{include-springbootfeatures}/validation/MyBean.java[] +include::{docs-java}/features/validation/MyBean.java[] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/webclient.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/webclient.adoc index 2b4fb3c9a6..b25a880f8e 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/webclient.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/webclient.adoc @@ -11,7 +11,7 @@ The following code shows a typical example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/webclient/MyService.java[] +include::{docs-java}/features/webclient/MyService.java[] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/webservices.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/webservices.adoc index 6690da5f7b..8c470f4707 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/webservices.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/webservices.adoc @@ -27,7 +27,7 @@ The following code shows a typical example: [source,java,indent=0] ---- -include::{include-springbootfeatures}/webservices/MyService.java[] +include::{docs-java}/features/webservices/template/MyService.java[] ---- By default, `WebServiceTemplateBuilder` detects a suitable HTTP-based `WebServiceMessageSender` using the available HTTP client libraries on the classpath. @@ -35,5 +35,5 @@ You can also customize read and connection timeouts as follows: [source,java,indent=0] ---- -include::{include-springbootfeatures}/webservices/MyWebServiceTemplateConfiguration.java[] +include::{docs-java}/features/webservices/template/MyWebServiceTemplateConfiguration.java[] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/actuator.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/actuator.adoc index e0e9190c26..829bc73767 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/actuator.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/actuator.adoc @@ -34,7 +34,6 @@ See also the section on "`<>`"). +If you need to externalize some settings, you can bind your `DataSource` to the environment (see "`<>`"). The following example shows how to define a data source in a bean: @@ -43,7 +43,7 @@ The following example shows how to create a data source by using a `DataSourceBu [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-howto}/dataaccess/BasicDataSourceConfiguration.java[tag=*] +include::{docs-java}/howto/dataaccess/configurecustomdatasource/BasicDataSourceConfiguration.java[tag=*] ---- To run an app with that `DataSource`, all you need is the connection information. @@ -84,7 +84,7 @@ The following example shows how create a `HikariDataSource` with `DataSourceBuil [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-howto}/dataaccess/SimpleDataSourceConfiguration.java[tag=*] +include::{docs-java}/howto/dataaccess/configurecustomdatasource/SimpleDataSourceConfiguration.java[tag=*] ---- You can even go further by leveraging what `DataSourceProperties` does for you -- that is, by providing a default embedded database with a sensible username and password if no URL is provided. @@ -94,7 +94,7 @@ To avoid that, you can redefine a custom `DataSourceProperties` on your custom n [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-howto}/dataaccess/ConfigurableDataSourceConfiguration.java[tag=*] +include::{docs-java}/howto/dataaccess/configurecustomdatasource/ConfigurableDataSourceConfiguration.java[tag=*] ---- This setup puts you _in sync_ with what Spring Boot does for you by default, except that a dedicated connection pool is chosen (in code) and its settings are exposed in the `app.datasource.configuration` sub namespace. @@ -131,7 +131,7 @@ In the following example, we provide the _exact_ same feature set as the auto-co [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-howto}/dataaccess/SimpleDataSourcesConfiguration.java[tag=*] +include::{docs-java}/howto/dataaccess/configuretwodatasources/SimpleDataSourcesConfiguration.java[tag=*] ---- TIP: `firstDataSourceProperties` has to be flagged as `@Primary` so that the database initializer feature uses your copy (if you use the initializer). @@ -161,7 +161,7 @@ You can apply the same concept to the secondary `DataSource` as well, as shown i [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-howto}/dataaccess/CompleteDataSourcesConfiguration.java[tag=*] +include::{docs-java}/howto/dataaccess/configuretwodatasources/CompleteDataSourcesConfiguration.java[tag=*] ---- The preceding example configures two data sources on custom namespaces with the same logic as Spring Boot would use in auto-configuration. @@ -255,7 +255,7 @@ This implementation provides the same table structure as Hibernate 4: all dots a [source,java,indent=0] ---- -include::{include-howto}/dataaccess/CaseSensitiveSpringPhysicalNamingStrategyConfiguration.java[tag=*] +include::{docs-java}/howto/dataaccess/configurehibernatenamingstrategy/CaseSensitiveSpringPhysicalNamingStrategyConfiguration.java[tag=*] ---- If you prefer to use Hibernate 5's default instead, set the following property: @@ -289,7 +289,7 @@ Then, add a `HibernatePropertiesCustomizer` bean as shown in the following examp [source,java,indent=0] ---- -include::{include-howto}/dataaccess/HibernateSecondLevelCacheConfiguration.java[tag=*] +include::{docs-java}/howto/dataaccess/configurehibernatesecondlevelcaching/HibernateSecondLevelCacheConfiguration.java[tag=*] ---- This customizer will configure Hibernate to use the same `CacheManager` as the one that the application uses. @@ -322,7 +322,7 @@ You can also reuse `JpaProperties` to bind settings for each `EntityManagerFacto [source,java,pending-extract=true,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-howto}/dataaccess/CustomEntityManagerFactoryExample.java[tag=*] +include::{docs-java}/howto/dataaccess/usemultipleentitymanagers/CustomEntityManagerFactoryExample.java[tag=*] ---- The example above creates an `EntityManagerFactory` using a `DataSource` bean named `firstDataSource`. @@ -413,7 +413,7 @@ For example, if you use Hibernate Search with Elasticsearch as its index manager [source,java,indent=0] ---- -include::{include-howto}/dataaccess/ElasticsearchEntityManagerFactoryDependsOnPostProcessor.java[tag=*] +include::{docs-java}/howto/dataaccess/configureacomponentthatisusedbyjpa/ElasticsearchEntityManagerFactoryDependsOnPostProcessor.java[tag=*] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/http-clients.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/http-clients.adoc index 1d6c050878..df382bfaff 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/http-clients.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/http-clients.adoc @@ -11,12 +11,6 @@ As described in <>, you can use a This is the recommended approach for creating a `RestTemplate` configured to use a proxy. The exact details of the proxy configuration depend on the underlying client request factory that is being used. -The following example configures `HttpComponentsClientRequestFactory` with an `HttpClient` that uses a proxy for all hosts except `192.168.0.5`: - -[source,java,indent=0] ----- -include::{include-springbootfeatures}/resttemplate/RestTemplateProxyCustomizer.java[tag=*] ----- @@ -28,7 +22,7 @@ The following example configures a 60 second connect timeout and adds a `ReadTim [source,java,indent=0] ---- -include::{include-howto}/httpclients/CustomizeReactorNettyClientConfiguration.java[tag=*] +include::{docs-java}/howto/httpclients/webclientreactornettycustomization/CustomizeReactorNettyClientConfiguration.java[tag=*] ---- TIP: Note the use of `ReactorResourceFactory` for the connection provider and event loop resources. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/jersey.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/jersey.adoc index 2aadd44a7b..b61499de7e 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/jersey.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/jersey.adoc @@ -13,7 +13,7 @@ The `jersey.config.server.response.setStatusOverSendError` property must be set [source,java,indent=0] ---- -include::{include-howto}/jersey/JerseySetStatusOverSendErrorConfig.java[tag=*] +include::{docs-java}/howto/jersey/springsecurity/JerseySetStatusOverSendErrorConfig.java[tag=*] ---- diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc index f338788b6b..fb04698a49 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc @@ -464,7 +464,7 @@ You can add an `org.apache.catalina.connector.Connector` to the `TomcatServletWe [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-howto}/embeddedwebservers/TomcatMultipleConnectorsConfiguration.java[tag=*] +include::{docs-java}/howto/webserver/enablemultipleconnectorsintomcat/TomcatMultipleConnectorsConfiguration.java[tag=*] ---- @@ -484,7 +484,7 @@ To switch to the `LegacyCookieProcessor`, use an `WebServerFactoryCustomizer` be [source,java,indent=0] ---- -include::{include-howto}/embeddedwebservers/LegacyCookieProcessorConfiguration.java[tag=*] +include::{docs-java}/howto/webserver/usetomcatlegacycookieprocessor/LegacyCookieProcessorConfiguration.java[tag=*] ---- @@ -511,7 +511,7 @@ Add an `UndertowBuilderCustomizer` to the `UndertowServletWebServerFactory` and [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- -include::{include-howto}/embeddedwebservers/UndertowMultipleListenersConfiguration.java[tag=*] +include::{docs-java}/howto/webserver/enablemultiplelistenersinundertow/UndertowMultipleListenersConfiguration.java[tag=*] ---- diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/cloudfoundry/CloudFoundryCustomContextPathConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/cloudfoundry/customcontextpath/CloudFoundryCustomContextPathConfiguration.java similarity index 97% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/cloudfoundry/CloudFoundryCustomContextPathConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/cloudfoundry/customcontextpath/CloudFoundryCustomContextPathConfiguration.java index 7264c032db..6757eea58b 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/cloudfoundry/CloudFoundryCustomContextPathConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/cloudfoundry/customcontextpath/CloudFoundryCustomContextPathConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.productionreadyfeatures.cloudfoundry; +package org.springframework.boot.docs.actuator.cloudfoundry.customcontextpath; // tag::code[] import java.io.IOException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/endpoints/CustomEndpoint.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/implementingcustom/CustomEndpoint.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/endpoints/CustomEndpoint.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/implementingcustom/CustomEndpoint.java index b23bef3c30..74eca85acb 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/endpoints/CustomEndpoint.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/implementingcustom/CustomEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.productionreadyfeatures.endpoints; +package org.springframework.boot.docs.actuator.endpoints.implementingcustom; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/MetricsFilterConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/customizing/MetricsFilterConfiguration.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/MetricsFilterConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/customizing/MetricsFilterConfiguration.java index b1d6e6335d..238c3ca63c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/MetricsFilterConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/customizing/MetricsFilterConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.productionreadyfeatures.metrics; +package org.springframework.boot.docs.actuator.metrics.customizing; // tag::code[] import io.micrometer.core.instrument.config.MeterFilter; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/MetricsMeterRegistryInjection.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/registeringcustom/MetricsMeterRegistryInjection.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/MetricsMeterRegistryInjection.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/registeringcustom/MetricsMeterRegistryInjection.java index 093a7edac8..9c5c440809 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/MetricsMeterRegistryInjection.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/registeringcustom/MetricsMeterRegistryInjection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.productionreadyfeatures.metrics; +package org.springframework.boot.docs.actuator.metrics.registeringcustom; //tag::code[] import java.util.Collections; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/SampleMeterBinderConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/registeringcustom/SampleMeterBinderConfiguration.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/SampleMeterBinderConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/registeringcustom/SampleMeterBinderConfiguration.java index 18d28419d9..35e894c975 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/SampleMeterBinderConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/registeringcustom/SampleMeterBinderConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.productionreadyfeatures.metrics; +package org.springframework.boot.docs.actuator.metrics.registeringcustom; // tag::code[] import io.micrometer.core.instrument.Gauge; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/mongo/SampleCommandTagsProviderConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/supported/mongodb/command/SampleCommandTagsProviderConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/mongo/SampleCommandTagsProviderConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/supported/mongodb/command/SampleCommandTagsProviderConfiguration.java index f5ae3e2c80..a8e817524f 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/mongo/SampleCommandTagsProviderConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/supported/mongodb/command/SampleCommandTagsProviderConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.productionreadyfeatures.metrics.mongo; +package org.springframework.boot.docs.actuator.metrics.supported.mongodb.command; import com.mongodb.event.CommandEvent; import io.micrometer.core.instrument.Tag; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/mongo/SampleConnectionPoolTagsProviderConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/supported/mongodb/connectionpool/SampleConnectionPoolTagsProviderConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/mongo/SampleConnectionPoolTagsProviderConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/supported/mongodb/connectionpool/SampleConnectionPoolTagsProviderConfiguration.java index 0696a652d5..850a820340 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/mongo/SampleConnectionPoolTagsProviderConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/metrics/supported/mongodb/connectionpool/SampleConnectionPoolTagsProviderConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.productionreadyfeatures.metrics.mongo; +package org.springframework.boot.docs.actuator.metrics.supported.mongodb.connectionpool; // tag::code[] import com.mongodb.event.ConnectionPoolCreatedEvent; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/caching/MathService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/MathService.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/caching/MathService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/MathService.java index fd2e8cba4a..4bd866be50 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/caching/MathService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/MathService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.caching; +package org.springframework.boot.docs.features.caching; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/caching/CacheManagerCustomizerConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/provider/CacheManagerCustomizerConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/caching/CacheManagerCustomizerConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/provider/CacheManagerCustomizerConfiguration.java index a3390a830c..0dfeff31bc 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/caching/CacheManagerCustomizerConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/provider/CacheManagerCustomizerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.caching; +package org.springframework.boot.docs.features.caching.provider; import org.springframework.boot.autoconfigure.cache.CacheManagerCustomizer; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/CouchbaseCacheManagerConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/provider/couchbase/CouchbaseCacheManagerConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/CouchbaseCacheManagerConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/provider/couchbase/CouchbaseCacheManagerConfiguration.java index b652a8cf70..ba23a5ca82 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/CouchbaseCacheManagerConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/provider/couchbase/CouchbaseCacheManagerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql; +package org.springframework.boot.docs.features.caching.provider.couchbase; import java.time.Duration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/RedisCacheManagerConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/provider/redis/RedisCacheManagerConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/RedisCacheManagerConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/provider/redis/RedisCacheManagerConfiguration.java index 8a02a4c6bb..e0217b868a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/RedisCacheManagerConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/caching/provider/redis/RedisCacheManagerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql; +package org.springframework.boot.docs.features.caching.provider.redis; import java.time.Duration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/beanconditions/MyAutoConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/MyAutoConfiguration.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/beanconditions/MyAutoConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/MyAutoConfiguration.java index 5b8c0f5f5e..2ac32c4f2a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/beanconditions/MyAutoConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/MyAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.creatingautoconfiguration.beanconditions; +package org.springframework.boot.docs.features.developingautoconfiguration.conditionannotations.beanconditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/beanconditions/SomeService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/SomeService.java similarity index 85% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/beanconditions/SomeService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/SomeService.java index a4d8b57c61..9335d3e90d 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/beanconditions/SomeService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/SomeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.creatingautoconfiguration.beanconditions; +package org.springframework.boot.docs.features.developingautoconfiguration.conditionannotations.beanconditions; public class SomeService { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/classconditions/MyAutoConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/MyAutoConfiguration.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/classconditions/MyAutoConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/MyAutoConfiguration.java index 1b9f3fff75..3db21879f2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/classconditions/MyAutoConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/MyAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.creatingautoconfiguration.classconditions; +package org.springframework.boot.docs.features.developingautoconfiguration.conditionannotations.classconditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/classconditions/SomeService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/SomeService.java similarity index 85% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/classconditions/SomeService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/SomeService.java index ae9de297ae..5d4c432083 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/classconditions/SomeService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/SomeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.creatingautoconfiguration.classconditions; +package org.springframework.boot.docs.features.developingautoconfiguration.conditionannotations.classconditions; class SomeService { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/configurationkeys/AcmeProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/customstarter/configurationkeys/AcmeProperties.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/configurationkeys/AcmeProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/customstarter/configurationkeys/AcmeProperties.java index 1701ecd6fe..efb304f41b 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/configurationkeys/AcmeProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/customstarter/configurationkeys/AcmeProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.creatingautoconfiguration.configurationkeys; +package org.springframework.boot.docs.features.developingautoconfiguration.customstarter.configurationkeys; import java.time.Duration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/ConditionEvaluationReportTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/ConditionEvaluationReportTests.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/ConditionEvaluationReportTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/ConditionEvaluationReportTests.java index 3b012f9c53..3baff5dcaa 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/ConditionEvaluationReportTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/ConditionEvaluationReportTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.developingautoconfiguration.testing; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/UserService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserService.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/UserService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserService.java index edc4e8363c..ed443db2da 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/UserService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.developingautoconfiguration.testing; public class UserService { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/UserServiceAutoConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserServiceAutoConfiguration.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/UserServiceAutoConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserServiceAutoConfiguration.java index e844120284..2371133d06 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/UserServiceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserServiceAutoConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.developingautoconfiguration.testing; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.docs.springbootfeatures.testing.UserServiceAutoConfiguration.UserProperties; +import org.springframework.boot.docs.features.developingautoconfiguration.testing.UserServiceAutoConfiguration.UserProperties; 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/springbootfeatures/testing/UserServiceAutoConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserServiceAutoConfigurationTests.java similarity index 96% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/UserServiceAutoConfigurationTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserServiceAutoConfigurationTests.java index 3250a45467..1110cef9e3 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/UserServiceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserServiceAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.developingautoconfiguration.testing; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/embeddedservletcontainer/CustomizationBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/CustomizationBean.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/embeddedservletcontainer/CustomizationBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/CustomizationBean.java index 1d6bed263a..e3a3ab0099 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/embeddedservletcontainer/CustomizationBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/CustomizationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.embeddedservletcontainer; +package org.springframework.boot.docs.features.developingwebapplications.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/springbootfeatures/webapplications/embeddedservletcontainer/TomcatServerCustomizer.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/TomcatServerCustomizer.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/embeddedservletcontainer/TomcatServerCustomizer.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/TomcatServerCustomizer.java index b48400321c..61358aec8e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/embeddedservletcontainer/TomcatServerCustomizer.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/embeddedcontainer/customizing/programmatic/TomcatServerCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.embeddedservletcontainer; +package org.springframework.boot.docs.features.developingwebapplications.embeddedcontainer.customizing.programmatic; import java.time.Duration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/jersey/Endpoint.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/Endpoint.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/jersey/Endpoint.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/Endpoint.java index 8309108339..c935127ddd 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/jersey/Endpoint.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/Endpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.jersey; +package org.springframework.boot.docs.features.developingwebapplications.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/springbootfeatures/webapplications/jersey/JerseyConfig.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/JerseyConfig.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/jersey/JerseyConfig.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/JerseyConfig.java index c51ef732c6..05edef4f60 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/jersey/JerseyConfig.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/jersey/JerseyConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.jersey; +package org.springframework.boot.docs.features.developingwebapplications.jersey; import org.glassfish.jersey.server.ResourceConfig; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/MyRestController.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/MyRestController.java similarity index 96% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/MyRestController.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/MyRestController.java index 1c46b9574c..f977711909 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/MyRestController.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/MyRestController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.servlet; +package org.springframework.boot.docs.features.developingwebapplications.springmvc; import java.util.List; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/CorsConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/cors/CorsConfiguration.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/CorsConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/cors/CorsConfiguration.java index 3496abd8dc..b52f45ceee 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/CorsConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/cors/CorsConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.servlet; +package org.springframework.boot.docs.features.developingwebapplications.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/springbootfeatures/webapplications/servlet/MyController.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyController.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/MyController.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyController.java index bc1bcc52aa..7a56d405b5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/MyController.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.servlet; +package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling; import javax.servlet.http.HttpServletRequest; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/MyControllerAdvice.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyControllerAdvice.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/MyControllerAdvice.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyControllerAdvice.java index 68a32134f1..9f10964fc9 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/MyControllerAdvice.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/MyControllerAdvice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.servlet; +package org.springframework.boot.docs.features.developingwebapplications.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/springbootfeatures/webapplications/servlet/MyErrorViewResolver.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpages/MyErrorViewResolver.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/MyErrorViewResolver.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpages/MyErrorViewResolver.java index 060b847f7a..663e5c4463 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/MyErrorViewResolver.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpages/MyErrorViewResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.servlet; +package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling.errorpages; import java.util.Map; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/ErrorPageConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/ErrorPageConfiguration.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/ErrorPageConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/ErrorPageConfiguration.java index 9978a900e2..5a0a80568d 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/ErrorPageConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/ErrorPageConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.servlet; +package org.springframework.boot.docs.features.developingwebapplications.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/springbootfeatures/webapplications/servlet/ServletFilterConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/ServletFilterConfiguration.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/ServletFilterConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/ServletFilterConfiguration.java index 925b053bd5..8d262cc03e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/servlet/ServletFilterConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/errorhandling/errorpageswithoutspringmvc/ServletFilterConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.servlet; +package org.springframework.boot.docs.features.developingwebapplications.springmvc.errorhandling.errorpageswithoutspringmvc; import java.io.IOException; import java.util.EnumSet; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/json/MyJsonComponent.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/MyJsonComponent.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/json/MyJsonComponent.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/MyJsonComponent.java index f474c8f93f..9e073a0237 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/json/MyJsonComponent.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/MyJsonComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.json; +package org.springframework.boot.docs.features.developingwebapplications.springmvc.json; import java.io.IOException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/json/object/MyJsonComponent.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/object/MyJsonComponent.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/json/object/MyJsonComponent.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/object/MyJsonComponent.java index 09a3b82f20..13e05634bc 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/json/object/MyJsonComponent.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/json/object/MyJsonComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.json.object; +package org.springframework.boot.docs.features.developingwebapplications.springmvc.json.object; import java.io.IOException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/HttpMessageConvertersConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/HttpMessageConvertersConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/HttpMessageConvertersConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/HttpMessageConvertersConfiguration.java index aabc90daa6..bcedfad34e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/HttpMessageConvertersConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springmvc/messageconverters/HttpMessageConvertersConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications; +package org.springframework.boot.docs.features.developingwebapplications.springmvc.messageconverters; import java.io.IOException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/MyRestController.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyRestController.java similarity index 96% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/MyRestController.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyRestController.java index c20ec7a11a..dbd46e8935 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/MyRestController.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/MyRestController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.webflux; +package org.springframework.boot.docs.features.developingwebapplications.springwebflux; import java.util.List; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/fn/RoutingConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/RoutingConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/fn/RoutingConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/RoutingConfiguration.java index 7d946f6549..9f410d3d29 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/fn/RoutingConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/RoutingConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.webflux.fn; +package org.springframework.boot.docs.features.developingwebapplications.springwebflux; 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/springbootfeatures/webapplications/webflux/fn/UserHandler.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/UserHandler.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/fn/UserHandler.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/UserHandler.java index c0ddd77ecb..6fff50a656 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/fn/UserHandler.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/UserHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.webflux.fn; +package org.springframework.boot.docs.features.developingwebapplications.springwebflux; import reactor.core.publisher.Mono; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/CustomErrorWebExceptionHandler.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/CustomErrorWebExceptionHandler.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/CustomErrorWebExceptionHandler.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/CustomErrorWebExceptionHandler.java index 2c74901152..2bdce52af9 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/CustomErrorWebExceptionHandler.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/CustomErrorWebExceptionHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.webflux; +package org.springframework.boot.docs.features.developingwebapplications.springwebflux.errorhandling; import reactor.core.publisher.Mono; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/ExceptionHandlingController.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/ExceptionHandlingController.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/ExceptionHandlingController.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/ExceptionHandlingController.java index ba4f0f236b..ad4f80c143 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/ExceptionHandlingController.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/errorhandling/ExceptionHandlingController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.webflux; +package org.springframework.boot.docs.features.developingwebapplications.springwebflux.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/springbootfeatures/webapplications/webflux/CodecConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/httpcodecs/CodecConfiguration.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/CodecConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/httpcodecs/CodecConfiguration.java index 2d82419c04..b085d19fc1 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/webflux/CodecConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/developingwebapplications/springwebflux/httpcodecs/CodecConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webapplications.webflux; +package org.springframework.boot.docs.features.developingwebapplications.springwebflux.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/springbootfeatures/externalizedconfiguration/valueinjection/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/MyBean.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/valueinjection/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/MyBean.java index 8ee16cbd10..97f1c61c91 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/valueinjection/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.valueinjection; +package org.springframework.boot.docs.features.externalconfig; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/constructorbinding/AcmeProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/constructorbinding/AcmeProperties.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/constructorbinding/AcmeProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/constructorbinding/AcmeProperties.java index a5aea2be78..b79507fdd4 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/constructorbinding/AcmeProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/constructorbinding/AcmeProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.constructorbinding; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.constructorbinding; import java.net.InetAddress; import java.util.List; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/constructorbinding/nonnull/AcmeProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/constructorbinding/nonnull/AcmeProperties.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/constructorbinding/nonnull/AcmeProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/constructorbinding/nonnull/AcmeProperties.java index 19aaf5ff87..a93c4f93b3 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/constructorbinding/nonnull/AcmeProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/constructorbinding/nonnull/AcmeProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.constructorbinding.nonnull; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.constructorbinding.nonnull; import java.net.InetAddress; import java.util.List; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/datasize/constructorbinding/AppIoProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/datasizes/constructorbinding/AppIoProperties.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/datasize/constructorbinding/AppIoProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/datasizes/constructorbinding/AppIoProperties.java index 4485e0889b..d00a68558c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/datasize/constructorbinding/AppIoProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/datasizes/constructorbinding/AppIoProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.datasize.constructorbinding; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.conversion.datasizes.constructorbinding; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConstructorBinding; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/datasize/javabeanbinding/AppIoProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/datasizes/javabeanbinding/AppIoProperties.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/datasize/javabeanbinding/AppIoProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/datasizes/javabeanbinding/AppIoProperties.java index d970eb1a04..2506980d43 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/datasize/javabeanbinding/AppIoProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/datasizes/javabeanbinding/AppIoProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.datasize.javabeanbinding; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.conversion.datasizes.javabeanbinding; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.convert.DataSizeUnit; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/constructorbinding/AppSystemProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/constructorbinding/AppSystemProperties.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/constructorbinding/AppSystemProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/constructorbinding/AppSystemProperties.java index e46f51d2bc..4c45adeb86 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/constructorbinding/AppSystemProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/constructorbinding/AppSystemProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.duration.constructorbinding; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.conversion.durations.constructorbinding; import java.time.Duration; import java.time.temporal.ChronoUnit; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/javabeanbinding/AppSystemProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/javabeanbinding/AppSystemProperties.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/javabeanbinding/AppSystemProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/javabeanbinding/AppSystemProperties.java index 556733f5d9..b2dc53101c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/javabeanbinding/AppSystemProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/javabeanbinding/AppSystemProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.duration.javabeanbinding; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.conversion.durations.javabeanbinding; import java.time.Duration; import java.time.temporal.ChronoUnit; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/enable/MyApplication.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/enablingannotatedtypes/MyApplication.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/enable/MyApplication.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/enablingannotatedtypes/MyApplication.java index c3c729c8af..7427464e93 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/enable/MyApplication.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/enablingannotatedtypes/MyApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.enable; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.enablingannotatedtypes; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/enable/MyConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/enablingannotatedtypes/MyConfiguration.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/enable/MyConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/enablingannotatedtypes/MyConfiguration.java index 333b3bc181..84379b9762 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/enable/MyConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/enablingannotatedtypes/MyConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.enable; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.enablingannotatedtypes; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/javabeanbinding/AcmeProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/javabeanbinding/AcmeProperties.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/javabeanbinding/AcmeProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/javabeanbinding/AcmeProperties.java index 0f6f9325d9..9313c7da6f 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/javabeanbinding/AcmeProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/javabeanbinding/AcmeProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.javabeanbinding; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.javabeanbinding; import java.net.InetAddress; import java.util.ArrayList; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/merge/list/AcmeProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/mergingcomplextypes/list/AcmeProperties.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/merge/list/AcmeProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/mergingcomplextypes/list/AcmeProperties.java index c1c962c1c8..42a0b4047e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/merge/list/AcmeProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/mergingcomplextypes/list/AcmeProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.merge.list; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.mergingcomplextypes.list; import java.util.ArrayList; import java.util.List; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/merge/map/AcmeProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/mergingcomplextypes/map/AcmeProperties.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/merge/map/AcmeProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/mergingcomplextypes/map/AcmeProperties.java index 76bfd9e2c2..640c044dd1 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/merge/map/AcmeProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/mergingcomplextypes/map/AcmeProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.merge.map; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.mergingcomplextypes.map; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/relaxed/OwnerProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/OwnerProperties.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/relaxed/OwnerProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/OwnerProperties.java index 6dc45b3968..8b945cc055 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/relaxed/OwnerProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/OwnerProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.relaxed; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.relaxedbinding; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/ThirdPartyConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/ThirdPartyConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.java index 9c1c1f95ad..d0b9677419 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/ThirdPartyConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.thirdpartyconfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/use/MyService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyService.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/use/MyService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyService.java index 5d7860e0a3..ae7893f684 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/use/MyService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.use; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.usingannotatedtypes; import org.springframework.stereotype.Service; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/validate/AcmeProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/validate/AcmeProperties.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/validate/AcmeProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/validate/AcmeProperties.java index 872cf496ed..440ddee7b8 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/validate/AcmeProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/validate/AcmeProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.validate; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.validate; import java.net.InetAddress; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/validate/nested/AcmeProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/validate/nested/AcmeProperties.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/validate/nested/AcmeProperties.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/validate/nested/AcmeProperties.java index ab62c47425..c4fcb1379d 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/validate/nested/AcmeProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/validate/nested/AcmeProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.validate.nested; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.validate.nested; import java.net.InetAddress; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/nonxa/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/jta/mixingxaandnonxaconnections/nonxa/MyBean.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/nonxa/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/jta/mixingxaandnonxaconnections/nonxa/MyBean.java index 594dca9822..6eeede5fff 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/nonxa/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/jta/mixingxaandnonxaconnections/nonxa/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.jta.nonxa; +package org.springframework.boot.docs.features.jta.mixingxaandnonxaconnections.nonxa; import javax.jms.ConnectionFactory; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/primary/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/jta/mixingxaandnonxaconnections/primary/MyBean.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/primary/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/jta/mixingxaandnonxaconnections/primary/MyBean.java index ef4e2423cf..b3441310be 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/primary/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/jta/mixingxaandnonxaconnections/primary/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.jta.primary; +package org.springframework.boot.docs.features.jta.mixingxaandnonxaconnections.primary; import javax.jms.ConnectionFactory; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/xa/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/jta/mixingxaandnonxaconnections/xa/MyBean.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/xa/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/jta/mixingxaandnonxaconnections/xa/MyBean.java index a5fa80ebdb..72ca53e66e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/xa/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/jta/mixingxaandnonxaconnections/xa/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.jta.xa; +package org.springframework.boot.docs.features.jta.mixingxaandnonxaconnections.xa; import javax.jms.ConnectionFactory; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/receiving/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/receiving/MyBean.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/receiving/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/receiving/MyBean.java index 3bee8ad6e7..8b7657acbc 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/receiving/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/receiving/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.amqp.receiving; +package org.springframework.boot.docs.features.messaging.amqp.receiving; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/receiving/custom/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/receiving/custom/MyBean.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/receiving/custom/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/receiving/custom/MyBean.java index 10f7050115..851f9dba30 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/receiving/custom/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/receiving/custom/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.amqp.receiving.custom; +package org.springframework.boot.docs.features.messaging.amqp.receiving.custom; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/receiving/custom/RabbitConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/receiving/custom/RabbitConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/receiving/custom/RabbitConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/receiving/custom/RabbitConfiguration.java index bde5112eca..4880c7dc5b 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/receiving/custom/RabbitConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/receiving/custom/RabbitConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.amqp.receiving.custom; +package org.springframework.boot.docs.features.messaging.amqp.receiving.custom; import org.springframework.amqp.core.Message; import org.springframework.amqp.core.MessageProperties; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/sending/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/sending/MyBean.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/sending/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/sending/MyBean.java index 040ab7f20b..8d5a3a9df4 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/amqp/sending/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/amqp/sending/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.amqp.sending; +package org.springframework.boot.docs.features.messaging.amqp.sending; import org.springframework.amqp.core.AmqpAdmin; import org.springframework.amqp.core.AmqpTemplate; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/receiving/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/receiving/MyBean.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/receiving/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/receiving/MyBean.java index ffc9683d08..c9190c173c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/receiving/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/receiving/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.jms.receiving; +package org.springframework.boot.docs.features.messaging.jms.receiving; import org.springframework.jms.annotation.JmsListener; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/receiving/custom/JmsConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/receiving/custom/JmsConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/receiving/custom/JmsConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/receiving/custom/JmsConfiguration.java index 52a3b9cc1c..67bb0f6160 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/receiving/custom/JmsConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/receiving/custom/JmsConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.jms.receiving.custom; +package org.springframework.boot.docs.features.messaging.jms.receiving.custom; import javax.jms.ConnectionFactory; import javax.jms.JMSException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/receiving/custom/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/receiving/custom/MyBean.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/receiving/custom/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/receiving/custom/MyBean.java index e774029754..3341edf2ee 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/receiving/custom/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/receiving/custom/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.jms.receiving.custom; +package org.springframework.boot.docs.features.messaging.jms.receiving.custom; import org.springframework.jms.annotation.JmsListener; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/template/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/sending/MyBean.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/template/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/sending/MyBean.java index b0b8e89bfd..70bbc53ae4 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/jms/template/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/jms/sending/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.jms.template; +package org.springframework.boot.docs.features.messaging.jms.sending; import org.springframework.jms.core.JmsTemplate; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/test/annotation/MyTest.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/embedded/annotation/MyTest.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/test/annotation/MyTest.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/embedded/annotation/MyTest.java index 718c07fc36..45251da820 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/test/annotation/MyTest.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/embedded/annotation/MyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.kafka.test.annotation; +package org.springframework.boot.docs.features.messaging.kafka.embedded.annotation; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.kafka.test.context.EmbeddedKafka; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/test/property/MyTest.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/embedded/property/MyTest.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/test/property/MyTest.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/embedded/property/MyTest.java index 2a2923d7ab..5fbe583a2f 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/test/property/MyTest.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/embedded/property/MyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.kafka.test.property; +package org.springframework.boot.docs.features.messaging.kafka.embedded.property; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.kafka.test.EmbeddedKafkaBroker; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/receiving/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/receiving/MyBean.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/receiving/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/receiving/MyBean.java index 884379db1e..30cdbbf587 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/receiving/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/receiving/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.kafka.receiving; +package org.springframework.boot.docs.features.messaging.kafka.receiving; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/sending/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/sending/MyBean.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/sending/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/sending/MyBean.java index 6848d11e37..207cc0b789 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/kafka/sending/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/sending/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging.kafka.sending; +package org.springframework.boot.docs.features.messaging.kafka.sending; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.kafka.core.KafkaTemplate; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/KafkaStreamsConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/streams/KafkaStreamsConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/KafkaStreamsConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/streams/KafkaStreamsConfiguration.java index c56c3c3d35..0915761292 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/KafkaStreamsConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/messaging/kafka/streams/KafkaStreamsConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.messaging; +package org.springframework.boot.docs.features.messaging.kafka.streams; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.streams.KeyValue; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/cassandra/template/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/cassandra/connecting/MyBean.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/cassandra/template/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/cassandra/connecting/MyBean.java index 4acf813c45..69faef5997 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/cassandra/template/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/cassandra/connecting/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.cassandra.template; +package org.springframework.boot.docs.features.nosql.cassandra.connecting; import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/couchbase/CouchbaseConversionsConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/couchbase/repositories/CouchbaseConversionsConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/couchbase/CouchbaseConversionsConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/couchbase/repositories/CouchbaseConversionsConfiguration.java index ef3df7f459..87038c14b3 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/couchbase/CouchbaseConversionsConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/couchbase/repositories/CouchbaseConversionsConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.couchbase; +package org.springframework.boot.docs.features.nosql.couchbase.repositories; import org.assertj.core.util.Arrays; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/couchbase/template/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/couchbase/repositories/MyBean.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/couchbase/template/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/couchbase/repositories/MyBean.java index 335d4a329e..496ef0f435 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/couchbase/template/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/couchbase/repositories/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.couchbase.template; +package org.springframework.boot.docs.features.nosql.couchbase.repositories; import org.springframework.data.couchbase.core.CouchbaseTemplate; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/elasticsearch/template/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/elasticsearch/connectingusingspringdata/MyBean.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/elasticsearch/template/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/elasticsearch/connectingusingspringdata/MyBean.java index d0e9176056..30ed5a0455 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/elasticsearch/template/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/elasticsearch/connectingusingspringdata/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.elasticsearch.template; +package org.springframework.boot.docs.features.nosql.elasticsearch.connectingusingspringdata; import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/ldap/template/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/ldap/repositories/MyBean.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/ldap/template/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/ldap/repositories/MyBean.java index 9050da16ca..3790edfc55 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/ldap/template/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/ldap/repositories/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.ldap.template; +package org.springframework.boot.docs.features.nosql.ldap.repositories; import java.util.List; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/databasefactory/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/connecting/MyBean.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/databasefactory/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/connecting/MyBean.java index 4a5364d11c..863ae5bab8 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/databasefactory/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/connecting/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.mongodb.databasefactory; +package org.springframework.boot.docs.features.nosql.mongodb.connecting; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/neo4j/data/City.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/repositories/City.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/neo4j/data/City.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/repositories/City.java index 3becfd07f9..7d23f3f6b5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/neo4j/data/City.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/repositories/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.neo4j.data; +package org.springframework.boot.docs.features.nosql.mongodb.repositories; public class City { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jpa/CityRepository.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/repositories/CityRepository.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jpa/CityRepository.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/repositories/CityRepository.java index 2db79b351d..d6f6fe1b83 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jpa/CityRepository.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/repositories/CityRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.sql.jpa; +package org.springframework.boot.docs.features.nosql.mongodb.repositories; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/template/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/template/MyBean.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/template/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/template/MyBean.java index 7d963deb05..09e104b580 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/template/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/mongodb/template/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.mongodb.template; +package org.springframework.boot.docs.features.nosql.mongodb.template; import com.mongodb.client.MongoCollection; import org.bson.Document; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/neo4j/driver/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/connecting/MyBean.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/neo4j/driver/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/connecting/MyBean.java index 520587463b..87abe298fa 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/neo4j/driver/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/connecting/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.neo4j.driver; +package org.springframework.boot.docs.features.nosql.neo4j.connecting; import org.neo4j.driver.Driver; import org.neo4j.driver.Session; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/data/City.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/repositories/City.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/data/City.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/repositories/City.java index 6aa1288cb8..ec5740768b 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/data/City.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/repositories/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.mongodb.data; +package org.springframework.boot.docs.features.nosql.neo4j.repositories; public class City { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/neo4j/data/CityRepository.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/repositories/CityRepository.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/neo4j/data/CityRepository.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/repositories/CityRepository.java index fd01326e79..8c58ae4888 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/neo4j/data/CityRepository.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/repositories/CityRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.neo4j.data; +package org.springframework.boot.docs.features.nosql.neo4j.repositories; import java.util.Optional; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/Neo4jReactiveTransactionManagerConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/repositories/Neo4jReactiveTransactionManagerConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/Neo4jReactiveTransactionManagerConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/repositories/Neo4jReactiveTransactionManagerConfiguration.java index 8717129a32..7f17aeb769 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/Neo4jReactiveTransactionManagerConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/neo4j/repositories/Neo4jReactiveTransactionManagerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql; +package org.springframework.boot.docs.features.nosql.neo4j.repositories; import org.neo4j.driver.Driver; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/redis/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/redis/connecting/MyBean.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/redis/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/redis/connecting/MyBean.java index a7328449fc..fbfd617e11 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/redis/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/redis/connecting/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.redis; +package org.springframework.boot.docs.features.nosql.redis.connecting; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/solr/client/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/solr/connecting/MyBean.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/solr/client/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/solr/connecting/MyBean.java index 2f1ae1036c..11bdccde03 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/solr/client/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/nosql/solr/connecting/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.solr.client; +package org.springframework.boot.docs.features.nosql.solr.connecting; import java.io.IOException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/profiles/ProductionConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/profiles/ProductionConfiguration.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/profiles/ProductionConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/profiles/ProductionConfiguration.java index 6aa6e6d9f7..d21a37612c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/profiles/ProductionConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/profiles/ProductionConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.profiles; +package org.springframework.boot.docs.features.profiles; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/quartz/SampleJob.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/quartz/SampleJob.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/quartz/SampleJob.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/quartz/SampleJob.java index 62b183e7d2..22340be179 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/quartz/SampleJob.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/quartz/SampleJob.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.quartz; +package org.springframework.boot.docs.features.quartz; import java.util.Date; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/MyService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/resttemplate/MyService.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/MyService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/resttemplate/MyService.java index cc38607a18..1b3fee4f54 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/MyService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/resttemplate/MyService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.resttemplate; +package org.springframework.boot.docs.features.resttemplate; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.stereotype.Service; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/RestTemplateBuilderConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/resttemplate/customization/RestTemplateBuilderConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/RestTemplateBuilderConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/resttemplate/customization/RestTemplateBuilderConfiguration.java index 95a823eaea..2110bf023c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/RestTemplateBuilderConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/resttemplate/customization/RestTemplateBuilderConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.resttemplate; +package org.springframework.boot.docs.features.resttemplate.customization; import java.time.Duration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/RestTemplateProxyCustomizer.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/resttemplate/customization/RestTemplateProxyCustomizer.java similarity index 96% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/RestTemplateProxyCustomizer.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/resttemplate/customization/RestTemplateProxyCustomizer.java index 5b219fad68..ad0bf293fb 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/RestTemplateProxyCustomizer.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/resttemplate/customization/RestTemplateProxyCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.resttemplate; +package org.springframework.boot.docs.features.resttemplate.customization; import org.apache.http.HttpException; import org.apache.http.HttpHost; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/rsocket/MyService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/rsocket/requester/MyService.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/rsocket/MyService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/rsocket/requester/MyService.java index c31568e133..2c2c511d02 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/rsocket/MyService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/rsocket/requester/MyService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.rsocket; +package org.springframework.boot.docs.features.rsocket.requester; import reactor.core.publisher.Mono; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/security/OAuthClientConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/security/oauth2/client/OAuthClientConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/security/OAuthClientConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/security/oauth2/client/OAuthClientConfiguration.java index 18e7e53fe3..65695c8ec1 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/security/OAuthClientConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/security/oauth2/client/OAuthClientConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.security; +package org.springframework.boot.docs.features.security.oauth2.client; 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/springbootfeatures/security/CustomWebFluxSecurityConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/security/springwebflux/CustomWebFluxSecurityConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/security/CustomWebFluxSecurityConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/security/springwebflux/CustomWebFluxSecurityConfiguration.java index 6cf1bbe307..9f5268f4f8 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/security/CustomWebFluxSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/security/springwebflux/CustomWebFluxSecurityConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.security; +package org.springframework.boot.docs.features.security.springwebflux; import org.springframework.boot.autoconfigure.security.reactive.PathRequest; import org.springframework.context.annotation.Bean; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/main/run/MyApplication.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/MyApplication.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/main/run/MyApplication.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/MyApplication.java index c5b47b9078..24f018ad49 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/main/run/MyApplication.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/MyApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.springapplication.main.run; +package org.springframework.boot.docs.features.springapplication; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/ApplicationArgumentsExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationarguments/ApplicationArgumentsExample.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/ApplicationArgumentsExample.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationarguments/ApplicationArgumentsExample.java index 6ede35e6a4..1ab87a57e1 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/ApplicationArgumentsExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationarguments/ApplicationArgumentsExample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.springapplication; +package org.springframework.boot.docs.features.springapplication.applicationarguments; import java.util.List; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/availability/LocalCacheVerifier.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationavailability/managing/LocalCacheVerifier.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/availability/LocalCacheVerifier.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationavailability/managing/LocalCacheVerifier.java index 3d4705c1bd..363e9bd052 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/availability/LocalCacheVerifier.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationavailability/managing/LocalCacheVerifier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.springapplication.availability; +package org.springframework.boot.docs.features.springapplication.applicationavailability.managing; import org.springframework.boot.availability.AvailabilityChangeEvent; import org.springframework.boot.availability.LivenessState; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/availability/ReadinessStateExporter.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationavailability/managing/ReadinessStateExporter.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/availability/ReadinessStateExporter.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationavailability/managing/ReadinessStateExporter.java index cfe80565f5..6f66c4c4f4 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/availability/ReadinessStateExporter.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationavailability/managing/ReadinessStateExporter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.springapplication.availability; +package org.springframework.boot.docs.features.springapplication.applicationavailability.managing; import org.springframework.boot.availability.AvailabilityChangeEvent; import org.springframework.boot.availability.ReadinessState; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/exitcode/MyApplication.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationexit/MyApplication.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/exitcode/MyApplication.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationexit/MyApplication.java index 80552fbc28..64951ba2a4 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/exitcode/MyApplication.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/applicationexit/MyApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.springapplication.exitcode; +package org.springframework.boot.docs.features.springapplication.applicationexit; import org.springframework.boot.ExitCodeGenerator; import org.springframework.boot.SpringApplication; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/CommandLineRunnerExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/commandlinerunner/CommandLineRunnerExample.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/CommandLineRunnerExample.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/commandlinerunner/CommandLineRunnerExample.java index 8b90aa635a..e7dc632fe5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/CommandLineRunnerExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/commandlinerunner/CommandLineRunnerExample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.springapplication; +package org.springframework.boot.docs.features.springapplication.commandlinerunner; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/main/custom/MyApplication.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/customizingspringapplication/MyApplication.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/main/custom/MyApplication.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/customizingspringapplication/MyApplication.java index 73f44d07fc..198966f711 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/main/custom/MyApplication.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/customizingspringapplication/MyApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.springapplication.main.custom; +package org.springframework.boot.docs.features.springapplication.customizingspringapplication; import org.springframework.boot.Banner; import org.springframework.boot.SpringApplication; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/SpringApplicationBuilderExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/fluentbuilderapi/SpringApplicationBuilderExample.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/SpringApplicationBuilderExample.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/fluentbuilderapi/SpringApplicationBuilderExample.java index 84220a9144..d0f6ea8d3a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/SpringApplicationBuilderExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/fluentbuilderapi/SpringApplicationBuilderExample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.springapplication; +package org.springframework.boot.docs.features.springapplication.fluentbuilderapi; import org.springframework.boot.Banner; import org.springframework.boot.builder.SpringApplicationBuilder; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/startup/MyApplication.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/startuptracking/MyApplication.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/startup/MyApplication.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/startuptracking/MyApplication.java index 5df88e11ad..649db10e28 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/startup/MyApplication.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/springapplication/startuptracking/MyApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.springapplication.startup; +package org.springframework.boot.docs.features.springapplication.startuptracking; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jdbctemplate/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jdbctemplate/MyBean.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jdbctemplate/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jdbctemplate/MyBean.java index 941a2e6c41..272d42d56b 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jdbctemplate/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jdbctemplate/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.sql.jdbctemplate; +package org.springframework.boot.docs.features.sql.jdbctemplate; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jooq/JooqExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jooq/dslcontext/JooqExample.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jooq/JooqExample.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jooq/dslcontext/JooqExample.java index cf7b5508ee..8a5efff54b 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jooq/JooqExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jooq/dslcontext/JooqExample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.sql.jooq; +package org.springframework.boot.docs.features.sql.jooq.dslcontext; import java.util.GregorianCalendar; import java.util.List; @@ -23,7 +23,7 @@ import org.jooq.DSLContext; import org.springframework.stereotype.Component; -import static org.springframework.boot.docs.springbootfeatures.sql.jooq.Tables.AUTHOR; +import static org.springframework.boot.docs.features.sql.jooq.dslcontext.Tables.AUTHOR; @Component public class JooqExample { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jooq/Tables.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jooq/dslcontext/Tables.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jooq/Tables.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jooq/dslcontext/Tables.java index d6f24e1419..1e00193a3c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jooq/Tables.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jooq/dslcontext/Tables.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.sql.jooq; +package org.springframework.boot.docs.features.sql.jooq.dslcontext; import java.util.GregorianCalendar; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jpa/City.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jpaandspringdata/entityclasses/City.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jpa/City.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jpaandspringdata/entityclasses/City.java index b10e2a795f..0936e91517 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/jpa/City.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jpaandspringdata/entityclasses/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.sql.jpa; +package org.springframework.boot.docs.features.sql.jpaandspringdata.entityclasses; import java.io.Serializable; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/data/CityRepository.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jpaandspringdata/repositories/CityRepository.java similarity index 84% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/data/CityRepository.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jpaandspringdata/repositories/CityRepository.java index 4fb7711b29..aa5816da69 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/mongodb/data/CityRepository.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/jpaandspringdata/repositories/CityRepository.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.nosql.mongodb.data; +package org.springframework.boot.docs.features.sql.jpaandspringdata.repositories; +import org.springframework.boot.docs.features.sql.jpaandspringdata.entityclasses.City; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.Repository; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/CustomizeR2dbcPortConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/CustomizeR2dbcPortConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/CustomizeR2dbcPortConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/CustomizeR2dbcPortConfiguration.java index 252a36f9c4..4a5995f57d 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/CustomizeR2dbcPortConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/CustomizeR2dbcPortConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.sql.r2dbc; +package org.springframework.boot.docs.features.sql.r2dbc; import io.r2dbc.spi.ConnectionFactoryOptions; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/CustomizeR2dbcPostgresOptionsConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/CustomizeR2dbcPostgresOptionsConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/CustomizeR2dbcPostgresOptionsConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/CustomizeR2dbcPostgresOptionsConfiguration.java index 18843cc930..231a8ff76b 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/CustomizeR2dbcPostgresOptionsConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/CustomizeR2dbcPostgresOptionsConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.sql.r2dbc; +package org.springframework.boot.docs.features.sql.r2dbc; import java.util.HashMap; import java.util.Map; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/City.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/repositories/City.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/City.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/repositories/City.java index 2a9997364d..0219fda902 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/City.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/repositories/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.sql.r2dbc; +package org.springframework.boot.docs.features.sql.r2dbc.repositories; public class City { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/CityRepository.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/repositories/CityRepository.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/CityRepository.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/repositories/CityRepository.java index 2ac9d9a895..801d128f41 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/CityRepository.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/repositories/CityRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.sql.r2dbc; +package org.springframework.boot.docs.features.sql.r2dbc.repositories; import reactor.core.publisher.Mono; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/databaseclient/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/usingdatabaseclient/MyBean.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/databaseclient/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/usingdatabaseclient/MyBean.java index b5af6815f8..325bb53fa0 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/r2dbc/databaseclient/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/sql/r2dbc/usingdatabaseclient/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.sql.r2dbc.databaseclient; +package org.springframework.boot.docs.features.sql.r2dbc.usingdatabaseclient; import java.util.Map; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/ExampleJdbcTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/additionalautoconfigurationandslicing/ExampleJdbcTests.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/ExampleJdbcTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/additionalautoconfigurationandslicing/ExampleJdbcTests.java index 43ea8f20c3..762126caad 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/ExampleJdbcTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/additionalautoconfigurationandslicing/ExampleJdbcTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.slicing; +package org.springframework.boot.docs.features.testing.springbootapplications.additionalautoconfigurationandslicing; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jdbc/MyTransactionalTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredjdbc/MyTransactionalTests.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jdbc/MyTransactionalTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredjdbc/MyTransactionalTests.java index e50c56af39..944e1ca34c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jdbc/MyTransactionalTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredjdbc/MyTransactionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.jdbc; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredjdbc; import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest; import org.springframework.transaction.annotation.Propagation; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/jooq/MyJooqTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredjooq/MyJooqTests.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/jooq/MyJooqTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredjooq/MyJooqTests.java index dfdd1c0b39..0f06dbbacb 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/jooq/MyJooqTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredjooq/MyJooqTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.jooq; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredjooq; import org.jooq.DSLContext; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restclient/MyRestClientTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredrestclient/MyRestClientTests.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restclient/MyRestClientTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredrestclient/MyRestClientTests.java index 4361ec7ff3..e7e3af7de6 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restclient/MyRestClientTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredrestclient/MyRestClientTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.restclient; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredrestclient; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/cassandra/MyDataCassandraTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatacassandra/MyDataCassandraTests.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/cassandra/MyDataCassandraTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatacassandra/MyDataCassandraTests.java index 330afa16d6..4f46f67300 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/cassandra/MyDataCassandraTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatacassandra/MyDataCassandraTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.cassandra; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringdatacassandra; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.cassandra.DataCassandraTest; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jpa/MyNonTransactionalTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatajpa/MyNonTransactionalTests.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jpa/MyNonTransactionalTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatajpa/MyNonTransactionalTests.java index 1bec39b9b1..90ba61f255 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jpa/MyNonTransactionalTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatajpa/MyNonTransactionalTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.jpa; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringdatajpa; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.transaction.annotation.Propagation; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jpa/db/MyRepositoryTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatajpa/withdb/MyRepositoryTests.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jpa/db/MyRepositoryTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatajpa/withdb/MyRepositoryTests.java index 3deef9aa3d..16aca2b282 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jpa/db/MyRepositoryTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatajpa/withdb/MyRepositoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.jpa.db; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringdatajpa.withdb; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jpa/MyRepositoryTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatajpa/withoutdb/MyRepositoryTests.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jpa/MyRepositoryTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatajpa/withoutdb/MyRepositoryTests.java index 3e407352be..9f40df95fd 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/jpa/MyRepositoryTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatajpa/withoutdb/MyRepositoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.jpa; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringdatajpa.withoutdb; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/ldap/MyDataLdapTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataldap/inmemory/MyDataLdapTests.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/ldap/MyDataLdapTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataldap/inmemory/MyDataLdapTests.java index 02c493e461..cb95fd2df0 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/ldap/MyDataLdapTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataldap/inmemory/MyDataLdapTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.ldap; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringdataldap.inmemory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.ldap.DataLdapTest; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/ldap/server/MyDataLdapTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataldap/server/MyDataLdapTests.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/ldap/server/MyDataLdapTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataldap/server/MyDataLdapTests.java index fae63808fd..81a21ddec4 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/ldap/server/MyDataLdapTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataldap/server/MyDataLdapTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.ldap.server; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringdataldap.server; import org.springframework.boot.autoconfigure.ldap.embedded.EmbeddedLdapAutoConfiguration; import org.springframework.boot.test.autoconfigure.data.ldap.DataLdapTest; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/mongodb/db/MyDataMongoDbTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatamongodb/withdb/MyDataMongoDbTests.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/mongodb/db/MyDataMongoDbTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatamongodb/withdb/MyDataMongoDbTests.java index bd1f639e44..e754131531 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/mongodb/db/MyDataMongoDbTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatamongodb/withdb/MyDataMongoDbTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.mongodb.db; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringdatamongodb.withdb; import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration; import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/mongodb/MyDataMongoDbTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatamongodb/withoutdb/MyDataMongoDbTests.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/mongodb/MyDataMongoDbTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatamongodb/withoutdb/MyDataMongoDbTests.java index 91d7fba52d..e342f484d3 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/mongodb/MyDataMongoDbTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdatamongodb/withoutdb/MyDataMongoDbTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.mongodb; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringdatamongodb.withoutdb; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/neo4j/tx/MyDataNeo4jTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataneo4j/nopropagation/MyDataNeo4jTests.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/neo4j/tx/MyDataNeo4jTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataneo4j/nopropagation/MyDataNeo4jTests.java index 33c52d5da4..ff923a9e83 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/neo4j/tx/MyDataNeo4jTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataneo4j/nopropagation/MyDataNeo4jTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.neo4j.tx; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringdataneo4j.nopropagation; import org.springframework.boot.test.autoconfigure.data.neo4j.DataNeo4jTest; import org.springframework.transaction.annotation.Propagation; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/neo4j/MyDataNeo4jTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataneo4j/propagation/MyDataNeo4jTests.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/neo4j/MyDataNeo4jTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataneo4j/propagation/MyDataNeo4jTests.java index 940f9c492a..c4da7d0a83 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/neo4j/MyDataNeo4jTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataneo4j/propagation/MyDataNeo4jTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.neo4j; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringdataneo4j.propagation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.neo4j.DataNeo4jTest; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/redis/MyDataRedisTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataredis/MyDataRedisTests.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/redis/MyDataRedisTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataredis/MyDataRedisTests.java index 4fe3ba63ea..ed9cac914c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/data/redis/MyDataRedisTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringdataredis/MyDataRedisTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.data.redis; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringdataredis; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.data.redis.DataRedisTest; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restdocs/mvc/CustomizationConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/CustomizationConfiguration.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restdocs/mvc/CustomizationConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/CustomizationConfiguration.java index d6fa1897e2..a2afa03851 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restdocs/mvc/CustomizationConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/CustomizationConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.restdocs.mvc; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringrestdocs.withmockmvc; import org.springframework.boot.test.autoconfigure.restdocs.RestDocsMockMvcConfigurationCustomizer; import org.springframework.boot.test.context.TestConfiguration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restdocs/mvc/ResultHandlerConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/ResultHandlerConfiguration.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restdocs/mvc/ResultHandlerConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/ResultHandlerConfiguration.java index 5f2c602249..6eef331a26 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restdocs/mvc/ResultHandlerConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/ResultHandlerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.restdocs.mvc; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringrestdocs.withmockmvc; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restdocs/mvc/UserDocumentationTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/UserDocumentationTests.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restdocs/mvc/UserDocumentationTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/UserDocumentationTests.java index dda6081095..956b78d733 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/restdocs/mvc/UserDocumentationTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withmockmvc/UserDocumentationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.restdocs.mvc; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringrestdocs.withmockmvc; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/restassured/AdvancedRestDocsConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withrestassured/AdvancedRestDocsConfiguration.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/restassured/AdvancedRestDocsConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withrestassured/AdvancedRestDocsConfiguration.java index 9ccf6324c7..6d011721eb 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/restassured/AdvancedRestDocsConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withrestassured/AdvancedRestDocsConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.restdocs.restassured; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringrestdocs.withrestassured; import org.springframework.boot.test.autoconfigure.restdocs.RestDocsRestAssuredConfigurationCustomizer; import org.springframework.boot.test.context.TestConfiguration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/restassured/UserDocumentationTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withrestassured/UserDocumentationTests.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/restassured/UserDocumentationTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withrestassured/UserDocumentationTests.java index e005785009..eac2836a42 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/restassured/UserDocumentationTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withrestassured/UserDocumentationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.restdocs.restassured; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringrestdocs.withrestassured; import io.restassured.specification.RequestSpecification; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/webclient/AdvancedRestDocsConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withwebtestclient/AdvancedRestDocsConfiguration.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/webclient/AdvancedRestDocsConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withwebtestclient/AdvancedRestDocsConfiguration.java index f01a5ad2c7..19a1c8ed1b 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/webclient/AdvancedRestDocsConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withwebtestclient/AdvancedRestDocsConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.restdocs.webclient; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringrestdocs.withwebtestclient; import org.springframework.boot.test.autoconfigure.restdocs.RestDocsWebTestClientConfigurationCustomizer; import org.springframework.boot.test.context.TestConfiguration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/webclient/UsersDocumentationTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withwebtestclient/UsersDocumentationTests.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/webclient/UsersDocumentationTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withwebtestclient/UsersDocumentationTests.java index 52c96d6c20..886ed4f466 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/restdocs/webclient/UsersDocumentationTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredspringrestdocs/withwebtestclient/UsersDocumentationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.restdocs.webclient; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredspringrestdocs.withwebtestclient; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/MyWebServiceClientTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/MyWebServiceClientTests.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/MyWebServiceClientTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/MyWebServiceClientTests.java index a96425deaa..522082aaa4 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/MyWebServiceClientTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/MyWebServiceClientTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.webservices; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredwebservices; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/Request.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/Request.java similarity index 87% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/Request.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/Request.java index 1bf2303b65..49998102c3 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/Request.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/Request.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.webservices; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredwebservices; import javax.xml.bind.annotation.XmlRootElement; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/Response.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/Response.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/Response.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/Response.java index 84d77ad65f..63758df1e7 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/Response.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/Response.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.webservices; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredwebservices; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/SomeWebService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/SomeWebService.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/SomeWebService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/SomeWebService.java index 2559c417c0..84fcc8d916 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webservices/SomeWebService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/SomeWebService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.webservices; +package org.springframework.boot.docs.features.testing.springbootapplications.autoconfiguredwebservices; import org.springframework.boot.webservices.client.WebServiceTemplateBuilder; import org.springframework.stereotype.Service; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/detection/MyWebFluxTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/detectingwebapptype/MyWebFluxTests.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/detection/MyWebFluxTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/detectingwebapptype/MyWebFluxTests.java index 57e66b2abc..6aebffbd26 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/detection/MyWebFluxTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/detectingwebapptype/MyWebFluxTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.detection; +package org.springframework.boot.docs.features.testing.springbootapplications.detectingwebapptype; import org.springframework.boot.test.context.SpringBootTest; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/excluding/MyTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/excludingconfiguration/MyTests.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/excluding/MyTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/excludingconfiguration/MyTests.java index 0bd543ba9f..1d3c4152b5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/excluding/MyTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/excludingconfiguration/MyTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.excluding; +package org.springframework.boot.docs.features.testing.springbootapplications.excludingconfiguration; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/jmx/SampleApp.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jmx/SampleApp.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/jmx/SampleApp.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jmx/SampleApp.java index 0edc242b2f..e6d101f0c2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/jmx/SampleApp.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jmx/SampleApp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.jmx; +package org.springframework.boot.docs.features.testing.springbootapplications.jmx; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/jmx/SampleJmxTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jmx/SampleJmxTests.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/jmx/SampleJmxTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jmx/SampleJmxTests.java index e9e899b724..f35b5a6db5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/jmx/SampleJmxTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jmx/SampleJmxTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.jmx; +package org.springframework.boot.docs.features.testing.springbootapplications.jmx; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/json/AssertJ.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jsontests/AssertJ.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/json/AssertJ.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jsontests/AssertJ.java index 4dff95a73f..68bf79885a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/json/AssertJ.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jsontests/AssertJ.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.json; +package org.springframework.boot.docs.features.testing.springbootapplications.jsontests; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/json/MyJsonTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jsontests/MyJsonTests.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/json/MyJsonTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jsontests/MyJsonTests.java index c97b805627..1e1172a38d 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/json/MyJsonTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jsontests/MyJsonTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.json; +package org.springframework.boot.docs.features.testing.springbootapplications.jsontests; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mocking/MyTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/mockingbeans/bean/MyTests.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mocking/MyTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/mockingbeans/bean/MyTests.java index bb2e9d2805..ef2ce5e8c7 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mocking/MyTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/mockingbeans/bean/MyTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.mocking; +package org.springframework.boot.docs.features.testing.springbootapplications.mockingbeans.bean; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mocking/listener/MyTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/mockingbeans/listener/MyTests.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mocking/listener/MyTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/mockingbeans/listener/MyTests.java index 74890be2a3..a82216bc6e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mocking/listener/MyTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/mockingbeans/listener/MyTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.mocking.listener; +package org.springframework.boot.docs.features.testing.springbootapplications.mockingbeans.listener; import org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener; import org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/MyControllerTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/MyControllerTests.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/MyControllerTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/MyControllerTests.java index 31ea0eb957..cce533a272 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/MyControllerTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/MyControllerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.mvc; +package org.springframework.boot.docs.features.testing.springbootapplications.springmvctests; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/MyHtmlUnitTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/MyHtmlUnitTests.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/MyHtmlUnitTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/MyHtmlUnitTests.java index ffe2a1971b..5d0b4b5bc9 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/MyHtmlUnitTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/MyHtmlUnitTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.mvc; +package org.springframework.boot.docs.features.testing.springbootapplications.springmvctests; import com.gargoylesoftware.htmlunit.WebClient; import com.gargoylesoftware.htmlunit.html.HtmlPage; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/UserVehicleController.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/UserVehicleController.java similarity index 87% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/UserVehicleController.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/UserVehicleController.java index c36eea669b..504d724e10 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/UserVehicleController.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/UserVehicleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.mvc; +package org.springframework.boot.docs.features.testing.springbootapplications.springmvctests; class UserVehicleController { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/UserVehicleService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/UserVehicleService.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/UserVehicleService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/UserVehicleService.java index e33eaa2a33..f7b4f7c9fa 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/UserVehicleService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/UserVehicleService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.mvc; +package org.springframework.boot.docs.features.testing.springbootapplications.springmvctests; class UserVehicleService { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/VehicleDetails.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/VehicleDetails.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/VehicleDetails.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/VehicleDetails.java index 677d5019bd..73b81924fc 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/mvc/VehicleDetails.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springmvctests/VehicleDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.mvc; +package org.springframework.boot.docs.features.testing.springbootapplications.springmvctests; class VehicleDetails { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/MyControllerTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/MyControllerTests.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/MyControllerTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/MyControllerTests.java index e3f7e6aa2d..914e4bcb05 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/MyControllerTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/MyControllerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.webflux; +package org.springframework.boot.docs.features.testing.springbootapplications.springwebfluxtests; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/UserVehicleController.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/UserVehicleController.java similarity index 87% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/UserVehicleController.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/UserVehicleController.java index 4e687c5fa8..4e24609332 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/UserVehicleController.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/UserVehicleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.webflux; +package org.springframework.boot.docs.features.testing.springbootapplications.springwebfluxtests; class UserVehicleController { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/UserVehicleService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/UserVehicleService.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/UserVehicleService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/UserVehicleService.java index 130fbb236b..c571ac3dd9 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/UserVehicleService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/UserVehicleService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.webflux; +package org.springframework.boot.docs.features.testing.springbootapplications.springwebfluxtests; class UserVehicleService { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/VehicleDetails.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/VehicleDetails.java similarity index 87% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/VehicleDetails.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/VehicleDetails.java index a841faf9b9..0645577d06 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/webflux/VehicleDetails.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/springwebfluxtests/VehicleDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.webflux; +package org.springframework.boot.docs.features.testing.springbootapplications.springwebfluxtests; class VehicleDetails { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/BatchConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/BatchConfiguration.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/BatchConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/BatchConfiguration.java index e4f6900c7c..48f5deac76 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/BatchConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/BatchConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.slicing; +package org.springframework.boot.docs.features.testing.springbootapplications.userconfigurationandslicing; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/SampleApplication.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/SampleApplication.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/SampleApplication.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/SampleApplication.java index 4f8b954437..d61b08edb7 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/SampleApplication.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/SampleApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.slicing; +package org.springframework.boot.docs.features.testing.springbootapplications.userconfigurationandslicing; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/TestWebMvcConfigurer.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/TestWebMvcConfigurer.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/TestWebMvcConfigurer.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/TestWebMvcConfigurer.java index cacabe951d..e58f873c7a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/TestWebMvcConfigurer.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/TestWebMvcConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.slicing; +package org.springframework.boot.docs.features.testing.springbootapplications.userconfigurationandslicing; import org.springframework.stereotype.Component; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/WebConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/WebConfiguration.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/WebConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/WebConfiguration.java index 10d71832ca..67d4370055 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/WebConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/WebConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.slicing; +package org.springframework.boot.docs.features.testing.springbootapplications.userconfigurationandslicing; 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/springbootfeatures/testing/applications/slicing/scan/SampleApplication.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/scan/SampleApplication.java similarity index 88% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/scan/SampleApplication.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/scan/SampleApplication.java index 0806e2a7c2..0e429a95e0 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/applications/slicing/scan/SampleApplication.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/userconfigurationandslicing/scan/SampleApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.applications.slicing.scan; +package org.springframework.boot.docs.features.testing.springbootapplications.userconfigurationandslicing.scan; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/ApplicationArgumentTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/usingapplicationarguments/ApplicationArgumentTests.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/ApplicationArgumentTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/usingapplicationarguments/ApplicationArgumentTests.java index 7ef7fe6e97..13fdac0579 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/ApplicationArgumentTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/usingapplicationarguments/ApplicationArgumentTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.testing.springbootapplications.usingapplicationarguments; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/MockMvcTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withmockenvironment/MockMvcTests.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/MockMvcTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withmockenvironment/MockMvcTests.java index 2eadc7b121..dd5d8fcf38 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/MockMvcTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withmockenvironment/MockMvcTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.testing.springbootapplications.withmockenvironment; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/MockWebTestClientTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withmockenvironment/MockWebTestClientTests.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/MockWebTestClientTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withmockenvironment/MockWebTestClientTests.java index 736cba508e..0348963f8e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/MockWebTestClientTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withmockenvironment/MockWebTestClientTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.testing.springbootapplications.withmockenvironment; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/RandomPortTestRestTemplateTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withrunningserver/RandomPortTestRestTemplateTests.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/RandomPortTestRestTemplateTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withrunningserver/RandomPortTestRestTemplateTests.java index 164cd3224f..14701eab57 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/RandomPortTestRestTemplateTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withrunningserver/RandomPortTestRestTemplateTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.testing.springbootapplications.withrunningserver; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/RandomPortWebTestClientTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withrunningserver/RandomPortWebTestClientTests.java similarity index 92% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/RandomPortWebTestClientTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withrunningserver/RandomPortWebTestClientTests.java index 5581139a85..30550081d0 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/RandomPortWebTestClientTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/withrunningserver/RandomPortWebTestClientTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.testing.springbootapplications.withrunningserver; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/utils/MyConfigFileTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/configdataapplicationcontextinitializer/MyConfigFileTests.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/utils/MyConfigFileTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/configdataapplicationcontextinitializer/MyConfigFileTests.java index 66e2cb359b..0c8cd807aa 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/utils/MyConfigFileTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/configdataapplicationcontextinitializer/MyConfigFileTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.utils; +package org.springframework.boot.docs.features.testing.utilities.configdataapplicationcontextinitializer; import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/OutputCaptureTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/outputcapture/OutputCaptureTests.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/OutputCaptureTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/outputcapture/OutputCaptureTests.java index e582928774..b96a3b3184 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/OutputCaptureTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/outputcapture/OutputCaptureTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.testing.utilities.outputcapture; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/utils/MyEnvironmentTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testpropertyvalues/MyEnvironmentTests.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/utils/MyEnvironmentTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testpropertyvalues/MyEnvironmentTests.java index 9f2e70e0a3..93444b1376 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/utils/MyEnvironmentTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testpropertyvalues/MyEnvironmentTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.utils; +package org.springframework.boot.docs.features.testing.utilities.testpropertyvalues; import org.junit.jupiter.api.Test; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/webclient/SampleWebClientTests.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MySpringBootTests.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/webclient/SampleWebClientTests.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MySpringBootTests.java index 791a9d4b96..f4dc7bb957 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/webclient/SampleWebClientTests.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MySpringBootTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.webclient; +package org.springframework.boot.docs.features.testing.utilities.testresttemplate; import java.time.Duration; @@ -32,7 +32,7 @@ import org.springframework.http.HttpHeaders; import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -class SampleWebClientTests { +class MySpringBootTests { @Autowired private TestRestTemplate template; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/webclient/SampleWebClientConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MySpringBootTestsConfiguration.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/webclient/SampleWebClientConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MySpringBootTestsConfiguration.java index 099f5ae350..dff84df28e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/webclient/SampleWebClientConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MySpringBootTestsConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.webclient; +package org.springframework.boot.docs.features.testing.utilities.testresttemplate; import java.net.URI; @@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController; @SpringBootConfiguration @ImportAutoConfiguration({ ServletWebServerFactoryAutoConfiguration.class, DispatcherServletAutoConfiguration.class, JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class }) -class SampleWebClientConfiguration { +class MySpringBootTestsConfiguration { @RestController private static class ExampleController { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/utils/testresttemplate/MyTest.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MyTests.java similarity index 91% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/utils/testresttemplate/MyTest.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MyTests.java index 96998d4dbc..04c9210217 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/utils/testresttemplate/MyTest.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MyTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.utils.testresttemplate; +package org.springframework.boot.docs.features.testing.utilities.testresttemplate; import org.junit.jupiter.api.Test; @@ -23,7 +23,7 @@ import org.springframework.http.ResponseEntity; import static org.assertj.core.api.Assertions.assertThat; -class MyTest { +class MyTests { private TestRestTemplate template = new TestRestTemplate(); diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/validation/MyBean.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/validation/MyBean.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/validation/MyBean.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/validation/MyBean.java index 100b2713c1..335a6a2d9c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/validation/MyBean.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/validation/MyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.validation; +package org.springframework.boot.docs.features.validation; import javax.validation.constraints.Size; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webclient/MyService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/webclient/MyService.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webclient/MyService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/webclient/MyService.java index 9b4c7625fb..0d0d863da2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webclient/MyService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/webclient/MyService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webclient; +package org.springframework.boot.docs.features.webclient; import org.neo4j.cypherdsl.core.Relationship.Details; import reactor.core.publisher.Mono; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webservices/MyService.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/webservices/template/MyService.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webservices/MyService.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/webservices/template/MyService.java index eff3634251..d64186ab36 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webservices/MyService.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/webservices/template/MyService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webservices; +package org.springframework.boot.docs.features.webservices.template; import org.springframework.boot.webservices.client.WebServiceTemplateBuilder; import org.springframework.stereotype.Service; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webservices/MyWebServiceTemplateConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/webservices/template/MyWebServiceTemplateConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webservices/MyWebServiceTemplateConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/webservices/template/MyWebServiceTemplateConfiguration.java index 1ecccada17..cfe3953dc1 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webservices/MyWebServiceTemplateConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/webservices/template/MyWebServiceTemplateConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.webservices; +package org.springframework.boot.docs.features.webservices.template; import java.time.Duration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/actuator/MetricsHealthMicrometerExport.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/actuator/maphealthindicatorstometrics/MetricsHealthMicrometerExport.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/actuator/MetricsHealthMicrometerExport.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/actuator/maphealthindicatorstometrics/MetricsHealthMicrometerExport.java index 2813360f47..034bf865af 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/actuator/MetricsHealthMicrometerExport.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/actuator/maphealthindicatorstometrics/MetricsHealthMicrometerExport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.actuator; +package org.springframework.boot.docs.howto.actuator.maphealthindicatorstometrics; // tag::code[] import io.micrometer.core.instrument.Gauge; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/actuator/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/actuator/package-info.java deleted file mode 100644 index b48bb91aef..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/actuator/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Actuator" section. - */ -package org.springframework.boot.docs.howto.actuator; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/springbootapplication/MyEnvironmentPostProcessor.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/application/customizetheenvironmentorapplicationcontext/MyEnvironmentPostProcessor.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/springbootapplication/MyEnvironmentPostProcessor.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/application/customizetheenvironmentorapplicationcontext/MyEnvironmentPostProcessor.java index fc0e6b7066..12b98d17e5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/springbootapplication/MyEnvironmentPostProcessor.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/application/customizetheenvironmentorapplicationcontext/MyEnvironmentPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.springbootapplication; +package org.springframework.boot.docs.howto.application.customizetheenvironmentorapplicationcontext; // tag::code[] import java.io.IOException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/batchapplications/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/batchapplications/package-info.java deleted file mode 100644 index ea999e25c1..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/batchapplications/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Batch Applications" section. - */ -package org.springframework.boot.docs.howto.batchapplications; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/build/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/build/package-info.java deleted file mode 100644 index d32b645817..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/build/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Build" section. - */ -package org.springframework.boot.docs.howto.build; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/ElasticsearchEntityManagerFactoryDependsOnPostProcessor.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configureacomponentthatisusedbyjpa/ElasticsearchEntityManagerFactoryDependsOnPostProcessor.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/ElasticsearchEntityManagerFactoryDependsOnPostProcessor.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configureacomponentthatisusedbyjpa/ElasticsearchEntityManagerFactoryDependsOnPostProcessor.java index 737ac85e31..c63ce6b824 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/ElasticsearchEntityManagerFactoryDependsOnPostProcessor.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configureacomponentthatisusedbyjpa/ElasticsearchEntityManagerFactoryDependsOnPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configureacomponentthatisusedbyjpa; // tag::code[] import javax.persistence.EntityManagerFactory; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/BasicDataSourceConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/BasicDataSourceConfiguration.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/BasicDataSourceConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/BasicDataSourceConfiguration.java index fd3ca2c6d8..16fe0eb534 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/BasicDataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/BasicDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource; // tag::code[] import javax.sql.DataSource; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/ConfigurableDataSourceConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/ConfigurableDataSourceConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/ConfigurableDataSourceConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/ConfigurableDataSourceConfiguration.java index 4f0af432f5..8619c1cf80 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/ConfigurableDataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/ConfigurableDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource; // tag::code[] import com.zaxxer.hikari.HikariDataSource; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourceConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/SimpleDataSourceConfiguration.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourceConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/SimpleDataSourceConfiguration.java index 88df89cf25..31601d1b5c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/SimpleDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource; // tag::code[] import com.zaxxer.hikari.HikariDataSource; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/CaseSensitiveSpringPhysicalNamingStrategyConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurehibernatenamingstrategy/CaseSensitiveSpringPhysicalNamingStrategyConfiguration.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/CaseSensitiveSpringPhysicalNamingStrategyConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurehibernatenamingstrategy/CaseSensitiveSpringPhysicalNamingStrategyConfiguration.java index 52f00426e3..fcffbf49dc 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/CaseSensitiveSpringPhysicalNamingStrategyConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurehibernatenamingstrategy/CaseSensitiveSpringPhysicalNamingStrategyConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configurehibernatenamingstrategy; // tag::code[] import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/HibernateSecondLevelCacheConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurehibernatesecondlevelcaching/HibernateSecondLevelCacheConfiguration.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/HibernateSecondLevelCacheConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurehibernatesecondlevelcaching/HibernateSecondLevelCacheConfiguration.java index e6fffd5302..c8e21418ba 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/HibernateSecondLevelCacheConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurehibernatesecondlevelcaching/HibernateSecondLevelCacheConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configurehibernatesecondlevelcaching; // tag::code[] import org.hibernate.cache.jcache.ConfigSettings; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/CompleteDataSourcesConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/CompleteDataSourcesConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/CompleteDataSourcesConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/CompleteDataSourcesConfiguration.java index e651b6d2a0..afa532a6b5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/CompleteDataSourcesConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/CompleteDataSourcesConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configuretwodatasources; // tag::code[] import com.zaxxer.hikari.HikariDataSource; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourcesConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/SimpleDataSourcesConfiguration.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourcesConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/SimpleDataSourcesConfiguration.java index 434e97a290..9b7fd1f45c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourcesConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/SimpleDataSourcesConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configuretwodatasources; // tag::code[] import com.zaxxer.hikari.HikariDataSource; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/package-info.java deleted file mode 100644 index 10e523a659..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Data Access" section. - */ -package org.springframework.boot.docs.howto.dataaccess; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/CustomEntityManagerFactoryExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/CustomEntityManagerFactoryExample.java similarity index 96% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/CustomEntityManagerFactoryExample.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/CustomEntityManagerFactoryExample.java index c43413a067..a665a0ee09 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/CustomEntityManagerFactoryExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/CustomEntityManagerFactoryExample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.usemultipleentitymanagers; import javax.sql.DataSource; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/databaseinitialization/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/databaseinitialization/package-info.java deleted file mode 100644 index 612af69477..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/databaseinitialization/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Database Initialization" section. - */ -package org.springframework.boot.docs.howto.databaseinitialization; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/package-info.java deleted file mode 100644 index 39d341eda5..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Embedded Web Servers" section. - */ -package org.springframework.boot.docs.howto.embeddedwebservers; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/hotswapping/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/hotswapping/package-info.java deleted file mode 100644 index e2a273bf01..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/hotswapping/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Hot Swapping" section. - */ -package org.springframework.boot.docs.howto.hotswapping; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/httpclients/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/httpclients/package-info.java deleted file mode 100644 index d27b0e1310..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/httpclients/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - HTTP Clients" section. - */ -package org.springframework.boot.docs.howto.httpclients; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/httpclients/CustomizeReactorNettyClientConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/httpclients/webclientreactornettycustomization/CustomizeReactorNettyClientConfiguration.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/httpclients/CustomizeReactorNettyClientConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/httpclients/webclientreactornettycustomization/CustomizeReactorNettyClientConfiguration.java index d476add985..528284c390 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/httpclients/CustomizeReactorNettyClientConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/httpclients/webclientreactornettycustomization/CustomizeReactorNettyClientConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.httpclients; +package org.springframework.boot.docs.howto.httpclients.webclientreactornettycustomization; // tag::code[] import io.netty.channel.ChannelOption; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/jersey/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/jersey/package-info.java deleted file mode 100644 index ef3a388de6..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/jersey/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Jersey" section. - */ -package org.springframework.boot.docs.howto.jersey; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/jersey/JerseySetStatusOverSendErrorConfig.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/jersey/springsecurity/JerseySetStatusOverSendErrorConfig.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/jersey/JerseySetStatusOverSendErrorConfig.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/jersey/springsecurity/JerseySetStatusOverSendErrorConfig.java index 52a5be8ab5..20566bc03a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/jersey/JerseySetStatusOverSendErrorConfig.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/jersey/springsecurity/JerseySetStatusOverSendErrorConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.jersey; +package org.springframework.boot.docs.howto.jersey.springsecurity; // tag::code[] import java.util.Collections; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/logging/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/logging/package-info.java deleted file mode 100644 index 2fe9a206ea..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/logging/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Logging" section. - */ -package org.springframework.boot.docs.howto.logging; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/messaging/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/messaging/package-info.java deleted file mode 100644 index 5dea09cf3e..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/messaging/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Messaging" section. - */ -package org.springframework.boot.docs.howto.messaging; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/propertiesandconfiguration/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/propertiesandconfiguration/package-info.java deleted file mode 100644 index dcfd0d12b2..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/propertiesandconfiguration/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Properties and Configuration" section. - */ -package org.springframework.boot.docs.howto.propertiesandconfiguration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/security/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/security/package-info.java deleted file mode 100644 index bd36bd612d..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/security/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Security" section. - */ -package org.springframework.boot.docs.howto.security; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/springbootapplication/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/springbootapplication/package-info.java deleted file mode 100644 index 7312f7df3a..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/springbootapplication/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Spring Boot Application" section. - */ -package org.springframework.boot.docs.howto.springbootapplication; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/springmvc/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/springmvc/package-info.java deleted file mode 100644 index 3473857d66..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/springmvc/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Spring MVC" section. - */ -package org.springframework.boot.docs.howto.springmvc; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testingwithspringsecurity/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testingwithspringsecurity/package-info.java deleted file mode 100644 index 6f0a7114c6..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testingwithspringsecurity/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Testing with Spring Security" section. - */ -package org.springframework.boot.docs.howto.testingwithspringsecurity; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/traditionaldeployment/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/traditionaldeployment/package-info.java deleted file mode 100644 index 45cf58f6dc..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/traditionaldeployment/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "How-to - Traditional Deployment" section. - */ -package org.springframework.boot.docs.howto.traditionaldeployment; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/TomcatMultipleConnectorsConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultipleconnectorsintomcat/TomcatMultipleConnectorsConfiguration.java similarity index 96% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/TomcatMultipleConnectorsConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultipleconnectorsintomcat/TomcatMultipleConnectorsConfiguration.java index 62569aeb19..6863c069a8 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/TomcatMultipleConnectorsConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultipleconnectorsintomcat/TomcatMultipleConnectorsConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.embeddedwebservers; +package org.springframework.boot.docs.howto.webserver.enablemultipleconnectorsintomcat; // tag::code[] import java.io.IOException; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/UndertowMultipleListenersConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultiplelistenersinundertow/UndertowMultipleListenersConfiguration.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/UndertowMultipleListenersConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultiplelistenersinundertow/UndertowMultipleListenersConfiguration.java index bed31b8b10..127f7b1de2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/UndertowMultipleListenersConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultiplelistenersinundertow/UndertowMultipleListenersConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.embeddedwebservers; +package org.springframework.boot.docs.howto.webserver.enablemultiplelistenersinundertow; import io.undertow.Undertow.Builder; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/LegacyCookieProcessorConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/usetomcatlegacycookieprocessor/LegacyCookieProcessorConfiguration.java similarity index 93% rename from spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/LegacyCookieProcessorConfiguration.java rename to spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/usetomcatlegacycookieprocessor/LegacyCookieProcessorConfiguration.java index 4ccb9f6dae..e41a00b89d 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/embeddedwebservers/LegacyCookieProcessorConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/usetomcatlegacycookieprocessor/LegacyCookieProcessorConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.embeddedwebservers; +package org.springframework.boot.docs.howto.webserver.usetomcatlegacycookieprocessor; // tag::code[] import org.apache.tomcat.util.http.LegacyCookieProcessor; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/auditing/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/auditing/package-info.java deleted file mode 100644 index 66e57e05fa..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/auditing/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Production Ready Features - Auditing" section. - */ -package org.springframework.boot.docs.productionreadyfeatures.auditing; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/cloudfoundry/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/cloudfoundry/package-info.java deleted file mode 100644 index 07dedb276e..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/cloudfoundry/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Production Ready Features - Cloud Foundry Support" section. - */ -package org.springframework.boot.docs.productionreadyfeatures.cloudfoundry; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/enabling/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/enabling/package-info.java deleted file mode 100644 index 038f7fb39b..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/enabling/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Production Ready Features - Enabling Production Ready Features" - * section. - */ -package org.springframework.boot.docs.productionreadyfeatures.enabling; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/endpoints/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/endpoints/package-info.java deleted file mode 100644 index 9f4ed9d936..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/endpoints/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Production Ready Features - Endpoints" section. - */ -package org.springframework.boot.docs.productionreadyfeatures.endpoints; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/httptracing/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/httptracing/package-info.java deleted file mode 100644 index 390de022b6..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/httptracing/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Production Ready Features - HTTP Tracing" section. - */ -package org.springframework.boot.docs.productionreadyfeatures.httptracing; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/loggers/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/loggers/package-info.java deleted file mode 100644 index bd125de90d..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/loggers/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Production Ready Features - Loggers" section. - */ -package org.springframework.boot.docs.productionreadyfeatures.loggers; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/mongo/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/mongo/package-info.java deleted file mode 100644 index f3f6b51685..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/mongo/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Production Ready Features - Metrics - MongoDB" section. - */ -package org.springframework.boot.docs.productionreadyfeatures.metrics.mongo; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/package-info.java deleted file mode 100644 index 0db6b7dd4e..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/metrics/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Production Ready Features - Metrics" section. - */ -package org.springframework.boot.docs.productionreadyfeatures.metrics; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/monitoring/http/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/monitoring/http/package-info.java deleted file mode 100644 index b6856c0ea5..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/monitoring/http/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Production Ready Features - Monitoring and Management overt HTTP" - * section. - */ -package org.springframework.boot.docs.productionreadyfeatures.monitoring.http; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/monitoring/jmx/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/monitoring/jmx/package-info.java deleted file mode 100644 index 4f30dd6082..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/monitoring/jmx/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Production Ready Features - Monitoring and Management overt JMX" - * section. - */ -package org.springframework.boot.docs.productionreadyfeatures.monitoring.jmx; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/processmonitoring/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/processmonitoring/package-info.java deleted file mode 100644 index d785b52657..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/productionreadyfeatures/processmonitoring/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Production Ready Features - Process Monitoring" section. - */ -package org.springframework.boot.docs.productionreadyfeatures.processmonitoring; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/caching/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/caching/package-info.java deleted file mode 100644 index ddc23dfa4e..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/caching/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Caching" section. - */ -package org.springframework.boot.docs.springbootfeatures.caching; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/containerimages/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/containerimages/package-info.java deleted file mode 100644 index 9f29fcca70..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/containerimages/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Container Images" section. - */ -package org.springframework.boot.docs.springbootfeatures.containerimages; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/package-info.java deleted file mode 100644 index 07eacefd46..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/creatingautoconfiguration/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Creating Your Own Auto-Configuration" section. - */ -package org.springframework.boot.docs.springbootfeatures.creatingautoconfiguration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/email/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/email/package-info.java deleted file mode 100644 index b6bca4cd16..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/email/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Sending Email" section. - */ -package org.springframework.boot.docs.springbootfeatures.email; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/package-info.java deleted file mode 100644 index 7a663f72c9..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Externalized Configuration" section. - */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/gracefulshutdown/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/gracefulshutdown/package-info.java deleted file mode 100644 index 6d9a551294..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/gracefulshutdown/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Graceful Shutdown" section. - */ -package org.springframework.boot.docs.springbootfeatures.gracefulshutdown; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/hazelcast/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/hazelcast/package-info.java deleted file mode 100644 index a3b310c68b..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/hazelcast/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Hazelcast" section. - */ -package org.springframework.boot.docs.springbootfeatures.hazelcast; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/integration/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/integration/package-info.java deleted file mode 100644 index 24ed40f48c..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/integration/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Spring Integration" section. - */ -package org.springframework.boot.docs.springbootfeatures.integration; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/internationalization/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/internationalization/package-info.java deleted file mode 100644 index 24086edc3b..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/internationalization/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Internationalization" section. - */ -package org.springframework.boot.docs.springbootfeatures.internationalization; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/json/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/json/package-info.java deleted file mode 100644 index 6ed366df90..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/json/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - JSON" section. - */ -package org.springframework.boot.docs.springbootfeatures.json; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/package-info.java deleted file mode 100644 index ccd9881872..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/jta/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Distributed Transactions with JTA" section. - */ -package org.springframework.boot.docs.springbootfeatures.jta; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/kotlin/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/kotlin/package-info.java deleted file mode 100644 index ff3d203b9d..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/kotlin/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Kotlin" section. - */ -package org.springframework.boot.docs.springbootfeatures.kotlin; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/logging/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/logging/package-info.java deleted file mode 100644 index e8ea52187d..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/logging/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Logging" section. - */ -package org.springframework.boot.docs.springbootfeatures.logging; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/package-info.java deleted file mode 100644 index e90952c474..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/messaging/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Messaging" section. - */ -package org.springframework.boot.docs.springbootfeatures.messaging; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/monitoring/jmx/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/monitoring/jmx/package-info.java deleted file mode 100644 index 9f29cd5082..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/monitoring/jmx/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Monitoring with JMX" section. - */ -package org.springframework.boot.docs.springbootfeatures.monitoring.jmx; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/package-info.java deleted file mode 100644 index 3602d39519..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/nosql/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Working with NoSQL Technologies" section. - */ -package org.springframework.boot.docs.springbootfeatures.nosql; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/profiles/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/profiles/package-info.java deleted file mode 100644 index 9f29878c13..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/profiles/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Profiles" section. - */ -package org.springframework.boot.docs.springbootfeatures.profiles; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/quartz/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/quartz/package-info.java deleted file mode 100644 index 201bb165a3..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/quartz/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Quartz" section. - */ -package org.springframework.boot.docs.springbootfeatures.quartz; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/package-info.java deleted file mode 100644 index 7fd33321fc..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/resttemplate/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Calling REST Services with RestTemplate" - * section. - */ -package org.springframework.boot.docs.springbootfeatures.resttemplate; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/rsocket/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/rsocket/package-info.java deleted file mode 100644 index abb6394716..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/rsocket/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - RSocket" section. - */ -package org.springframework.boot.docs.springbootfeatures.rsocket; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/security/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/security/package-info.java deleted file mode 100644 index b2aa6cd5e0..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/security/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Security" section. - */ -package org.springframework.boot.docs.springbootfeatures.security; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/session/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/session/package-info.java deleted file mode 100644 index e0b0be9834..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/session/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Spring Session" section. - */ -package org.springframework.boot.docs.springbootfeatures.session; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/package-info.java deleted file mode 100644 index 2af4c750ba..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/springapplication/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - SpringApplication" section. - */ -package org.springframework.boot.docs.springbootfeatures.springapplication; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/package-info.java deleted file mode 100644 index 9aad26329e..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/sql/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Working with SQL Databases" section. - */ -package org.springframework.boot.docs.springbootfeatures.sql; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/task/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/task/package-info.java deleted file mode 100644 index ee9d796674..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/task/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Task Execution and Scheduling" section. - */ -package org.springframework.boot.docs.springbootfeatures.task; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/package-info.java deleted file mode 100644 index e499e9d77a..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/testing/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Testing" section. - */ -package org.springframework.boot.docs.springbootfeatures.testing; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/validation/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/validation/package-info.java deleted file mode 100644 index 16b4e55655..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/validation/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Validation" section. - */ -package org.springframework.boot.docs.springbootfeatures.validation; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/package-info.java deleted file mode 100644 index ed5dd710ce..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webapplications/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Developing Web Applications" section. - */ -package org.springframework.boot.docs.springbootfeatures.webapplications; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webclient/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webclient/package-info.java deleted file mode 100644 index 991a5d5aaa..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webclient/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Calling REST Services with WebClient" section. - */ -package org.springframework.boot.docs.springbootfeatures.webclient; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webservices/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webservices/package-info.java deleted file mode 100644 index f1b3ec9220..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/webservices/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - Web Services" section. - */ -package org.springframework.boot.docs.springbootfeatures.webservices; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/websockets/package-info.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/websockets/package-info.java deleted file mode 100644 index 71cf783a86..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/websockets/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Examples for the "Spring Boot Features - WebSockets" section. - */ -package org.springframework.boot.docs.springbootfeatures.websockets; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/UserServiceAutoConfigurationTestsTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserServiceAutoConfigurationTestsTests.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/UserServiceAutoConfigurationTestsTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserServiceAutoConfigurationTestsTests.java index 7f00013f3d..476b71cc60 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/UserServiceAutoConfigurationTestsTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/developingautoconfiguration/testing/UserServiceAutoConfigurationTestsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.developingautoconfiguration.testing; /** * Tests for {@link UserServiceAutoConfigurationTests}. diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/constructorbinding/AppSystemPropertiesTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/constructorbinding/AppSystemPropertiesTests.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/constructorbinding/AppSystemPropertiesTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/constructorbinding/AppSystemPropertiesTests.java index f2f76bee65..ac4a8e6f75 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/constructorbinding/AppSystemPropertiesTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/constructorbinding/AppSystemPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.duration.constructorbinding; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.conversion.durations.constructorbinding; import java.util.function.Consumer; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/javabeanbinding/AppSystemPropertiesTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/javabeanbinding/AppSystemPropertiesTests.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/javabeanbinding/AppSystemPropertiesTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/javabeanbinding/AppSystemPropertiesTests.java index 0d12e58e77..fc902f9d92 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/javabeanbinding/AppSystemPropertiesTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/conversion/durations/javabeanbinding/AppSystemPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.duration.javabeanbinding; +package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.conversion.durations.javabeanbinding; import java.util.function.Consumer; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/springapplication/SpringApplicationBuilderExampleTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/springapplication/fluentbuilderapi/SpringApplicationBuilderExampleTests.java similarity index 94% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/springapplication/SpringApplicationBuilderExampleTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/springapplication/fluentbuilderapi/SpringApplicationBuilderExampleTests.java index 457b994fba..2a9cc9c27c 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/springapplication/SpringApplicationBuilderExampleTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/springapplication/fluentbuilderapi/SpringApplicationBuilderExampleTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.springapplication; +package org.springframework.boot.docs.features.springapplication.fluentbuilderapi; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/jmx/SampleJmxTestsTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/testing/springbootapplications/jmx/SampleJmxTestsTests.java similarity index 89% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/jmx/SampleJmxTestsTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/testing/springbootapplications/jmx/SampleJmxTestsTests.java index 9729e9cff8..83570c9c14 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/jmx/SampleJmxTestsTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/testing/springbootapplications/jmx/SampleJmxTestsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.jmx; +package org.springframework.boot.docs.features.testing.springbootapplications.jmx; /** * Tests for SampleJmxTests diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/OutputCaptureTestsTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/testing/utilities/outputcapture/OutputCaptureTestsTests.java similarity index 90% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/OutputCaptureTestsTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/testing/utilities/outputcapture/OutputCaptureTestsTests.java index e7b6389a6e..7fb0f26319 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/OutputCaptureTestsTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/testing/utilities/outputcapture/OutputCaptureTestsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing; +package org.springframework.boot.docs.features.testing.utilities.outputcapture; /** * Tests for {@link OutputCaptureTests}. diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/webclient/SampleWebClientTestsTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MySpringBootTestsTests.java similarity index 78% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/webclient/SampleWebClientTestsTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MySpringBootTestsTests.java index 323dddb0b3..d91bc5fb7e 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/springbootfeatures/testing/webclient/SampleWebClientTestsTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/features/testing/utilities/testresttemplate/MySpringBootTestsTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.docs.springbootfeatures.testing.webclient; +package org.springframework.boot.docs.features.testing.utilities.testresttemplate; /** - * Tests for {@link SampleWebClientTests}. + * Tests for {@link MySpringBootTests}. * * @author Stephane Nicoll */ -class SampleWebClientTestsTests extends SampleWebClientTests { +class MySpringBootTestsTests extends MySpringBootTests { } diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/actuator/MetricsHealthMicrometerExportTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/actuator/maphealthindicatorstometrics/MetricsHealthMicrometerExportTests.java similarity index 96% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/actuator/MetricsHealthMicrometerExportTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/actuator/maphealthindicatorstometrics/MetricsHealthMicrometerExportTests.java index f03001cec3..3ebe9c97b0 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/actuator/MetricsHealthMicrometerExportTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/actuator/maphealthindicatorstometrics/MetricsHealthMicrometerExportTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.actuator; +package org.springframework.boot.docs.howto.actuator.maphealthindicatorstometrics; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/BasicDataSourceConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/BasicDataSourceConfigurationTests.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/BasicDataSourceConfigurationTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/BasicDataSourceConfigurationTests.java index a4b017ffca..03428d4f81 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/BasicDataSourceConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/BasicDataSourceConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource; import java.sql.SQLException; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/ConfigurableDataSourceConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/ConfigurableDataSourceConfigurationTests.java similarity index 96% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/ConfigurableDataSourceConfigurationTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/ConfigurableDataSourceConfigurationTests.java index 792a2ad853..e1d10c637f 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/ConfigurableDataSourceConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/ConfigurableDataSourceConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource; import java.sql.SQLException; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourceConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/SimpleDataSourceConfigurationTests.java similarity index 95% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourceConfigurationTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/SimpleDataSourceConfigurationTests.java index 35a387c097..829f13850b 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourceConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/SimpleDataSourceConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource; import java.sql.SQLException; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/CompleteDataSourcesConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/CompleteDataSourcesConfigurationTests.java similarity index 96% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/CompleteDataSourcesConfigurationTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/CompleteDataSourcesConfigurationTests.java index 4a549830ab..41770d3c5b 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/CompleteDataSourcesConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/CompleteDataSourcesConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configuretwodatasources; import java.sql.SQLException; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourcesConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/SimpleDataSourcesConfigurationTests.java similarity index 96% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourcesConfigurationTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/SimpleDataSourcesConfigurationTests.java index c446893019..c5b7dc05b5 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/SimpleDataSourcesConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/SimpleDataSourcesConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess; +package org.springframework.boot.docs.howto.dataaccess.configuretwodatasources; import java.sql.SQLException; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/springbootapplication/MyEnvironmentPostProcessorTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/springbootapplication/MyEnvironmentPostProcessorTests.java index d43d86b81d..3b271f94cc 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/springbootapplication/MyEnvironmentPostProcessorTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/springbootapplication/MyEnvironmentPostProcessorTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.docs.howto.springbootapplication; import org.junit.jupiter.api.Test; import org.springframework.boot.SpringApplication; +import org.springframework.boot.docs.howto.application.customizetheenvironmentorapplicationcontext.MyEnvironmentPostProcessor; import org.springframework.core.env.StandardEnvironment; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/embeddedwebservers/LegacyCookieProcessorConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/webserver/usetomcatlegacycookieprocessor/LegacyCookieProcessorConfigurationTests.java similarity index 96% rename from spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/embeddedwebservers/LegacyCookieProcessorConfigurationTests.java rename to spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/webserver/usetomcatlegacycookieprocessor/LegacyCookieProcessorConfigurationTests.java index db2bb91633..c481483b91 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/embeddedwebservers/LegacyCookieProcessorConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/webserver/usetomcatlegacycookieprocessor/LegacyCookieProcessorConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.embeddedwebservers; +package org.springframework.boot.docs.howto.webserver.usetomcatlegacycookieprocessor; import org.apache.catalina.Context; import org.apache.tomcat.util.http.LegacyCookieProcessor;