Skip to content

Commit 0219b22

Browse files
committed
Merge branch '2.7.x'
2 parents 8acf9af + d3750c4 commit 0219b22

File tree

21 files changed

+41
-41
lines changed

21 files changed

+41
-41
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ This would make `liveness` available at `/livez` and `readiness` at `readyz` on
903903

904904

905905
[[actuator.endpoints.kubernetes-probes.external-state]]
906-
==== Checking External State with Kubernetes Probes
906+
==== Checking External State With Kubernetes Probes
907907
Actuator configures the "`liveness`" and "`readiness`" probes as Health Groups.
908908
This means that all the <<actuator#actuator.endpoints.health.groups, health groups features>> are available for them.
909909
You can, for example, configure additional Health Indicators:

spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/monitoring.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[actuator.monitoring]]
2-
== Monitoring and Management over HTTP
2+
== Monitoring and Management Over HTTP
33
If you are developing a web application, Spring Boot Actuator auto-configures all enabled endpoints to be exposed over HTTP.
44
The default convention is to use the `id` of the endpoint with a prefix of `/actuator` as the URL path.
55
For example, `health` is exposed as `/actuator/health`.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/container-images/efficient-images.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[container-images.efficient-images]]
2-
== Efficient container images
2+
== Efficient Container Images
33
It is easily possible to package a Spring Boot fat jar as a docker image.
44
However, there are various downsides to copying and running the fat jar as is in the docker image.
55
There’s always a certain amount of overhead when running a fat jar without unpacking it, and in a containerized environment this can be noticeable.
@@ -9,7 +9,7 @@ If you put jar files in the layer before your application classes, Docker often
99

1010

1111
[[container-images.efficient-images.unpacking]]
12-
=== Unpacking the fat jar
12+
=== Unpacking the Executable JAR
1313
If you are running your application from a container, you can use an executable jar, but it is also often an advantage to explode it and run it in a different way.
1414
Certain PaaS implementations may also choose to unpack archives before they run.
1515
For example, Cloud Foundry operates this way.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/nosql.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ Spring Boot provides a dedicated "`Starter`", `spring-boot-starter-data-elastics
220220

221221

222222
[[data.nosql.elasticsearch.connecting-using-rest]]
223-
==== Connecting to Elasticsearch using REST clients
223+
==== Connecting to Elasticsearch Using REST clients
224224
Elasticsearch ships two different REST clients] that you can use to query a cluster: the https://www.elastic.co/guide/en/elasticsearch/client/java-api-client/current/java-rest-low.html[low-level client] from the `org.elasticsearch.client:elasticsearch-rest-client` module and the https://www.elastic.co/guide/en/elasticsearch/client/java-api-client/current/index.html[Java API client] from the `co.elastic.clients:elasticsearch-java` module.
225225
Additionally, Spring Boot provides support for a reactive client from the `org.springframework.data:spring-data-elasticsearch` module.
226226
By default, the clients will target `http://localhost:9200`.
@@ -237,7 +237,7 @@ You can use `spring.elasticsearch.*` properties to further tune how the clients
237237
----
238238

239239
[[data.nosql.elasticsearch.connecting-using-rest.restclient]]
240-
===== Connecting to Elasticsearch using RestClient
240+
===== Connecting to Elasticsearch Using RestClient
241241
If you have `elasticsearch-rest-client` on the classpath, Spring Boot will auto-configure and register a `RestClient` bean.
242242
In addition to the properties described previously, to fine-tune the `RestClient` you can register an arbitrary number of beans that implement `RestClientBuilderCustomizer` for more advanced customizations.
243243
To take full control over the clients' configuration, define a `RestClientBuilder` bean.
@@ -259,7 +259,7 @@ You can further tune how `Sniffer` is configured, as shown in the following exam
259259

260260

261261
[[data.nosql.elasticsearch.connecting-using-rest.javaapiclient]]
262-
===== Connecting to Elasticsearch using ElasticsearchClient
262+
===== Connecting to Elasticsearch Using ElasticsearchClient
263263
If you have `co.elastic.clients:elasticsearch-java` on the classpath, Spring Boot will auto-configure and register an `ElasticsearchClient` bean.
264264

265265
The `ElasticsearchClient` uses a transport that depends upon the previously described `RestClient`.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/documentation/using.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[documentation.using]]
2-
== Developing with Spring Boot
2+
== Developing With Spring Boot
33
Ready to actually start using Spring Boot? <<using#using, We have you covered>>:
44

