Skip to content

Commit a2cb968

Browse files
committed
Use ClassPathExclusions.packages to exclude JDK HttpClient
See #36120
1 parent 6228be2 commit a2cb968

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ClientHttpRequestFactoriesHttpComponentsTests
3939

4040
@Override
4141
protected long connectTimeout(HttpComponentsClientHttpRequestFactory requestFactory) {
42-
return (int) ReflectionTestUtils.getField(requestFactory, "connectTimeout");
42+
return (long) ReflectionTestUtils.getField(requestFactory, "connectTimeout");
4343
}
4444

4545
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected long connectTimeout(JdkClientHttpRequestFactory requestFactory) {
4646
@Override
4747
@SuppressWarnings("unchecked")
4848
protected long readTimeout(JdkClientHttpRequestFactory requestFactory) {
49-
return (int) ReflectionTestUtils.getField(requestFactory, "readTimeout");
49+
return ((Duration) ReflectionTestUtils.getField(requestFactory, "readTimeout")).toMillis();
5050
}
5151

5252
}

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({ "httpclient5-*.jar", "okhttp-*.jar" })
29+
@ClassPathExclusions(value = {"httpclient5-*.jar", "okhttp-*.jar"}, packages = "java.net.http")
3030
class ClientHttpRequestFactoriesSimpleTests
3131
extends AbstractClientHttpRequestFactoriesTests<SimpleClientHttpRequestFactory> {
3232

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({ "httpclient5-*.jar", "okhttp*.jar" })
37+
@ClassPathExclusions(value = {"httpclient5-*.jar", "okhttp-*.jar"}, packages = "java.net.http")
3838
class HttpWebServiceMessageSenderBuilderSimpleIntegrationTests {
3939

4040
private final HttpWebServiceMessageSenderBuilder builder = new HttpWebServiceMessageSenderBuilder();

0 commit comments

Comments
 (0)