ACCUMULO-4685 Remove unneeded code Remove unneeded semicolons (empty blocks), generic type parameters (use diamond operator), and import statements (same package).
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f88f5cf7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f88f5cf7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f88f5cf7 Branch: refs/heads/1.8 Commit: f88f5cf75bc7589a83c9d1ca100d2b5e92942194 Parents: f08c58c Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jul 27 19:58:31 2017 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jul 27 19:58:31 2017 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/ClientConfiguration.java | 2 +- .../apache/accumulo/core/client/admin/ActiveCompaction.java | 4 ++-- .../org/apache/accumulo/core/client/impl/ThriftScanner.java | 3 +-- .../java/org/apache/accumulo/core/client/mock/MockTable.java | 2 +- core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 2 +- .../apache/accumulo/core/file/blockfile/cache/CachedBlock.java | 2 +- .../accumulo/core/file/blockfile/impl/CachableBlockFile.java | 2 +- .../crypto/CachingHDFSSecretKeyEncryptionStrategy.java | 2 +- core/src/main/java/org/apache/accumulo/core/util/Merge.java | 2 +- .../accumulo/core/iterators/system/ColumnFilterTest.java | 6 +++--- .../accumulo/fate/zookeeper/DistributedReadWriteLock.java | 2 +- .../apache/accumulo/fate/zookeeper/TransactionWatcherTest.java | 2 +- .../java/org/apache/accumulo/server/master/LiveTServerSet.java | 2 +- .../org/apache/accumulo/server/security/UserImpersonation.java | 1 - .../java/org/apache/accumulo/server/rpc/RpcWrapperTest.java | 3 +-- .../src/main/java/org/apache/accumulo/master/Master.java | 2 +- .../apache/accumulo/master/state/RootTabletStateStoreTest.java | 2 +- .../org/apache/accumulo/tserver/log/SortedLogRecovery.java | 2 +- .../main/java/org/apache/accumulo/tserver/tablet/Tablet.java | 2 +- shell/src/main/java/org/apache/accumulo/shell/Shell.java | 4 ++-- .../main/java/org/apache/accumulo/shell/ShellOptionsJC.java | 2 +- .../org/apache/accumulo/shell/format/DeleterFormatterTest.java | 2 +- .../org/apache/accumulo/test/BalanceWithOfflineTableIT.java | 1 - .../apache/accumulo/test/functional/FunctionalTestUtils.java | 2 +- 24 files changed, 26 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java index 3c6673b..1b9b380 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java @@ -145,7 +145,7 @@ public class ClientConfiguration extends CompositeConfiguration { return prop; return null; } - }; + } public ClientConfiguration(String configFile) throws ConfigurationException { this(new PropertiesConfiguration(), configFile); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java index 89d30b1..5228391 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java +++ b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java @@ -45,7 +45,7 @@ public abstract class ActiveCompaction { * compaction that merges all of a tablets files into one file */ FULL - }; + } public static enum CompactionReason { /** @@ -68,7 +68,7 @@ public abstract class ActiveCompaction { * Compaction initiated to close a unload a tablet */ CLOSE - }; + } /** * http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java index cfb0235..bdf381d 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java @@ -161,7 +161,6 @@ public class ThriftScanner { public ScanState(ClientContext context, Text tableId, Authorizations authorizations, Range range, SortedSet<Column> fetchedColumns, int size, List<IterInfo> serverSideIteratorList, Map<String,Map<String,String>> serverSideIteratorOptions, boolean isolated, long readaheadThreshold) { this.context = context; - ; this.authorizations = authorizations; columns = new ArrayList<>(fetchedColumns.size()); @@ -423,7 +422,7 @@ public class ThriftScanner { client.closeScan(tinfo, is.scanID); } else { - // log.debug("Calling continue scan : "+scanState.range+" loc = "+loc); + // log.debug("Calling continue scan : "+scanState.range+" loc = "+loc); String msg = "Continuing scan tserver=" + loc.tablet_location + " scanid=" + scanState.scanID; Thread.currentThread().setName(msg); opTimer.start(msg); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java index 6b91531..8f2d0fa 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java @@ -81,7 +81,7 @@ public class MockTable { } return 0; } - }; + } final SortedMap<Key,Value> table = new ConcurrentSkipListMap<>(); int mutationCount = 0; http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/core/src/main/java/org/apache/accumulo/core/data/Mutation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java index 1083684..a0bbd0c 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java +++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java @@ -74,7 +74,7 @@ public class Mutation implements Writable { */ public static enum SERIALIZED_FORMAT { VERSION1, VERSION2 - }; + } private boolean useOldDeserialize = false; private byte[] row; http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java index 19612d0..c67b4c7 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java +++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java @@ -44,7 +44,7 @@ public class CachedBlock implements HeapSize, Comparable<CachedBlock>, CacheEntr * Block from in-memory store */ MEMORY - }; + } private final String blockName; private final byte buf[]; http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java index e0358d3..7daacb7 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java +++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; public class CachableBlockFile { - private CachableBlockFile() {}; + private CachableBlockFile() {} private static final Logger log = LoggerFactory.getLogger(CachableBlockFile.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java index 4ee27ef..7b79d99 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CachingHDFSSecretKeyEncryptionStrategy.java @@ -112,7 +112,7 @@ public class CachingHDFSSecretKeyEncryptionStrategy implements SecretKeyEncrypti private byte[] keyEncryptionKey; private String pathToKeyName; - public SecretKeyCache() {}; + public SecretKeyCache() {} public synchronized void ensureSecretKeyCacheInitialized(CryptoModuleParameters context) throws IOException { http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/core/src/main/java/org/apache/accumulo/core/util/Merge.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/Merge.java b/core/src/main/java/org/apache/accumulo/core/util/Merge.java index b6a85ea..7c3caa0 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/Merge.java +++ b/core/src/main/java/org/apache/accumulo/core/util/Merge.java @@ -51,7 +51,7 @@ public class Merge { MergeException(Exception ex) { super(ex); } - }; + } private static final Logger log = LoggerFactory.getLogger(Merge.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java index 15e0743..4b03826 100644 --- a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java +++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java @@ -47,7 +47,7 @@ public class ColumnFilterTest extends TestCase { } public void test1() { - TreeMap<Key,Value> data = new TreeMap<Key,Value>(); + TreeMap<Key,Value> data = new TreeMap<>(); data.put(newKey("r1", "cf1", "cq1"), new Value()); data.put(newKey("r1", "cf2", "cq1"), new Value()); @@ -62,7 +62,7 @@ public class ColumnFilterTest extends TestCase { public void test2() throws Exception { - TreeMap<Key,Value> data = new TreeMap<Key,Value>(); + TreeMap<Key,Value> data = new TreeMap<>(); data.put(newKey("r1", "cf1", "cq1"), new Value()); data.put(newKey("r1", "cf2", "cq1"), new Value()); data.put(newKey("r1", "cf2", "cq2"), new Value()); @@ -86,7 +86,7 @@ public class ColumnFilterTest extends TestCase { public void test3() throws Exception { - TreeMap<Key,Value> data = new TreeMap<Key,Value>(); + TreeMap<Key,Value> data = new TreeMap<>(); data.put(newKey("r1", "cf1", "cq1"), new Value()); data.put(newKey("r1", "cf2", "cq1"), new Value()); data.put(newKey("r1", "cf2", "cq2"), new Value()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java ---------------------------------------------------------------------- diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java index 624ce5d..fe31011 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java +++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java @@ -37,7 +37,7 @@ public class DistributedReadWriteLock implements java.util.concurrent.locks.Read static enum LockType { READ, WRITE, - }; + } // serializer for lock type and user data static class ParsedLock { http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java ---------------------------------------------------------------------- diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java index 72745b9..6779f6c 100644 --- a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java +++ b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java @@ -124,7 +124,7 @@ public class TransactionWatcherTest { }); Assert.fail("work against stopped transaction should fail"); } catch (Exception ex) { - ; + } final long txid2 = 9; sa.start(txType, txid2); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java index 76ae39e..46f5f8b 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java @@ -205,7 +205,7 @@ public class LiveTServerSet implements Watcher { this.connection = connection; this.instance = instance; } - }; + } // The set of active tservers with locks, indexed by their name in zookeeper private Map<String,TServerInfo> current = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java b/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java index 97bc858..736fdeb 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java @@ -259,7 +259,6 @@ public class UserImpersonation { * @param configProperties * The relevant configuration properties for impersonation. */ - @SuppressWarnings("javadoc") private void parseMultiPropertyConfiguration(Map<String,String> configProperties) { @SuppressWarnings("deprecation") final String configKey = Property.INSTANCE_RPC_SASL_PROXYUSERS.getKey(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java b/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java index de0df01..d32178e 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/rpc/RpcWrapperTest.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.Set; import org.apache.accumulo.core.trace.wrappers.RpcServerInvocationHandler; -import org.apache.accumulo.server.rpc.RpcWrapper; import org.apache.thrift.ProcessFunction; import org.apache.thrift.TBase; import org.apache.thrift.TException; @@ -196,7 +195,7 @@ public class RpcWrapperTest { public long barfoo() { return 0; } - }; + } /** * A fake ProcessFunction implementation for testing that allows injection of method name and oneway. http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/server/master/src/main/java/org/apache/accumulo/master/Master.java ---------------------------------------------------------------------- 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 2e13be4..6a43e93 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 @@ -719,7 +719,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List static enum TabletGoalState { HOSTED, UNASSIGNED, DELETED - }; + } TabletGoalState getSystemGoalState(TabletLocationState tls) { switch (getMasterState()) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java ---------------------------------------------------------------------- diff --git a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java index d726adb..13bf954 100644 --- a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java +++ b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java @@ -59,7 +59,7 @@ public class RootTabletStateStoreTest { return node; return null; } - }; + } static class FakeZooStore implements DistributedStore { http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java index 1139b8e..c1eabaf 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java @@ -69,7 +69,7 @@ public class SortedLogRecovery { private enum Status { INITIAL, LOOKING_FOR_FINISH, COMPLETE - }; + } private static class LastStartToFinish { long lastStart = -1; http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java ---------------------------------------------------------------------- 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 7338ae4..ef23066 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 @@ -205,7 +205,7 @@ public class Tablet implements TabletCommitter { static enum CompactionState { WAITING_TO_START, IN_PROGRESS - }; + } private volatile CompactionState minorCompactionState = null; private volatile CompactionState majorCompactionState = null; http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/shell/src/main/java/org/apache/accumulo/shell/Shell.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java index cdd177e..36c843e 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java +++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java @@ -1021,7 +1021,7 @@ public class Shell extends ShellOptions implements KeywordExecutable { @Override public void close() {} - }; + } public static class PrintFile implements PrintLine { PrintWriter writer; @@ -1039,7 +1039,7 @@ public class Shell extends ShellOptions implements KeywordExecutable { public void close() { writer.close(); } - }; + } public final void printLines(Iterator<String> lines, boolean paginate) throws IOException { printLines(lines, paginate, null); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java index 250084b..c099302 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java +++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java @@ -104,7 +104,7 @@ public class ShellOptionsJC { String process(String value) { return value; } - }; + } @Override public String convert(String value) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java ---------------------------------------------------------------------- diff --git a/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java b/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java index 5e3e01a..b52ce16 100644 --- a/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java +++ b/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java @@ -70,7 +70,7 @@ public class DeleterFormatterTest { public void set(String in) { bais = new ByteArrayInputStream(in.getBytes(UTF_8)); } - }; + } @Before public void setUp() throws IOException, MutationsRejectedException { http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/test/src/test/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java b/test/src/test/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java index 2d79dd8..b58cde5 100644 --- a/test/src/test/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java +++ b/test/src/test/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java @@ -50,7 +50,6 @@ public class BalanceWithOfflineTableIT extends ConfigurableMacIT { final Connector c = getConnector(); log.info("Creating table " + tableName); c.tableOperations().create(tableName); - ; final SortedSet<Text> splits = new TreeSet<>(); for (String split : "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z".split(",")) { splits.add(new Text(split)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f88f5cf7/test/src/test/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java b/test/src/test/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java index 2fea4c6..0152ba2 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java @@ -211,7 +211,7 @@ public class FunctionalTestUtils { AdminUtil<String> admin = new AdminUtil<>(false); String secret = cluster.getSiteConfiguration().get(Property.INSTANCE_SECRET); IZooReaderWriter zk = new ZooReaderWriterFactory().getZooReaderWriter(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut(), secret); - ZooStore<String> zs = new ZooStore<String>(ZooUtil.getRoot(instance) + Constants.ZFATE, zk); + ZooStore<String> zs = new ZooStore<>(ZooUtil.getRoot(instance) + Constants.ZFATE, zk); FateStatus fateStatus = admin.getStatus(zs, zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS, null, null); return fateStatus; } catch (KeeperException | InterruptedException e) {
