You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/08/26 23:11:17 UTC
[2/3] accumulo git commit: ACCUMULO-4013 Remove new trivial warnings
ACCUMULO-4013 Remove new trivial warnings
Remove some redundant type args
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c2900a38
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c2900a38
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c2900a38
Branch: refs/heads/master
Commit: c2900a3806894558a0bb609ca6edfd818a28c92a
Parents: a8881ac
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Aug 26 16:25:49 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Aug 26 16:25:49 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/iterators/user/FilterTest.java | 4 ++--
.../main/java/org/apache/accumulo/master/TabletGroupWatcher.java | 4 ++--
.../java/org/apache/accumulo/test/functional/WALSunnyDayIT.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c2900a38/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
index e7e2266..929d266 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
@@ -258,7 +258,7 @@ public class FilterTest {
Text colf = new Text("a");
Text colq = new Text("b");
Value dv = new Value();
- TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+ TreeMap<Key,Value> tm = new TreeMap<>();
IteratorSetting is = new IteratorSetting(1, ColumnAgeOffFilter.class);
ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a"), 901l);
ColumnAgeOffFilter.setNegate(is, true);
@@ -299,7 +299,7 @@ public class FilterTest {
Text colf = new Text("negate");
Text colq = new Text("b");
Value dv = new Value();
- TreeMap<Key,Value> tm = new TreeMap<Key,Value>();
+ TreeMap<Key,Value> tm = new TreeMap<>();
IteratorSetting is = new IteratorSetting(1, ColumnAgeOffFilter.class);
ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("negate"), 901l);
long ts = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c2900a38/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 3f7dc74..3890b38 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
@@ -181,8 +181,8 @@ abstract class TabletGroupWatcher extends Daemon {
SortedMap<TServerInstance,TabletServerStatus> destinations = new TreeMap<>(currentTServers);
destinations.keySet().removeAll(this.master.serversToShutdown);
- List<Assignment> assignments = new ArrayList<Assignment>();
- List<Assignment> assigned = new ArrayList<Assignment>();
+ List<Assignment> assignments = new ArrayList<>();
+ List<Assignment> assigned = new ArrayList<>();
List<TabletLocationState> assignedToDeadServers = new ArrayList<>();
List<TabletLocationState> suspendedToGoneServers = new ArrayList<>();
Map<KeyExtent,TServerInstance> unassigned = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c2900a38/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
----------------------------------------------------------------------
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 0831812..2f5ee81 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
@@ -238,7 +238,7 @@ public class WALSunnyDayIT extends ConfigurableMacBase {
}
fail("Unable to get the correct number of WALs, expected " + expectedCount + " but got " + wals.toString());
- return new HashMap<String,Boolean>();
+ return new HashMap<>();
}
private int getWaitFactor() {