This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch 1.8 in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit b95db79ec7ed0ab937fd186b650e67f52b0e7ce4 Author: Mike Miller <mmil...@apache.org> AuthorDate: Thu Sep 14 17:58:20 2017 -0400 ACCUMULO-4702 Removed Beta Guava code where possible --- .../main/java/org/apache/accumulo/core/client/IsolatedScanner.java | 2 +- .../org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java | 2 +- .../main/java/org/apache/accumulo/core/client/impl/MasterClient.java | 2 +- .../java/org/apache/accumulo/core/client/impl/OfflineIterator.java | 2 +- .../apache/accumulo/core/client/impl/ReplicationOperationsImpl.java | 2 +- .../java/org/apache/accumulo/core/client/impl/RootTabletLocator.java | 2 +- .../main/java/org/apache/accumulo/core/client/impl/ServerClient.java | 2 +- .../org/apache/accumulo/core/client/impl/TableOperationsImpl.java | 2 +- .../java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java | 2 +- core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java | 2 +- .../org/apache/accumulo/core/client/mapred/AbstractInputFormat.java | 2 +- .../apache/accumulo/core/client/mapreduce/AbstractInputFormat.java | 2 +- .../src/test/java/org/apache/accumulo/core/client/TestThrift1474.java | 2 +- .../org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++-- server/base/src/main/java/org/apache/accumulo/server/Accumulo.java | 2 +- .../src/main/java/org/apache/accumulo/server/client/BulkImporter.java | 2 +- server/base/src/main/java/org/apache/accumulo/server/util/Halt.java | 2 +- .../main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java | 2 +- .../main/java/org/apache/accumulo/server/util/MetadataTableUtil.java | 2 +- .../java/org/apache/accumulo/server/util/ReplicationTableUtil.java | 2 +- .../src/main/java/org/apache/accumulo/server/util/TabletIterator.java | 2 +- .../src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- server/master/src/main/java/org/apache/accumulo/master/Master.java | 2 +- .../java/org/apache/accumulo/master/MasterClientServiceHandler.java | 2 +- .../src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java | 2 +- .../accumulo/master/replication/DistributedWorkQueueWorkAssigner.java | 2 +- .../org/apache/accumulo/master/replication/UnorderedWorkAssigner.java | 2 +- .../main/java/org/apache/accumulo/master/replication/WorkDriver.java | 2 +- .../src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java | 2 +- .../src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java | 2 +- server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 2 +- .../src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java | 2 +- .../tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java | 2 +- .../src/main/java/org/apache/accumulo/tserver/InMemoryMap.java | 2 +- .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 2 +- .../java/org/apache/accumulo/tserver/TabletServerResourceManager.java | 2 +- .../main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java | 2 +- .../apache/accumulo/tserver/replication/AccumuloReplicaSystem.java | 2 +- .../main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java | 2 +- .../main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java | 2 +- .../src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java | 2 +- .../main/java/org/apache/accumulo/shell/commands/TraceCommand.java | 2 +- .../main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/CleanWalIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java | 4 ++-- test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java | 2 +- test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/NamespacesIT.java | 2 +- .../main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java | 2 +- test/src/main/java/org/apache/accumulo/test/ShellServerIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java | 2 +- .../src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java | 2 +- .../org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java | 2 +- .../org/apache/accumulo/test/continuous/ContinuousBatchWalker.java | 2 +- .../java/org/apache/accumulo/test/continuous/ContinuousScanner.java | 2 +- .../src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java | 2 +- .../java/org/apache/accumulo/test/functional/BadIteratorMincIT.java | 2 +- .../java/org/apache/accumulo/test/functional/BatchScanSplitIT.java | 2 +- .../java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java | 2 +- .../org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java | 2 +- .../java/org/apache/accumulo/test/functional/CacheTestReader.java | 2 +- .../java/org/apache/accumulo/test/functional/CacheTestWriter.java | 2 +- .../main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java | 2 +- .../main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java | 2 +- .../main/java/org/apache/accumulo/test/functional/ConstraintIT.java | 2 +- .../java/org/apache/accumulo/test/functional/DeleteEverythingIT.java | 2 +- .../java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java | 2 +- .../org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java | 2 +- .../src/main/java/org/apache/accumulo/test/functional/ExamplesIT.java | 2 +- .../java/org/apache/accumulo/test/functional/GarbageCollectorIT.java | 2 +- .../java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java | 2 +- .../src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java | 2 +- .../src/main/java/org/apache/accumulo/test/functional/MetadataIT.java | 2 +- .../java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java | 2 +- .../java/org/apache/accumulo/test/functional/MetadataSplitIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java | 2 +- .../java/org/apache/accumulo/test/functional/RestartStressIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java | 2 +- .../org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java | 2 +- .../java/org/apache/accumulo/test/functional/ServerSideErrorIT.java | 2 +- .../src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java | 2 +- .../org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java | 2 +- .../main/java/org/apache/accumulo/test/functional/SlowConstraint.java | 2 +- .../main/java/org/apache/accumulo/test/functional/SlowIterator.java | 2 +- test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java | 2 +- test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java | 2 +- .../main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java | 2 +- .../main/java/org/apache/accumulo/test/functional/ZombieTServer.java | 2 +- .../java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java | 2 +- .../org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java | 2 +- .../java/org/apache/accumulo/test/performance/thrift/NullTserver.java | 2 +- .../main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java | 2 +- .../src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java | 2 +- .../org/apache/accumulo/test/randomwalk/concurrent/OfflineTable.java | 2 +- .../org/apache/accumulo/test/randomwalk/concurrent/Replication.java | 2 +- .../java/org/apache/accumulo/test/randomwalk/concurrent/Shutdown.java | 2 +- .../java/org/apache/accumulo/test/randomwalk/concurrent/StartAll.java | 2 +- .../java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java | 2 +- .../apache/accumulo/test/replication/MultiInstanceReplicationIT.java | 2 +- .../main/java/org/apache/accumulo/test/replication/ReplicationIT.java | 2 +- .../accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java | 2 +- 107 files changed, 109 insertions(+), 109 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java index 689bc6b..f1065f8 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java +++ b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.Iterator; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java index defcfd4..a7eed9e 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java @@ -17,8 +17,8 @@ package org.apache.accumulo.core.client.impl; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java b/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java index 622e671..856536b 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java @@ -17,7 +17,7 @@ package org.apache.accumulo.core.client.impl; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.net.UnknownHostException; import java.util.List; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java index 9f51704..aba89a4 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client.impl; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java index ab6160e..da8cc37 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.core.client.impl; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.util.Objects.requireNonNull; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collections; import java.util.HashSet; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java index 2bbe113..fb002e3 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client.impl; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java index 84295c4..373d704 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java @@ -17,8 +17,8 @@ package org.apache.accumulo.core.client.impl; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java index 353cb58..549cd6f 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java @@ -17,9 +17,9 @@ package org.apache.accumulo.core.client.impl; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Objects.requireNonNull; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.BufferedReader; import java.io.FileNotFoundException; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java index 1fa71a2..77b2d2b 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client.impl; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java index 3adf45c..4af6c68 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java @@ -17,8 +17,8 @@ package org.apache.accumulo.core.client.impl; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java index 7d75f64..4529d8b 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client.mapred; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.net.InetAddress; diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java index 1925d0e..f6c3392 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client.mapreduce; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.net.InetAddress; diff --git a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java index a0c94ef..6ab8b36 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java +++ b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java index 829b321..c0a60b4 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java @@ -17,6 +17,7 @@ package org.apache.accumulo.minicluster.impl; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -113,7 +114,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import com.google.common.util.concurrent.Uninterruptibles; /** * This class provides the backing implementation for {@link MiniAccumuloCluster}, and may contain features for internal testing which have not yet been @@ -631,7 +631,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster { ret = exec(Main.class, SetGoalState.class.getName(), MasterGoalState.NORMAL.toString()).waitFor(); if (ret == 0) break; - Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS); + sleepUninterruptibly(1, TimeUnit.SECONDS); } if (ret != 0) { throw new RuntimeException("Could not set master goal state, process returned " + ret + ". Check the logs in " + config.getLogDir() + " for errors."); diff --git a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java index b35803d..c51b152 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java +++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.server; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.File; import java.io.FileInputStream; diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java index cfc2b40..886cd9f 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java +++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.server.client; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java index e0dadee..4228ce7 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.server.util; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.concurrent.TimeUnit; diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java index 1bdd255..c789a79 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.server.util; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java index 3c9a380..9b32e4b 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java @@ -16,11 +16,11 @@ */ package org.apache.accumulo.server.util; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN; import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.TIME_COLUMN; import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java index f234593..05f924c 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.server.util; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collections; import java.util.EnumSet; diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java index 9569f49..13afe24 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.server.util; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Iterator; import java.util.Map; diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index eef856c..1c437d5 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.gc; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index 165f926..77dde82 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.master; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java index 7b397b2..52ff4a2 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java +++ b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.master; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java index 3890b38..8540f7a 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java +++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.master; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.lang.Math.min; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java b/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java index 3d22d9f..0b25a2f 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java +++ b/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.master.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collection; import java.util.Map.Entry; diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java b/server/master/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java index 93d4cc2..8e8a2da 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java +++ b/server/master/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.master.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.HashSet; import java.util.Iterator; diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java index cc9d936..dabfc79 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java +++ b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.master.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.concurrent.TimeUnit; diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java index 622690c..a36b119 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.master.tableOps; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java index 6c4e493..a1009d3 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.master.tableOps; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.BufferedWriter; import java.io.OutputStreamWriter; diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java index 1b754d4..fbd1284 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.monitor; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java index 49a3178..eb88237 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.monitor; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collection; import java.util.Objects; diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java index 2fe9a27..dd7ca12 100644 --- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java +++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.tracer; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java index a5f2f97..599a174 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.tserver; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index 6eaea59..962bd69 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -16,10 +16,10 @@ */ package org.apache.accumulo.tserver; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.apache.accumulo.server.problems.ProblemType.TABLET_LOAD; import java.io.IOException; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java index d8ae94c..0ae9830 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.tserver; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.util.Objects.requireNonNull; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java index a4cd6b0..b4c6cb8 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.tserver.log; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java index 18c5593..24b7756 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.tserver.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.util.Objects.requireNonNull; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java index ac5243a..c12a7e0 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.tserver.tablet; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.Collection; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java index 6bd2545..5f86743 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.tserver.tablet; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.Collections; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java index 9278a36..37d7f26 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java @@ -16,9 +16,9 @@ */ package org.apache.accumulo.tserver.tablet; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Objects.requireNonNull; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java index 7c298f8..214ed32 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.shell.commands; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.Map; diff --git a/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java b/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java index cde84c1..e997d8b 100644 --- a/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Map; import java.util.Map.Entry; diff --git a/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java b/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java index 6e01cea..70e94f7 100644 --- a/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; diff --git a/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java b/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java index 937ccb8..60d51da 100644 --- a/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java +++ b/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.Map.Entry; diff --git a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java index 9ebb2bd..3f592ae 100644 --- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java @@ -17,8 +17,8 @@ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import java.io.IOException; diff --git a/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java b/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java index 22a8cef..04076cd 100644 --- a/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java +++ b/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java @@ -16,6 +16,7 @@ */ package org.apache.accumulo.test; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -52,7 +53,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.junit.Test; -import com.google.common.util.concurrent.Uninterruptibles; import com.google.gson.Gson; // ACCUMULO-3949, ACCUMULO-3953 @@ -161,7 +161,7 @@ public class GetFileInfoBulkIT extends ConfigurableMacBase { es.shutdown(); es.awaitTermination(2, TimeUnit.MINUTES); log.info(String.format("Completed in %.2f seconds", (System.currentTimeMillis() - now) / 1000.)); - Uninterruptibles.sleepUninterruptibly(30, TimeUnit.SECONDS); + sleepUninterruptibly(30, TimeUnit.SECONDS); long getFileInfoOpts = getOpts() - startOps; log.info("# opts: {}", getFileInfoOpts); assertTrue("unexpected number of getFileOps", getFileInfoOpts < 2100 && getFileInfoOpts > 1000); diff --git a/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java b/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java index 6bae346..140410b 100644 --- a/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java +++ b/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.HashMap; diff --git a/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java b/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java index 9785f8a..1476900 100644 --- a/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java @@ -17,7 +17,7 @@ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java index 3bba08e..94db212 100644 --- a/test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java index 36427b8..a3fe554 100644 --- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java b/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java index 52fdc11..ff22cbc 100644 --- a/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java +++ b/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collections; import java.util.Iterator; diff --git a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java index e3d823c..95f0a8c 100644 --- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java b/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java index 1afd33d..1e29009 100644 --- a/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java +++ b/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import java.util.EnumSet; diff --git a/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java index d843a15..5132ced 100644 --- a/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.Map.Entry; diff --git a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java index 8455a40..807e425 100644 --- a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java b/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java index bad1a55..a1a784e 100644 --- a/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.TreeSet; diff --git a/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java b/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java index 8c2f8c9..8297b69 100644 --- a/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import java.util.Random; diff --git a/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java index 2c4d970..13b58e9 100644 --- a/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import java.util.concurrent.TimeUnit; diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java index 73fe806..68081c1 100644 --- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java +++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.continuous; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.HashSet; diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java index fa53a64..2e34e22 100644 --- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java +++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.continuous; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Iterator; import java.util.Map.Entry; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java index 7f9ac6d..7c5babe 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collection; import java.util.Iterator; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java index 64fc905..0d60cce 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.EnumSet; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java index 528f486..554a9b3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.Collection; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java index 9b50306..ea04867 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.Collections; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java index 21539b2..6b7ca47 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.concurrent.TimeUnit; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java index 0703694..809d75a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.File; import java.io.FileOutputStream; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java index 9f1dc67..c19c111 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.File; import java.io.FileInputStream; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java index 9c2b71f..22ac6a7 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java index 929bb61..087b412 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.EnumSet; import java.util.Map; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java index 39b0342..0ec3fef 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.HashMap; import java.util.Iterator; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java index c82f721..b3e186c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.Map; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java index ed48d10..c32171c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import java.util.ArrayList; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java index b535534..b4eb5cc 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.fail; import java.util.Map; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ExamplesIT.java index a69f4a5..fde71e3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ExamplesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ExamplesIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java index 83f38ae..f531603 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java index f1fbac3..0813f32 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java index 39764cd..787d0d0 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Map; import java.util.Map.Entry; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java index 42ef7b4..eb4e400 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java index 6a20297..a928124 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.Map.Entry; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataSplitIT.java index fc66c12..c32cbe0 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataSplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataSplitIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java index 38d388d..3f9dd83 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.io.IOException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java index 1fb56ef..45767d3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.Map; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java index 46bf3fc..c82e302 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java index 5864155..74d6fbf 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Iterator; import java.util.Map; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java index 37bef1a..f70fc32 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collections; import java.util.Map.Entry; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java index ca099bf..fc4e5ee 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java index 864ba06..7c3c9e0 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java b/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java index aca092b..5e8034a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java b/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java index 2f72db4..d5d7164 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.Collection; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java index d8eff6f..80e79e7 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java index 8511d10..d9fa3bd 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.fail; import java.util.Collections; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java index c92e70f..40aa8b7 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java @@ -16,13 +16,13 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static org.apache.accumulo.core.conf.Property.GC_CYCLE_DELAY; import static org.apache.accumulo.core.conf.Property.GC_CYCLE_START; import static org.apache.accumulo.core.conf.Property.INSTANCE_ZK_TIMEOUT; import static org.apache.accumulo.core.conf.Property.TSERV_WALOG_MAX_SIZE; import static org.apache.accumulo.core.conf.Property.TSERV_WAL_REPLICATION; import static org.apache.accumulo.core.security.Authorizations.EMPTY; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.apache.accumulo.minicluster.ServerType.GARBAGE_COLLECTOR; import static org.apache.accumulo.minicluster.ServerType.TABLET_SERVER; import static org.junit.Assert.assertEquals; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java index 04cd3a4..bc34b67 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.HashMap; import java.util.Random; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java index e376555..a7eaef3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java index a581099..8fd68c5 100644 --- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java +++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.mapreduce; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.lang.System.currentTimeMillis; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; diff --git a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java index cb2af2a..40cacdb 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java @@ -78,7 +78,7 @@ import org.apache.thrift.TException; import com.beust.jcommander.Parameter; import org.apache.accumulo.core.util.HostAndPort; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import org.apache.accumulo.core.tabletserver.thrift.TUnloadTabletGoal; /** diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java index fd8ad83..a9d5a3d 100644 --- a/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java +++ b/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.proxy; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java index 513132d..97f9da8 100644 --- a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java +++ b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.proxy; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/OfflineTable.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/OfflineTable.java index d06ad9a..4940fbc 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/OfflineTable.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/OfflineTable.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.randomwalk.concurrent; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.List; import java.util.Properties; diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Replication.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Replication.java index 25b0ccc..9a70785 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Replication.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Replication.java @@ -16,7 +16,6 @@ */ package org.apache.accumulo.test.randomwalk.concurrent; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static org.apache.accumulo.core.conf.Property.MASTER_REPLICATION_SCAN_INTERVAL; import static org.apache.accumulo.core.conf.Property.REPLICATION_NAME; import static org.apache.accumulo.core.conf.Property.REPLICATION_PEERS; @@ -27,6 +26,7 @@ import static org.apache.accumulo.core.conf.Property.REPLICATION_WORK_PROCESSOR_ import static org.apache.accumulo.core.conf.Property.REPLICATION_WORK_PROCESSOR_PERIOD; import static org.apache.accumulo.core.conf.Property.TABLE_REPLICATION; import static org.apache.accumulo.core.conf.Property.TABLE_REPLICATION_TARGET; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.apache.accumulo.server.replication.ReplicaSystemFactory.getPeerConfigurationValue; import java.util.Map.Entry; diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Shutdown.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Shutdown.java index 3887a2a..e2b8d88 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Shutdown.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Shutdown.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.randomwalk.concurrent; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Properties; import java.util.concurrent.TimeUnit; diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StartAll.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StartAll.java index 64d9abd..d66ea27 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StartAll.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StartAll.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.randomwalk.concurrent; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Properties; import java.util.concurrent.TimeUnit; diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java index 3ec2d6d..0975c69 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.randomwalk.shard; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.BufferedOutputStream; import java.io.IOException; diff --git a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java index 2852c70..aa179f1 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.HashMap; import java.util.Iterator; diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java index 11f0634..b08fa5b 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.net.URI; import java.net.URISyntaxException; diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java index 282e5b3..7e6352a 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.HashMap; import java.util.Iterator; -- To stop receiving notification emails like this one, please contact "commits@accumulo.apache.org" <commits@accumulo.apache.org>.