Merge branch '2.3.x' into 2.4.x

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryWebEndpointServletHandlerMapping.java

@@ -25,6 +25,9 @@
 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 @@
  */
 class CloudFoundryWebEndpointServletHandlerMapping extends AbstractWebMvcEndpointHandlerMapping {
 
+	private static final Log logger = LogFactory.getLog(CloudFoundryWebEndpointServletHandlerMapping.class);
+
 	private final CloudFoundrySecurityInterceptor securityInterceptor;
 
 	private final EndpointLinksResolver linksResolver;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MockedDriverConfiguration.java

@@ -16,7 +16,7 @@
 
 package org.springframework.boot.autoconfigure.data.neo4j;
 
-import org.mockito.Mockito;
+import org.mockito.ArgumentMatchers;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.Session;
 import org.neo4j.driver.SessionConfig;
@@ -43,7 +43,7 @@ Driver driver() {
 		TypeSystem typeSystem = mock(TypeSystem.class);
 		Session session = mock(Session.class);
 		given(driver.defaultTypeSystem()).willReturn(typeSystem);
-		given(driver.session(Mockito.any(SessionConfig.class))).willReturn(session);
+		given(driver.session(ArgumentMatchers.any(SessionConfig.class))).willReturn(session);
 		return driver;
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java

@@ -644,7 +644,7 @@ static class TestLayers implements Layers {
 
 		private static final Layer DEFAULT_LAYER = new Layer("default");
 
-		private Set<Layer> layers = new LinkedHashSet<Layer>();
+		private Set<Layer> layers = new LinkedHashSet<>();
 
 		private Map<String, Layer> libraries = new HashMap<>();
 

spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java

@@ -643,7 +643,7 @@ void jarFileEntryWithEpochTimeOfZeroShouldNotFail() throws Exception {
 	@Test
 	void iterator() {
 		Iterator<JarEntry> iterator = this.jarFile.iterator();
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 		while (iterator.hasNext()) {
 			names.add(iterator.next().getName());
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactory.java

@@ -82,7 +82,7 @@ public abstract class AbstractServletWebServerFactory extends AbstractConfigurab
 
 	private final StaticResourceJars staticResourceJars = new StaticResourceJars();
 
-	private final Set<String> webListenerClassNames = new HashSet<String>();
+	private final Set<String> webListenerClassNames = new HashSet<>();
 
 	/**
 	 * Create a new {@link AbstractServletWebServerFactory} instance.

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesTests.java

@@ -203,7 +203,7 @@ static class TestPropertySource extends MapPropertySource implements OriginLooku
 		}
 
 		private static Map<String, Object> createProperties(int index) {
-			Map<String, Object> map = new LinkedHashMap<String, Object>();
+			Map<String, Object> map = new LinkedHashMap<>();
 			for (int i = 0; i < 1000; i++) {
 				String name = "test-" + index + "-property-" + i;
 				String value = name + "-value";