From 1e7d85a63232b718dfe0f4266c50b43a6a323b39 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 6 Nov 2017 09:31:08 -0800 Subject: [PATCH] Polish --- .../template/PathBasedTemplateAvailabilityProvider.java | 3 +-- .../servlet/server/AbstractServletWebServerFactoryTests.java | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/PathBasedTemplateAvailabilityProvider.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/PathBasedTemplateAvailabilityProvider.java index 2fc7c19ccae..871c2e546ef 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/PathBasedTemplateAvailabilityProvider.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/PathBasedTemplateAvailabilityProvider.java @@ -55,10 +55,9 @@ public abstract class PathBasedTemplateAvailabilityProvider ClassLoader classLoader, ResourceLoader resourceLoader) { if (ClassUtils.isPresent(this.className, classLoader)) { Binder binder = Binder.get(environment); - TemplateAvailabilityProperties properties1 = binder + TemplateAvailabilityProperties properties = binder .bind(this.propertyPrefix, this.propertiesClass) .orElseCreate(this.propertiesClass); - TemplateAvailabilityProperties properties = properties1; return isTemplateAvailable(view, resourceLoader, properties); } return false; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java index b08c996757c..8765e8fd6fd 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java @@ -269,7 +269,8 @@ public abstract class AbstractServletWebServerFactoryTests { factory.setContextPath("/custom"); this.webServer = factory.getWebServer(exampleServletRegistration()); this.webServer.start(); - assertThat(this.output.toString()).containsOnlyOnce("with context path '/custom'"); + assertThat(this.output.toString()) + .containsOnlyOnce("with context path '/custom'"); } @Test