From 47e4bc14478a942c73d18fc20b0e1b9abff0a4e4 Mon Sep 17 00:00:00 2001 From: Jan Werner Date: Wed, 11 Dec 2024 14:40:28 -0500 Subject: [PATCH 1/3] update asynchttpclient --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba0a660de8..586d7b520e 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 4.5.13 https://packages.confluent.io/maven/ 2.36 - 2.2.0 + 3.0.1 checkstyle/suppressions.xml 7.1.16-0 From 029215476e959da0288bef4b2715da8796e90924 Mon Sep 17 00:00:00 2001 From: Jan Werner Date: Thu, 12 Dec 2024 12:07:11 -0500 Subject: [PATCH 2/3] update the duration type to reflect change in asynchttpclient --- core/src/test/java/io/confluent/rest/CustomInitTest.java | 3 ++- core/src/test/java/io/confluent/rest/SaslTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/io/confluent/rest/CustomInitTest.java b/core/src/test/java/io/confluent/rest/CustomInitTest.java index a052bf79ae..82d5503d72 100644 --- a/core/src/test/java/io/confluent/rest/CustomInitTest.java +++ b/core/src/test/java/io/confluent/rest/CustomInitTest.java @@ -27,6 +27,7 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; +import java.time.Duration; import javax.websocket.EndpointConfig; import javax.websocket.OnOpen; import javax.websocket.Session; @@ -143,7 +144,7 @@ public void onError(Throwable t) { WebSocket ws = Dsl.asyncHttpClient() .prepareGet(uri + "/test") - .setRequestTimeout(10000) + .setRequestTimeout(Duration.ofSeconds(10000)) .execute(wsHandler) .get(); diff --git a/core/src/test/java/io/confluent/rest/SaslTest.java b/core/src/test/java/io/confluent/rest/SaslTest.java index 9bdf90d3f4..faa4e75e9e 100644 --- a/core/src/test/java/io/confluent/rest/SaslTest.java +++ b/core/src/test/java/io/confluent/rest/SaslTest.java @@ -52,6 +52,7 @@ import java.util.Collections; import java.util.Map; import java.util.Properties; +import java.time.Duration; import javax.security.auth.login.Configuration; import javax.ws.rs.GET; @@ -283,7 +284,7 @@ public void onError(Throwable t) { } WebSocket ws = requestBuilder - .setRequestTimeout(10000) + .setRequestTimeout(Duration.ofSeconds(10000)) .execute(wsHandler) .get(); From f122447e9e58be39993a0f295458bb39e6d6dc61 Mon Sep 17 00:00:00 2001 From: Jan Werner Date: Thu, 12 Dec 2024 12:45:56 -0500 Subject: [PATCH 3/3] use proper timeout unit s -> ms --- core/src/test/java/io/confluent/rest/CustomInitTest.java | 2 +- core/src/test/java/io/confluent/rest/SaslTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/io/confluent/rest/CustomInitTest.java b/core/src/test/java/io/confluent/rest/CustomInitTest.java index 82d5503d72..ad12a103cd 100644 --- a/core/src/test/java/io/confluent/rest/CustomInitTest.java +++ b/core/src/test/java/io/confluent/rest/CustomInitTest.java @@ -144,7 +144,7 @@ public void onError(Throwable t) { WebSocket ws = Dsl.asyncHttpClient() .prepareGet(uri + "/test") - .setRequestTimeout(Duration.ofSeconds(10000)) + .setRequestTimeout(Duration.ofMillis(10000)) .execute(wsHandler) .get(); diff --git a/core/src/test/java/io/confluent/rest/SaslTest.java b/core/src/test/java/io/confluent/rest/SaslTest.java index faa4e75e9e..d52e8c3a9e 100644 --- a/core/src/test/java/io/confluent/rest/SaslTest.java +++ b/core/src/test/java/io/confluent/rest/SaslTest.java @@ -284,7 +284,7 @@ public void onError(Throwable t) { } WebSocket ws = requestBuilder - .setRequestTimeout(Duration.ofSeconds(10000)) + .setRequestTimeout(Duration.ofMillis(10000)) .execute(wsHandler) .get();