This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch issue/simplify-it in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-mcp-server.git
commit 79013da20bbf701e5e8b238c2b8a8058cbac640a Author: Robert Munteanu <[email protected]> AuthorDate: Thu May 21 14:09:39 2026 +0200 chore: simplify MCP client initialisation in McpServerIT --- .../org/apache/sling/mcp/server/McpServerIT.java | 32 ++++++++++------------ 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/test/java/org/apache/sling/mcp/server/McpServerIT.java b/src/test/java/org/apache/sling/mcp/server/McpServerIT.java index 0a360ee..6768778 100644 --- a/src/test/java/org/apache/sling/mcp/server/McpServerIT.java +++ b/src/test/java/org/apache/sling/mcp/server/McpServerIT.java @@ -24,8 +24,8 @@ import java.nio.file.Path; import java.time.Duration; import java.util.Base64; import java.util.Map; +import java.util.Objects; import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicReference; import io.modelcontextprotocol.client.McpClient; import io.modelcontextprotocol.client.McpSyncClient; @@ -79,26 +79,24 @@ class McpServerIT { } private McpSyncClient initializeMcpClient(String basicAuthHeader) { - AtomicReference<McpSyncClient> initializedClient = new AtomicReference<>(); - await("mcp client initializes") + return await("mcp client initializes") .atMost(AWAIT_TIMEOUT) .pollInterval(AWAIT_POLL_INTERVAL) .ignoreExceptions() - .until(() -> { - McpSyncClient candidate = buildMcpClient(basicAuthHeader); - - try { - candidate.initialize(); - initializedClient.set(candidate); - return true; - } catch (RuntimeException e) { - candidate.close(); - throw e; - } - }); - - return initializedClient.get(); + .until( + () -> { + McpSyncClient candidate = buildMcpClient(basicAuthHeader); + + try { + candidate.initialize(); + return candidate; + } catch (RuntimeException e) { + candidate.close(); + return null; + } + }, + Objects::nonNull); } private McpSyncClient buildMcpClient(String basicAuthHeader) {
