mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.4.x' into 1.5.x
This commit is contained in:
commit
389acb094b
@ -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"]
|
||||
----
|
||||
|
@ -4494,11 +4494,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.
|
||||
|
||||
|
@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
/**
|
||||
* Tests for {@link BeanCurrentlyInCreationFailureAnalyzer}
|
||||
* Tests for {@link BeanCurrentlyInCreationFailureAnalyzer}.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
@ -66,14 +66,6 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests {
|
||||
assertThat(lines.get(7)).startsWith(
|
||||
"| three defined in " + CyclicBeanMethodsConfiguration.class.getName());
|
||||
assertThat(lines.get(8)).isEqualTo("└─────┘");
|
||||
assertThat(analysis.getDescription()).startsWith(
|
||||
"The dependencies of some of the beans in the application context form a cycle:");
|
||||
assertThat(analysis.getDescription()).contains(
|
||||
"one defined in " + CyclicBeanMethodsConfiguration.class.getName());
|
||||
assertThat(analysis.getDescription()).contains(
|
||||
"two defined in " + CyclicBeanMethodsConfiguration.class.getName());
|
||||
assertThat(analysis.getDescription()).contains(
|
||||
"three defined in " + CyclicBeanMethodsConfiguration.class.getName());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Loading…
Reference in New Issue
Block a user