From 7164635b0fc1a1b2d24bdbea0bf700416da9836c Mon Sep 17 00:00:00 2001 From: Santhosh Date: Thu, 21 May 2026 22:22:58 +0530 Subject: [PATCH 1/3] Apply suggested fix to netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java from Copilot Autofix Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com> --- .../transport/SocketIoJavaClientSslTest.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java b/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java index 3a018052..f444bef9 100644 --- a/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java +++ b/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java @@ -97,12 +97,7 @@ public X509Certificate[] getAcceptedIssuers() { .readTimeout(1, TimeUnit.MINUTES) .build(); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "websocket" }; - opts.webSocketFactory = okHttp; - opts.callFactory = okHttp; + IO.Options opts = createIoOptions(okHttp, "websocket"); Socket socket = IO.socket("https://127.0.0.1:" + port, opts); try { @@ -557,4 +552,13 @@ private static int awaitBoundPort(SocketIOServer server) throws InterruptedExcep } return port; } + private IO.Options createIoOptions(OkHttpClient okHttp, String... transports) { + IO.Options opts = new IO.Options(); + opts.forceNew = true; + opts.reconnection = false; + opts.transports = transports; + opts.webSocketFactory = okHttp; + opts.callFactory = okHttp; + return opts; + } } From 3bc73254e5df27469a47e756678b1b3cbc0f42c4 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Thu, 21 May 2026 22:22:58 +0530 Subject: [PATCH 2/3] Apply suggested fix to netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java from Copilot Autofix Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com> --- .../transport/SocketIoJavaClientSslTest.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java b/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java index f444bef9..6310054c 100644 --- a/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java +++ b/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java @@ -55,6 +55,23 @@ public class SocketIoJavaClientSslTest { private SocketIOServer server; + private X509TrustManager trustAllManager() { + return new X509TrustManager() { + @Override + public void checkClientTrusted(X509Certificate[] chain, String authType) { + } + + @Override + public void checkServerTrusted(X509Certificate[] chain, String authType) { + } + + @Override + public X509Certificate[] getAcceptedIssuers() { + return new X509Certificate[0]; + } + }; + } + @AfterEach public void tearDown() { if (server != null) { @@ -74,20 +91,7 @@ public void shouldReceiveHelloEventAndAckOverWssFromJavaClient() throws Exceptio int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - X509TrustManager trustAll = new X509TrustManager() { - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; - } - }; + X509TrustManager trustAll = trustAllManager(); SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(null, new TrustManager[] { trustAll }, new SecureRandom()); From 1bde0653930cc9f575d34b5036ad1ff8944c35b4 Mon Sep 17 00:00:00 2001 From: sanjomo Date: Thu, 21 May 2026 22:29:28 +0530 Subject: [PATCH 3/3] Refactor SSL tests to use helper methods Replace repeated inline X509TrustManager and IO.Options setup in SocketIoJavaClientSslTest with calls to trustAllManager() and createIoOptions(...). This removes duplication when configuring SSL contexts and OkHttp-based IO options (transports/webSocketFactory/callFactory) while preserving existing test behavior and transport combinations. --- .../transport/SocketIoJavaClientSslTest.java | 76 ++----------------- 1 file changed, 8 insertions(+), 68 deletions(-) diff --git a/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java b/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java index 6310054c..99d653fd 100644 --- a/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java +++ b/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java @@ -152,20 +152,7 @@ public void shouldHandshakeOverWssWhenSslProtocolNotExplicitlyConfigured() throw int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - X509TrustManager trustAll = new X509TrustManager() { - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; - } - }; + X509TrustManager trustAll = trustAllManager(); SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(null, new TrustManager[] { trustAll }, new SecureRandom()); @@ -175,12 +162,7 @@ public X509Certificate[] getAcceptedIssuers() { .readTimeout(1, TimeUnit.MINUTES) .build(); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "websocket" }; - opts.webSocketFactory = okHttp; - opts.callFactory = okHttp; + IO.Options opts = createIoOptions(okHttp, "websocket"); Socket socket = IO.socket("https://127.0.0.1:" + port, opts); try { @@ -237,20 +219,7 @@ public void shouldPollUpgradeToWebSocketWithServerPushAndClientHelloAckOverWss() int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - X509TrustManager trustAll = new X509TrustManager() { - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; - } - }; + X509TrustManager trustAll = trustAllManager(); SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(null, new TrustManager[] { trustAll }, new SecureRandom()); @@ -260,12 +229,7 @@ public X509Certificate[] getAcceptedIssuers() { .readTimeout(1, TimeUnit.MINUTES) .build(); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "polling", "websocket" }; - opts.webSocketFactory = okHttp; - opts.callFactory = okHttp; + IO.Options opts = createIoOptions(okHttp, "polling","websocket"); Socket socket = IO.socket("https://127.0.0.1:" + port, opts); try { @@ -321,10 +285,7 @@ public void shouldReceiveHelloEventAndAckOverPlainWebSocketFromJavaClient() thro int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "websocket" }; + IO.Options opts = createIoOptions(null, "websocket"); Socket socket = IO.socket("http://127.0.0.1:" + port, opts); try { @@ -375,20 +336,7 @@ public void shouldReceiveHelloEventAndAckOverPollingFromJavaClient() throws Exce int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - X509TrustManager trustAll = new X509TrustManager() { - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; - } - }; + X509TrustManager trustAll = trustAllManager(); SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(null, new TrustManager[] { trustAll }, new SecureRandom()); @@ -398,12 +346,7 @@ public X509Certificate[] getAcceptedIssuers() { .readTimeout(1, TimeUnit.MINUTES) .build(); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "polling" }; - opts.webSocketFactory = okHttp; - opts.callFactory = okHttp; + IO.Options opts = createIoOptions(okHttp, "polling"); Socket socket = IO.socket("https://127.0.0.1:" + port, opts); try { @@ -454,10 +397,7 @@ public void shouldReceiveHelloEventAndAckOverPlainPollingFromJavaClient() throws int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "polling" }; + IO.Options opts = createIoOptions(null, "polling"); Socket socket = IO.socket("http://127.0.0.1:" + port, opts); try {