From ae5adb5bd4c6a95a1c4a4995905c2182fa7c5d84 Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Thu, 23 Apr 2026 22:40:31 +0500 Subject: [PATCH 1/3] IGNITE-28597 Fix FunctionalTest.testClientFailsOnStart fails on JDK 17 --- .../apache/ignite/internal/client/thin/FunctionalTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java index a3cb5e824188c..f2217be8036e8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java @@ -557,7 +557,11 @@ public void testClientFailsOnStart() { expEx ); - assertContains(log, expEx.getMessage(), Config.SERVER); + String addr = U.majorJavaVersion(U.jdkVersion()) >= 17 + ? Config.SERVER.replace(":", "/:") + : Config.SERVER; + + assertContains(log, expEx.getMessage(), addr); } From 52481532c27b9f893e910e3ec62a88f65a3f2018 Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Fri, 24 Apr 2026 00:08:53 +0500 Subject: [PATCH 2/3] use regex --- .../ignite/internal/client/thin/FunctionalTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java index f2217be8036e8..ec20934bc1791 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java @@ -34,6 +34,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.TimeUnit; +import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.IntStream; import javax.cache.expiry.AccessedExpiryPolicy; @@ -557,11 +558,10 @@ public void testClientFailsOnStart() { expEx ); - String addr = U.majorJavaVersion(U.jdkVersion()) >= 17 - ? Config.SERVER.replace(":", "/:") - : Config.SERVER; + String[] splitedAddr = Config.SERVER.split(":"); - assertContains(log, expEx.getMessage(), addr); + assertContains(log, expEx.getMessage(), + Pattern.compile(".*" + Pattern.quote(splitedAddr[0]) + "(?:/)?:" + splitedAddr[1] + ".*")); } From a85e8307b15f0782c7dccf6d96c5dca87de6ef55 Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Fri, 24 Apr 2026 00:10:31 +0500 Subject: [PATCH 3/3] minor --- .../apache/ignite/internal/client/thin/FunctionalTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java index ec20934bc1791..22beeb58adbb7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/FunctionalTest.java @@ -558,10 +558,10 @@ public void testClientFailsOnStart() { expEx ); - String[] splitedAddr = Config.SERVER.split(":"); + String[] addr = Config.SERVER.split(":"); assertContains(log, expEx.getMessage(), - Pattern.compile(".*" + Pattern.quote(splitedAddr[0]) + "(?:/)?:" + splitedAddr[1] + ".*")); + Pattern.compile(".*" + Pattern.quote(addr[0]) + "(?:/)?:" + addr[1] + ".*")); }