Merge pull request #10494 from Johnny Lim

* gh-10494:
  Polish “Remove explicit type arguments”
  Remove explicit type arguments

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerFactoryCustomizer.java

@@ -67,7 +67,7 @@ public final void customize(T factory) {
 		// the same place)
 		webServerFactoryCustomizer.customize(factory);
 		// Then reset the error pages
-		factory.setErrorPages(Collections.<ErrorPage>emptySet());
+		factory.setErrorPages(Collections.emptySet());
 		// and add the management-specific bits
 		customize(factory, managementServerProperties, serverProperties);
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/RequestMappingEndpointTests.java

@@ -38,7 +38,6 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.context.support.StaticApplicationContext;
-import org.springframework.web.servlet.handler.AbstractHandlerMethodMapping;
 import org.springframework.web.servlet.handler.AbstractUrlHandlerMapping;
 import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 
@@ -59,8 +58,7 @@ public void concreteUrlMappings() {
 		mapping.setUrlMap(Collections.singletonMap("/foo", new Object()));
 		mapping.setApplicationContext(new StaticApplicationContext());
 		mapping.initApplicationContext();
-		this.endpoint.setHandlerMappings(
-				Collections.<AbstractUrlHandlerMapping>singletonList(mapping));
+		this.endpoint.setHandlerMappings(Collections.singletonList(mapping));
 		Map<String, Object> result = this.endpoint.mappings();
 		assertThat(result).hasSize(1);
 		@SuppressWarnings("unchecked")
@@ -120,8 +118,7 @@ public void beanMethodMappings() {
 	@Test
 	public void concreteMethodMappings() {
 		WebMvcEndpointHandlerMapping mapping = createHandlerMapping();
-		this.endpoint.setMethodMappings(
-				Collections.<AbstractHandlerMethodMapping<?>>singletonList(mapping));
+		this.endpoint.setMethodMappings(Collections.singletonList(mapping));
 		Map<String, Object> result = this.endpoint.mappings();
 		assertThat(result).hasSize(2);
 		assertThat(result.keySet())

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/ShutdownEndpoint.java

@@ -39,12 +39,12 @@
 public class ShutdownEndpoint implements ApplicationContextAware {
 
 	private static final Map<String, String> NO_CONTEXT_MESSAGE = Collections
-			.unmodifiableMap(Collections.<String, String>singletonMap("message",
-					"No context to shutdown."));
+			.unmodifiableMap(
+					Collections.singletonMap("message", "No context to shutdown."));
 
 	private static final Map<String, String> SHUTDOWN_MESSAGE = Collections
-			.unmodifiableMap(Collections.<String, String>singletonMap("message",
-					"Shutting down, bye..."));
+			.unmodifiableMap(
+					Collections.singletonMap("message", "Shutting down, bye..."));
 
 	private ConfigurableApplicationContext context;
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java

@@ -154,7 +154,7 @@ private Map<String, Object> safeSerialize(ObjectMapper mapper, Object bean,
 			return result;
 		}
 		catch (Exception ex) {
-			return new HashMap<>(Collections.<String, Object>singletonMap("error",
+			return new HashMap<>(Collections.singletonMap("error",
 					"Cannot serialize '" + prefix + "'"));
 		}
 	}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java

@@ -106,7 +106,7 @@ public AuditEventsWebEndpointExtension auditEventsWebEndpointExtension(
 
 		private AuditEvent createEvent(String instant, String principal, String type) {
 			return new AuditEvent(Date.from(Instant.parse(instant)), principal, type,
-					Collections.<String, Object>emptyMap());
+					Collections.emptyMap());
 		}
 
 	}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java

@@ -36,8 +36,7 @@ public class AuditListenerTests {
 	@Test
 	public void testStoredEvents() {
 		AuditEventRepository repository = mock(AuditEventRepository.class);
-		AuditEvent event = new AuditEvent("principal", "type",
-				Collections.<String, Object>emptyMap());
+		AuditEvent event = new AuditEvent("principal", "type", Collections.emptyMap());
 		AuditListener listener = new AuditListener(repository);
 		listener.onApplicationEvent(new AuditApplicationEvent(event));
 		verify(repository).add(event);

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java

@@ -25,7 +25,6 @@
 import org.springframework.boot.actuate.audit.listener.AuditApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.access.event.AbstractAuthorizationEvent;
 import org.springframework.security.access.event.AuthenticationCredentialsNotFoundEvent;
@@ -56,8 +55,7 @@ public void init() {
 	public void testAuthenticationCredentialsNotFound() {
 		AuditApplicationEvent event = handleAuthorizationEvent(
 				new AuthenticationCredentialsNotFoundEvent(this,
-						Collections.<ConfigAttribute>singletonList(
-								new SecurityConfig("USER")),
+						Collections.singletonList(new SecurityConfig("USER")),
 						new AuthenticationCredentialsNotFoundException("Bad user")));
 		assertThat(event.getAuditEvent().getType())
 				.isEqualTo(AuthenticationAuditListener.AUTHENTICATION_FAILURE);
@@ -67,8 +65,7 @@ public void testAuthenticationCredentialsNotFound() {
 	public void testAuthorizationFailure() {
 		AuditApplicationEvent event = handleAuthorizationEvent(
 				new AuthorizationFailureEvent(this,
-						Collections.<ConfigAttribute>singletonList(
-								new SecurityConfig("USER")),
+						Collections.singletonList(new SecurityConfig("USER")),
 						new UsernamePasswordAuthenticationToken("user", "password"),
 						new AccessDeniedException("Bad user")));
 		assertThat(event.getAuditEvent().getType())
@@ -83,8 +80,7 @@ public void testDetailsAreIncludedInAuditEvent() throws Exception {
 		authentication.setDetails(details);
 		AuditApplicationEvent event = handleAuthorizationEvent(
 				new AuthorizationFailureEvent(this,
-						Collections.<ConfigAttribute>singletonList(
-								new SecurityConfig("USER")),
+						Collections.singletonList(new SecurityConfig("USER")),
 						authentication, new AccessDeniedException("Bad user")));
 		assertThat(event.getAuditEvent().getType())
 				.isEqualTo(AuthorizationAuditListener.AUTHORIZATION_FAILURE);

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java

@@ -35,9 +35,9 @@ public class InMemoryTraceRepositoryTests {
 	@Test
 	public void capacityLimited() {
 		this.repository.setCapacity(2);
-		this.repository.add(Collections.<String, Object>singletonMap("foo", "bar"));
-		this.repository.add(Collections.<String, Object>singletonMap("bar", "foo"));
-		this.repository.add(Collections.<String, Object>singletonMap("bar", "bar"));
+		this.repository.add(Collections.singletonMap("foo", "bar"));
+		this.repository.add(Collections.singletonMap("bar", "foo"));
+		this.repository.add(Collections.singletonMap("bar", "bar"));
 		List<Trace> traces = this.repository.findAll();
 		assertThat(traces).hasSize(2);
 		assertThat(traces.get(0).getInfo().get("bar")).isEqualTo("bar");
@@ -48,9 +48,9 @@ public void capacityLimited() {
 	public void reverseFalse() {
 		this.repository.setReverse(false);
 		this.repository.setCapacity(2);
-		this.repository.add(Collections.<String, Object>singletonMap("foo", "bar"));
-		this.repository.add(Collections.<String, Object>singletonMap("bar", "foo"));
-		this.repository.add(Collections.<String, Object>singletonMap("bar", "bar"));
+		this.repository.add(Collections.singletonMap("foo", "bar"));
+		this.repository.add(Collections.singletonMap("bar", "foo"));
+		this.repository.add(Collections.singletonMap("bar", "bar"));
 		List<Trace> traces = this.repository.findAll();
 		assertThat(traces).hasSize(2);
 		assertThat(traces.get(1).getInfo().get("bar")).isEqualTo("bar");

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/TraceEndpointTests.java

@@ -33,7 +33,7 @@ public class TraceEndpointTests {
 	@Test
 	public void trace() throws Exception {
 		TraceRepository repository = new InMemoryTraceRepository();
-		repository.add(Collections.<String, Object>singletonMap("a", "b"));
+		repository.add(Collections.singletonMap("a", "b"));
 		Trace trace = new TraceEndpoint(repository).traces().getTraces().get(0);
 		assertThat(trace.getInfo().get("a")).isEqualTo("b");
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java

@@ -131,7 +131,7 @@ public void registerBeanDefinitions(AnnotationMetadata metadata,
 
 		@Override
 		public Set<Object> determineImports(AnnotationMetadata metadata) {
-			return Collections.<Object>singleton(new PackageImport(metadata));
+			return Collections.singleton(new PackageImport(metadata));
 		}
 
 	}