Reformat code

philwebb · philwebb · commit 15686ed4fd15 · 2015-09-08T14:07:06.000-07:00
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
@@ -338,7 +338,7 @@ public void init() {
 
 		@Override
 		protected Iterable<PropertyDescriptor<?>> createConfigurationCapabilities() {
-			return Arrays.<PropertyDescriptor<?>> asList(ROLES);
+			return Arrays.<PropertyDescriptor<?>>asList(ROLES);
 		}
 
 	}
@@ -458,7 +458,7 @@ public Iterator<InputStream> open(ResourceHandle handle) throws IOException {
 				return Collections.singletonList(((FileHandle) handle).openStream())
 						.iterator();
 			}
-			return Collections.<InputStream> emptyList().iterator();
+			return Collections.<InputStream>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
@@ -112,7 +112,7 @@ public void customize(ConfigurableEmbeddedServletContainer container) {
 			// the same place)
 			this.server.customize(container);
 			// Then reset the error pages
-			container.setErrorPages(Collections.<ErrorPage> emptySet());
+			container.setErrorPages(Collections.<ErrorPage>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
@@ -184,7 +184,7 @@ private Map<String, Object> safeSerialize(ObjectMapper mapper, Object bean,
 			return result;
 		}
 		catch (Exception ex) {
-			return new HashMap<String, Object>(Collections.<String, Object> singletonMap(
+			return new HashMap<String, Object>(Collections.<String, Object>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
@@ -48,12 +48,12 @@ public ShutdownEndpoint() {
 	public Map<String, Object> invoke() {
 
 		if (this.context == null) {
-			return Collections.<String, Object> singletonMap("message",
+			return Collections.<String, Object>singletonMap("message",
 					"No context to shutdown.");
 		}
 
 		try {
-			return Collections.<String, Object> singletonMap("message",
+			return Collections.<String, Object>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
@@ -36,7 +36,7 @@ public class AuditListenerTests {
 	public void testStoredEvents() {
 		AuditEventRepository repository = mock(AuditEventRepository.class);
 		AuditEvent event = new AuditEvent("principal", "type",
-				Collections.<String, Object> emptyMap());
+				Collections.<String, Object>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
@@ -171,7 +171,7 @@ PublicMetrics customPublicMetrics() {
 				@Override
 				public Collection<Metric<?>> metrics() {
 					Metric<Integer> metric = new Metric<Integer>("foo", 1);
-					return Collections.<Metric<?>> singleton(metric);
+					return Collections.<Metric<?>>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
@@ -97,7 +97,7 @@ public void idOverride() throws Exception {
 	public void isSensitiveOverride() throws Exception {
 		this.context = new AnnotationConfigApplicationContext();
 		PropertySource<?> propertySource = new MapPropertySource("test",
-				Collections.<String, Object> singletonMap(this.property + ".sensitive",
+				Collections.<String, Object>singletonMap(this.property + ".sensitive",
 						String.valueOf(!this.sensitive)));
 		this.context.getEnvironment().getPropertySources().addFirst(propertySource);
 		this.context.register(this.configClass);
@@ -114,7 +114,7 @@ public void isEnabledByDefault() throws Exception {
 	public void isEnabledFallbackToEnvironment() throws Exception {
 		this.context = new AnnotationConfigApplicationContext();
 		PropertySource<?> propertySource = new MapPropertySource("test",
-				Collections.<String, Object> singletonMap(this.property + ".enabled",
+				Collections.<String, Object>singletonMap(this.property + ".enabled",
 						false));
 		this.context.getEnvironment().getPropertySources().addFirst(propertySource);
 		this.context.register(this.configClass);
@@ -127,7 +127,7 @@ Collections.<String, Object> singletonMap(this.property + ".enabled",
 	public void isExplicitlyEnabled() throws Exception {
 		this.context = new AnnotationConfigApplicationContext();
 		PropertySource<?> propertySource = new MapPropertySource("test",
-				Collections.<String, Object> singletonMap(this.property + ".enabled",
+				Collections.<String, Object>singletonMap(this.property + ".enabled",
 						false));
 		this.context.getEnvironment().getPropertySources().addFirst(propertySource);
 		this.context.register(this.configClass);
@@ -140,7 +140,7 @@ Collections.<String, Object> singletonMap(this.property + ".enabled",
 	public void isAllEndpointsDisabled() throws Exception {
 		this.context = new AnnotationConfigApplicationContext();
 		PropertySource<?> propertySource = new MapPropertySource("test",
-				Collections.<String, Object> singletonMap("endpoints.enabled", false));
+				Collections.<String, Object>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
@@ -106,7 +106,7 @@ public MetricsEndpoint endpoint() {
 			PublicMetrics metrics = new PublicMetrics() {
 				@Override
 				public Collection<Metric<?>> metrics() {
-					return Collections.<Metric<?>> singleton(metric);
+					return Collections.<Metric<?>>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
@@ -53,7 +53,7 @@ public void concreteUrlMappings() {
 		mapping.setApplicationContext(new StaticApplicationContext());
 		mapping.initApplicationContext();
 		this.endpoint.setHandlerMappings(Collections
-				.<AbstractUrlHandlerMapping> singletonList(mapping));
+				.<AbstractUrlHandlerMapping>singletonList(mapping));
 		Map<String, Object> result = this.endpoint.invoke();
 		assertEquals(1, result.size());
 		@SuppressWarnings("unchecked")
@@ -114,7 +114,7 @@ public void concreteMethodMappings() {
 		mapping.setApplicationContext(new StaticApplicationContext());
 		mapping.afterPropertiesSet();
 		this.endpoint.setMethodMappings(Collections
-				.<AbstractHandlerMethodMapping<?>> singletonList(mapping));
+				.<AbstractHandlerMethodMapping<?>>singletonList(mapping));
 		Map<String, Object> 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
@@ -53,7 +53,7 @@ public static class Config {
 		@Bean
 		public TraceEndpoint endpoint() {
 			TraceRepository repository = new InMemoryTraceRepository();
-			repository.add(Collections.<String, Object> singletonMap("a", "b"));
+			repository.add(Collections.<String, Object>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
@@ -49,7 +49,7 @@
 public class HealthMvcEndpointTests {
 
 	private static final PropertySource<?> NON_SENSITIVE = new MapPropertySource("test",
-			Collections.<String, Object> singletonMap("endpoints.health.sensitive",
+			Collections.<String, Object>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
@@ -108,7 +108,7 @@ public MetricsEndpoint endpoint() {
 
 				@Override
 				public Collection<Metric<?>> metrics() {
-					return Arrays.<Metric<?>> asList(new Metric<Integer>("foo", 1));
+					return Arrays.<Metric<?>>asList(new Metric<Integer>("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
@@ -60,7 +60,7 @@ public void unprefixedMetricsNotCopied() {
 
 	@Test
 	public void multiMetricGroupsCopiedAsDefault() {
-		this.reader.set("foo", Arrays.<Metric<?>> asList(new Metric<Number>("bar", 2.3),
+		this.reader.set("foo", Arrays.<Metric<?>>asList(new Metric<Number>("bar", 2.3),
 				new Metric<Number>("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
@@ -55,7 +55,7 @@ public class RedisMultiMetricRepositoryTests {
 
 	@Parameters
 	public static List<Object[]> parameters() {
-		return Arrays.<Object[]> asList(new Object[] { null }, new Object[] { "test" });
+		return Arrays.<Object[]>asList(new Object[] { null }, new Object[] { "test" });
 	}
 
 	@Before
@@ -85,37 +85,37 @@ public void clear() {
 	@Test
 	public void setAndGet() {
 		this.repository.set("foo",
-				Arrays.<Metric<?>> asList(new Metric<Number>("foo.bar", 12.3)));
+				Arrays.<Metric<?>>asList(new Metric<Number>("foo.bar", 12.3)));
 		this.repository.set("foo",
-				Arrays.<Metric<?>> asList(new Metric<Number>("foo.bar", 15.3)));
+				Arrays.<Metric<?>>asList(new Metric<Number>("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.<Metric<?>> asList(new Metric<Number>(
-				"foo.val", 12.3), new Metric<Number>("foo.bar", 11.3)));
+		this.repository.set("foo", Arrays.<Metric<?>>asList(new Metric<Number>("foo.val",
+				12.3), new Metric<Number>("foo.bar", 11.3)));
 		assertEquals(2, Iterables.collection(this.repository.findAll("foo")).size());
 	}
 
 	@Test
 	public void groups() {
-		this.repository.set("foo", Arrays.<Metric<?>> asList(new Metric<Number>(
-				"foo.val", 12.3), new Metric<Number>("foo.bar", 11.3)));
-		this.repository.set("bar", Arrays.<Metric<?>> asList(new Metric<Number>(
-				"bar.val", 12.3), new Metric<Number>("bar.foo", 11.3)));
+		this.repository.set("foo", Arrays.<Metric<?>>asList(new Metric<Number>("foo.val",
+				12.3), new Metric<Number>("foo.bar", 11.3)));
+		this.repository.set("bar", Arrays.<Metric<?>>asList(new Metric<Number>("bar.val",
+				12.3), new Metric<Number>("bar.foo", 11.3)));
 		Collection<String> groups = Iterables.collection(this.repository.groups());
 		assertEquals(2, groups.size());
 		assertTrue("Wrong groups: " + groups, groups.contains("foo"));
 	}
 
 	@Test
 	public void count() {
-		this.repository.set("foo", Arrays.<Metric<?>> asList(new Metric<Number>(
-				"foo.val", 12.3), new Metric<Number>("foo.bar", 11.3)));
-		this.repository.set("bar", Arrays.<Metric<?>> asList(new Metric<Number>(
-				"bar.val", 12.3), new Metric<Number>("bar.foo", 11.3)));
+		this.repository.set("foo", Arrays.<Metric<?>>asList(new Metric<Number>("foo.val",
+				12.3), new Metric<Number>("foo.bar", 11.3)));
+		this.repository.set("bar", Arrays.<Metric<?>>asList(new Metric<Number>("bar.val",
+				12.3), new Metric<Number>("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
@@ -36,7 +36,8 @@
 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
@@ -49,7 +49,7 @@ public void init() {
 	@Test
 	public void testAuthenticationSuccess() {
 		this.listener.onApplicationEvent(new AuthorizationFailureEvent(this, Arrays
-				.<ConfigAttribute> asList(new SecurityConfig("USER")),
+				.<ConfigAttribute>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
@@ -35,9 +35,9 @@ public class InMemoryTraceRepositoryTests {
 	@Test
 	public void capacityLimited() {
 		this.repository.setCapacity(2);
-		this.repository.add(Collections.<String, Object> singletonMap("foo", "bar"));
-		this.repository.add(Collections.<String, Object> singletonMap("bar", "foo"));
-		this.repository.add(Collections.<String, Object> singletonMap("bar", "bar"));
+		this.repository.add(Collections.<String, Object>singletonMap("foo", "bar"));
+		this.repository.add(Collections.<String, Object>singletonMap("bar", "foo"));
+		this.repository.add(Collections.<String, Object>singletonMap("bar", "bar"));
 		List<Trace> traces = this.repository.findAll();
 		assertEquals(2, traces.size());
 		assertEquals("bar", traces.get(0).getInfo().get("bar"));
@@ -48,9 +48,9 @@ public void capacityLimited() {
 	public void reverseFalse() {
 		this.repository.setReverse(false);
 		this.repository.setCapacity(2);
-		this.repository.add(Collections.<String, Object> singletonMap("foo", "bar"));
-		this.repository.add(Collections.<String, Object> singletonMap("bar", "foo"));
-		this.repository.add(Collections.<String, Object> singletonMap("bar", "bar"));
+		this.repository.add(Collections.<String, Object>singletonMap("foo", "bar"));
+		this.repository.add(Collections.<String, Object>singletonMap("bar", "foo"));
+		this.repository.add(Collections.<String, Object>singletonMap("bar", "bar"));
 		List<Trace> 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
@@ -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
@@ -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
@@ -36,7 +36,7 @@ public JndiPropertiesHidingClassLoader(ClassLoader parent) {
 	@Override
 	public Enumeration<URL> getResources(String name) throws IOException {
 		if ("jndi.properties".equals(name)) {
-			return Collections.enumeration(Collections.<URL> emptyList());
+			return Collections.enumeration(Collections.<URL>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
@@ -109,7 +109,7 @@ private static void assertDomainTypesDiscovered(MongoMappingContext mappingConte
 		Set<Class> initialEntitySet = (Set<Class>) ReflectionTestUtils.getField(
 				mappingContext, "initialEntitySet");
 		assertThat(initialEntitySet, hasSize(types.length));
-		assertThat(initialEntitySet, Matchers.<Class> hasItems(types));
+		assertThat(initialEntitySet, Matchers.<Class>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
@@ -58,7 +58,7 @@ public void containsDefaults() throws Exception {
 		for (HttpMessageConverter<?> converter : converters) {
 			converterClasses.add(converter.getClass());
 		}
-		assertThat(converterClasses, equalTo(Arrays.<Class<?>> asList(
+		assertThat(converterClasses, equalTo(Arrays.<Class<?>>asList(
 				ByteArrayHttpMessageConverter.class, StringHttpMessageConverter.class,
 				ResourceHttpMessageConverter.class, SourceHttpMessageConverter.class,
 				AllEncompassingFormHttpMessageConverter.class,
@@ -117,7 +117,7 @@ protected List<HttpMessageConverter<?>> postProcessConverters(
 		for (HttpMessageConverter<?> converter : converters) {
 			converterClasses.add(converter.getClass());
 		}
-		assertThat(converterClasses, equalTo(Arrays.<Class<?>> asList(
+		assertThat(converterClasses, equalTo(Arrays.<Class<?>>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
@@ -38,7 +38,7 @@
  */
 public class DefaultCommandFactory implements CommandFactory {
 
-	private static final List<Command> DEFAULT_COMMANDS = Arrays.<Command> asList(
+	private static final List<Command> DEFAULT_COMMANDS = Arrays.<Command>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
@@ -39,7 +39,7 @@ public abstract class GroovyTemplate {
 
 	public static String template(String name) throws IOException,
 			CompilationFailedException, ClassNotFoundException {
-		return template(name, Collections.<String, Object> emptyMap());
+		return template(name, Collections.<String, Object>emptyMap());
 	}
 
 	public static String template(String name, Map<String, ?> 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
@@ -29,7 +29,7 @@ public class CustomCommandFactory implements CommandFactory {
 
 	@Override
 	public Collection<Command> getCommands() {
-		return Collections.<Command> singleton(new CustomCommand());
+		return Collections.<Command>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
@@ -81,7 +81,8 @@ public String test(String... args) throws Exception {
 		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
@@ -41,7 +41,7 @@
 public class ProjectGenerationRequestTests {
 
 	public static final Map<String, String> EMPTY_TAGS = Collections
-			.<String, String> emptyMap();
+			.<String, String>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
@@ -72,7 +72,7 @@ private static class EmbeddedAtmosphereInitializer extends AtmosphereInitializer
 
 		@Override
 		public void onStartup(ServletContext servletContext) throws ServletException {
-			onStartup(Collections.<Class<?>> emptySet(), servletContext);
+			onStartup(Collections.<Class<?>>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
@@ -33,8 +33,7 @@
 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
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
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
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
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
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
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
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
diff --git a/spring-boot/src/test/java/org/springframework/boot/ResourceBannerTests.java b/spring-boot/src/test/java/org/springframework/boot/ResourceBannerTests.java
diff --git a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
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
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
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
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

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ public void init() {`
`338`	`338`
`339`	`339`	`@Override`
`340`	`340`	`protected Iterable<PropertyDescriptor<?>> createConfigurationCapabilities() {`
`341`		`- return Arrays.<PropertyDescriptor<?>> asList(ROLES);`
	`341`	`+ return Arrays.<PropertyDescriptor<?>>asList(ROLES);`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`}`
`@@ -458,7 +458,7 @@ public Iterator<InputStream> open(ResourceHandle handle) throws IOException {`
`458`	`458`	`return Collections.singletonList(((FileHandle) handle).openStream())`
`459`	`459`	`.iterator();`
`460`	`460`	`}`
`461`		`- return Collections.<InputStream> emptyList().iterator();`
	`461`	`+ return Collections.<InputStream>emptyList().iterator();`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ private Map<String, Object> safeSerialize(ObjectMapper mapper, Object bean,`
`184`	`184`	`return result;`
`185`	`185`	`}`
`186`	`186`	`catch (Exception ex) {`
`187`		`- return new HashMap<String, Object>(Collections.<String, Object> singletonMap(`
	`187`	`+ return new HashMap<String, Object>(Collections.<String, Object>singletonMap(`
`188`	`188`	`"error", "Cannot serialize '" + prefix + "'"));`
`189`	`189`	`}`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@ public ShutdownEndpoint() {`
`48`	`48`	`public Map<String, Object> invoke() {`
`49`	`49`
`50`	`50`	`if (this.context == null) {`
`51`		`- return Collections.<String, Object> singletonMap("message",`
	`51`	`+ return Collections.<String, Object>singletonMap("message",`
`52`	`52`	`"No context to shutdown.");`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`try {`
`56`		`- return Collections.<String, Object> singletonMap("message",`
	`56`	`+ return Collections.<String, Object>singletonMap("message",`
`57`	`57`	`"Shutting down, bye...");`
`58`	`58`	`}`
`59`	`59`	`finally {`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ PublicMetrics customPublicMetrics() {`
`171`	`171`	`@Override`
`172`	`172`	`public Collection<Metric<?>> metrics() {`
`173`	`173`	`Metric<Integer> metric = new Metric<Integer>("foo", 1);`
`174`		`- return Collections.<Metric<?>> singleton(metric);`
	`174`	`+ return Collections.<Metric<?>>singleton(metric);`
`175`	`175`	`}`
`176`	`176`	`};`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public MetricsEndpoint endpoint() {`
`106`	`106`	`PublicMetrics metrics = new PublicMetrics() {`
`107`	`107`	`@Override`
`108`	`108`	`public Collection<Metric<?>> metrics() {`
`109`		`- return Collections.<Metric<?>> singleton(metric);`
	`109`	`+ return Collections.<Metric<?>>singleton(metric);`
`110`	`110`	`}`
`111`	`111`	`};`
`112`	`112`	`return new MetricsEndpoint(metrics);`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public static class Config {`
`53`	`53`	`@Bean`
`54`	`54`	`public TraceEndpoint endpoint() {`
`55`	`55`	`TraceRepository repository = new InMemoryTraceRepository();`
`56`		`- repository.add(Collections.<String, Object> singletonMap("a", "b"));`
	`56`	`+ repository.add(Collections.<String, Object>singletonMap("a", "b"));`
`57`	`57`	`return new TraceEndpoint(repository);`
`58`	`58`	`}`
`59`	`59`	`}`