Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2016-11-05 07:44:48 +01:00
parent 3435fdf7fd 389acb094b
commit e4be5c6102
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@@ -3079,7 +3079,7 @@ Once the war is working we make it executable by adding a `main` method to our
====
If you intend to start your application as a war or as an executable application, you
need to share the customizations of the builder in a method that is both available to the
`ServletInitializr` callback and the `main` method, something like:
`SpringBootServletInitializer` callback and the `main` method, something like:
[source,java,indent=0,subs="verbatim,quotes,attributes"]
----

4
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@@ -4464,11 +4464,11 @@ There are three main approaches to `RestTemplate` customization, depending on ho
you want the customizations to apply.
To make the scope of any customizations as narrow as possible, inject the auto-configured
`RestTemplateBuilder` and then calls its methods as required. Each method call returns a
`RestTemplateBuilder` and then call its methods as required. Each method call returns a
new `RestTemplateBuilder` instance so the customizations will only affect this use of
the builder.
To make a application-wide, additive customization a `RestTemplateCustomizer` bean can be
To make an application-wide, additive customization a `RestTemplateCustomizer` bean can be
used. All such beans are automatically registered with the auto-configured
`RestTemplateBuilder` and will be applied to any templates that are built with it.