diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java
index b0eed78bf0..63e6a5d7dc 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java
@@ -202,8 +202,7 @@ public class CacheProperties {
 		 */
 		private Resource config;
 
-		@DeprecatedConfigurationProperty(replacement = "spring.hazelcast.config",
-				reason = "Use general hazelcast auto-configuration instead.")
+		@DeprecatedConfigurationProperty(replacement = "spring.hazelcast.config", reason = "Use general hazelcast auto-configuration instead.")
 		@Deprecated
 		public Resource getConfig() {
 			return this.config;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java
index a6dd265747..cd90a881e9 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java
@@ -33,7 +33,7 @@ import org.springframework.beans.factory.FactoryBean;
  * @author Dave Syer
  * @since 1.2.2
  * @see MustacheResourceTemplateLoader
- * @deprecated  as of 1.5
+ * @deprecated as of 1.5
  */
 @Deprecated
 public class MustacheCompilerFactoryBean implements FactoryBean<Mustache.Compiler> {
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java
index 35bb938cb0..67217b0587 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java
@@ -59,7 +59,7 @@ public class JooqExceptionTranslatorTests {
 				new Object[] { SQLDialect.POSTGRES_9_3, sqlException("03000") },
 				new Object[] { SQLDialect.POSTGRES_9_4, sqlException("03000") },
 				new Object[] { SQLDialect.POSTGRES_9_5, sqlException("03000") },
-				new Object[] { SQLDialect.SQLITE, sqlException("21000") }};
+				new Object[] { SQLDialect.SQLITE, sqlException("21000") } };
 	}
 
 	private static SQLException sqlException(String sqlState) {
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcValidatorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcValidatorTests.java
index a0df0cf239..3db4eac29c 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcValidatorTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcValidatorTests.java
@@ -54,8 +54,7 @@ public class WebMvcValidatorTests {
 
 	@Test
 	public void wrapLocalValidatorFactoryBean() {
-		WebMvcValidator wrapper = load(
-				LocalValidatorFactoryBeanConfig.class);
+		WebMvcValidator wrapper = load(LocalValidatorFactoryBeanConfig.class);
 		assertThat(wrapper.supports(SampleData.class)).isTrue();
 		MapBindingResult errors = new MapBindingResult(new HashMap<String, Object>(),
 				"test");
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java
index 9ea1cb6c93..5e9bbe26b0 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java
@@ -102,7 +102,8 @@ public final class LoggerConfiguration {
 			rtn = rtn && ObjectUtils.nullSafeEquals(this.name, other.name);
 			rtn = rtn && ObjectUtils.nullSafeEquals(this.configuredLevel,
 					other.configuredLevel);
-			rtn = rtn && ObjectUtils.nullSafeEquals(this.effectiveLevel, other.effectiveLevel);
+			rtn = rtn && ObjectUtils.nullSafeEquals(this.effectiveLevel,
+					other.effectiveLevel);
 			return rtn;
 		}
 		return super.equals(obj);
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java
index bb47f09f2a..deb16d5065 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java
@@ -263,11 +263,11 @@ public class UndertowEmbeddedServletContainerFactoryTests
 	}
 
 	private ServletContainer getServletContainerFromNewFactory() {
-		UndertowEmbeddedServletContainer container = (UndertowEmbeddedServletContainer)
-				getFactory().getEmbeddedServletContainer();
+		UndertowEmbeddedServletContainer container = (UndertowEmbeddedServletContainer) getFactory()
+				.getEmbeddedServletContainer();
 		try {
-			return ((DeploymentManager) ReflectionTestUtils.getField(container, "manager"))
-					.getDeployment().getServletContainer();
+			return ((DeploymentManager) ReflectionTestUtils.getField(container,
+					"manager")).getDeployment().getServletContainer();
 		}
 		finally {
 			container.stop();
diff --git a/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosPropertiesTests.java
index 21afd195c3..d63270a604 100644
--- a/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosPropertiesTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosPropertiesTests.java
@@ -75,8 +75,7 @@ public class AtomikosPropertiesTests {
 		assertThat(properties).contains(defaultOf(defaultSettings,
 				"com.atomikos.icatch.max_timeout",
 				"com.atomikos.icatch.default_jta_timeout",
-				"com.atomikos.icatch.max_actives",
-				"com.atomikos.icatch.enable_logging",
+				"com.atomikos.icatch.max_actives", "com.atomikos.icatch.enable_logging",
 				"com.atomikos.icatch.serial_jta_transactions",
 				"com.atomikos.icatch.force_shutdown_on_vm_exit",
 				"com.atomikos.icatch.log_base_name",
@@ -96,7 +95,8 @@ public class AtomikosPropertiesTests {
 
 	private Properties loadDefaultSettings() {
 		try {
-			Class<?> target = ClassUtils.forName("com.atomikos.icatch.standalone.UserTransactionServiceImp",
+			Class<?> target = ClassUtils.forName(
+					"com.atomikos.icatch.standalone.UserTransactionServiceImp",
 					getClass().getClassLoader());
 			Method m = target.getMethod("getDefaultProperties");
 			m.setAccessible(true);