Replace explicit generics with diamond operator

Where possible, explicit generic declarations to use the Java 8 diamond
operator.

See gh-9781

Author: emacampolo

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java

@@ -169,7 +169,7 @@ public static class Security {
 		/**
 		 * Comma-separated list of roles that can access the management endpoint.
 		 */
-		private List<String> roles = new ArrayList<String>(
+		private List<String> roles = new ArrayList<>(
 				Collections.singletonList("ACTUATOR"));
 
 		/**

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java

@@ -89,7 +89,7 @@ public PropertyResolver getResolver() {
 	}
 
 	private Map<String, PropertySource<?>> getPropertySourcesAsMap() {
-		Map<String, PropertySource<?>> map = new LinkedHashMap<String, PropertySource<?>>();
+		Map<String, PropertySource<?>> map = new LinkedHashMap<>();
 		for (PropertySource<?> source : getPropertySources()) {
 			extract("", map, source);
 		}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java

@@ -40,7 +40,7 @@ public class CompositeHealthIndicator implements HealthIndicator {
 	 * @param healthAggregator the health aggregator
 	 */
 	public CompositeHealthIndicator(HealthAggregator healthAggregator) {
-		this(healthAggregator, new LinkedHashMap<String, HealthIndicator>());
+		this(healthAggregator, new LinkedHashMap<>());
 	}
 
 	/**

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java

@@ -191,7 +191,7 @@ private Object getHeaderValue(HttpServletRequest request, String name) {
 	}
 
 	private Map<String, String[]> getParameterMapCopy(HttpServletRequest request) {
-		return new LinkedHashMap<String, String[]>(request.getParameterMap());
+		return new LinkedHashMap<>(request.getParameterMap());
 	}
 
 	/**

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/CachePublicMetricsTests.java

@@ -45,7 +45,7 @@
  */
 public class CachePublicMetricsTests {
 
-	private Map<String, CacheManager> cacheManagers = new HashMap<String, CacheManager>();
+	private Map<String, CacheManager> cacheManagers = new HashMap<>();
 
 	@Before
 	public void setup() {
@@ -98,7 +98,7 @@ public void cacheMetricsWithTransactionAwareCacheDecorator() {
 	private Map<String, Number> metrics(CachePublicMetrics cpm) {
 		Collection<Metric<?>> metrics = cpm.metrics();
 		assertThat(metrics).isNotNull();
-		Map<String, Number> result = new HashMap<String, Number>();
+		Map<String, Number> result = new HashMap<>();
 		for (Metric<?> metric : metrics) {
 			result.put(metric.getName(), metric.getValue());
 		}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java

@@ -435,9 +435,9 @@ public void setAddress(InetAddress address) {
 
 	public static class InitializedMapAndListProperties extends Foo {
 
-		private Map<String, Boolean> map = new HashMap<String, Boolean>();
+		private Map<String, Boolean> map = new HashMap<>();
 
-		private List<String> list = new ArrayList<String>();
+		private List<String> list = new ArrayList<>();
 
 		public Map<String, Boolean> getMap() {
 			return this.map;

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java

@@ -268,7 +268,7 @@ public void propertyWithTypeOtherThanStringShouldNotFail() throws Exception {
 		this.context = new AnnotationConfigApplicationContext();
 		MutablePropertySources propertySources = this.context.getEnvironment()
 				.getPropertySources();
-		Map<String, Object> source = new HashMap<String, Object>();
+		Map<String, Object> source = new HashMap<>();
 		source.put("foo", Collections.singletonMap("bar", "baz"));
 		propertySources.addFirst(new MapPropertySource("test", source));
 		this.context.register(Config.class);

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java

@@ -142,7 +142,7 @@ public void regex() throws Exception {
 	@Test
 	public void nestedPathWhenPlaceholderCannotBeResolvedShouldReturnUnresolvedProperty()
 			throws Exception {
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("my.foo", "${my.bar}");
 		((ConfigurableEnvironment) this.context.getEnvironment()).getPropertySources()
 				.addFirst(new MapPropertySource("unresolved-placeholder", map));
@@ -152,7 +152,7 @@ public void nestedPathWhenPlaceholderCannotBeResolvedShouldReturnUnresolvedPrope
 
 	@Test
 	public void nestedPathWithSensitivePlaceholderShouldSanitize() throws Exception {
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("my.foo", "${my.password}");
 		map.put("my.password", "hello");
 		((ConfigurableEnvironment) this.context.getEnvironment()).getPropertySources()
@@ -165,7 +165,7 @@ public void nestedPathWithSensitivePlaceholderShouldSanitize() throws Exception
 	public void propertyWithTypeOtherThanStringShouldNotFail() throws Exception {
 		MutablePropertySources propertySources = ((ConfigurableEnvironment) this.context
 				.getEnvironment()).getPropertySources();
-		Map<String, Object> source = new HashMap<String, Object>();
+		Map<String, Object> source = new HashMap<>();
 		source.put("foo", Collections.singletonMap("bar", "baz"));
 		propertySources.addFirst(new MapPropertySource("test", source));
 		this.mvc.perform(get("/application/env/foo.*")).andExpect(status().isOk())

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java

@@ -97,15 +97,15 @@ public void periodPrefix() throws Exception {
 
 	@Test
 	public void incrementMetricWithInvalidCharsInName() throws Exception {
-		this.writer.increment(new Delta<Long>("counter.fo:o", 3L));
+		this.writer.increment(new Delta<>("counter.fo:o", 3L));
 		this.server.waitForMessage();
 		assertThat(this.server.messagesReceived().get(0))
 				.isEqualTo("me.counter.fo-o:3|c");
 	}
 
 	@Test
 	public void setMetricWithInvalidCharsInName() throws Exception {
-		this.writer.set(new Metric<Long>("gauge.f:o:o", 3L));
+		this.writer.set(new Metric<>("gauge.f:o:o", 3L));
 		this.server.waitForMessage();
 		assertThat(this.server.messagesReceived().get(0)).isEqualTo("me.gauge.f-o-o:3|g");
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java

@@ -134,7 +134,7 @@ protected final Map<Class<?>, List<Annotation>> getAnnotations(
 			AnnotationMetadata metadata) {
 		MultiValueMap<Class<?>, Annotation> annotations = new LinkedMultiValueMap<>();
 		Class<?> source = ClassUtils.resolveClassName(metadata.getClassName(), null);
-		collectAnnotations(source, annotations, new HashSet<Class<?>>());
+		collectAnnotations(source, annotations, new HashSet<>());
 		return Collections.unmodifiableMap(annotations);
 	}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java

@@ -34,7 +34,7 @@ public class JestProperties {
 	/**
 	 * Comma-separated list of the Elasticsearch instances to use.
 	 */
-	private List<String> uris = new ArrayList<String>(
+	private List<String> uris = new ArrayList<>(
 			Collections.singletonList("http://localhost:9200"));
 
 	/**

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java

@@ -73,7 +73,7 @@ public class FlywayProperties {
 	 * SQL statements to execute to initialize a connection immediately after obtaining
 	 * it.
 	 */
-	private List<String> initSqls = new ArrayList<String>();
+	private List<String> initSqls = new ArrayList<>();
 
 	public void setLocations(List<String> locations) {
 		this.locations = locations;

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProvider.java

@@ -41,7 +41,7 @@ public FreeMarkerTemplateAvailabilityProvider() {
 	static final class FreeMarkerTemplateAvailabilityProperties
 			extends TemplateAvailabilityProperties {
 
-		private List<String> templateLoaderPath = new ArrayList<String>(
+		private List<String> templateLoaderPath = new ArrayList<>(
 				Arrays.asList(FreeMarkerProperties.DEFAULT_TEMPLATE_LOADER_PATH));
 
 		FreeMarkerTemplateAvailabilityProperties() {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProvider.java

@@ -41,7 +41,7 @@ public GroovyTemplateAvailabilityProvider() {
 	static final class GroovyTemplateAvailabilityProperties
 			extends TemplateAvailabilityProperties {
 
-		private List<String> resourceLoaderPath = new ArrayList<String>(
+		private List<String> resourceLoaderPath = new ArrayList<>(
 				Arrays.asList(GroovyTemplateProperties.DEFAULT_RESOURCE_LOADER_PATH));
 
 		GroovyTemplateAvailabilityProperties() {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java

@@ -181,8 +181,7 @@ private void setPortProperty(ApplicationContext context, int port) {
 	private Map<String, Object> getLdapPorts(MutablePropertySources sources) {
 		PropertySource<?> propertySource = sources.get(PROPERTY_SOURCE_NAME);
 		if (propertySource == null) {
-			propertySource = new MapPropertySource(PROPERTY_SOURCE_NAME,
-					new HashMap<String, Object>());
+			propertySource = new MapPropertySource(PROPERTY_SOURCE_NAME, new HashMap<>());
 			sources.addFirst(propertySource);
 		}
 		return (Map<String, Object>) propertySource.getSource();

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java

@@ -179,8 +179,7 @@ private void setPortProperty(ApplicationContext currentContext, int port) {
 	private Map<String, Object> getMongoPorts(MutablePropertySources sources) {
 		PropertySource<?> propertySource = sources.get("mongo.ports");
 		if (propertySource == null) {
-			propertySource = new MapPropertySource("mongo.ports",
-					new HashMap<String, Object>());
+			propertySource = new MapPropertySource("mongo.ports", new HashMap<>());
 			sources.addFirst(propertySource);
 		}
 		return (Map<String, Object>) propertySource.getSource();

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java

@@ -64,7 +64,7 @@ public class UserInfoTokenServicesTests {
 	public void init() {
 		this.resource.setClientId("foo");
 		given(this.template.getForEntity(any(String.class), eq(Map.class)))
-				.willReturn(new ResponseEntity<Map>(this.map, HttpStatus.OK));
+				.willReturn(new ResponseEntity<>(this.map, HttpStatus.OK));
 		given(this.template.getAccessToken())
 				.willReturn(new DefaultOAuth2AccessToken("FOO"));
 		given(this.template.getResource()).willReturn(this.resource);

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java

@@ -120,7 +120,7 @@ public void testTomcatBinding() throws Exception {
 
 	@Test
 	public void redirectContextRootIsNotConfiguredByDefault() throws Exception {
-		bind(new HashMap<String, String>());
+		bind(new HashMap<>());
 		ServerProperties.Tomcat tomcat = this.properties.getTomcat();
 		assertThat(tomcat.getRedirectContextRoot()).isNull();
 	}
@@ -164,7 +164,7 @@ public void testCustomizeJettySelectors() throws Exception {
 
 	@Test
 	public void testCustomizeJettyAccessLog() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.jetty.accesslog.enabled", "true");
 		map.put("server.jetty.accesslog.filename", "foo.txt");
 		map.put("server.jetty.accesslog.file-date-format", "yyyymmdd");

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DefaultServletWebServerFactoryCustomizerTests.java

@@ -107,7 +107,7 @@ public void tomcatAccessLogCanBeEnabled() {
 	@Test
 	public void tomcatAccessLogFileDateFormatByDefault() {
 		TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.accesslog.enabled", "true");
 		bindProperties(map);
 		this.customizer.customize(factory);
@@ -118,7 +118,7 @@ public void tomcatAccessLogFileDateFormatByDefault() {
 	@Test
 	public void tomcatAccessLogFileDateFormatCanBeRedefined() {
 		TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.accesslog.enabled", "true");
 		map.put("server.tomcat.accesslog.file-date-format", "yyyy-MM-dd.HH");
 		bindProperties(map);
@@ -397,7 +397,7 @@ public void customTomcatMaxHttpPostSize() {
 
 	@Test
 	public void customTomcatDisableMaxHttpPostSize() {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.max-http-post-size", "-1");
 		bindProperties(map);
 		TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0);

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java

@@ -126,8 +126,7 @@ private enum InMemoryDatabase {
 
 			InMemoryDatabase(String urlPrefix, String... driverClassNames) {
 				this.urlPrefix = urlPrefix;
-				this.driverClassNames = new HashSet<String>(
-						Arrays.asList(driverClassNames));
+				this.driverClassNames = new HashSet<>(Arrays.asList(driverClassNames));
 			}
 
 			boolean matches(DataSourceProperties properties) {

spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java

@@ -58,7 +58,7 @@ public static Object[] parameters(String packaging,
 
 	private static List<Object> createParameters(String packaging, String container,
 			List<Class<? extends AbstractApplicationLauncher>> applicationLaunchers) {
-		List<Object> parameters = new ArrayList<Object>();
+		List<Object> parameters = new ArrayList<>();
 		ApplicationBuilder applicationBuilder = new ApplicationBuilder(temporaryFolder,
 				packaging, container);
 		for (Class<? extends AbstractApplicationLauncher> launcherClass : applicationLaunchers) {

spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/BootRunApplicationLauncher.java

@@ -56,7 +56,7 @@ protected List<String> getArguments(File archive) {
 			if (archive.getName().endsWith(".war")) {
 				populateSrcMainWebapp();
 			}
-			List<String> classpath = new ArrayList<String>();
+			List<String> classpath = new ArrayList<>();
 			classpath.add(targetClasses.getAbsolutePath());
 			for (File dependency : dependencies.listFiles()) {
 				classpath.add(dependency.getAbsolutePath());

spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/IdeApplicationLauncher.java

@@ -67,7 +67,7 @@ protected List<String> getArguments(File archive) {
 			if (archive.getName().endsWith(".war")) {
 				populateSrcMainWebapp();
 			}
-			List<String> classpath = new ArrayList<String>();
+			List<String> classpath = new ArrayList<>();
 			classpath.add(targetClasses.getAbsolutePath());
 			for (File dependency : dependencies.listFiles()) {
 				classpath.add(dependency.getAbsolutePath());

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySource.java

@@ -60,7 +60,7 @@ public AnnotationsPropertySource(String name, Class<?> source) {
 
 	private Map<String, Object> getProperties(Class<?> source) {
 		Map<String, Object> properties = new LinkedHashMap<>();
-		collectProperties(source, source, properties, new HashSet<Class<?>>());
+		collectProperties(source, source, properties, new HashSet<>());
 		return Collections.unmodifiableMap(properties);
 	}
 

spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java

@@ -219,7 +219,7 @@ private boolean isFromConfiguration(MergedContextConfiguration candidateConfig,
 			ContextConfiguration configuration) {
 		ContextConfigurationAttributes attributes = new ContextConfigurationAttributes(
 				candidateConfig.getTestClass(), configuration);
-		Set<Class<?>> configurationClasses = new HashSet<Class<?>>(
+		Set<Class<?>> configurationClasses = new HashSet<>(
 				Arrays.asList(attributes.getClasses()));
 		for (Class<?> candidate : candidateConfig.getClasses()) {
 			if (configurationClasses.contains(candidate)) {

spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java

@@ -60,7 +60,7 @@ public void customizeContext(ConfigurableApplicationContext context,
 		}
 
 		private List<URL> findJsonObjects() {
-			List<URL> jsonObjects = new ArrayList<URL>();
+			List<URL> jsonObjects = new ArrayList<>();
 			try {
 				Enumeration<URL> resources = getClass().getClassLoader()
 						.getResources("org/json/JSONObject.class");

spring-boot-test/src/main/java/org/springframework/boot/test/json/JacksonTester.java

@@ -158,7 +158,7 @@ public static void initFields(Object testInstance,
 	 * @return the new instance
 	 */
 	public JacksonTester<T> forView(Class<?> view) {
-		return new JacksonTester<T>(this.getResourceLoadClass(), this.getType(),
+		return new JacksonTester<>(this.getResourceLoadClass(), this.getType(),
 				this.objectMapper, view);
 	}
 

spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java

@@ -46,7 +46,7 @@ class BootArchiveSupport {
 	private static final Set<String> DEFAULT_LAUNCHER_CLASSES;
 
 	static {
-		Set<String> defaultLauncherClasses = new HashSet<String>();
+		Set<String> defaultLauncherClasses = new HashSet<>();
 		defaultLauncherClasses.add("org.springframework.boot.loader.JarLauncher");
 		defaultLauncherClasses.add("org.springframework.boot.loader.PropertiesLauncher");
 		defaultLauncherClasses.add("org.springframework.boot.loader.WarLauncher");
@@ -121,7 +121,7 @@ void setExcludeDevtools(boolean excludeDevtools) {
 	}
 
 	private void configureExclusions() {
-		Set<String> excludes = new HashSet<String>();
+		Set<String> excludes = new HashSet<>();
 		if (this.excludeDevtools) {
 			excludes.add("**/spring-boot-devtools-*.jar");
 		}

spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java

@@ -132,7 +132,7 @@ private Spec<FileTreeElement> writeLoaderClassesIfNecessary(
 	private Spec<FileTreeElement> writeLoaderClasses(ZipArchiveOutputStream out) {
 		try (ZipInputStream in = new ZipInputStream(getClass()
 				.getResourceAsStream("/META-INF/loader/spring-boot-loader.jar"))) {
-			Set<String> entries = new HashSet<String>();
+			Set<String> entries = new HashSet<>();
 			java.util.zip.ZipEntry entry;
 			while ((entry = in.getNextEntry()) != null) {
 				if (entry.isDirectory() && !entry.getName().startsWith("META-INF/")) {

spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LaunchScriptConfiguration.java

@@ -34,7 +34,7 @@ public class LaunchScriptConfiguration implements Serializable {
 
 	private boolean included = false;
 
-	private final Map<String, String> properties = new HashMap<String, String>();
+	private final Map<String, String> properties = new HashMap<>();
 
 	private File script;
 

spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/PomCondition.java

@@ -40,7 +40,7 @@ class PomCondition extends Condition<File> {
 	private Set<String> notExpectedContents;
 
 	PomCondition() {
-		this(new HashSet<String>(), new HashSet<String>());
+		this(new HashSet<>(), new HashSet<>());
 	}
 
 	private PomCondition(Set<String> expectedContents, Set<String> notExpectedContents) {

spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java

@@ -160,7 +160,7 @@ public GradleRunner prepareRunner(String... arguments) throws IOException {
 		if (this.gradleVersion != null) {
 			gradleRunner.withGradleVersion(this.gradleVersion);
 		}
-		List<String> allArguments = new ArrayList<String>();
+		List<String> allArguments = new ArrayList<>();
 		allArguments.add("-PpluginClasspath=" + pluginClasspath());
 		allArguments.add("-PbootVersion=" + getBootVersion());
 		allArguments.add("--stacktrace");

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java

@@ -330,7 +330,7 @@ protected String getMainClass() throws Exception {
 
 	@Override
 	protected ClassLoader createClassLoader(List<Archive> archives) throws Exception {
-		Set<URL> urls = new LinkedHashSet<URL>(archives.size());
+		Set<URL> urls = new LinkedHashSet<>(archives.size());
 		for (Archive archive : archives) {
 			urls.add(archive.getUrl());
 		}
@@ -522,7 +522,7 @@ private List<Archive> getNestedArchives(String path) throws Exception {
 			root = "";
 		}
 		EntryFilter filter = new PrefixMatchingArchiveFilter(root);
-		List<Archive> archives = new ArrayList<Archive>(parent.getNestedArchives(filter));
+		List<Archive> archives = new ArrayList<>(parent.getNestedArchives(filter));
 		if (("".equals(root) || ".".equals(root)) && !path.endsWith(".jar")
 				&& parent != this.parent) {
 			// You can't find the root with an entry filter so it has to be added