root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2017-11-06 09:31:08 -08:00
parent 723222aa95
commit 1e7d85a632
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/PathBasedTemplateAvailabilityProvider.java
View File

@ -55,10 +55,9 @@ public abstract class PathBasedTemplateAvailabilityProvider
ClassLoader classLoader, ResourceLoader resourceLoader) { ClassLoader classLoader, ResourceLoader resourceLoader) {
if (ClassUtils.isPresent(this.className, classLoader)) { if (ClassUtils.isPresent(this.className, classLoader)) {
Binder binder = Binder.get(environment); Binder binder = Binder.get(environment);
TemplateAvailabilityProperties properties1 = binder TemplateAvailabilityProperties properties = binder
.bind(this.propertyPrefix, this.propertiesClass) .bind(this.propertyPrefix, this.propertiesClass)
.orElseCreate(this.propertiesClass); .orElseCreate(this.propertiesClass);
TemplateAvailabilityProperties properties = properties1;
return isTemplateAvailable(view, resourceLoader, properties); return isTemplateAvailable(view, resourceLoader, properties);
} }
return false; return false;

3
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
View File

@ -269,7 +269,8 @@ public abstract class AbstractServletWebServerFactoryTests {
factory.setContextPath("/custom"); factory.setContextPath("/custom");
this.webServer = factory.getWebServer(exampleServletRegistration()); this.webServer = factory.getWebServer(exampleServletRegistration());
this.webServer.start(); this.webServer.start();
assertThat(this.output.toString()).containsOnlyOnce("with context path '/custom'"); assertThat(this.output.toString())
.containsOnlyOnce("with context path '/custom'");
} }
@Test @Test