Use ClassPathExclusions.packages to exclude JDK HttpClient

See spring-projects#36120
poutsma · Jul 3, 2023 · a2cb968 · a2cb968
1 parent 6228be2
commit a2cb968
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...va/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java b/...va/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java
@@ -39,7 +39,7 @@ class ClientHttpRequestFactoriesHttpComponentsTests
 
 	@Override
 	protected long connectTimeout(HttpComponentsClientHttpRequestFactory requestFactory) {
-		return (int) ReflectionTestUtils.getField(requestFactory, "connectTimeout");
+		return (long) ReflectionTestUtils.getField(requestFactory, "connectTimeout");
 	}
 
 	@Override

diff --git a/...st/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJdkClientTests.java b/...st/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJdkClientTests.java
@@ -46,7 +46,7 @@ protected long connectTimeout(JdkClientHttpRequestFactory requestFactory) {
 	@Override
 	@SuppressWarnings("unchecked")
 	protected long readTimeout(JdkClientHttpRequestFactory requestFactory) {
-		return (int) ReflectionTestUtils.getField(requestFactory, "readTimeout");
+		return ((Duration) ReflectionTestUtils.getField(requestFactory, "readTimeout")).toMillis();
 	}
 
 }
diff --git a/.../test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java b/.../test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java
@@ -26,7 +26,7 @@
  *
  * @author Andy Wilkinson
  */
-@ClassPathExclusions({ "httpclient5-*.jar", "okhttp-*.jar" })
+@ClassPathExclusions(value = {"httpclient5-*.jar", "okhttp-*.jar"}, packages = "java.net.http")
 class ClientHttpRequestFactoriesSimpleTests
 		extends AbstractClientHttpRequestFactoriesTests<SimpleClientHttpRequestFactory> {
 

diff --git a/...ork/boot/webservices/client/HttpWebServiceMessageSenderBuilderSimpleIntegrationTests.java b/...ork/boot/webservices/client/HttpWebServiceMessageSenderBuilderSimpleIntegrationTests.java
@@ -34,7 +34,7 @@
  *
  * @author Stephane Nicoll
  */
-@ClassPathExclusions({ "httpclient5-*.jar", "okhttp*.jar" })
+@ClassPathExclusions(value = {"httpclient5-*.jar", "okhttp-*.jar"}, packages = "java.net.http")
 class HttpWebServiceMessageSenderBuilderSimpleIntegrationTests {
 
 	private final HttpWebServiceMessageSenderBuilder builder = new HttpWebServiceMessageSenderBuilder();