From 29300530c684ef35db859852435d3224f849fb57 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 15 Dec 2020 19:44:40 -0800 Subject: [PATCH] Polish --- .../CloudFoundryWebEndpointServletHandlerMapping.java | 5 +++++ .../boot/loader/tools/AbstractPackagerTests.java | 2 +- .../org/springframework/boot/loader/jar/JarFileTests.java | 2 +- .../embedded/undertow/UndertowWebServerFactoryDelegate.java | 2 +- .../properties/source/ConfigurationPropertySourcesTests.java | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryWebEndpointServletHandlerMapping.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryWebEndpointServletHandlerMapping.java index bb2331e7bc..472535cf6b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryWebEndpointServletHandlerMapping.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryWebEndpointServletHandlerMapping.java @@ -25,6 +25,9 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.springframework.boot.actuate.autoconfigure.cloudfoundry.AccessLevel; import org.springframework.boot.actuate.autoconfigure.cloudfoundry.SecurityResponse; import org.springframework.boot.actuate.endpoint.EndpointId; @@ -51,6 +54,8 @@ import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMappi */ class CloudFoundryWebEndpointServletHandlerMapping extends AbstractWebMvcEndpointHandlerMapping { + private static final Log logger = LogFactory.getLog(CloudFoundryWebEndpointServletHandlerMapping.class); + private final CloudFoundrySecurityInterceptor securityInterceptor; private final EndpointLinksResolver linksResolver; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java index 8051f97923..afeacd673d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java @@ -644,7 +644,7 @@ abstract class AbstractPackagerTests

{ private static final Layer DEFAULT_LAYER = new Layer("default"); - private Set layers = new LinkedHashSet(); + private Set layers = new LinkedHashSet<>(); private Map libraries = new HashMap<>(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java index 38356cd4c7..54273b6412 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java @@ -645,7 +645,7 @@ class JarFileTests { @Test void iterator() { Iterator iterator = this.jarFile.iterator(); - List names = new ArrayList(); + List names = new ArrayList<>(); while (iterator.hasNext()) { names.add(iterator.next().getName()); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServerFactoryDelegate.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServerFactoryDelegate.java index 31f1e59b6c..4c2520b6da 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServerFactoryDelegate.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServerFactoryDelegate.java @@ -189,7 +189,7 @@ class UndertowWebServerFactoryDelegate { static List createHttpHandlerFactories(Compression compression, boolean useForwardHeaders, String serverHeader, Shutdown shutdown, HttpHandlerFactory... initialHttpHandlerFactories) { - List factories = new ArrayList(); + List factories = new ArrayList<>(); factories.addAll(Arrays.asList(initialHttpHandlerFactories)); if (compression != null && compression.getEnabled()) { factories.add(new CompressionHttpHandlerFactory(compression)); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesTests.java index 98be1e214f..94b97cce3d 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesTests.java @@ -203,7 +203,7 @@ class ConfigurationPropertySourcesTests { } private static Map createProperties(int index) { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); for (int i = 0; i < 1000; i++) { String name = "test-" + index + "-property-" + i; String value = name + "-value";