diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/HttpClientProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/HttpClientProperties.java
index 3117da8484..abdc2e0c4c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/HttpClientProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/HttpClientProperties.java
@@ -56,7 +56,7 @@ public class HttpClientProperties {
 	/**
 	 * Default SSL configuration for a client HTTP request.
 	 */
-	private Ssl ssl = new Ssl();
+	private final Ssl ssl = new Ssl();
 
 	public Factory getFactory() {
 		return this.factory;
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java
index 37a418383f..c2a2ad97ec 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java
@@ -47,7 +47,7 @@ public record ClientHttpRequestFactorySettings(Redirects redirects, Duration con
 
 	/**
 	 * Return a new {@link ClientHttpRequestFactorySettings} instance with an updated
-	 * connect timeout setting .
+	 * connect timeout setting.
 	 * @param connectTimeout the new connect timeout setting
 	 * @return a new {@link ClientHttpRequestFactorySettings} instance
 	 */
@@ -116,12 +116,12 @@ public record ClientHttpRequestFactorySettings(Redirects redirects, Duration con
 		FOLLOW_WHEN_POSSIBLE,
 
 		/**
-		 * Follow redirects (fail if the underlying library has not support).
+		 * Follow redirects (fail if the underlying library has no support).
 		 */
 		FOLLOW,
 
 		/**
-		 * Don't follow redirects (fail if the underlying library has not support).
+		 * Don't follow redirects (fail if the underlying library has no support).
 		 */
 		DONT_FOLLOW
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
index f5cac48423..2e12294567 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
@@ -32,7 +32,6 @@ import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuil
 import org.apache.hc.client5.http.protocol.RedirectStrategy;
 import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
 import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
-import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.io.SocketConfig;
@@ -97,8 +96,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
 
 	private RedirectStrategy asRedirectStrategy(Redirects redirects) {
 		return switch (redirects) {
-			case FOLLOW_WHEN_POSSIBLE -> DefaultRedirectStrategy.INSTANCE;
-			case FOLLOW -> DefaultRedirectStrategy.INSTANCE;
+			case FOLLOW_WHEN_POSSIBLE, FOLLOW -> DefaultRedirectStrategy.INSTANCE;
 			case DONT_FOLLOW -> NoFollowRedirectStrategy.INSTANCE;
 		};
 	}
@@ -113,9 +111,8 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
 
 	private DefaultClientTlsStrategy createTlsSocketStrategy(SslBundle sslBundle) {
 		SslOptions options = sslBundle.getOptions();
-		DefaultClientTlsStrategy tlsSocketStrategy = new DefaultClientTlsStrategy(sslBundle.createSslContext(),
-				options.getEnabledProtocols(), options.getCiphers(), null, new DefaultHostnameVerifier());
-		return tlsSocketStrategy;
+		return new DefaultClientTlsStrategy(sslBundle.createSslContext(), options.getEnabledProtocols(),
+				options.getCiphers(), null, new DefaultHostnameVerifier());
 	}
 
 	private SocketConfig createSocketConfig(Duration readTimeout) {
@@ -133,14 +130,12 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
 		}
 
 		@Override
-		public boolean isRedirected(HttpRequest request, HttpResponse response, HttpContext context)
-				throws HttpException {
+		public boolean isRedirected(HttpRequest request, HttpResponse response, HttpContext context) {
 			return false;
 		}
 
 		@Override
-		public URI getLocationURI(HttpRequest request, HttpResponse response, HttpContext context)
-				throws HttpException {
+		public URI getLocationURI(HttpRequest request, HttpResponse response, HttpContext context) {
 			return null;
 		}
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java
index deb12aa9f4..9523e3cc93 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java
@@ -78,8 +78,7 @@ public class JdkClientHttpRequestFactoryBuilder
 
 	private Redirect asHttpClientRedirect(Redirects redirects) {
 		return switch (redirects) {
-			case FOLLOW_WHEN_POSSIBLE -> Redirect.NORMAL;
-			case FOLLOW -> Redirect.NORMAL;
+			case FOLLOW_WHEN_POSSIBLE, FOLLOW -> Redirect.NORMAL;
 			case DONT_FOLLOW -> Redirect.NEVER;
 		};
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java
index 17efd009a1..d7a650fdba 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java
@@ -102,8 +102,7 @@ public final class JettyClientHttpRequestFactoryBuilder
 
 	private boolean followRedirects(Redirects redirects) {
 		return switch (redirects) {
-			case FOLLOW_WHEN_POSSIBLE -> true;
-			case FOLLOW -> true;
+			case FOLLOW_WHEN_POSSIBLE, FOLLOW -> true;
 			case DONT_FOLLOW -> false;
 		};
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java
index e443a25952..4a42d6995b 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java
@@ -87,8 +87,7 @@ public final class ReactorClientHttpRequestFactoryBuilder
 
 	private boolean followRedirects(Redirects redirects) {
 		return switch (redirects) {
-			case FOLLOW_WHEN_POSSIBLE -> true;
-			case FOLLOW -> true;
+			case FOLLOW_WHEN_POSSIBLE, FOLLOW -> true;
 			case DONT_FOLLOW -> false;
 		};
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java
index ef9697a66b..d11c4e754a 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java
@@ -41,7 +41,7 @@ import org.springframework.util.ReflectionUtils;
 final class ReflectiveComponentsClientHttpRequestFactoryBuilder<T extends ClientHttpRequestFactory>
 		implements ClientHttpRequestFactoryBuilder<T> {
 
-	private Supplier<T> requestFactorySupplier;
+	private final Supplier<T> requestFactorySupplier;
 
 	ReflectiveComponentsClientHttpRequestFactoryBuilder(Supplier<T> requestFactorySupplier) {
 		Assert.notNull(requestFactorySupplier, "'requestFactorySupplier' must not be null");
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
index 7409873477..d7ce9c4b51 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
@@ -48,7 +48,7 @@ public record ClientHttpRequestFactorySettings(Duration connectTimeout, Duration
 
 	/**
 	 * Return a new {@link ClientHttpRequestFactorySettings} instance with an updated
-	 * connect timeout setting .
+	 * connect timeout setting.
 	 * @param connectTimeout the new connect timeout setting
 	 * @return a new {@link ClientHttpRequestFactorySettings} instance
 	 */