diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestIntegrationTests.java
index d667eb08df..674e209132 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestIntegrationTests.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestIntegrationTests.java
@@ -62,7 +62,7 @@ public class DataLdapTestIntegrationTests {
 	public void testRepository() {
 		LdapQuery ldapQuery = LdapQueryBuilder.query().where("cn").is("Bob Smith");
 		Optional<ExampleEntry> entry = this.exampleRepository.findOne(ldapQuery);
-		assertThat(entry.isPresent());
+		assertThat(entry.isPresent()).isTrue();
 		assertThat(entry.get().getDn()).isEqualTo(LdapUtils
 				.newLdapName("cn=Bob Smith,ou=company1,c=Sweden,dc=spring,dc=org"));
 		assertThat(this.ldapTemplate.findOne(ldapQuery, ExampleEntry.class).getDn())
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/StaticResourceJars.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/StaticResourceJars.java
index 304b255798..c95940764a 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/StaticResourceJars.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/StaticResourceJars.java
@@ -79,19 +79,16 @@ class StaticResourceJars {
 	}
 
 	private void addUrlFile(List<URL> urls, URL url, File file) {
-		if (file.isDirectory() && new File(file, "META-INF/resources").isDirectory()) {
-			urls.add(url);
-		}
-		else if (isResourcesJar(file)) {
+		if ((file.isDirectory() && new File(file, "META-INF/resources").isDirectory())
+				|| isResourcesJar(file)) {
 			urls.add(url);
 		}
 	}
 
 	private void addUrlConnection(List<URL> urls, URL url, URLConnection connection) {
-		if (connection instanceof JarURLConnection) {
-			if (isResourcesJar((JarURLConnection) connection)) {
-				urls.add(url);
-			}
+		if (connection instanceof JarURLConnection
+				&& isResourcesJar((JarURLConnection) connection)) {
+			urls.add(url);
 		}
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/InvalidConfigurationPropertyValueFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/InvalidConfigurationPropertyValueFailureAnalyzerTests.java
index 6eab25b83f..984904f60f 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/InvalidConfigurationPropertyValueFailureAnalyzerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/InvalidConfigurationPropertyValueFailureAnalyzerTests.java
@@ -113,8 +113,8 @@ public class InvalidConfigurationPropertyValueFailureAnalyzerTests {
 			FailureAnalysis analysis) {
 		assertThat(analysis.getDescription()).contains("test.property")
 				.contains("invalid").contains("TestOrigin test.property");
-		assertThat(analysis.getAction()
-				.contains("Review the value of the property with the provided reason."));
+		assertThat(analysis.getAction())
+				.contains("Review the value of the property with the provided reason.");
 		assertThat(analysis.getCause()).isSameAs(failure);
 	}