diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilter.java
index 4f6f9620c0..75ad0ac94c 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilter.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilter.java
@@ -82,7 +82,7 @@ public class ExposeExcludePropertyEndpointFilter<E extends ExposableEndpoint<?>>
 		if (items == null) {
 			return Collections.emptySet();
 		}
-		return items.stream().map(item -> item.toLowerCase(Locale.ENGLISH))
+		return items.stream().map((item) -> item.toLowerCase(Locale.ENGLISH))
 				.collect(Collectors.toCollection(HashSet::new));
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java
index 052dd52a8b..7ea0371bfe 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java
@@ -98,7 +98,7 @@ public class MessageSourceAutoConfigurationTests {
 
 	private ContextConsumer<AssertableApplicationContext> assertCache(long expected) {
 		return (context) -> {
-			assertThat(assertThat(context).hasSingleBean(MessageSource.class));
+			assertThat(context).hasSingleBean(MessageSource.class);
 			assertThat(new DirectFieldAccessor(context.getBean(MessageSource.class))
 					.getPropertyValue("cacheMillis")).isEqualTo(expected);
 		};
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java
index 7606cae846..6ebf1e7438 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedYamlLoader.java
@@ -69,9 +69,7 @@ class OriginTrackedYamlLoader extends YamlProcessor {
 
 	public List<Map<String, Object>> load() {
 		final List<Map<String, Object>> result = new ArrayList<>();
-		process((properties, map) -> {
-			result.add(getFlattenedMap(map));
-		});
+		process((properties, map) -> result.add(getFlattenedMap(map)));
 		return result;
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/StringToEnumIgnoringCaseConverterFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/StringToEnumIgnoringCaseConverterFactoryTests.java
index 65c53d4ae6..4e7aca2c23 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/StringToEnumIgnoringCaseConverterFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/StringToEnumIgnoringCaseConverterFactoryTests.java
@@ -87,8 +87,8 @@ public class StringToEnumIgnoringCaseConverterFactoryTests {
 			Locale.setDefault(new Locale("tr"));
 			LocaleSensitiveEnum result = this.conversionService.convert(
 					"accept-case-insensitive-properties", LocaleSensitiveEnum.class);
-			assertThat(result
-					.equals(LocaleSensitiveEnum.ACCEPT_CASE_INSENSITIVE_PROPERTIES));
+			assertThat(result)
+					.isEqualTo(LocaleSensitiveEnum.ACCEPT_CASE_INSENSITIVE_PROPERTIES);
 		}
 		finally {
 			Locale.setDefault(defaultLocale);