Repository: accumulo Updated Branches: refs/heads/master 3bd0caa58 -> d1543a4e5
Revert "ACCUMULO-2490 Make Pair API more generics-friendly" This reverts commit 053e83fc4225969efda31ee4957651640cc7ac9e. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d1543a4e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1543a4e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d1543a4e Branch: refs/heads/master Commit: d1543a4e590531eb71f4e16481b29f435c019654 Parents: 3bd0caa Author: Mike Drob <md...@cloudera.com> Authored: Tue Mar 18 11:42:38 2014 -0400 Committer: Mike Drob <md...@cloudera.com> Committed: Tue Mar 18 11:42:38 2014 -0400 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/util/Pair.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1543a4e/core/src/main/java/org/apache/accumulo/core/util/Pair.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/Pair.java b/core/src/main/java/org/apache/accumulo/core/util/Pair.java index 159a77b..00eab0e 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/Pair.java +++ b/core/src/main/java/org/apache/accumulo/core/util/Pair.java @@ -72,16 +72,16 @@ public class Pair<A,B> { return prefix + first + separator + second + suffix; } - public Entry<? super A,? super B> toMapEntry() { + public Entry<A,B> toMapEntry() { return new SimpleImmutableEntry<A,B>(getFirst(), getSecond()); } - public Pair<? super B,? super A> swap() { + public Pair<B,A> swap() { return new Pair<B,A>(getSecond(), getFirst()); } - public static <K2,V2,K1 extends K2,V1 extends V2> Pair<K2,V2> fromEntry(Entry<K1,V1> entry) { - return new Pair<K2,V2>(entry.getKey(), entry.getValue()); + public static <K,V> Pair<K,V> fromEntry(Entry<K,V> entry) { + return new Pair<K,V>(entry.getKey(), entry.getValue()); } }
