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

Merge branch '1.5.x' into 2.0.x

Browse Source
This commit is contained in:
Phillip Webb
2018-05-03 12:43:50 -07:00
parent 60e4e51fea 4e96587dc8
commit e125085993
138 changed files with 274 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/test/spock/SpockTestRestTemplateExample.java
View File

@@ -45,8 +45,8 @@ public class SpockTestRestTemplateExample {
ObjectProvider<RestTemplateBuilder> builderProvider,
Environment environment) {
RestTemplateBuilder builder = builderProvider.getIfAvailable();
TestRestTemplate template = builder == null ? new TestRestTemplate()
: new TestRestTemplate(builder);
TestRestTemplate template = (builder != null ? new TestRestTemplate(builder)
: new TestRestTemplate());
template.setUriTemplateHandler(new LocalHostUriTemplateHandler(environment));
return template;
}