diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java index 4452e123e86..1ce38e694be 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java @@ -338,7 +338,7 @@ public class CrshAutoConfiguration { @Override protected Iterable> createConfigurationCapabilities() { - return Arrays.> asList(ROLES); + return Arrays.>asList(ROLES); } } @@ -458,7 +458,7 @@ public class CrshAutoConfiguration { return Collections.singletonList(((FileHandle) handle).openStream()) .iterator(); } - return Collections. emptyList().iterator(); + return Collections.emptyList().iterator(); } @Override diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java index 3c3273f52b3..119e1fdd55e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java @@ -112,7 +112,7 @@ public class EndpointWebMvcChildContextConfiguration { // the same place) this.server.customize(container); // Then reset the error pages - container.setErrorPages(Collections. emptySet()); + container.setErrorPages(Collections.emptySet()); // and add the management-specific bits container.setPort(this.managementServerProperties.getPort()); container.setAddress(this.managementServerProperties.getAddress()); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java index 947bf8995c7..a7aeb59bfc6 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java @@ -184,7 +184,7 @@ public class ConfigurationPropertiesReportEndpoint extends return result; } catch (Exception ex) { - return new HashMap(Collections. singletonMap( + return new HashMap(Collections.singletonMap( "error", "Cannot serialize '" + prefix + "'")); } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ShutdownEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ShutdownEndpoint.java index 844ed1125c6..5ad68a7f726 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ShutdownEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ShutdownEndpoint.java @@ -48,12 +48,12 @@ public class ShutdownEndpoint extends AbstractEndpoint> impl public Map invoke() { if (this.context == null) { - return Collections. singletonMap("message", + return Collections.singletonMap("message", "No context to shutdown."); } try { - return Collections. singletonMap("message", + return Collections.singletonMap("message", "Shutting down, bye..."); } finally { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java index 363f89e2626..639c899c63e 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java @@ -36,7 +36,7 @@ public class AuditListenerTests { public void testStoredEvents() { AuditEventRepository repository = mock(AuditEventRepository.class); AuditEvent event = new AuditEvent("principal", "type", - Collections. emptyMap()); + Collections.emptyMap()); AuditListener listener = new AuditListener(repository); listener.onApplicationEvent(new AuditApplicationEvent(event)); verify(repository).add(event); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java index bc127565e04..e0c7e133bd2 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java @@ -171,7 +171,7 @@ public class EndpointAutoConfigurationTests { @Override public Collection> metrics() { Metric metric = new Metric("foo", 1); - return Collections.> singleton(metric); + return Collections.>singleton(metric); } }; } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java index d765e6ad2f6..ffb2fd4105f 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java @@ -97,7 +97,7 @@ public abstract class AbstractEndpointTests> { public void isSensitiveOverride() throws Exception { this.context = new AnnotationConfigApplicationContext(); PropertySource propertySource = new MapPropertySource("test", - Collections. singletonMap(this.property + ".sensitive", + Collections.singletonMap(this.property + ".sensitive", String.valueOf(!this.sensitive))); this.context.getEnvironment().getPropertySources().addFirst(propertySource); this.context.register(this.configClass); @@ -114,7 +114,7 @@ public abstract class AbstractEndpointTests> { public void isEnabledFallbackToEnvironment() throws Exception { this.context = new AnnotationConfigApplicationContext(); PropertySource propertySource = new MapPropertySource("test", - Collections. singletonMap(this.property + ".enabled", + Collections.singletonMap(this.property + ".enabled", false)); this.context.getEnvironment().getPropertySources().addFirst(propertySource); this.context.register(this.configClass); @@ -127,7 +127,7 @@ public abstract class AbstractEndpointTests> { public void isExplicitlyEnabled() throws Exception { this.context = new AnnotationConfigApplicationContext(); PropertySource propertySource = new MapPropertySource("test", - Collections. singletonMap(this.property + ".enabled", + Collections.singletonMap(this.property + ".enabled", false)); this.context.getEnvironment().getPropertySources().addFirst(propertySource); this.context.register(this.configClass); @@ -140,7 +140,7 @@ public abstract class AbstractEndpointTests> { public void isAllEndpointsDisabled() throws Exception { this.context = new AnnotationConfigApplicationContext(); PropertySource propertySource = new MapPropertySource("test", - Collections. singletonMap("endpoints.enabled", false)); + Collections.singletonMap("endpoints.enabled", false)); this.context.getEnvironment().getPropertySources().addFirst(propertySource); this.context.register(this.configClass); this.context.refresh(); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java index 5920c45e4c5..5eb60461a3d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java @@ -106,7 +106,7 @@ public class MetricsEndpointTests extends AbstractEndpointTests PublicMetrics metrics = new PublicMetrics() { @Override public Collection> metrics() { - return Collections.> singleton(metric); + return Collections.>singleton(metric); } }; return new MetricsEndpoint(metrics); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java index 5cf9d8eb178..0cf90b0066e 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java @@ -53,7 +53,7 @@ public class RequestMappingEndpointTests { mapping.setApplicationContext(new StaticApplicationContext()); mapping.initApplicationContext(); this.endpoint.setHandlerMappings(Collections - . singletonList(mapping)); + .singletonList(mapping)); Map result = this.endpoint.invoke(); assertEquals(1, result.size()); @SuppressWarnings("unchecked") @@ -114,7 +114,7 @@ public class RequestMappingEndpointTests { mapping.setApplicationContext(new StaticApplicationContext()); mapping.afterPropertiesSet(); this.endpoint.setMethodMappings(Collections - .> singletonList(mapping)); + .>singletonList(mapping)); Map result = this.endpoint.invoke(); assertEquals(1, result.size()); assertTrue(result.keySet().iterator().next().contains("/dump")); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java index 57f85b13d3b..078ff677e8b 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java @@ -53,7 +53,7 @@ public class TraceEndpointTests extends AbstractEndpointTests { @Bean public TraceEndpoint endpoint() { TraceRepository repository = new InMemoryTraceRepository(); - repository.add(Collections. singletonMap("a", "b")); + repository.add(Collections.singletonMap("a", "b")); return new TraceEndpoint(repository); } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java index 05a2061b2df..68c949200c1 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java @@ -49,7 +49,7 @@ import static org.mockito.Mockito.mock; public class HealthMvcEndpointTests { private static final PropertySource NON_SENSITIVE = new MapPropertySource("test", - Collections. singletonMap("endpoints.health.sensitive", + Collections.singletonMap("endpoints.health.sensitive", "false")); private HealthEndpoint endpoint = null; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java index fc50083c290..37a517c417a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java @@ -108,7 +108,7 @@ public class MetricsMvcEndpointTests { @Override public Collection> metrics() { - return Arrays.> asList(new Metric("foo", 1)); + return Arrays.>asList(new Metric("foo", 1)); } }); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java index 63312459747..955764db228 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java @@ -60,7 +60,7 @@ public class PrefixMetricGroupExporterTests { @Test public void multiMetricGroupsCopiedAsDefault() { - this.reader.set("foo", Arrays.> asList(new Metric("bar", 2.3), + this.reader.set("foo", Arrays.>asList(new Metric("bar", 2.3), new Metric("spam", 1.3))); this.exporter.export(); assertEquals(1, this.writer.countGroups()); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java index ac60f67405d..9fb60e6ae37 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java @@ -55,7 +55,7 @@ public class RedisMultiMetricRepositoryTests { @Parameters public static List parameters() { - return Arrays. asList(new Object[] { null }, new Object[] { "test" }); + return Arrays.asList(new Object[] { null }, new Object[] { "test" }); } @Before @@ -85,26 +85,26 @@ public class RedisMultiMetricRepositoryTests { @Test public void setAndGet() { this.repository.set("foo", - Arrays.> asList(new Metric("foo.bar", 12.3))); + Arrays.>asList(new Metric("foo.bar", 12.3))); this.repository.set("foo", - Arrays.> asList(new Metric("foo.bar", 15.3))); + Arrays.>asList(new Metric("foo.bar", 15.3))); assertEquals(15.3, Iterables.collection(this.repository.findAll("foo")) .iterator().next().getValue()); } @Test public void setAndGetMultiple() { - this.repository.set("foo", Arrays.> asList(new Metric( - "foo.val", 12.3), new Metric("foo.bar", 11.3))); + this.repository.set("foo", Arrays.>asList(new Metric("foo.val", + 12.3), new Metric("foo.bar", 11.3))); assertEquals(2, Iterables.collection(this.repository.findAll("foo")).size()); } @Test public void groups() { - this.repository.set("foo", Arrays.> asList(new Metric( - "foo.val", 12.3), new Metric("foo.bar", 11.3))); - this.repository.set("bar", Arrays.> asList(new Metric( - "bar.val", 12.3), new Metric("bar.foo", 11.3))); + this.repository.set("foo", Arrays.>asList(new Metric("foo.val", + 12.3), new Metric("foo.bar", 11.3))); + this.repository.set("bar", Arrays.>asList(new Metric("bar.val", + 12.3), new Metric("bar.foo", 11.3))); Collection groups = Iterables.collection(this.repository.groups()); assertEquals(2, groups.size()); assertTrue("Wrong groups: " + groups, groups.contains("foo")); @@ -112,10 +112,10 @@ public class RedisMultiMetricRepositoryTests { @Test public void count() { - this.repository.set("foo", Arrays.> asList(new Metric( - "foo.val", 12.3), new Metric("foo.bar", 11.3))); - this.repository.set("bar", Arrays.> asList(new Metric( - "bar.val", 12.3), new Metric("bar.foo", 11.3))); + this.repository.set("foo", Arrays.>asList(new Metric("foo.val", + 12.3), new Metric("foo.bar", 11.3))); + this.repository.set("bar", Arrays.>asList(new Metric("bar.val", + 12.3), new Metric("bar.foo", 11.3))); assertEquals(2, this.repository.countGroups()); } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriterTests.java index 896fee979af..0167bf88bfb 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriterTests.java @@ -36,7 +36,8 @@ import static org.junit.Assert.assertFalse; public class DropwizardMetricWriterTests { private final MetricRegistry registry = new MetricRegistry(); - private final DropwizardMetricWriter writer = new DropwizardMetricWriter(this.registry); + private final DropwizardMetricWriter writer = new DropwizardMetricWriter( + this.registry); @Test public void incrementCounter() { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java index 58423c0be3c..1ba2b3082e9 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java @@ -49,7 +49,7 @@ public class AuthorizationAuditListenerTests { @Test public void testAuthenticationSuccess() { this.listener.onApplicationEvent(new AuthorizationFailureEvent(this, Arrays - . asList(new SecurityConfig("USER")), + .asList(new SecurityConfig("USER")), new UsernamePasswordAuthenticationToken("user", "password"), new AccessDeniedException("Bad user"))); verify(this.publisher).publishEvent((ApplicationEvent) anyObject()); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java index 35b71de18ed..091fe9376e1 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java +++ b/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. singletonMap("foo", "bar")); - this.repository.add(Collections. singletonMap("bar", "foo")); - this.repository.add(Collections. 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 traces = this.repository.findAll(); assertEquals(2, traces.size()); assertEquals("bar", traces.get(0).getInfo().get("bar")); @@ -48,9 +48,9 @@ public class InMemoryTraceRepositoryTests { public void reverseFalse() { this.repository.setReverse(false); this.repository.setCapacity(2); - this.repository.add(Collections. singletonMap("foo", "bar")); - this.repository.add(Collections. singletonMap("bar", "foo")); - this.repository.add(Collections. 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 traces = this.repository.findAll(); assertEquals(2, traces.size()); assertEquals("bar", traces.get(1).getInfo().get("bar")); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java index f90dd107c97..0fed3ca4df3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java @@ -45,8 +45,7 @@ public class JacksonProperties { /** * Joda date time format string (yyyy-MM-dd HH:mm:ss). If not configured, - * "date-format" will be used as a fallback if it is configured with a format - * string. + * "date-format" will be used as a fallback if it is configured with a format string. */ private String jodaDateTimeFormat; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DatabaseDriver.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DatabaseDriver.java index 455e6fdfbe4..dc6c69dc516 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DatabaseDriver.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DatabaseDriver.java @@ -86,7 +86,8 @@ enum DatabaseDriver { /** * SQL Server */ - SQLSERVER("com.microsoft.sqlserver.jdbc.SQLServerDriver", "com.microsoft.sqlserver.jdbc.SQLServerXADataSource"); + SQLSERVER("com.microsoft.sqlserver.jdbc.SQLServerDriver", + "com.microsoft.sqlserver.jdbc.SQLServerXADataSource"); private final String driverClassName; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java index 17b5a9a226e..10d7fccb21c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java @@ -36,7 +36,7 @@ public class JndiPropertiesHidingClassLoader extends ClassLoader { @Override public Enumeration getResources(String name) throws IOException { if ("jndi.properties".equals(name)) { - return Collections.enumeration(Collections. emptyList()); + return Collections.enumeration(Collections.emptyList()); } return super.getResources(name); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfigurationTests.java index 6e30429c465..5e57e5470d6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfigurationTests.java @@ -109,7 +109,7 @@ public class MongoDataAutoConfigurationTests { Set initialEntitySet = (Set) ReflectionTestUtils.getField( mappingContext, "initialEntitySet"); assertThat(initialEntitySet, hasSize(types.length)); - assertThat(initialEntitySet, Matchers. hasItems(types)); + assertThat(initialEntitySet, Matchers.hasItems(types)); } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersTests.java index f5fa9b517c7..0f3a5937bd3 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersTests.java @@ -58,7 +58,7 @@ public class HttpMessageConvertersTests { for (HttpMessageConverter converter : converters) { converterClasses.add(converter.getClass()); } - assertThat(converterClasses, equalTo(Arrays.> asList( + assertThat(converterClasses, equalTo(Arrays.>asList( ByteArrayHttpMessageConverter.class, StringHttpMessageConverter.class, ResourceHttpMessageConverter.class, SourceHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class, @@ -117,7 +117,7 @@ public class HttpMessageConvertersTests { for (HttpMessageConverter converter : converters) { converterClasses.add(converter.getClass()); } - assertThat(converterClasses, equalTo(Arrays.> asList( + assertThat(converterClasses, equalTo(Arrays.>asList( ByteArrayHttpMessageConverter.class, StringHttpMessageConverter.class, ResourceHttpMessageConverter.class, SourceHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class, diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java index ac0117ef4f5..c13a6c7b899 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java @@ -38,7 +38,7 @@ import org.springframework.boot.cli.command.test.TestCommand; */ public class DefaultCommandFactory implements CommandFactory { - private static final List DEFAULT_COMMANDS = Arrays. asList( + private static final List DEFAULT_COMMANDS = Arrays.asList( new VersionCommand(), new RunCommand(), new TestCommand(), new GrabCommand(), new JarCommand(), new InstallCommand(), new UninstallCommand(), new InitCommand()); diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java b/spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java index 556f9449db3..ea2f99ee2c2 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java @@ -39,7 +39,7 @@ public abstract class GroovyTemplate { public static String template(String name) throws IOException, CompilationFailedException, ClassNotFoundException { - return template(name, Collections. emptyMap()); + return template(name, Collections.emptyMap()); } public static String template(String name, Map model) throws IOException, diff --git a/spring-boot-cli/src/test/java/cli/command/CustomCommandFactory.java b/spring-boot-cli/src/test/java/cli/command/CustomCommandFactory.java index fa830a3a38b..081d7284ce6 100644 --- a/spring-boot-cli/src/test/java/cli/command/CustomCommandFactory.java +++ b/spring-boot-cli/src/test/java/cli/command/CustomCommandFactory.java @@ -29,7 +29,7 @@ public class CustomCommandFactory implements CommandFactory { @Override public Collection getCommands() { - return Collections. singleton(new CustomCommand()); + return Collections.singleton(new CustomCommand()); } } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java index d41dd740430..9dee88b0904 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java @@ -81,7 +81,8 @@ public class CliTester implements TestRule { try { this.commands.add(future.get(this.timeout, TimeUnit.MILLISECONDS)); return getOutput(); - } catch (Exception ex) { + } + catch (Exception ex) { return getOutput(); } } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java index 11057e44feb..a3c030c837a 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java @@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals; public class ProjectGenerationRequestTests { public static final Map EMPTY_TAGS = Collections - . emptyMap(); + .emptyMap(); @Rule public final ExpectedException thrown = ExpectedException.none(); diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/SampleAtmosphereApplication.java b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/SampleAtmosphereApplication.java index 752687be271..46159427d63 100644 --- a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/SampleAtmosphereApplication.java +++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/SampleAtmosphereApplication.java @@ -72,7 +72,7 @@ public class SampleAtmosphereApplication { @Override public void onStartup(ServletContext servletContext) throws ServletException { - onStartup(Collections.> emptySet(), servletContext); + onStartup(Collections.>emptySet(), servletContext); } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/FieldValuesParser.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/FieldValuesParser.java index e2e73d3a7fd..61cb3abe77b 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/FieldValuesParser.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/FieldValuesParser.java @@ -33,8 +33,7 @@ import org.springframework.boot.configurationprocessor.fieldvalues.javac.JavaCom public interface FieldValuesParser { /** - * Implementation of {@link FieldValuesParser} that always returns an empty - * result. + * Implementation of {@link FieldValuesParser} that always returns an empty result. */ public static final FieldValuesParser NONE = new FieldValuesParser() { diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/NotAnnotated.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/NotAnnotated.java index 8346236a47a..0a5d7b9e4e4 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/NotAnnotated.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/NotAnnotated.java @@ -16,7 +16,6 @@ package org.springframework.boot.configurationsample.simple; - /** * This has no annotation on purpose to check that no meta-data is generated. * diff --git a/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/Dependency.java b/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/Dependency.java index 34c8ed386ec..49768a2c176 100644 --- a/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/Dependency.java +++ b/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/Dependency.java @@ -42,7 +42,7 @@ public final class Dependency { * @param version the version */ public Dependency(String groupId, String artifactId, String version) { - this(groupId, artifactId, version, Collections. emptyList()); + this(groupId, artifactId, version, Collections.emptyList()); } /** diff --git a/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/ManagedDependencies.java b/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/ManagedDependencies.java index 3602a9521cf..e584147e18d 100644 --- a/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/ManagedDependencies.java +++ b/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/ManagedDependencies.java @@ -93,7 +93,7 @@ public abstract class ManagedDependencies implements Dependencies { * @see #get(Collection) */ public static ManagedDependencies get() { - return get(Collections. emptySet()); + return get(Collections.emptySet()); } /** diff --git a/spring-boot-tools/spring-boot-dependency-tools/src/test/java/org/springframework/boot/dependency/tools/ManagedDependenciesDelegateTests.java b/spring-boot-tools/spring-boot-dependency-tools/src/test/java/org/springframework/boot/dependency/tools/ManagedDependenciesDelegateTests.java index ee1d1d5bed3..7cf95485c55 100644 --- a/spring-boot-tools/spring-boot-dependency-tools/src/test/java/org/springframework/boot/dependency/tools/ManagedDependenciesDelegateTests.java +++ b/spring-boot-tools/spring-boot-dependency-tools/src/test/java/org/springframework/boot/dependency/tools/ManagedDependenciesDelegateTests.java @@ -41,7 +41,7 @@ public class ManagedDependenciesDelegateTests { PropertiesFileDependencies extra = new PropertiesFileDependencies(getClass() .getResourceAsStream("additional-external.properties")); this.dependencies = new ManagedDependenciesDelegate(root, - Collections. singleton(extra)); + Collections.singleton(extra)); } @Test diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java index 72b79e24abe..6c0043cea70 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java @@ -138,8 +138,7 @@ public class PropertiesLauncherTests { public void testCustomClassLoaderCreation() throws Exception { System.setProperty("loader.classLoader", TestLoader.class.getName()); PropertiesLauncher launcher = new PropertiesLauncher(); - ClassLoader loader = launcher - .createClassLoader(Collections. emptyList()); + ClassLoader loader = launcher.createClassLoader(Collections.emptyList()); assertNotNull(loader); assertEquals(TestLoader.class.getName(), loader.getClass().getName()); } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java index 1db573c2cbc..1f37f240fa6 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java @@ -42,7 +42,7 @@ public class DependencyFilterMojoTests { @Test public void filterDependencies() throws MojoExecutionException { TestableDependencyFilterMojo mojo = new TestableDependencyFilterMojo( - Collections. emptyList(), "com.foo", "exclude-id"); + Collections.emptyList(), "com.foo", "exclude-id"); Artifact artifact = createArtifact("com.bar", "one"); Set artifacts = mojo.filterDependencies( @@ -55,7 +55,7 @@ public class DependencyFilterMojoTests { @Test public void filterGroupIdExactMatch() throws MojoExecutionException { TestableDependencyFilterMojo mojo = new TestableDependencyFilterMojo( - Collections. emptyList(), "com.foo", ""); + Collections.emptyList(), "com.foo", ""); Artifact artifact = createArtifact("com.foo.bar", "one"); Set artifacts = mojo.filterDependencies( diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java index 9be8e633ab1..f96c3309cc2 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java +++ b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java @@ -101,7 +101,7 @@ public class AtomikosDependsOnBeanFactoryPostProcessor implements } private List asList(String[] array) { - return (array == null ? Collections. emptyList() : Arrays.asList(array)); + return (array == null ? Collections.emptyList() : Arrays.asList(array)); } @Override diff --git a/spring-boot/src/main/java/org/springframework/boot/test/TestRestTemplate.java b/spring-boot/src/main/java/org/springframework/boot/test/TestRestTemplate.java index 3a4a06f5adf..e9117ca4d2d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/test/TestRestTemplate.java +++ b/spring-boot/src/main/java/org/springframework/boot/test/TestRestTemplate.java @@ -85,7 +85,7 @@ public class TestRestTemplate extends RestTemplate { return; } List interceptors = Collections - . singletonList(new BasicAuthorizationInterceptor( + .singletonList(new BasicAuthorizationInterceptor( username, password)); setRequestFactory(new InterceptingClientHttpRequestFactory(getRequestFactory(), interceptors)); diff --git a/spring-boot/src/test/java/org/springframework/boot/ResourceBannerTests.java b/spring-boot/src/test/java/org/springframework/boot/ResourceBannerTests.java index b1c0ff4af19..aed738dce9b 100644 --- a/spring-boot/src/test/java/org/springframework/boot/ResourceBannerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/ResourceBannerTests.java @@ -77,7 +77,7 @@ public class ResourceBannerTests { ResourceBanner banner = new MockResourceBanner(resource, bootVersion, applicationVersion); ConfigurableEnvironment environment = new MockEnvironment(); - Map source = Collections. singletonMap("a", "1"); + Map source = Collections.singletonMap("a", "1"); environment.getPropertySources().addLast(new MapPropertySource("map", source)); ByteArrayOutputStream out = new ByteArrayOutputStream(); banner.printBanner(environment, getClass(), new PrintStream(out)); diff --git a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java index 89e8eb57fed..9373f8816cc 100644 --- a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java @@ -314,7 +314,7 @@ public class SpringApplicationTests { ConfigurableEnvironment environment = new StandardEnvironment(); environment.getPropertySources().addFirst( new MapPropertySource("commandLineArgs", Collections - . singletonMap("foo", "original"))); + .singletonMap("foo", "original"))); application.setEnvironment(environment); application.run("--foo=bar", "--bar=foo"); assertTrue(hasPropertySource(environment, CompositePropertySource.class, diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java index 458ca9732e2..2cf79477cd7 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java @@ -56,12 +56,12 @@ public class PropertySourcesPropertyValuesTests { }); this.propertySources.addFirst(new MapPropertySource("map", Collections - . singletonMap("name", "${foo}"))); + .singletonMap("name", "${foo}"))); } @Test public void testTypesPreserved() { - Map map = Collections. singletonMap("name", 123); + Map map = Collections.singletonMap("name", 123); this.propertySources.replace("map", new MapPropertySource("map", map)); PropertySourcesPropertyValues propertyValues = new PropertySourcesPropertyValues( this.propertySources); @@ -142,7 +142,7 @@ public class PropertySourcesPropertyValuesTests { @Test public void testOverriddenValue() { this.propertySources.addFirst(new MapPropertySource("new", Collections - . singletonMap("name", "spam"))); + .singletonMap("name", "spam"))); PropertySourcesPropertyValues propertyValues = new PropertySourcesPropertyValues( this.propertySources); assertEquals("spam", propertyValues.getPropertyValue("name").getValue()); @@ -170,7 +170,7 @@ public class PropertySourcesPropertyValuesTests { TestBean target = new TestBean(); DataBinder binder = new DataBinder(target); this.propertySources.addFirst(new MapPropertySource("another", Collections - . singletonMap("something", "${nonexistent}"))); + .singletonMap("something", "${nonexistent}"))); binder.bind(new PropertySourcesPropertyValues(this.propertySources)); assertEquals("bar", target.getName()); } diff --git a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java index 02200827c08..98e400aa7b6 100644 --- a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java @@ -75,7 +75,7 @@ public class SpringApplicationBuilderTests { SpringApplicationBuilder application = new SpringApplicationBuilder() .sources(ExampleConfig.class) .contextClass(StaticApplicationContext.class) - .properties(Collections. singletonMap("bar", "foo")); + .properties(Collections.singletonMap("bar", "foo")); this.context = application.run(); assertThat(this.context.getEnvironment().getProperty("bar"), is(equalTo("foo"))); } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java index dec57b25671..3309e7a1c14 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java @@ -149,7 +149,7 @@ public class MockEmbeddedServletContainerFactory extends } }); given(this.servletContext.getAttributeNames()).willReturn( - MockEmbeddedServletContainer. emptyEnumeration()); + MockEmbeddedServletContainer.emptyEnumeration()); given(this.servletContext.getNamedDispatcher("default")).willReturn( mock(RequestDispatcher.class)); for (ServletContextInitializer initializer : this.initializers) { diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java index 812f5102ad1..a7e2f7ab790 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java @@ -157,7 +157,7 @@ public class EnableConfigurationPropertiesTests { public void testExceptionOnValidation() { this.context.register(ExceptionIfInvalidTestConfiguration.class); EnvironmentTestUtils.addEnvironment(this.context, "name:foo"); - this.expected.expectCause(Matchers. instanceOf(BindException.class)); + this.expected.expectCause(Matchers.instanceOf(BindException.class)); this.context.refresh(); }