Remove deprecated support for OkHTTP

Closes gh-42780

Author: wilkinsona

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -1441,13 +1441,6 @@ bom {
 			site("https://netty.io")
 		}
 	}
-	library("OkHttp", "4.12.0") {
-		group("com.squareup.okhttp3") {
-			imports = [
-				"okhttp-bom"
-			]
-		}
-	}
 	library("OpenTelemetry", "1.43.0") {
 		group("io.opentelemetry") {
 			imports = [

spring-boot-project/spring-boot-parent/build.gradle

@@ -158,6 +158,13 @@ bom {
 			]
 		}
 	}
+	library("OkHttp", "4.12.0") {
+		group("com.squareup.okhttp3") {
+			imports = [
+				"okhttp-bom"
+			]
+		}
+	}
 	library("OpenTelemetry Logback Appender", "2.7.0-alpha") {
 		group("io.opentelemetry.instrumentation") {
 			modules = [

spring-boot-project/spring-boot/build.gradle

@@ -29,7 +29,6 @@ dependencies {
 	optional("com.oracle.database.jdbc:ucp11")
 	optional("com.oracle.database.jdbc:ojdbc11")
 	optional("com.samskivert:jmustache")
-	optional("com.squareup.okhttp3:okhttp")
 	optional("com.zaxxer:HikariCP")
 	optional("io.netty:netty-tcnative-boringssl-static")
 	optional("io.projectreactor:reactor-tools")

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java

@@ -29,11 +29,8 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
 
 import io.netty.handler.ssl.SslContextBuilder;
-import okhttp3.OkHttpClient;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
@@ -77,10 +74,6 @@ public final class ClientHttpRequestFactories {
 
 	private static final boolean APACHE_HTTP_CLIENT_PRESENT = ClassUtils.isPresent(APACHE_HTTP_CLIENT_CLASS, null);
 
-	static final String OKHTTP_CLIENT_CLASS = "okhttp3.OkHttpClient";
-
-	private static final boolean OKHTTP_CLIENT_PRESENT = ClassUtils.isPresent(OKHTTP_CLIENT_CLASS, null);
-
 	static final String JETTY_CLIENT_CLASS = "org.eclipse.jetty.client.HttpClient";
 
 	private static final boolean JETTY_CLIENT_PRESENT = ClassUtils.isPresent(JETTY_CLIENT_CLASS, null);
@@ -100,14 +93,11 @@ private ClientHttpRequestFactories() {
 	 * <li>{@link HttpComponentsClientHttpRequestFactory}</li>
 	 * <li>{@link JettyClientHttpRequestFactory}</li>
 	 * <li>{@link ReactorClientHttpRequestFactory}</li>
-	 * <li>{@link org.springframework.http.client.OkHttp3ClientHttpRequestFactory
-	 * OkHttp3ClientHttpRequestFactory} (deprecated)</li>
 	 * <li>{@link SimpleClientHttpRequestFactory}</li>
 	 * </ol>
 	 * @param settings the settings to apply
 	 * @return a new {@link ClientHttpRequestFactory}
 	 */
-	@SuppressWarnings("removal")
 	public static ClientHttpRequestFactory get(ClientHttpRequestFactorySettings settings) {
 		Assert.notNull(settings, "Settings must not be null");
 		if (APACHE_HTTP_CLIENT_PRESENT) {
@@ -119,9 +109,6 @@ public static ClientHttpRequestFactory get(ClientHttpRequestFactorySettings sett
 		if (REACTOR_CLIENT_PRESENT) {
 			return Reactor.get(settings);
 		}
-		if (OKHTTP_CLIENT_PRESENT) {
-			return OkHttp.get(settings);
-		}
 		return Simple.get(settings);
 	}
 
@@ -135,8 +122,6 @@ public static ClientHttpRequestFactory get(ClientHttpRequestFactorySettings sett
 	 * <li>{@link JdkClientHttpRequestFactory}</li>
 	 * <li>{@link JettyClientHttpRequestFactory}</li>
 	 * <li>{@link ReactorClientHttpRequestFactory}</li>
-	 * <li>{@link org.springframework.http.client.OkHttp3ClientHttpRequestFactory
-	 * OkHttp3ClientHttpRequestFactory} (deprecated)</li>
 	 * <li>{@link SimpleClientHttpRequestFactory}</li>
 	 * </ul>
 	 * A {@code requestFactoryType} of {@link ClientHttpRequestFactory} is equivalent to
@@ -146,7 +131,7 @@ public static ClientHttpRequestFactory get(ClientHttpRequestFactorySettings sett
 	 * @param settings the settings to apply
 	 * @return a new {@link ClientHttpRequestFactory} instance
 	 */
-	@SuppressWarnings({ "unchecked", "removal" })
+	@SuppressWarnings("unchecked")
 	public static <T extends ClientHttpRequestFactory> T get(Class<T> requestFactoryType,
 			ClientHttpRequestFactorySettings settings) {
 		Assert.notNull(settings, "Settings must not be null");
@@ -168,9 +153,6 @@ public static <T extends ClientHttpRequestFactory> T get(Class<T> requestFactory
 		if (requestFactoryType == SimpleClientHttpRequestFactory.class) {
 			return (T) Simple.get(settings);
 		}
-		if (requestFactoryType == org.springframework.http.client.OkHttp3ClientHttpRequestFactory.class) {
-			return (T) OkHttp.get(settings);
-		}
 		return get(() -> createRequestFactory(requestFactoryType), settings);
 	}
 
@@ -237,44 +219,6 @@ private static HttpClient createHttpClient(Duration readTimeout, SslBundle sslBu
 
 	}
 
-	/**
-	 * Support for
-	 * {@link org.springframework.http.client.OkHttp3ClientHttpRequestFactory}.
-	 *
-	 * @deprecated since 3.2.0 for removal in 3.4.0
-	 */
-	@Deprecated(since = "3.2.0", forRemoval = true)
-	@SuppressWarnings("removal")
-	static class OkHttp {
-
-		static org.springframework.http.client.OkHttp3ClientHttpRequestFactory get(
-				ClientHttpRequestFactorySettings settings) {
-			org.springframework.http.client.OkHttp3ClientHttpRequestFactory requestFactory = createRequestFactory(
-					settings.sslBundle());
-			PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
-			map.from(settings::connectTimeout).asInt(Duration::toMillis).to(requestFactory::setConnectTimeout);
-			map.from(settings::readTimeout).asInt(Duration::toMillis).to(requestFactory::setReadTimeout);
-			return requestFactory;
-		}
-
-		private static org.springframework.http.client.OkHttp3ClientHttpRequestFactory createRequestFactory(
-				SslBundle sslBundle) {
-			if (sslBundle != null) {
-				Assert.state(!sslBundle.getOptions().isSpecified(), "SSL Options cannot be specified with OkHttp");
-				SSLSocketFactory socketFactory = sslBundle.createSslContext().getSocketFactory();
-				TrustManager[] trustManagers = sslBundle.getManagers().getTrustManagers();
-				Assert.state(trustManagers.length == 1,
-						"Trust material must be provided in the SSL bundle for OkHttp3ClientHttpRequestFactory");
-				OkHttpClient client = new OkHttpClient.Builder()
-					.sslSocketFactory(socketFactory, (X509TrustManager) trustManagers[0])
-					.build();
-				return new org.springframework.http.client.OkHttp3ClientHttpRequestFactory(client);
-			}
-			return new org.springframework.http.client.OkHttp3ClientHttpRequestFactory();
-		}
-
-	}
-
 	/**
 	 * Support for {@link JettyClientHttpRequestFactory}.
 	 */

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesRuntimeHints.java

@@ -63,17 +63,6 @@ private void registerHints(ReflectionHints hints, ClassLoader classLoader) {
 			typeHint.onReachableType(HttpURLConnection.class);
 			registerReflectionHints(hints, SimpleClientHttpRequestFactory.class);
 		});
-		registerOkHttpHints(hints, classLoader);
-	}
-
-	@SuppressWarnings("removal")
-	@Deprecated(since = "3.2.0", forRemoval = true)
-	private void registerOkHttpHints(ReflectionHints hints, ClassLoader classLoader) {
-		hints.registerTypeIfPresent(classLoader, ClientHttpRequestFactories.OKHTTP_CLIENT_CLASS, (typeHint) -> {
-			typeHint.onReachableType(TypeReference.of(ClientHttpRequestFactories.OKHTTP_CLIENT_CLASS));
-			registerReflectionHints(hints, org.springframework.http.client.OkHttp3ClientHttpRequestFactory.class);
-		});
-
 	}
 
 	private void registerReflectionHints(ReflectionHints hints,

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java

@@ -27,7 +27,7 @@
  *
  * @author Arjen Poutsma
  */
-@ClassPathExclusions({ "httpclient5-*.jar", "okhttp-*.jar" })
+@ClassPathExclusions("httpclient5-*.jar")
 class ClientHttpRequestFactoriesJettyTests
 		extends AbstractClientHttpRequestFactoriesTests<JettyClientHttpRequestFactory> {
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesOkHttp3Tests.java

@@ -61,24 +61,6 @@ void shouldRegisterHttpComponentHints() {
 			.accepts(hints);
 	}
 
-	@Test
-	@Deprecated(since = "3.2.0")
-	@SuppressWarnings("removal")
-	void shouldRegisterOkHttpHints() {
-		RuntimeHints hints = new RuntimeHints();
-		new ClientHttpRequestFactoriesRuntimeHints().registerHints(hints, getClass().getClassLoader());
-		ReflectionHintsPredicates reflection = RuntimeHintsPredicates.reflection();
-		assertThat(reflection.onMethod(method(org.springframework.http.client.OkHttp3ClientHttpRequestFactory.class,
-				"setConnectTimeout", int.class)))
-			.accepts(hints);
-		assertThat(reflection.onMethod(method(org.springframework.http.client.OkHttp3ClientHttpRequestFactory.class,
-				"setReadTimeout", int.class)))
-			.accepts(hints);
-		assertThat(hints.reflection()
-			.getTypeHint(org.springframework.http.client.OkHttp3ClientHttpRequestFactory.class)
-			.methods()).hasSize(2);
-	}
-
 	@Test
 	void shouldRegisterJettyClientHints() {
 		RuntimeHints hints = new RuntimeHints();

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesOkHttp4Tests.java

@@ -26,7 +26,7 @@
  *
  * @author Andy Wilkinson
  */
-@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar", "okhttp-*.jar", "reactor-netty-http-*.jar" })
+@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar", "reactor-netty-http-*.jar" })
 class ClientHttpRequestFactoriesSimpleTests
 		extends AbstractClientHttpRequestFactoriesTests<SimpleClientHttpRequestFactory> {
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesRuntimeHintsTests.java

@@ -34,7 +34,7 @@
  *
  * @author Stephane Nicoll
  */
-@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar", "okhttp*.jar", "reactor-netty-http-*.jar" })
+@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar", "reactor-netty-http-*.jar" })
 class HttpWebServiceMessageSenderBuilderSimpleIntegrationTests {
 
 	private final HttpWebServiceMessageSenderBuilder builder = new HttpWebServiceMessageSenderBuilder();