55
* *Build systems:* <<using#using.build-systems.maven, Maven>> | <<using#using.build-systems.gradle, Gradle>> | <<using#using.build-systems.ant, Ant>> | <<using#using.build-systems.starters, Starters>>

spring-boot-project/spring-boot-docs/src/docs/asciidoc/executable-jar/jarfile-class.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ We do not need to unpack the archive, and we do not need to read all entry data
2626

2727

2828
[[appendix.executable-jar.jarfile-class.compatibility]]
29-
=== Compatibility with the Standard Java "`JarFile`"
29+
=== Compatibility With the Standard Java "`JarFile`"
3030
Spring Boot Loader strives to remain compatible with existing code and libraries.
3131
`org.springframework.boot.loader.jar.JarFile` extends from `java.util.jar.JarFile` and should work as a drop-in replacement.
3232
The `getURL()` method returns a `URL` that opens a connection compatible with `java.net.JarURLConnection` and can be used with Java's `URLClassLoader`.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/external-config.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ This means that the JSON cannot override properties from lower order property so
9898

9999

100100
[[features.external-config.files]]
101-
=== External Application Properties [[features.external-config.files]]
101+
=== External Application Properties
102102
Spring Boot will automatically find and load `application.properties` and `application.yaml` files from the following locations when your application starts:
103103

104104
. From the classpath
@@ -471,7 +471,7 @@ See the _<<howto#howto.properties-and-configuration.short-command-line-arguments
471471

472472

473473
[[features.external-config.files.multi-document]]
474-
==== Working with Multi-Document Files
474+
==== Working With Multi-Document Files
475475
Spring Boot allows you to split a single physical file into multiple logical documents which are each added independently.
476476
Documents are processed in order, from top to bottom.
477477
Later documents can override the properties defined in earlier ones.
@@ -564,7 +564,7 @@ If you need a secure way to store credentials and passwords, the https://cloud.s
564564

565565

566566
[[features.external-config.yaml]]
567-
=== Working with YAML
567+
=== Working With YAML
568568
https://yaml.org[YAML] is a superset of JSON and, as such, is a convenient format for specifying hierarchical configuration data.
569569
The `SpringApplication` class automatically supports YAML as an alternative to properties whenever you have the https://github.com/snakeyaml/snakeyaml[SnakeYAML] library on your classpath.
570570

@@ -677,7 +677,7 @@ TIP: See also the <<features#features.external-config.typesafe-configuration-pro
677677

678678

679679
[[features.external-config.typesafe-configuration-properties.java-bean-binding]]
680-
==== JavaBean properties binding
680+
==== JavaBean Properties Binding
681681
It is possible to bind a bean declaring standard JavaBean properties as shown in the following example:
682682

683683
include::code:MyProperties[]
@@ -715,7 +715,7 @@ Finally, only standard Java Bean properties are considered and binding on static
715715

716716

717717
[[features.external-config.typesafe-configuration-properties.constructor-binding]]
718-
==== Constructor binding
718+
==== Constructor Binding
719719
The example in the previous section can be rewritten in an immutable fashion as shown in the following example:
720720

721721
include::code:MyProperties[]
@@ -747,7 +747,7 @@ For consistency with properties of other types, if you do declare an `Optional`
747747

748748

749749
[[features.external-config.typesafe-configuration-properties.enabling-annotated-types]]
750-
==== Enabling @ConfigurationProperties-annotated types
750+
==== Enabling @ConfigurationProperties-annotated Types
751751
Spring Boot provides infrastructure to bind `@ConfigurationProperties` types and register them as beans.
752752
You can either enable configuration properties on a class-by-class basis or enable configuration property scanning that works in a similar manner to component scanning.
753753

@@ -779,7 +779,7 @@ If you still want to inject other beans using the constructor, the configuration
779779

780780

781781
[[features.external-config.typesafe-configuration-properties.using-annotated-types]]
782-
==== Using @ConfigurationProperties-annotated types
782+
==== Using @ConfigurationProperties-annotated Types
783783
This style of configuration works particularly well with the `SpringApplication` external YAML configuration, as shown in the following example:
784784

785785
[source,yaml,indent=0,subs="verbatim"]
@@ -913,7 +913,7 @@ For example, binding `a.b=c` to `Map<String, Object>` will return a Map with the
913913

914914

915915
[[features.external-config.typesafe-configuration-properties.relaxed-binding.environment-variables]]
916-
===== Binding from Environment Variables
916+
===== Binding From Environment Variables
917917
Most operating systems impose strict rules around the names that can be used for environment variables.
918918
For example, Linux shell variables can contain only letters (`a` to `z` or `A` to `Z`), numbers (`0` to `9`) or the underscore character (`_`).
919919
By convention, Unix shell variables will also have their names in UPPERCASE.
@@ -1077,7 +1077,7 @@ Doing so gives a transparent upgrade path while supporting a much richer format.
10771077

