From 31127bd9ddf0c54ccaf55cc49c924a2fec2be71b Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 13 Jan 2022 15:32:38 +0100 Subject: Replace use of Guava's UncheckedTimeoutException with our own --- .../src/main/java/ai/vespa/reindexing/ReindexingCurator.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'clustercontroller-reindexer/src/main/java/ai') diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingCurator.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingCurator.java index 0d77792de6d..44d729c802e 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingCurator.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingCurator.java @@ -3,8 +3,7 @@ package ai.vespa.reindexing; import ai.vespa.reindexing.Reindexing.Status; import ai.vespa.reindexing.Reindexing.Trigger; -import com.google.common.util.concurrent.UncheckedTimeoutException; -import com.yahoo.document.DocumentType; +import com.yahoo.concurrent.UncheckedTimeoutException; import com.yahoo.document.DocumentTypeManager; import com.yahoo.path.Path; import com.yahoo.slime.Cursor; @@ -18,7 +17,6 @@ import com.yahoo.yolean.Exceptions; import java.time.Duration; import java.time.Instant; import java.util.List; -import java.util.Map; import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; @@ -87,7 +85,7 @@ public class ReindexingCurator { try { return curator.lock(lockPath(cluster), lockTimeout); } - catch (UncheckedTimeoutException e) { // TODO jonmv: Avoid use of guava classes. + catch (UncheckedTimeoutException e) { throw new ReindexingLockException(e); } } -- cgit v1.2.3