From f34d3095486b6cfcfaf413821033eea8e185d3dc Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 26 Jan 2017 15:03:02 +0000
Subject: [PATCH] Formatting

---
 ...SpringApplicationAdminJmxAutoConfiguration.java |  3 +--
 .../cache/CouchbaseCacheConfiguration.java         |  5 +++--
 .../jdbc/DataSourceAutoConfiguration.java          |  4 ++--
 .../autoconfigure/jdbc/DataSourceInitializer.java  |  3 ++-
 .../aop/AopAutoConfigurationTests.java             |  1 -
 .../cassandra/CassandraAutoConfigurationTests.java |  5 +++--
 .../autoconfigure/orm/jpa/JpaPropertiesTests.java  | 14 +++++++-------
 .../sample/metrics/opentsdb/SampleController.java  |  4 ++--
 .../web/support/SpringBootServletInitializer.java  |  8 ++++----
 .../boot/yaml/SpringProfileDocumentMatcher.java    |  4 ++--
 10 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java
index f20d6343b3..1e7e8690f6 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java
@@ -60,8 +60,7 @@ public class SpringApplicationAdminJmxAutoConfiguration {
 	private final Environment environment;
 
 	public SpringApplicationAdminJmxAutoConfiguration(
-			ObjectProvider<MBeanExporter> mbeanExporter,
-			Environment environment) {
+			ObjectProvider<MBeanExporter> mbeanExporter, Environment environment) {
 		this.mbeanExporter = mbeanExporter.getIfAvailable();
 		this.environment = environment;
 	}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java
index 3813a40a61..302f1419d8 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java
@@ -60,8 +60,9 @@ public class CouchbaseCacheConfiguration {
 	public CouchbaseCacheManager cacheManager() {
 		List<String> cacheNames = this.cacheProperties.getCacheNames();
 		CouchbaseCacheManager cacheManager = new CouchbaseCacheManager(
-				CacheBuilder.newInstance(this.bucket).withExpiration(
-						this.cacheProperties.getCouchbase().getExpirationSeconds()),
+				CacheBuilder.newInstance(this.bucket)
+						.withExpiration(this.cacheProperties.getCouchbase()
+								.getExpirationSeconds()),
 				cacheNames.toArray(new String[cacheNames.size()]));
 		return this.customizers.customize(cacheManager);
 	}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
index 5e6d4fbaf1..acdc373211 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
@@ -71,8 +71,8 @@ public class DataSourceAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public DataSourceInitializer dataSourceInitializer(
-		DataSourceProperties properties, ApplicationContext applicationContext) {
+	public DataSourceInitializer dataSourceInitializer(DataSourceProperties properties,
+			ApplicationContext applicationContext) {
 		return new DataSourceInitializer(properties, applicationContext);
 	}
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
index 23b3b67bb5..16e0debaa2 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
@@ -60,7 +60,8 @@ class DataSourceInitializer implements ApplicationListener<DataSourceInitialized
 
 	private boolean initialized = false;
 
-	DataSourceInitializer(DataSourceProperties properties, ApplicationContext applicationContext) {
+	DataSourceInitializer(DataSourceProperties properties,
+			ApplicationContext applicationContext) {
 		this.properties = properties;
 		this.applicationContext = applicationContext;
 	}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java
index e11eacbd78..73e8fdc334 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java
@@ -107,7 +107,6 @@ public class AopAutoConfigurationTests {
 		this.context = ctx;
 	}
 
-
 	@EnableAspectJAutoProxy(proxyTargetClass = true)
 	@Configuration
 	@Import(TestConfiguration.class)
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
index 48c5ede305..5707df4502 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
@@ -66,8 +66,9 @@ public class CassandraAutoConfigurationTests {
 	public void createCustomizeCluster() {
 		load(MockCustomizerConfig.class);
 		assertThat(this.context.getBeanNamesForType(Cluster.class).length).isEqualTo(1);
-		assertThat(this.context.getBeanNamesForType(ClusterBuilderCustomizer.class).length)
-				.isEqualTo(1);
+		assertThat(
+				this.context.getBeanNamesForType(ClusterBuilderCustomizer.class).length)
+						.isEqualTo(1);
 	}
 
 	@Test
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java
index 0c1d716603..eb188910a9 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java
@@ -184,24 +184,24 @@ public class JpaPropertiesTests {
 	@Test
 	public void determineDatabaseWithKnownUrl() {
 		JpaProperties properties = load(HibernateVersion.V5);
-		Database database = properties.determineDatabase(
-				mockDataSource("jdbc:h2:mem:testdb"));
+		Database database = properties
+				.determineDatabase(mockDataSource("jdbc:h2:mem:testdb"));
 		assertThat(database).isEqualTo(Database.H2);
 	}
 
 	@Test
 	public void determineDatabaseWithKnownUrlAndUserConfig() {
 		JpaProperties properties = load(HibernateVersion.V5, "spring.jpa.database=mysql");
-		Database database = properties.determineDatabase(
-				mockDataSource("jdbc:h2:mem:testdb"));
+		Database database = properties
+				.determineDatabase(mockDataSource("jdbc:h2:mem:testdb"));
 		assertThat(database).isEqualTo(Database.MYSQL);
 	}
 
 	@Test
 	public void determineDatabaseWithUnknownUrl() {
 		JpaProperties properties = load(HibernateVersion.V5);
-		Database database = properties.determineDatabase(
-				mockDataSource("jdbc:unknown://localhost"));
+		Database database = properties
+				.determineDatabase(mockDataSource("jdbc:unknown://localhost"));
 		assertThat(database).isEqualTo(Database.DEFAULT);
 	}
 
@@ -222,7 +222,7 @@ public class JpaPropertiesTests {
 			given(ds.getConnection()).willReturn(connection);
 		}
 		catch (SQLException e) {
-			//Do nothing
+			// Do nothing
 		}
 		return ds;
 	}
diff --git a/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleController.java b/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleController.java
index 2fa39f6a96..8c5d73057f 100644
--- a/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleController.java
+++ b/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleController.java
@@ -39,8 +39,8 @@ public class SampleController {
 	@GetMapping("/")
 	@ResponseBody
 	public Map<String, String> hello() {
-		return Collections.singletonMap("message", "Hello " +
-				this.helloWorldProperties.getName());
+		return Collections.singletonMap("message",
+				"Hello " + this.helloWorldProperties.getName());
 	}
 
 	protected static class Message {
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/support/SpringBootServletInitializer.java b/spring-boot/src/main/java/org/springframework/boot/web/support/SpringBootServletInitializer.java
index f57ebc3244..c4a6f9444f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/support/SpringBootServletInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/support/SpringBootServletInitializer.java
@@ -163,10 +163,10 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
 	}
 
 	/**
-	 * Configure the application. Normally all you would need to do is to add sources (e.g.
-	 * config classes) because other settings have sensible defaults. You might choose
-	 * (for instance) to add default command line arguments, or set an active Spring
-	 * profile.
+	 * Configure the application. Normally all you would need to do is to add sources
+	 * (e.g. config classes) because other settings have sensible defaults. You might
+	 * choose (for instance) to add default command line arguments, or set an active
+	 * Spring profile.
 	 * @param builder a builder for the application context
 	 * @return the application builder
 	 * @see SpringApplicationBuilder
diff --git a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java
index 38d9551ef1..edf962ccfb 100644
--- a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java
@@ -144,8 +144,8 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher {
 	}
 
 	/**
-	 * {@link ProfilesMatcher} that matches when a value in {@code spring.profiles} is also
-	 * in {@code spring.profiles.active}.
+	 * {@link ProfilesMatcher} that matches when a value in {@code spring.profiles} is
+	 * also in {@code spring.profiles.active}.
 	 */
 	private static class ActiveProfilesMatcher extends ProfilesMatcher {