diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index c76835bf488..2cc17dee875 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -321,11 +321,6 @@ mariadb-java-client test - - io.netty - netty-all - test - org.postgresql postgresql diff --git a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java index c3df825a521..dc224ee9e1f 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java @@ -72,8 +72,6 @@ public class RestTemplateBuilder { "org.springframework.http.client.OkHttp3ClientHttpRequestFactory"); candidates.put("com.squareup.okhttp.OkHttpClient", "org.springframework.http.client.OkHttpClientHttpRequestFactory"); - candidates.put("io.netty.channel.EventLoopGroup", - "org.springframework.http.client.Netty4ClientHttpRequestFactory"); REQUEST_FACTORY_CANDIDATES = Collections.unmodifiableMap(candidates); } diff --git a/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java index daa38124ed8..a2036f6ce76 100644 --- a/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java @@ -31,7 +31,6 @@ import org.springframework.http.client.BufferingClientHttpRequestFactory; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; -import org.springframework.http.client.Netty4ClientHttpRequestFactory; import org.springframework.http.client.OkHttp3ClientHttpRequestFactory; import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.http.client.support.BasicAuthorizationInterceptor; @@ -465,24 +464,6 @@ public class RestTemplateBuilderTests { .isEqualTo(1234); } - @Test - public void connectTimeoutCanBeConfiguredOnNetty4RequestFactory() { - ClientHttpRequestFactory requestFactory = this.builder - .requestFactory(Netty4ClientHttpRequestFactory.class) - .setConnectTimeout(1234).build().getRequestFactory(); - assertThat(ReflectionTestUtils.getField(requestFactory, "connectTimeout")) - .isEqualTo(1234); - } - - @Test - public void readTimeoutCanBeConfiguredOnNetty4RequestFactory() { - ClientHttpRequestFactory requestFactory = this.builder - .requestFactory(Netty4ClientHttpRequestFactory.class).setReadTimeout(1234) - .build().getRequestFactory(); - assertThat(ReflectionTestUtils.getField(requestFactory, "readTimeout")) - .isEqualTo(1234); - } - @Test public void connectTimeoutCanBeConfiguredOnOkHttp3RequestFactory() { ClientHttpRequestFactory requestFactory = this.builder