diff --git a/buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java b/buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
index f84a9e20cb8..0dc5ddec5fd 100644
--- a/buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
+++ b/buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
@@ -86,7 +86,7 @@ public class DockerApi {
 	 * Create a new {@link DockerApi} instance.
 	 */
 	public DockerApi() {
-		this(HttpTransport.create((DockerConnectionConfiguration) null), DockerLog.toSystemOut());
+		this(HttpTransport.create(null), DockerLog.toSystemOut());
 	}
 
 	/**
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java
index f7d73a6d8fa..ba9dc28b71e 100644
--- a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java
+++ b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java
@@ -178,8 +178,7 @@ public class Binder {
 			@Nullable Consumer<PropertyEditorRegistry> propertyEditorInitializer,
 			@Nullable BindHandler defaultBindHandler, @Nullable BindConstructorProvider constructorProvider) {
 		this(sources, placeholdersResolver,
-				(conversionService != null) ? Collections.singletonList(conversionService)
-						: (List<ConversionService>) null,
+				(conversionService != null) ? Collections.singletonList(conversionService) : null,
 				propertyEditorInitializer, defaultBindHandler, constructorProvider);
 	}
 
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java b/core/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java
index 5d95505a1e2..c25dc0789c1 100644
--- a/core/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java
+++ b/core/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java
@@ -349,7 +349,7 @@ public class ApplicationConversionService extends FormattingConversionService {
 
 	static void addBean(FormatterRegistry registry, Object bean, @Nullable ResolvableType beanType) {
 		if (bean instanceof GenericConverter converterBean) {
-			addBean(registry, converterBean, beanType, GenericConverter.class, registry::addConverter, (Runnable) null);
+			addBean(registry, converterBean, beanType, GenericConverter.class, registry::addConverter, null);
 		}
 		else if (bean instanceof Converter<?, ?> converterBean) {
 			Assert.state(beanType != null, "beanType is missing");
diff --git a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/MaximumAllowableTagsMeterFilter.java b/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/MaximumAllowableTagsMeterFilter.java
index 8aa0610dedb..8070c232a1a 100644
--- a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/MaximumAllowableTagsMeterFilter.java
+++ b/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/MaximumAllowableTagsMeterFilter.java
@@ -63,7 +63,7 @@ public final class MaximumAllowableTagsMeterFilter implements MeterFilter {
 	 * @param maximumTagValues the total number of tag values that are allowable
 	 */
 	public MaximumAllowableTagsMeterFilter(String meterNamePrefix, String tagKey, int maximumTagValues) {
-		this(meterNamePrefix, tagKey, maximumTagValues, (String) null);
+		this(meterNamePrefix, tagKey, maximumTagValues, null);
 	}
 
 	/**