ACCUMULO-4386 Fix trivial compiler warnings Fix extra import and use generic method for emptyMap() instead of EMPTY_MAP constant.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c587a6f5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c587a6f5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c587a6f5 Branch: refs/heads/master Commit: c587a6f5607b211fa6d7d542f3694cac814956c0 Parents: 4980eec Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jul 21 22:52:24 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jul 21 22:52:24 2016 -0400 ---------------------------------------------------------------------- .../minicluster/impl/MiniAccumuloClusterControl.java | 2 +- .../org/apache/accumulo/master/TabletGroupWatcher.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c587a6f5/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java index 688cb5d..9a433cf 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java @@ -134,7 +134,7 @@ public class MiniAccumuloClusterControl implements ClusterControl { @Override public synchronized void start(ServerType server, String hostname) throws IOException { - start(server, hostname, Collections.EMPTY_MAP, Integer.MAX_VALUE); + start(server, hostname, Collections.<String,String> emptyMap(), Integer.MAX_VALUE); } public synchronized void start(ServerType server, String hostname, Map<String,String> configOverrides, int limit) throws IOException { http://git-wip-us.apache.org/repos/asf/accumulo/blob/c587a6f5/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java ---------------------------------------------------------------------- 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 2cf7d9d..76fda21 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 com.google.common.collect.ImmutableSortedSet; import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static java.lang.Math.min; import java.io.IOException; import java.util.ArrayList; @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.SortedMap; +import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; import java.util.concurrent.TimeUnit; @@ -43,6 +44,7 @@ import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.client.RowIterator; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.TableNotFoundException; +import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.PartialKey; @@ -67,6 +69,7 @@ import org.apache.accumulo.master.state.MergeStats; import org.apache.accumulo.master.state.TableCounts; import org.apache.accumulo.master.state.TableStats; import org.apache.accumulo.server.ServerConstants; +import org.apache.accumulo.server.conf.TableConfiguration; import org.apache.accumulo.server.fs.FileRef; import org.apache.accumulo.server.fs.VolumeManager.FileType; import org.apache.accumulo.server.log.WalStateManager; @@ -91,12 +94,8 @@ import org.apache.hadoop.io.Text; import org.apache.thrift.TException; import com.google.common.base.Optional; +import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Iterators; -import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.server.conf.TableConfiguration; -import static java.lang.Math.min; -import java.util.SortedSet; -import static java.lang.Math.min; abstract class TabletGroupWatcher extends Daemon { // Constants used to make sure assignment logging isn't excessive in quantity or size