10781078

10791079
[[features.external-config.typesafe-configuration-properties.conversion.periods]]
1080-
===== Converting periods
1080+
===== Converting Periods
10811081
In addition to durations, Spring Boot can also work with `java.time.Period` type.
10821082
The following formats can be used in application properties:
10831083

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/kotlin.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[features.kotlin]]
2-
== Kotlin support
2+
== Kotlin Support
33
https://kotlinlang.org[Kotlin] is a statically-typed language targeting the JVM (and other platforms) which allows writing concise and elegant code while providing {kotlin-docs}java-interop.html[interoperability] with existing libraries written in Java.
44

55
Spring Boot provides Kotlin support by leveraging the support in other Spring projects such as Spring Framework, Spring Data, and Reactor.

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ include::code:MyApplicationArgumentTests[]
192192

193193

194194
[[features.testing.spring-boot-applications.with-mock-environment]]
195-
==== Testing with a mock environment
195+
==== Testing With a Mock Environment
196196
By default, `@SpringBootTest` does not start the server but instead sets up a mock environment for testing web endpoints.
197197

198198
With Spring MVC, we can query our web endpoints using {spring-framework-docs}/testing.html#spring-mvc-test-framework[`MockMvc`] or `WebTestClient`, as shown in the following example:
@@ -218,7 +218,7 @@ If you need to test these lower-level concerns, you can start a fully running se
218218

219219

220220
[[features.testing.spring-boot-applications.with-running-server]]
221-
==== Testing with a running server
221+
==== Testing With a Running Server
222222
If you need to start a full running server, we recommend that you use random ports.
223223
If you use `@SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT)`, an available port is picked at random each time your test runs.
224224

@@ -718,7 +718,7 @@ It can also be used to configure the host, scheme, and port that appears in any
718718

719719

720720
[[features.testing.spring-boot-applications.autoconfigured-spring-restdocs.with-mock-mvc]]
721-
===== Auto-configured Spring REST Docs Tests with Mock MVC
721+
===== Auto-configured Spring REST Docs Tests With Mock MVC
722722
`@AutoConfigureRestDocs` customizes the `MockMvc` bean to use Spring REST Docs when testing servlet-based web applications.
723723
You can inject it by using `@Autowired` and use it in your tests as you normally would when using Mock MVC and Spring REST Docs, as shown in the following example:
724724

@@ -737,7 +737,7 @@ include::code:MyResultHandlerConfiguration[]
737737

738738

739739
[[features.testing.spring-boot-applications.autoconfigured-spring-restdocs.with-web-test-client]]
740-
===== Auto-configured Spring REST Docs Tests with WebTestClient
740+
===== Auto-configured Spring REST Docs Tests With WebTestClient
741741
`@AutoConfigureRestDocs` can also be used with `WebTestClient` when testing reactive web applications.
742742
You can inject it by using `@Autowired` and use it in your tests as you normally would when using `@WebFluxTest` and Spring REST Docs, as shown in the following example:
743743

@@ -755,7 +755,7 @@ include::code:MyWebTestClientBuilderCustomizerConfiguration[]
755755

756756

757757
[[features.testing.spring-boot-applications.autoconfigured-spring-restdocs.with-rest-assured]]
758-
===== Auto-configured Spring REST Docs Tests with REST Assured
758+
===== Auto-configured Spring REST Docs Tests With REST Assured
759759
`@AutoConfigureRestDocs` makes a `RequestSpecification` bean, preconfigured to use Spring REST Docs, available to your tests.
760760
You can inject it by using `@Autowired` and use it in your tests as you normally would when using REST Assured and Spring REST Docs, as shown in the following example:
761761

spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/batch.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ See {spring-boot-autoconfigure-module-code}/batch/BatchAutoConfiguration.java[Ba
3232

3333

3434
[[howto.batch.running-from-the-command-line]]
35-
=== Running from the Command Line
35+
=== Running From the Command Line
3636
Spring Boot converts any command line argument starting with `--` to a property to add to the `Environment`, see <<features#features.external-config.command-line-args,accessing command line properties>>.
3737
This should not be used to pass arguments to batch jobs.
3838
To specify batch arguments on the command line, use the regular format (that is without `--`), as shown in the following example:

0 commit comments

Comments
 (0)