Polish “Remove explicit type arguments”

wilkinsona · wilkinsona · commit 2b426c30a6cc · 2017-10-24T14:44:26.000+01:00
Closes gh-10494
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/RequestMappingEndpointTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/RequestMappingEndpointTests.java
@@ -58,8 +58,7 @@ public void concreteUrlMappings() {
 		mapping.setUrlMap(Collections.singletonMap("/foo", new Object()));
 		mapping.setApplicationContext(new StaticApplicationContext());
 		mapping.initApplicationContext();
-		this.endpoint.setHandlerMappings(
-				Collections.singletonList(mapping));
+		this.endpoint.setHandlerMappings(Collections.singletonList(mapping));
 		Map<String, Object> result = this.endpoint.mappings();
 		assertThat(result).hasSize(1);
 		@SuppressWarnings("unchecked")
@@ -119,8 +118,7 @@ public void beanMethodMappings() {
 	@Test
 	public void concreteMethodMappings() {
 		WebMvcEndpointHandlerMapping mapping = createHandlerMapping();
-		this.endpoint.setMethodMappings(
-				Collections.singletonList(mapping));
+		this.endpoint.setMethodMappings(Collections.singletonList(mapping));
 		Map<String, Object> result = this.endpoint.mappings();
 		assertThat(result).hasSize(2);
 		assertThat(result.keySet())
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/ShutdownEndpoint.java b/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.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.singletonMap("message",
-					"Shutting down, bye..."));
+			.unmodifiableMap(
+					Collections.singletonMap("message", "Shutting down, bye..."));
 
 	private ConfigurableApplicationContext context;
 
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java b/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.emptyMap());
+		AuditEvent event = new AuditEvent("principal", "type", Collections.emptyMap());
 		AuditListener listener = new AuditListener(repository);
 		listener.onApplicationEvent(new AuditApplicationEvent(event));
 		verify(repository).add(event);
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java
@@ -55,8 +55,7 @@ public void init() {
 	public void testAuthenticationCredentialsNotFound() {
 		AuditApplicationEvent event = handleAuthorizationEvent(
 				new AuthenticationCredentialsNotFoundEvent(this,
-						Collections.singletonList(
-								new SecurityConfig("USER")),
+						Collections.singletonList(new SecurityConfig("USER")),
 						new AuthenticationCredentialsNotFoundException("Bad user")));
 		assertThat(event.getAuditEvent().getType())
 				.isEqualTo(AuthenticationAuditListener.AUTHENTICATION_FAILURE);
@@ -66,8 +65,7 @@ public void testAuthenticationCredentialsNotFound() {
 	public void testAuthorizationFailure() {
 		AuditApplicationEvent event = handleAuthorizationEvent(
 				new AuthorizationFailureEvent(this,
-						Collections.singletonList(
-								new SecurityConfig("USER")),
+						Collections.singletonList(new SecurityConfig("USER")),
 						new UsernamePasswordAuthenticationToken("user", "password"),
 						new AccessDeniedException("Bad user")));
 		assertThat(event.getAuditEvent().getType())
@@ -82,8 +80,7 @@ public void testDetailsAreIncludedInAuditEvent() throws Exception {
 		authentication.setDetails(details);
 		AuditApplicationEvent event = handleAuthorizationEvent(
 				new AuthorizationFailureEvent(this,
-						Collections.singletonList(
-								new SecurityConfig("USER")),
+						Collections.singletonList(new SecurityConfig("USER")),
 						authentication, new AccessDeniedException("Bad user")));
 		assertThat(event.getAuditEvent().getType())
 				.isEqualTo(AuthorizationAuditListener.AUTHORIZATION_FAILURE);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConverters.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConverters.java
@@ -103,8 +103,7 @@ public HttpMessageConverters(
 	public HttpMessageConverters(boolean addDefaultConverters,
 			Collection<HttpMessageConverter<?>> converters) {
 		List<HttpMessageConverter<?>> combined = getCombinedConverters(converters,
-				addDefaultConverters ? getDefaultConverters()
-						: Collections.emptyList());
+				addDefaultConverters ? getDefaultConverters() : Collections.emptyList());
 		combined = postProcessConverters(combined);
 		this.converters = Collections.unmodifiableList(combined);
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfiguration.java
@@ -68,8 +68,8 @@ public HttpMessageConvertersAutoConfiguration(
 	@Bean
 	@ConditionalOnMissingBean
 	public HttpMessageConverters messageConverters() {
-		return new HttpMessageConverters(this.converters == null
-				? Collections.emptyList() : this.converters);
+		return new HttpMessageConverters(
+				this.converters == null ? Collections.emptyList() : this.converters);
 	}
 
 	@Configuration
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java
@@ -56,8 +56,8 @@ public ContextSource ldapContextSource() {
 		source.setPassword(this.properties.getPassword());
 		source.setBase(this.properties.getBase());
 		source.setUrls(this.properties.determineUrls(this.environment));
-		source.setBaseEnvironmentProperties(Collections
-				.unmodifiableMap(this.properties.getBaseEnvironment()));
+		source.setBaseEnvironmentProperties(
+				Collections.unmodifiableMap(this.properties.getBaseEnvironment()));
 		return source;
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java
@@ -258,8 +258,7 @@ private ToStringFriendlyFeatureAwareVersion(String version,
 				Set<Feature> features) {
 			Assert.notNull(version, "version must not be null");
 			this.version = version;
-			this.features = (features == null ? Collections.emptySet()
-					: features);
+			this.features = (features == null ? Collections.emptySet() : features);
 		}
 
 		@Override
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorController.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorController.java
@@ -62,8 +62,7 @@ public class BasicErrorController extends AbstractErrorController {
 	 */
 	public BasicErrorController(ErrorAttributes errorAttributes,
 			ErrorProperties errorProperties) {
-		this(errorAttributes, errorProperties,
-				Collections.emptyList());
+		this(errorAttributes, errorProperties, Collections.emptyList());
 	}
 
 	/**
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java
@@ -248,8 +248,7 @@ protected List<AutoConfigurationImportFilter> getAutoConfigurationImportFilters(
 
 		@Override
 		protected List<AutoConfigurationImportListener> getAutoConfigurationImportListeners() {
-			return Collections.singletonList(
-					(event) -> this.lastEvent = event);
+			return Collections.singletonList((event) -> this.lastEvent = event);
 		}
 
 		public AutoConfigurationImportEvent getLastEvent() {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java
@@ -935,8 +935,7 @@ static class JCacheCustomCacheManager {
 		@Bean
 		public javax.cache.CacheManager customJCacheCacheManager() {
 			javax.cache.CacheManager cacheManager = mock(javax.cache.CacheManager.class);
-			given(cacheManager.getCacheNames())
-					.willReturn(Collections.emptyList());
+			given(cacheManager.getCacheNames()).willReturn(Collections.emptyList());
 			return cacheManager;
 		}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java
@@ -102,8 +102,7 @@ private List<String> entityManagerFactoryDependencies(
 		String[] dependsOn = ((BeanDefinitionRegistry) context
 				.getSourceApplicationContext()).getBeanDefinition("entityManagerFactory")
 						.getDependsOn();
-		return dependsOn != null ? Arrays.asList(dependsOn)
-				: Collections.emptyList();
+		return dependsOn != null ? Arrays.asList(dependsOn) : Collections.emptyList();
 	}
 
 	@Configuration
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQPropertiesTests.java
@@ -87,8 +87,7 @@ public void setTrustedPackages() {
 
 	private ActiveMQConnectionFactoryFactory createFactory(
 			ActiveMQProperties properties) {
-		return new ActiveMQConnectionFactoryFactory(properties,
-				Collections.emptyList());
+		return new ActiveMQConnectionFactoryFactory(properties, Collections.emptyList());
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java
@@ -43,8 +43,7 @@
  */
 public class ProjectGenerationRequestTests {
 
-	public static final Map<String, String> EMPTY_TAGS = Collections
-			.emptyMap();
+	public static final Map<String, String> EMPTY_TAGS = Collections.emptyMap();
 
 	@Rule
 	public final ExpectedException thrown = ExpectedException.none();
diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java
@@ -99,8 +99,8 @@ public void postProcessWhenRestarterDisabledAndRemoteSecretSetShouldAddPropertyS
 		SpringApplication application = new SpringApplication(
 				BeanConditionConfiguration.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
-		application.setDefaultProperties(Collections.singletonMap(
-				"spring.devtools.remote.secret", "donttell"));
+		application.setDefaultProperties(
+				Collections.singletonMap("spring.devtools.remote.secret", "donttell"));
 		this.context = application.run();
 		this.context.getBean(MyBean.class);
 	}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java
@@ -77,8 +77,7 @@ public int compareTo(ItemHint other) {
 	}
 
 	public static ItemHint newHint(String name, ValueHint... values) {
-		return new ItemHint(name, Arrays.asList(values),
-				Collections.emptyList());
+		return new ItemHint(name, Arrays.asList(values), Collections.emptyList());
 	}
 
 	@Override
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java
@@ -818,13 +818,14 @@ public void mergingOfHintWithNonCanonicalName() throws Exception {
 
 	@Test
 	public void mergingOfHintWithProvider() throws Exception {
-		writeAdditionalHints(new ItemHint("simple.theName",
-				Collections.emptyList(),
-				Arrays.asList(
-						new ItemHint.ValueProvider("first",
-								Collections.singletonMap("target",
-										"org.foo")),
-						new ItemHint.ValueProvider("second", null))));
+		writeAdditionalHints(
+				new ItemHint("simple.theName",
+						Collections
+								.emptyList(),
+						Arrays.asList(
+								new ItemHint.ValueProvider("first",
+										Collections.singletonMap("target", "org.foo")),
+								new ItemHint.ValueProvider("second", null))));
 		ConfigurationMetadata metadata = compile(SimpleProperties.class);
 		assertThat(metadata).has(Metadata.withProperty("simple.the-name", String.class)
 				.fromSource(SimpleProperties.class)
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshallerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshallerTests.java
@@ -57,9 +57,8 @@ public void marshallAndUnmarshal() throws Exception {
 		metadata.add(new ItemHint("d", null,
 				Arrays.asList(
 						new ItemHint.ValueProvider("first",
-								Collections.singletonMap("target",
-										"foo")),
-				new ItemHint.ValueProvider("second", null))));
+								Collections.singletonMap("target", "foo")),
+						new ItemHint.ValueProvider("second", null))));
 		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 		JsonMarshaller marshaller = new JsonMarshaller();
 		marshaller.write(metadata, outputStream);
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java
@@ -130,8 +130,8 @@ private PropertyResolver getAnsiResolver() {
 	private PropertyResolver getTitleResolver(Class<?> sourceClass) {
 		MutablePropertySources sources = new MutablePropertySources();
 		String applicationTitle = getApplicationTitle(sourceClass);
-		Map<String, Object> titleMap = Collections.singletonMap(
-				"application.title", (applicationTitle == null ? "" : applicationTitle));
+		Map<String, Object> titleMap = Collections.singletonMap("application.title",
+				(applicationTitle == null ? "" : applicationTitle));
 		sources.addFirst(new MapPropertySource("title", titleMap));
 		return new PropertySourcesPropertyResolver(sources);
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/CompositeDataSourcePoolMetadataProvider.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/CompositeDataSourcePoolMetadataProvider.java
@@ -42,8 +42,7 @@ public class CompositeDataSourcePoolMetadataProvider
 	 */
 	public CompositeDataSourcePoolMetadataProvider(
 			Collection<? extends DataSourcePoolMetadataProvider> providers) {
-		this.providers = (providers == null
-				? Collections.emptyList()
+		this.providers = (providers == null ? Collections.emptyList()
 				: Collections.unmodifiableList(new ArrayList<>(providers)));
 	}
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
@@ -596,15 +596,13 @@ private ClientHttpRequestFactory detectRequestFactory() {
 	}
 
 	private <T> Set<T> append(Set<T> set, T addition) {
-		Set<T> result = new LinkedHashSet<>(
-				set == null ? Collections.emptySet() : set);
+		Set<T> result = new LinkedHashSet<>(set == null ? Collections.emptySet() : set);
 		result.add(addition);
 		return Collections.unmodifiableSet(result);
 	}
 
 	private <T> Set<T> append(Set<T> set, Collection<? extends T> additions) {
-		Set<T> result = new LinkedHashSet<>(
-				set == null ? Collections.emptySet() : set);
+		Set<T> result = new LinkedHashSet<>(set == null ? Collections.emptySet() : set);
 		result.addAll(additions);
 		return Collections.unmodifiableSet(result);
 	}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
@@ -738,8 +738,7 @@ public void profileSubDocumentInDifferentProfileSpecificFile() throws Exception
 	@Test
 	public void addBeforeDefaultProperties() throws Exception {
 		MapPropertySource defaultSource = new MapPropertySource("defaultProperties",
-				Collections.singletonMap("the.property",
-						"fromdefaultproperties"));
+				Collections.singletonMap("the.property", "fromdefaultproperties"));
 		this.environment.getPropertySources().addFirst(defaultSource);
 		this.initializer.setSearchNames("testproperties");
 		this.initializer.postProcessEnvironment(this.environment, this.application);
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
@@ -66,8 +66,8 @@ public void getWhenNotAttachedShouldReturnAdapted() throws Exception {
 	public void getWhenAttachedShouldReturnAttached() throws Exception {
 		ConfigurableEnvironment environment = new StandardEnvironment();
 		MutablePropertySources sources = environment.getPropertySources();
-		sources.addFirst(new MapPropertySource("test",
-				Collections.singletonMap("a", "b")));
+		sources.addFirst(
+				new MapPropertySource("test", Collections.singletonMap("a", "b")));
 		int expectedSize = sources.size();
 		ConfigurationPropertySources.attach(environment);
 		assertThat(ConfigurationPropertySources.get(environment)).hasSize(expectedSize);
@@ -99,10 +99,10 @@ public void fromPropertySourceShouldReturnSpringConfigurationPropertySource()
 	@Test
 	public void fromPropertySourceShouldFlattenPropertySources() throws Exception {
 		StandardEnvironment environment = new StandardEnvironment();
-		environment.getPropertySources().addFirst(new MapPropertySource("foo",
-				Collections.singletonMap("foo", "bar")));
-		environment.getPropertySources().addFirst(new MapPropertySource("far",
-				Collections.singletonMap("far", "far")));
+		environment.getPropertySources().addFirst(
+				new MapPropertySource("foo", Collections.singletonMap("foo", "bar")));
+		environment.getPropertySources().addFirst(
+				new MapPropertySource("far", Collections.singletonMap("far", "far")));
 		MutablePropertySources sources = new MutablePropertySources();
 		sources.addFirst(new PropertySource<Environment>("env", environment) {
 
@@ -112,8 +112,8 @@ public String getProperty(String key) {
 			}
 
 		});
-		sources.addLast(new MapPropertySource("baz",
-				Collections.singletonMap("baz", "barf")));
+		sources.addLast(
+				new MapPropertySource("baz", Collections.singletonMap("baz", "barf")));
 		Iterable<ConfigurationPropertySource> configurationSources = ConfigurationPropertySources
 				.from(sources);
 		assertThat(configurationSources.iterator()).hasSize(5);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySourcesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySourcesTests.java
@@ -53,8 +53,8 @@ public void createWhenPropertySourcesIsNullShouldThrowException() throws Excepti
 	@Test
 	public void shouldAdaptPropertySource() throws Exception {
 		MutablePropertySources sources = new MutablePropertySources();
-		sources.addFirst(new MapPropertySource("test",
-				Collections.singletonMap("a", "b")));
+		sources.addFirst(
+				new MapPropertySource("test", Collections.singletonMap("a", "b")));
 		Iterator<ConfigurationPropertySource> iterator = new SpringConfigurationPropertySources(
 				sources).iterator();
 		ConfigurationPropertyName name = ConfigurationPropertyName.of("a");
@@ -83,8 +83,8 @@ public void shouldAdaptMultiplePropertySources() throws Exception {
 				Collections.singletonMap("SERVER_PORT", "1234")));
 		sources.addLast(new MapPropertySource("test1",
 				Collections.singletonMap("server.po-rt", "4567")));
-		sources.addLast(new MapPropertySource("test2",
-				Collections.singletonMap("a", "b")));
+		sources.addLast(
+				new MapPropertySource("test2", Collections.singletonMap("a", "b")));
 		Iterator<ConfigurationPropertySource> iterator = new SpringConfigurationPropertySources(
 				sources).iterator();
 		ConfigurationPropertyName name = ConfigurationPropertyName.of("server.port");
@@ -101,10 +101,10 @@ public void shouldAdaptMultiplePropertySources() throws Exception {
 	@Test
 	public void shouldFlattenEnvironment() throws Exception {
 		StandardEnvironment environment = new StandardEnvironment();
-		environment.getPropertySources().addFirst(new MapPropertySource("foo",
-				Collections.singletonMap("foo", "bar")));
-		environment.getPropertySources().addFirst(new MapPropertySource("far",
-				Collections.singletonMap("far", "far")));
+		environment.getPropertySources().addFirst(
+				new MapPropertySource("foo", Collections.singletonMap("foo", "bar")));
+		environment.getPropertySources().addFirst(
+				new MapPropertySource("far", Collections.singletonMap("far", "far")));
 		MutablePropertySources sources = new MutablePropertySources();
 		sources.addFirst(new PropertySource<Environment>("env", environment) {
 
@@ -114,8 +114,8 @@ public String getProperty(String key) {
 			}
 
 		});
-		sources.addLast(new MapPropertySource("baz",
-				Collections.singletonMap("baz", "barf")));
+		sources.addLast(
+				new MapPropertySource("baz", Collections.singletonMap("baz", "barf")));
 		SpringConfigurationPropertySources configurationSources = new SpringConfigurationPropertySources(
 				sources);
 		assertThat(configurationSources.iterator()).hasSize(5);
@@ -124,11 +124,11 @@ public String getProperty(String key) {
 	@Test
 	public void shouldTrackChanges() throws Exception {
 		MutablePropertySources sources = new MutablePropertySources();
-		sources.addLast(new MapPropertySource("test1",
-				Collections.singletonMap("a", "b")));
+		sources.addLast(
+				new MapPropertySource("test1", Collections.singletonMap("a", "b")));
 		assertThat(new SpringConfigurationPropertySources(sources).iterator()).hasSize(1);
-		sources.addLast(new MapPropertySource("test2",
-				Collections.singletonMap("b", "c")));
+		sources.addLast(
+				new MapPropertySource("test2", Collections.singletonMap("b", "c")));
 		assertThat(new SpringConfigurationPropertySources(sources).iterator()).hasSize(2);
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java

Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,7 @@ private ToStringFriendlyFeatureAwareVersion(String version,`
`258`	`258`	`Set<Feature> features) {`
`259`	`259`	`Assert.notNull(version, "version must not be null");`
`260`	`260`	`this.version = version;`
`261`		`- this.features = (features == null ? Collections.emptySet()`
`262`		`- : features);`
	`261`	`+ this.features = (features == null ? Collections.emptySet() : features);`
`263`	`262`	`}`
`264`	`263`
`265`	`264`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,7 @@ public class BasicErrorController extends AbstractErrorController {`
`62`	`62`	`*/`
`63`	`63`	`public BasicErrorController(ErrorAttributes errorAttributes,`
`64`	`64`	`ErrorProperties errorProperties) {`
`65`		`- this(errorAttributes, errorProperties,`
`66`		`- Collections.emptyList());`
	`65`	`+ this(errorAttributes, errorProperties, Collections.emptyList());`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -248,8 +248,7 @@ protected List<AutoConfigurationImportFilter> getAutoConfigurationImportFilters(`
`248`	`248`
`249`	`249`	`@Override`
`250`	`250`	`protected List<AutoConfigurationImportListener> getAutoConfigurationImportListeners() {`
`251`		`- return Collections.singletonList(`
`252`		`- (event) -> this.lastEvent = event);`
	`251`	`+ return Collections.singletonList((event) -> this.lastEvent = event);`
`253`	`252`	`}`
`254`	`253`
`255`	`254`	`public AutoConfigurationImportEvent getLastEvent() {`