Skip to content

Commit bb2c4cc

Browse files
committed
Polish "Support JDK HttpClient in ClientHttpRequestFactories"
See gh-36118
1 parent 3bbfee5 commit bb2c4cc

File tree

5 files changed

+10
-61
lines changed

5 files changed

+10
-61
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ public final class ClientHttpRequestFactories {
8080

8181
private static final boolean JETTY_CLIENT_PRESENT = ClassUtils.isPresent(JETTY_CLIENT_CLASS, null);
8282

83-
static final String JDK_CLIENT_CLASS = "java.net.http.HttpClient";
84-
85-
private static final boolean JDK_CLIENT_PRESENT = ClassUtils.isPresent(JDK_CLIENT_CLASS, null);
86-
8783
private ClientHttpRequestFactories() {
8884
}
8985

@@ -104,9 +100,6 @@ public static ClientHttpRequestFactory get(ClientHttpRequestFactorySettings sett
104100
if (JETTY_CLIENT_PRESENT) {
105101
return Jetty.get(settings);
106102
}
107-
if (JDK_CLIENT_PRESENT) {
108-
return Jdk.get(settings);
109-
}
110103
return Simple.get(settings);
111104
}
112105

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
* @author Andy Wilkinson
2828
*/
29-
@ClassPathExclusions(files = {"httpclient5-*.jar", "jetty-client-*.jar", "okhttp-*.jar"}, packages = "java.net.http")
29+
@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar", "okhttp-*.jar" })
3030
class ClientHttpRequestFactoriesSimpleTests
3131
extends AbstractClientHttpRequestFactoriesTests<SimpleClientHttpRequestFactory> {
3232

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.springframework.http.client.ClientHttpRequest;
2828
import org.springframework.http.client.ClientHttpRequestFactory;
2929
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
30+
import org.springframework.http.client.JdkClientHttpRequestFactory;
3031
import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
3132
import org.springframework.http.client.SimpleClientHttpRequestFactory;
3233

@@ -75,6 +76,13 @@ void getOfOkHttpFactoryReturnsOkHttpFactory() {
7576
assertThat(requestFactory).isInstanceOf(OkHttp3ClientHttpRequestFactory.class);
7677
}
7778

79+
@Test
80+
void getOfJdkFactoryReturnsJdkFactory() {
81+
ClientHttpRequestFactory requestFactory = ClientHttpRequestFactories.get(JdkClientHttpRequestFactory.class,
82+
ClientHttpRequestFactorySettings.DEFAULTS);
83+
assertThat(requestFactory).isInstanceOf(JdkClientHttpRequestFactory.class);
84+
}
85+
7886
@Test
7987
void getOfUnknownTypeCreatesFactory() {
8088
ClientHttpRequestFactory requestFactory = ClientHttpRequestFactories.get(TestClientHttpRequestFactory.class,

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderSimpleIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*
3535
* @author Stephane Nicoll
3636
*/
37-
@ClassPathExclusions(files = { "httpclient5-*.jar", "jetty-client-*.jar", "okhttp*.jar" }, packages = "java.net.http")
37+
@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar", "okhttp*.jar" })
3838
class HttpWebServiceMessageSenderBuilderSimpleIntegrationTests {
3939

4040
private final HttpWebServiceMessageSenderBuilder builder = new HttpWebServiceMessageSenderBuilder();

0 commit comments

Comments
 (0)