diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
index 0762335b98..fac87745bb 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
@@ -105,8 +105,7 @@ public class HealthIndicatorAutoConfiguration {
 
 	private final HealthIndicatorProperties properties;
 
-	public HealthIndicatorAutoConfiguration(
-			HealthIndicatorProperties properties) {
+	public HealthIndicatorAutoConfiguration(HealthIndicatorProperties properties) {
 		this.properties = properties;
 	}
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/EhCacheStatisticsProvider.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/EhCacheStatisticsProvider.java
index 7b960e81b0..cacae50d5f 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/EhCacheStatisticsProvider.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/EhCacheStatisticsProvider.java
@@ -35,8 +35,8 @@ public class EhCacheStatisticsProvider implements CacheStatisticsProvider<EhCach
 		DefaultCacheStatistics statistics = new DefaultCacheStatistics();
 		StatisticsGateway ehCacheStatistics = cache.getNativeCache().getStatistics();
 		statistics.setSize(ehCacheStatistics.getSize());
-		Double hitRatio = cacheHitRatio(ehCacheStatistics);
-		if (!hitRatio.isNaN()) {
+		double hitRatio = cacheHitRatio(ehCacheStatistics);
+		if (!Double.isNaN(hitRatio)) {
 			// ratio is calculated 'racily' and can drift marginally above unity,
 			// so we cap it here
 			double sanitizedHitRatio = (hitRatio > 1 ? 1 : hitRatio);
@@ -46,7 +46,7 @@ public class EhCacheStatisticsProvider implements CacheStatisticsProvider<EhCach
 		return statistics;
 	}
 
-	private static Double cacheHitRatio(StatisticsGateway stats) {
+	private double cacheHitRatio(StatisticsGateway stats) {
 		long hitCount = stats.cacheHitCount();
 		long cacheMissCount = stats.cacheMissCount();
 		return ((double) hitCount) / (hitCount + cacheMissCount);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
index d21e8ff4db..511d377351 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
@@ -57,9 +57,11 @@ public class CouchbaseAutoConfiguration {
 
 		@Bean
 		@ConditionalOnBean(Validator.class)
-		public ValidatingCouchbaseEventListener validationEventListener(Validator validator) {
+		public ValidatingCouchbaseEventListener validationEventListener(
+				Validator validator) {
 			return new ValidatingCouchbaseEventListener(validator);
 		}
+
 	}
 
 	@Configuration
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java
index 852cc379a4..3e2a65794f 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java
@@ -74,8 +74,8 @@ public class ProjectInfoAutoConfiguration {
 
 	protected void bindPropertiesTo(Object target, Resource location, String prefix)
 			throws BindException, IOException {
-		PropertiesConfigurationFactory<Object> factory =
-				new PropertiesConfigurationFactory<Object>(target);
+		PropertiesConfigurationFactory<Object> factory = new PropertiesConfigurationFactory<Object>(
+				target);
 		factory.setConversionService(this.conversionService);
 		factory.setTargetName(prefix);
 		Properties gitInfoProperties = PropertiesLoaderUtils.loadProperties(location);
@@ -89,7 +89,6 @@ public class ProjectInfoAutoConfiguration {
 		return conversionService;
 	}
 
-
 	static class GitResourceAvailableCondition extends SpringBootCondition {
 
 		private final ResourceLoader defaultResourceLoader = new DefaultResourceLoader();
@@ -125,7 +124,8 @@ public class ProjectInfoAutoConfiguration {
 			if (epoch != null) {
 				return new Date(epoch);
 			}
-			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX", Locale.US);
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX",
+					Locale.US);
 			try {
 				return format.parse(s);
 			}
@@ -145,10 +145,11 @@ public class ProjectInfoAutoConfiguration {
 			try {
 				return Long.parseLong(s) * 1000;
 			}
-			catch (NumberFormatException e) {
+			catch (NumberFormatException ex) {
 				return null;
 			}
 		}
+
 	}
 
 }
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java
index fa21a2567c..ba564f520a 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java
@@ -64,7 +64,8 @@ public class CouchbaseRepositoriesAutoConfigurationTests {
 
 	@Test
 	public void disableRepository() {
-		load(DefaultConfiguration.class, "spring.data.couchbase.repositories.enabled=false");
+		load(DefaultConfiguration.class,
+				"spring.data.couchbase.repositories.enabled=false");
 		assertThat(this.context.getBeansOfType(CityRepository.class)).hasSize(0);
 	}
 
@@ -87,14 +88,12 @@ public class CouchbaseRepositoriesAutoConfigurationTests {
 		this.context = context;
 	}
 
-
 	@Configuration
 	@TestAutoConfigurationPackage(City.class)
 	static class CouchbaseNotAvailableConfiguration {
 
 	}
 
-
 	@Configuration
 	@TestAutoConfigurationPackage(City.class)
 	@Import(CouchbaseTestConfiguration.class)
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java
index 74d1bd0fd8..822d15ce77 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java
@@ -86,7 +86,6 @@ public class ProjectInfoAutoConfigurationTests {
 		assertThat(gitInfo).isSameAs(this.context.getBean("customGitInfo"));
 	}
 
-
 	private void load(String... environment) {
 		load(null, environment);
 	}
diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc
index 6e6731abb1..062e139147 100644
--- a/spring-boot-docs/src/main/asciidoc/howto.adoc
+++ b/spring-boot-docs/src/main/asciidoc/howto.adoc
@@ -438,6 +438,7 @@ in the '`Spring Boot features`' section, or the
 code.
 
 
+
 [[howto-user-a-random-unassigned-http-port]]
 === Use a random unassigned HTTP port
 To scan for a free port (using OS natives to prevent clashes) use `server.port=0`.
@@ -507,6 +508,8 @@ the two to configure programmatically. See the
 {github-code}/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors[`spring-boot-sample-tomcat-multi-connectors`]
 sample project for an example.
 
+
+
 [[howto-configure-accesslogs]]
 === Configure Access Logging
 Access logs can be configured for Tomcat and Undertow via their respective namespaces.
@@ -538,6 +541,7 @@ Logs are stored in a `logs` directory relative to the working directory of the
 application. This can be customized via `server.undertow.accesslog.directory`.
 
 
+
 [[howto-use-behind-a-proxy-server]]
 [[howto-use-tomcat-behind-a-proxy-server]]
 === Use behind a front-end proxy server
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
index 4c160715c1..7281267b47 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
@@ -344,7 +344,6 @@ public class TomcatEmbeddedServletContainerFactoryTests
 	public void startupFailureDoesNotResultInUnstoppedThreadsBeingReported()
 			throws IOException {
 		super.portClashOfPrimaryConnectorResultsInPortInUseException();
-
 		String string = this.outputCapture.toString();
 		assertThat(string)
 				.doesNotContain("appears to have started a thread named [main]");