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 index 2f9ad3c27f..8b6b364812 100644 --- 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 class RequestMappingEndpointTests { 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 result = this.endpoint.mappings(); assertThat(result).hasSize(1); @SuppressWarnings("unchecked") @@ -119,8 +118,7 @@ public class RequestMappingEndpointTests { @Test public void concreteMethodMappings() { WebMvcEndpointHandlerMapping mapping = createHandlerMapping(); - this.endpoint.setMethodMappings( - Collections.singletonList(mapping)); + this.endpoint.setMethodMappings(Collections.singletonList(mapping)); Map 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 index 06cb33b080..c5ab87fe00 100644 --- 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 @@ import org.springframework.context.ConfigurableApplicationContext; public class ShutdownEndpoint implements ApplicationContextAware { private static final Map NO_CONTEXT_MESSAGE = Collections - .unmodifiableMap(Collections.singletonMap("message", - "No context to shutdown.")); + .unmodifiableMap( + Collections.singletonMap("message", "No context to shutdown.")); private static final Map 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 index 2613b3ea76..6c80e6ba5f 100644 --- 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 index 16319be6ed..c1b65a671d 100644 --- 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 class AuthorizationAuditListenerTests { 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 class AuthorizationAuditListenerTests { 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 class AuthorizationAuditListenerTests { 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 index 1f9150a15f..b264f9c456 100644 --- 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 class HttpMessageConverters implements Iterable> public HttpMessageConverters(boolean addDefaultConverters, Collection> converters) { List> 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 index 50c1c5c2a0..7524220e5e 100644 --- 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 class 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 index 672689dd8c..acf6f93929 100644 --- 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 class LdapAutoConfiguration { 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 index 45f3903681..38852a73f2 100644 --- 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 @@ public class EmbeddedMongoAutoConfiguration { Set 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 index 41e5eb131c..dee8ab911b 100644 --- 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 index f2c8875fc0..3c1c63a281 100644 --- 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 @@ public class AutoConfigurationImportSelectorTests { @Override protected List 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 index 7c765abbf6..9019e77c24 100644 --- 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 @@ public class CacheAutoConfigurationTests { @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 index 3ece48df6a..cfd5f58dd1 100644 --- 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 @@ public class HazelcastJpaDependencyAutoConfigurationTests { 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 index e18e3ec0a7..0e76919573 100644 --- 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 class ActiveMQPropertiesTests { 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 index 470a14ed8d..ce854ae0ed 100644 --- 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 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class ProjectGenerationRequestTests { - public static final Map EMPTY_TAGS = Collections - .emptyMap(); + public static final Map 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 index 4ca1541be5..12e3d3a12c 100644 --- 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 class DevToolPropertiesIntegrationTests { 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 index fab3332fc8..94adc8f157 100644 --- 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 class ItemHint implements Comparable { } 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 index 2fbbc9b548..111a6ad3bb 100644 --- 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 class ConfigurationMetadataAnnotationProcessorTests { @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 index ef8a3efed0..a9b0b8b78d 100644 --- 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 class JsonMarshallerTests { 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 index 8c5c8375d8..1373a75d3b 100644 --- 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 @@ public class ResourceBanner implements Banner { private PropertyResolver getTitleResolver(Class sourceClass) { MutablePropertySources sources = new MutablePropertySources(); String applicationTitle = getApplicationTitle(sourceClass); - Map titleMap = Collections.singletonMap( - "application.title", (applicationTitle == null ? "" : applicationTitle)); + Map 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 index dc0289ddd7..57428b5fe0 100644 --- 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 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 index ac968268df..49110d6ad8 100644 --- 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 @@ public class RestTemplateBuilder { } private Set append(Set set, T addition) { - Set result = new LinkedHashSet<>( - set == null ? Collections.emptySet() : set); + Set result = new LinkedHashSet<>(set == null ? Collections.emptySet() : set); result.add(addition); return Collections.unmodifiableSet(result); } private Set append(Set set, Collection additions) { - Set result = new LinkedHashSet<>( - set == null ? Collections.emptySet() : set); + Set 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 index 80f16e3b08..23786e5741 100644 --- 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 class ConfigFileApplicationListenerTests { @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 index 1a541c9360..aa9ef5e315 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 @@ -66,8 +66,8 @@ public class ConfigurationPropertySourcesTests { 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 class ConfigurationPropertySourcesTests { @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("env", environment) { @@ -112,8 +112,8 @@ public class ConfigurationPropertySourcesTests { } }); - sources.addLast(new MapPropertySource("baz", - Collections.singletonMap("baz", "barf"))); + sources.addLast( + new MapPropertySource("baz", Collections.singletonMap("baz", "barf"))); Iterable 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 index 01a390133a..ca0235abd4 100644 --- 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 class SpringConfigurationPropertySourcesTests { @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 iterator = new SpringConfigurationPropertySources( sources).iterator(); ConfigurationPropertyName name = ConfigurationPropertyName.of("a"); @@ -83,8 +83,8 @@ public class SpringConfigurationPropertySourcesTests { 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 iterator = new SpringConfigurationPropertySources( sources).iterator(); ConfigurationPropertyName name = ConfigurationPropertyName.of("server.port"); @@ -101,10 +101,10 @@ public class SpringConfigurationPropertySourcesTests { @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("env", environment) { @@ -114,8 +114,8 @@ public class SpringConfigurationPropertySourcesTests { } }); - 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 class SpringConfigurationPropertySourcesTests { @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 index 4d7e856569..63d09821fd 100644 --- 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 @@ -185,8 +185,7 @@ public class RestTemplateBuilderTests { @Test public void defaultMessageConvertersShouldSetDefaultList() throws Exception { RestTemplate template = new RestTemplate( - Collections.singletonList( - new StringHttpMessageConverter())); + Collections.singletonList(new StringHttpMessageConverter())); this.builder.defaultMessageConverters().configure(template); assertThat(template.getMessageConverters()) .hasSameSizeAs(new RestTemplate().getMessageConverters()); @@ -195,8 +194,7 @@ public class RestTemplateBuilderTests { @Test public void defaultMessageConvertersShouldClearExisting() throws Exception { RestTemplate template = new RestTemplate( - Collections.singletonList( - new StringHttpMessageConverter())); + Collections.singletonList(new StringHttpMessageConverter())); this.builder.additionalMessageConverters(this.messageConverter) .defaultMessageConverters().configure(template); assertThat(template.getMessageConverters())