From f1daf2ccf46b93f27020c6c0375b2750075ab278 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 3 Feb 2020 12:43:57 +0000 Subject: Provide pongHandler in constructor to avoid needing an AtomicReference. --- .../test/java/com/yahoo/search/dispatch/DispatcherTest.java | 3 ++- .../search/dispatch/searchcluster/SearchClusterTest.java | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'container-search/src/test/java/com/yahoo/search') diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java index a369b859b13..a1ae3b6a19d 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java @@ -11,6 +11,7 @@ import com.yahoo.search.cluster.ClusterMonitor; import com.yahoo.search.dispatch.searchcluster.Node; import com.yahoo.search.dispatch.searchcluster.PingFactory; import com.yahoo.search.dispatch.searchcluster.Pinger; +import com.yahoo.search.dispatch.searchcluster.PongHandler; import com.yahoo.search.dispatch.searchcluster.SearchCluster; import org.junit.Test; @@ -143,7 +144,7 @@ public class DispatcherTest { } @Override - public Pinger createPinger(Node node, ClusterMonitor monitor) { + public Pinger createPinger(Node node, ClusterMonitor monitor, PongHandler pongHandler) { fail("Unexpected call to createPinger"); return null; } diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java index bc32297d123..a1b5bd6d102 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java @@ -116,15 +116,17 @@ public class SearchClusterTest { private final AtomicInteger numDocs; private final AtomicInteger pingCount; - PingJob(AtomicInteger numDocs, AtomicInteger pingCount) { + private final PongHandler pongHandler; + PingJob(AtomicInteger numDocs, AtomicInteger pingCount, PongHandler pongHandler) { this.numDocs = numDocs; this.pingCount = pingCount; + this.pongHandler = pongHandler; } @Override - public void ping(PongHandler handler) { + public void ping() { int docs = numDocs.get(); pingCount.incrementAndGet(); - handler.handle ((docs < 0) + pongHandler.handle ((docs < 0) ? new Pong(ErrorMessage.createBackendCommunicationError("Negative numDocs = " + docs)) : new Pong(docs)); } @@ -141,9 +143,9 @@ public class SearchClusterTest { } @Override - public Pinger createPinger(Node node, ClusterMonitor monitor) { + public Pinger createPinger(Node node, ClusterMonitor monitor, PongHandler pongHandler) { int index = node.group() * numPerGroup + node.key(); - return new PingJob(activeDocs.get(index), pingCounts.get(index)); + return new PingJob(activeDocs.get(index), pingCounts.get(index), pongHandler); } } -- cgit v1.2.3